Changeset 1293 for trunk/source/tracking/src
- Timestamp:
- Jun 2, 2010, 10:23:13 AM (14 years ago)
- Location:
- trunk/source/tracking/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/tracking/src/G4RichTrajectory.cc
r1228 r1293 25 25 // 26 26 // 27 // $Id: G4RichTrajectory.cc,v 1. 8 2009/11/24 10:04:14 perlExp $28 // GEANT4 tag $Name: geant4-09-03 $27 // $Id: G4RichTrajectory.cc,v 1.9 2010/02/22 21:26:56 allison Exp $ 28 // GEANT4 tag $Name: tracking-V09-03-03 $ 29 29 // 30 30 // --------------------------------------------------------------- … … 145 145 if(!secondTrajectory) return; 146 146 147 G4Trajectory::MergeTrajectory(secondTrajectory);148 149 147 G4RichTrajectory* seco = (G4RichTrajectory*)secondTrajectory; 150 148 G4int ent = seco->GetPointEntries(); … … 245 243 values->push_back(G4AttValue("CPTN",G4VProcess::GetProcessTypeName(type),"")); 246 244 } else { 247 values->push_back(G4AttValue("CPN"," User Defined",""));248 values->push_back(G4AttValue("CPTN"," User",""));245 values->push_back(G4AttValue("CPN","None","")); 246 values->push_back(G4AttValue("CPTN","None","")); 249 247 } 250 248 … … 266 264 values->push_back(G4AttValue("EPTN",G4VProcess::GetProcessTypeName(type),"")); 267 265 } else { 268 values->push_back(G4AttValue("EPN"," User Defined",""));269 values->push_back(G4AttValue("EPTN"," User",""));266 values->push_back(G4AttValue("EPN","None","")); 267 values->push_back(G4AttValue("EPTN","None","")); 270 268 } 271 269 -
trunk/source/tracking/src/G4RichTrajectoryPoint.cc
r1228 r1293 25 25 // 26 26 // 27 // $Id: G4RichTrajectoryPoint.cc,v 1. 5 2009/11/24 10:04:14 perlExp $28 // GEANT4 tag $Name: geant4-09-03 $27 // $Id: G4RichTrajectoryPoint.cc,v 1.6 2010/02/22 21:26:56 allison Exp $ 28 // GEANT4 tag $Name: tracking-V09-03-03 $ 29 29 // 30 30 // … … 236 236 "")); 237 237 } else { 238 values->push_back 239 (G4AttValue("PDS","User Defined Limit in Current Volume","")); 240 values->push_back(G4AttValue("PTDS","User","")); 238 values->push_back(G4AttValue("PDS","None","")); 239 values->push_back(G4AttValue("PTDS","None","")); 241 240 } 242 241 -
trunk/source/tracking/src/G4SmoothTrajectory.cc
r1228 r1293 25 25 // 26 26 // 27 // $Id: G4SmoothTrajectory.cc,v 1. 19 2009/11/12 09:09:56allison Exp $28 // GEANT4 tag $Name: geant4-09-03 $27 // $Id: G4SmoothTrajectory.cc,v 1.20 2010/05/29 21:31:03 allison Exp $ 28 // GEANT4 tag $Name: tracking-V09-03-03 $ 29 29 // 30 30 // … … 120 120 } 121 121 122 void G4SmoothTrajectory::DrawTrajectory() const 123 { 124 // Invoke the default implementation in G4VTrajectory... 125 G4VTrajectory::DrawTrajectory(); 126 // ... or override with your own code here. 127 } 128 122 129 void G4SmoothTrajectory::DrawTrajectory(G4int i_mode) const 123 130 { -
trunk/source/tracking/src/G4Trajectory.cc
r1228 r1293 25 25 // 26 26 // 27 // $Id: G4Trajectory.cc,v 1.3 3 2009/11/12 09:09:56allison Exp $28 // GEANT4 tag $Name: geant4-09-03 $27 // $Id: G4Trajectory.cc,v 1.34 2010/05/29 21:31:03 allison Exp $ 28 // GEANT4 tag $Name: tracking-V09-03-03 $ 29 29 // 30 30 // --------------------------------------------------------------- … … 115 115 } 116 116 117 void G4Trajectory::DrawTrajectory() const 118 { 119 // Invoke the default implementation in G4VTrajectory... 120 G4VTrajectory::DrawTrajectory(); 121 // ... or override with your own code here. 122 } 123 117 124 void G4Trajectory::DrawTrajectory(G4int i_mode) const 118 125 { -
trunk/source/tracking/src/G4VTrajectory.cc
r1228 r1293 25 25 // 26 26 // 27 // $Id: G4VTrajectory.cc,v 1.1 2 2006/10/16 13:45:01allison Exp $28 // GEANT4 tag $Name: geant4-09-03 $27 // $Id: G4VTrajectory.cc,v 1.15 2010/05/29 21:31:03 allison Exp $ 28 // GEANT4 tag $Name: tracking-V09-03-03 $ 29 29 // 30 30 // --------------------------------------------------------------- … … 116 116 } 117 117 118 void G4VTrajectory::DrawTrajectory() const 119 { 120 G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance(); 121 122 if (0 != pVVisManager) { 123 pVVisManager->DispatchToModel(*this); 124 } 125 } 126 118 127 void G4VTrajectory::DrawTrajectory(G4int i_mode) const 119 128 { 120 129 G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance(); 130 131 static G4bool warnedAboutIMode = false; 132 if (!warnedAboutIMode) { 133 G4Exception 134 ("G4VTrajectory::DrawTrajectory", 135 "", 136 JustWarning, 137 "WARNING: DEPRECATED: The use of i_mode argument in DrawTrajectory" 138 "\n is deprecated and will be removed at the next major release."); 139 warnedAboutIMode = true; 140 } 121 141 122 142 if (0 != pVVisManager) {
Note: See TracChangeset
for help on using the changeset viewer.