Changeset 1196 for trunk/source/tracking
- Timestamp:
- Nov 25, 2009, 5:13:58 PM (16 years ago)
- Location:
- trunk/source/tracking
- Files:
-
- 31 edited
-
include/G4RichTrajectory.hh (modified) (2 diffs)
-
include/G4RichTrajectoryPoint.hh (modified) (2 diffs)
-
include/G4SmoothTrajectory.hh (modified) (4 diffs)
-
include/G4SmoothTrajectoryPoint.hh (modified) (1 diff)
-
include/G4SteppingManager.hh (modified) (1 diff)
-
include/G4SteppingVerbose.hh (modified) (1 diff)
-
include/G4TrackingManager.hh (modified) (1 diff)
-
include/G4TrackingMessenger.hh (modified) (1 diff)
-
include/G4Trajectory.hh (modified) (3 diffs)
-
include/G4TrajectoryPoint.hh (modified) (1 diff)
-
include/G4UserSteppingAction.hh (modified) (1 diff)
-
include/G4UserTrackingAction.hh (modified) (1 diff)
-
include/G4VSteppingVerbose.hh (modified) (1 diff)
-
include/G4VTrajectory.hh (modified) (1 diff)
-
include/G4VTrajectoryPoint.hh (modified) (1 diff)
-
src/G4RichTrajectory.cc (modified) (8 diffs)
-
src/G4RichTrajectoryPoint.cc (modified) (7 diffs)
-
src/G4SmoothTrajectory.cc (modified) (6 diffs)
-
src/G4SmoothTrajectoryPoint.cc (modified) (1 diff)
-
src/G4SteppingManager.cc (modified) (2 diffs)
-
src/G4SteppingManager2.cc (modified) (7 diffs)
-
src/G4SteppingVerbose.cc (modified) (1 diff)
-
src/G4TrackingManager.cc (modified) (1 diff)
-
src/G4TrackingMessenger.cc (modified) (1 diff)
-
src/G4Trajectory.cc (modified) (6 diffs)
-
src/G4TrajectoryPoint.cc (modified) (1 diff)
-
src/G4UserSteppingAction.cc (modified) (1 diff)
-
src/G4UserTrackingAction.cc (modified) (1 diff)
-
src/G4VSteppingVerbose.cc (modified) (1 diff)
-
src/G4VTrajectory.cc (modified) (1 diff)
-
src/G4VTrajectoryPoint.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/tracking/include/G4RichTrajectory.hh
r1011 r1196 25 25 // 26 26 // 27 // $Id: G4RichTrajectory.hh,v 1. 4 2006/06/29 21:15:23 gunterExp $28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$27 // $Id: G4RichTrajectory.hh,v 1.5 2009/11/12 09:09:56 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- … … 95 95 G4VPhysicalVolume* fpInitialNextVolume; 96 96 const G4VProcess* fpCreatorProcess; 97 G4double fFinalKineticEnergy; 97 98 98 99 }; -
trunk/source/tracking/include/G4RichTrajectoryPoint.hh
r1011 r1196 25 25 // 26 26 // 27 // $Id: G4RichTrajectoryPoint.hh,v 1. 5 2006/09/27 20:42:52 asaimExp $28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$27 // $Id: G4RichTrajectoryPoint.hh,v 1.6 2009/11/12 09:09:56 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- … … 97 97 std::vector<G4ThreeVector>* fpAuxiliaryPointVector; 98 98 G4double fTotEDep; 99 G4double fRemainingEnergy; 99 100 const G4VProcess* fpProcess; 100 101 G4double fPreStepPointGlobalTime; -
trunk/source/tracking/include/G4SmoothTrajectory.hh
r1011 r1196 25 25 // 26 26 // 27 // $Id: G4SmoothTrajectory.hh,v 1.1 1 2006/06/29 21:15:27 gunterExp $28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$27 // $Id: G4SmoothTrajectory.hh,v 1.12 2009/11/12 09:09:56 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- … … 95 95 inline G4int GetPDGEncoding() const 96 96 { return PDGEncoding; } 97 inline G4double GetInitialKineticEnergy() const 98 { return initialKineticEnergy; } 97 99 inline G4ThreeVector GetInitialMomentum() const 98 100 { return initialMomentum; } … … 109 111 G4ParticleDefinition* GetParticleDefinition(); 110 112 111 // Get method for HEPRep style attributes113 // Get method for HEPRep style attributes 112 114 virtual const std::map<G4String,G4AttDef>* GetAttDefs() const; 113 115 virtual std::vector<G4AttValue>* CreateAttValues() const; … … 123 125 G4double PDGCharge; 124 126 G4String ParticleName; 127 G4double initialKineticEnergy; 125 128 G4ThreeVector initialMomentum; 126 129 -
trunk/source/tracking/include/G4SmoothTrajectoryPoint.hh
r1011 r1196 26 26 // 27 27 // $Id: G4SmoothTrajectoryPoint.hh,v 1.13 2006/06/29 21:15:29 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4SteppingManager.hh
r1011 r1196 26 26 // 27 27 // $Id: G4SteppingManager.hh,v 1.31 2007/10/09 03:51:06 tsasaki Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4SteppingVerbose.hh
r1011 r1196 26 26 // 27 27 // $Id: G4SteppingVerbose.hh,v 1.12 2006/06/29 21:15:33 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4TrackingManager.hh
r1011 r1196 26 26 // 27 27 // $Id: G4TrackingManager.hh,v 1.21 2006/11/14 10:58:47 tsasaki Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4TrackingMessenger.hh
r1011 r1196 26 26 // 27 27 // $Id: G4TrackingMessenger.hh,v 1.10 2006/06/29 21:15:39 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4Trajectory.hh
r1011 r1196 25 25 // 26 26 // 27 // $Id: G4Trajectory.hh,v 1.2 4 2006/06/29 21:15:41 gunterExp $28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$27 // $Id: G4Trajectory.hh,v 1.25 2009/11/12 09:09:56 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- … … 101 101 inline G4int GetPDGEncoding() const 102 102 { return PDGEncoding; } 103 inline G4double GetInitialKineticEnergy() const 104 { return initialKineticEnergy; } 103 105 inline G4ThreeVector GetInitialMomentum() const 104 106 { return initialMomentum; } … … 128 130 G4double PDGCharge; 129 131 G4String ParticleName; 132 G4double initialKineticEnergy; 130 133 G4ThreeVector initialMomentum; 131 134 -
trunk/source/tracking/include/G4TrajectoryPoint.hh
r1011 r1196 26 26 // 27 27 // $Id: G4TrajectoryPoint.hh,v 1.17 2006/06/29 21:15:43 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4UserSteppingAction.hh
r1011 r1196 26 26 // 27 27 // $Id: G4UserSteppingAction.hh,v 1.12 2006/06/29 21:15:45 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4UserTrackingAction.hh
r1011 r1196 26 26 // 27 27 // $Id: G4UserTrackingAction.hh,v 1.11 2006/06/29 21:15:47 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 // -
trunk/source/tracking/include/G4VSteppingVerbose.hh
r1011 r1196 26 26 // 27 27 // $Id: G4VSteppingVerbose.hh,v 1.24 2006/11/14 10:58:47 tsasaki Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4VTrajectory.hh
r1011 r1196 26 26 // 27 27 // $Id: G4VTrajectory.hh,v 1.17 2006/06/29 21:15:51 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4VTrajectoryPoint.hh
r1011 r1196 26 26 // 27 27 // $Id: G4VTrajectoryPoint.hh,v 1.15 2006/06/29 21:15:53 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/src/G4RichTrajectory.cc
r1011 r1196 25 25 // 26 26 // 27 // $Id: G4RichTrajectory.cc,v 1. 6 2006/10/16 13:43:43allison Exp $28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$27 // $Id: G4RichTrajectory.cc,v 1.7 2009/11/12 09:09:56 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 // --------------------------------------------------------------- … … 49 49 #include "G4AttDef.hh" 50 50 #include "G4AttValue.hh" 51 #include "G4UnitsTable.hh" 51 52 #include "G4VProcess.hh" 52 53 … … 62 63 fpInitialVolume(0), 63 64 fpInitialNextVolume(0), 64 fpCreatorProcess(0) 65 fpCreatorProcess(0), 66 fFinalKineticEnergy(0.) 65 67 {} 66 68 … … 81 83 // Insert the first rich trajectory point (see note above)... 82 84 fpRichPointsContainer->push_back(new G4RichTrajectoryPoint(aTrack)); 85 // On construction, set final KE to initial KE. 86 // Final KE is updated at the addition of every step - see AppendStep. 87 fFinalKineticEnergy = aTrack->GetKineticEnergy(); 83 88 } 84 89 … … 90 95 fpCreatorProcess = right.fpCreatorProcess; 91 96 fpRichPointsContainer = new RichTrajectoryPointsContainer; 97 fFinalKineticEnergy = right.fFinalKineticEnergy; 92 98 for(size_t i=0;i<right.fpRichPointsContainer->size();i++) 93 99 { … … 114 120 { 115 121 fpRichPointsContainer->push_back(new G4RichTrajectoryPoint(aStep)); 122 // Except for first step, which is a sort of virtual step to start 123 // the track, compute the final energy. 124 if (aStep->GetTrack()->GetCurrentStepNumber() > 0) { 125 fFinalKineticEnergy = 126 aStep->GetPreStepPoint()->GetKineticEnergy() - 127 aStep->GetTotalEnergyDeposit(); 128 } 116 129 } 117 130 … … 160 173 (*store)[ID] = G4AttDef(ID,"Creator Process Type Name", 161 174 "Physics","","G4String"); 175 176 ID = "FKE"; 177 (*store)[ID] = G4AttDef(ID,"Final kinetic energy", 178 "Physics","G4BestUnit","G4double"); 162 179 163 180 } … … 184 201 } 185 202 203 values->push_back 204 (G4AttValue("FKE",G4BestUnit(fFinalKineticEnergy,"Energy"),"")); 205 186 206 #ifdef G4ATTDEBUG 187 207 G4cout << G4AttCheck(values,GetAttDefs()); -
trunk/source/tracking/src/G4RichTrajectoryPoint.cc
r1011 r1196 25 25 // 26 26 // 27 // $Id: G4RichTrajectoryPoint.cc,v 1. 3 2006/09/27 20:42:52 asaimExp $28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$27 // $Id: G4RichTrajectoryPoint.cc,v 1.4 2009/11/12 09:09:56 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 // … … 66 66 fpAuxiliaryPointVector(0), 67 67 fTotEDep(0.), 68 fRemainingEnergy(0.), 68 69 fpProcess(0), 69 70 fPreStepPointGlobalTime(0), … … 75 76 fpAuxiliaryPointVector(0), 76 77 fTotEDep(0.), 78 fRemainingEnergy(aTrack->GetKineticEnergy()), 77 79 fpProcess(0), 78 80 fPreStepPointGlobalTime(aTrack->GetGlobalTime()), … … 87 89 G4StepPoint* preStepPoint = aStep->GetPreStepPoint(); 88 90 G4StepPoint* postStepPoint = aStep->GetPostStepPoint(); 91 if (aStep->GetTrack()->GetCurrentStepNumber() <= 0) { // First step 92 fRemainingEnergy = aStep->GetTrack()->GetKineticEnergy(); 93 } else { 94 fRemainingEnergy = preStepPoint->GetKineticEnergy() - fTotEDep; 95 } 89 96 fpProcess = postStepPoint->GetProcessDefinedStep(); 90 97 fPreStepPointGlobalTime = preStepPoint->GetGlobalTime(); … … 124 131 fpAuxiliaryPointVector(right.fpAuxiliaryPointVector), 125 132 fTotEDep(right.fTotEDep), 133 fRemainingEnergy(right.fRemainingEnergy), 126 134 fpProcess(right.fpProcess), 127 135 fPreStepPointGlobalTime(right.fPreStepPointGlobalTime), … … 159 167 ID = "TED"; 160 168 (*store)[ID] = G4AttDef(ID,"Total Energy Deposit", 169 "Physics","G4BestUnit","G4double"); 170 ID = "RE"; 171 (*store)[ID] = G4AttDef(ID,"Remaining Energy", 161 172 "Physics","G4BestUnit","G4double"); 162 173 ID = "PDS"; … … 190 201 191 202 values->push_back(G4AttValue("TED",G4BestUnit(fTotEDep,"Energy"),"")); 203 204 values->push_back(G4AttValue("RE",G4BestUnit(fRemainingEnergy,"Energy"),"")); 192 205 193 206 if (fpProcess) { -
trunk/source/tracking/src/G4SmoothTrajectory.cc
r1011 r1196 25 25 // 26 26 // 27 // $Id: G4SmoothTrajectory.cc,v 1.1 8 2006/10/16 13:37:17allison Exp $28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$27 // $Id: G4SmoothTrajectory.cc,v 1.19 2009/11/12 09:09:56 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 // … … 60 60 : positionRecord(0), fTrackID(0), fParentID(0), 61 61 PDGEncoding( 0 ), PDGCharge(0.0), ParticleName(""), 62 initial Momentum( G4ThreeVector() )62 initialKineticEnergy( 0. ), initialMomentum( G4ThreeVector() ) 63 63 {;} 64 64 … … 71 71 fTrackID = aTrack->GetTrackID(); 72 72 fParentID = aTrack->GetParentID(); 73 initialKineticEnergy = aTrack->GetKineticEnergy(); 73 74 initialMomentum = aTrack->GetMomentum(); 74 75 positionRecord = new TrajectoryPointContainer(); … … 88 89 fTrackID = right.fTrackID; 89 90 fParentID = right.fParentID; 91 initialKineticEnergy = right.initialKineticEnergy; 90 92 initialMomentum = right.initialMomentum; 91 93 positionRecord = new TrajectoryPointContainer(); … … 147 149 (*store)[PDG] = G4AttDef(PDG,"PDG Encoding","Physics","","G4int"); 148 150 151 G4String IKE("IKE"); 152 (*store)[IKE] = 153 G4AttDef(IKE, "Initial kinetic energy", 154 "Physics","G4BestUnit","G4double"); 155 149 156 G4String IMom("IMom"); 150 (*store)[IMom] = G4AttDef(IMom, " Momentum of track at start of trajectory",157 (*store)[IMom] = G4AttDef(IMom, "Initial momentum", 151 158 "Physics","G4BestUnit","G4ThreeVector"); 152 159 153 160 G4String IMag("IMag"); 154 161 (*store)[IMag] = G4AttDef 155 (IMag, " Magnitude of momentum of track at start of trajectory",162 (IMag, "Initial momentum magnitude", 156 163 "Physics","G4BestUnit","G4double"); 157 164 … … 181 188 values->push_back 182 189 (G4AttValue("PDG",G4UIcommand::ConvertToString(PDGEncoding),"")); 190 191 values->push_back 192 (G4AttValue("IKE",G4BestUnit(initialKineticEnergy,"Energy"),"")); 183 193 184 194 values->push_back -
trunk/source/tracking/src/G4SmoothTrajectoryPoint.cc
r1011 r1196 26 26 // 27 27 // $Id: G4SmoothTrajectoryPoint.cc,v 1.15 2006/06/29 21:16:01 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 // -
trunk/source/tracking/src/G4SteppingManager.cc
r1011 r1196 25 25 // 26 26 // 27 // $Id: G4SteppingManager.cc,v 1. 49 2008/05/06 12:52:48tsasaki Exp $28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$27 // $Id: G4SteppingManager.cc,v 1.50 2009/02/27 08:09:50 tsasaki Exp $ 28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- … … 313 313 fTrack->GetMomentumDirection(), 314 314 *((G4TouchableHistory*)fTrack->GetTouchableHandle()()) ); 315 if(newTopVolume != oldTopVolume ){ 315 // if(newTopVolume != oldTopVolume ){ 316 if(newTopVolume != oldTopVolume || oldTopVolume->GetRegularStructureId() == 1 ) { 316 317 fTouchableHandle = fNavigator->CreateTouchableHistory(); 317 318 fTrack->SetTouchableHandle( fTouchableHandle ); -
trunk/source/tracking/src/G4SteppingManager2.cc
r1011 r1196 25 25 // 26 26 // 27 // $Id: G4SteppingManager2.cc,v 1.3 5 2008/12/05 22:15:04 asaim Exp $28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$27 // $Id: G4SteppingManager2.cc,v 1.37 2009/09/25 00:23:41 gum Exp $ 28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- … … 276 276 ////////////////////////////////////////////////////// 277 277 { 278 279 278 // Select the rest process which has the shortest time before 280 279 // it is invoked. In rest processes, GPIL() … … 294 293 } // NULL means the process is inactivated by a user on fly. 295 294 296 lifeTime = 295 lifeTime = 297 296 fCurrentProcess->AtRestGPIL( 298 297 *fTrack, 299 298 &fCondition ); 300 if(fCondition==Forced){ 299 300 if(fCondition==Forced && fCurrentProcess){ 301 301 (*fSelectedAtRestDoItVector)[ri] = Forced; 302 302 } 303 303 else{ 304 304 (*fSelectedAtRestDoItVector)[ri] = InActivated; 305 if(lifeTime < shortestLifeTime ){ 306 shortestLifeTime = lifeTime; 307 fAtRestDoItProcTriggered = G4int(int(ri)); 305 if(lifeTime < shortestLifeTime ){ 306 shortestLifeTime = lifeTime; 307 fAtRestDoItProcTriggered = G4int(int(ri)); 308 (*fSelectedAtRestDoItVector)[fAtRestDoItProcTriggered] = NotForced; 308 309 } 309 310 } … … 315 316 // G4Exception("G4SteppingManager::InvokeAtRestDoItProcs: No AtRestDoIt process is active. " ); 316 317 G4cerr << "G4SteppingManager::InvokeAtRestDoItProcs: No AtRestDoIt process is active. " << G4endl; 317 } else {318 (*fSelectedAtRestDoItVector)[fAtRestDoItProcTriggered] = NotForced;319 318 } 320 319 … … 329 328 // 330 329 if( (*fSelectedAtRestDoItVector)[MAXofAtRestLoops-np-1] != InActivated){ 331 332 330 333 331 fCurrentProcess = (*fAtRestDoItVector)[np]; … … 383 381 } //if(fSelectedAtRestDoItVector[np] != InActivated){ 384 382 } //for(size_t np=0; np < MAXofAtRestLoops; np++){ 385 386 383 fStep->UpdateTrack(); 387 384 … … 615 612 } 616 613 617 -
trunk/source/tracking/src/G4SteppingVerbose.cc
r1011 r1196 26 26 // 27 27 // $Id: G4SteppingVerbose.cc,v 1.23 2006/07/14 14:13:57 tsasaki Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/src/G4TrackingManager.cc
r1011 r1196 26 26 // 27 27 // $Id: G4TrackingManager.cc,v 1.22 2006/11/14 10:58:47 tsasaki Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/src/G4TrackingMessenger.cc
r1011 r1196 26 26 // 27 27 // $Id: G4TrackingMessenger.cc,v 1.15 2006/11/03 11:13:38 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/src/G4Trajectory.cc
r1011 r1196 25 25 // 26 26 // 27 // $Id: G4Trajectory.cc,v 1.3 2 2006/10/16 13:39:35allison Exp $28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$27 // $Id: G4Trajectory.cc,v 1.33 2009/11/12 09:09:56 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 // --------------------------------------------------------------- … … 59 59 : positionRecord(0), fTrackID(0), fParentID(0), 60 60 PDGEncoding( 0 ), PDGCharge(0.0), ParticleName(""), 61 initial Momentum( G4ThreeVector() )61 initialKineticEnergy( 0. ), initialMomentum( G4ThreeVector() ) 62 62 {;} 63 63 … … 70 70 fTrackID = aTrack->GetTrackID(); 71 71 fParentID = aTrack->GetParentID(); 72 initialKineticEnergy = aTrack->GetKineticEnergy(); 72 73 initialMomentum = aTrack->GetMomentum(); 73 74 positionRecord = new TrajectoryPointContainer(); … … 83 84 fTrackID = right.fTrackID; 84 85 fParentID = right.fParentID; 86 initialKineticEnergy = right.initialKineticEnergy; 85 87 initialMomentum = right.initialMomentum; 86 88 positionRecord = new TrajectoryPointContainer(); … … 142 144 (*store)[PDG] = G4AttDef(PDG,"PDG Encoding","Physics","","G4int"); 143 145 146 G4String IKE("IKE"); 147 (*store)[IKE] = 148 G4AttDef(IKE, "Initial kinetic energy", 149 "Physics","G4BestUnit","G4double"); 150 144 151 G4String IMom("IMom"); 145 (*store)[IMom] = G4AttDef(IMom, " Momentum at start of trajectory",152 (*store)[IMom] = G4AttDef(IMom, "Initial momentum", 146 153 "Physics","G4BestUnit","G4ThreeVector"); 147 154 148 155 G4String IMag("IMag"); 149 156 (*store)[IMag] = 150 G4AttDef(IMag, " Magnitude of momentum at start of trajectory",157 G4AttDef(IMag, "Initial momentum magnitude", 151 158 "Physics","G4BestUnit","G4double"); 152 159 … … 175 182 values->push_back 176 183 (G4AttValue("PDG",G4UIcommand::ConvertToString(PDGEncoding),"")); 184 185 values->push_back 186 (G4AttValue("IKE",G4BestUnit(initialKineticEnergy,"Energy"),"")); 177 187 178 188 values->push_back -
trunk/source/tracking/src/G4TrajectoryPoint.cc
r1011 r1196 26 26 // 27 27 // $Id: G4TrajectoryPoint.cc,v 1.19 2006/06/29 21:16:15 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 // --------------------------------------------------------------- -
trunk/source/tracking/src/G4UserSteppingAction.cc
r1011 r1196 26 26 // 27 27 // $Id: G4UserSteppingAction.cc,v 1.10 2006/06/29 21:16:17 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 // --------------------------------------------------------------- -
trunk/source/tracking/src/G4UserTrackingAction.cc
r1011 r1196 26 26 // 27 27 // $Id: G4UserTrackingAction.cc,v 1.10 2006/06/29 21:16:19 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 // --------------------------------------------------------------- -
trunk/source/tracking/src/G4VSteppingVerbose.cc
r1011 r1196 26 26 // 27 27 // $Id: G4VSteppingVerbose.cc,v 1.18 2006/11/14 10:58:47 tsasaki Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/src/G4VTrajectory.cc
r1011 r1196 26 26 // 27 27 // $Id: G4VTrajectory.cc,v 1.12 2006/10/16 13:45:01 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 // --------------------------------------------------------------- -
trunk/source/tracking/src/G4VTrajectoryPoint.cc
r1011 r1196 26 26 // 27 27 // $Id: G4VTrajectoryPoint.cc,v 1.4 2006/06/29 21:16:26 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 2-ref-02$28 // GEANT4 tag $Name: geant4-09-03-cand-01 $ 29 29 // 30 30 //---------------------------------------------------------------
Note:
See TracChangeset
for help on using the changeset viewer.
