Changeset 1011 for trunk/source/tracking
- Timestamp:
- Apr 22, 2009, 11:59:36 AM (15 years ago)
- Location:
- trunk/source/tracking
- Files:
-
- 32 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/tracking/History
r921 r1011 1 $Id: History,v 1.12 5 2008/10/02 01:08:23 tsasakiExp $2 $Name: geant4-09-02- cand-01$1 $Id: History,v 1.126 2008/12/09 01:37:25 asaim Exp $ 2 $Name: geant4-09-02-ref-02 $ 3 3 ------------------------------------------------------------------- 4 4 … … 18 18 * Reverse chronological order (last date on top), please * 19 19 ---------------------------------------------------------- 20 21 08 Doc 2008 M.Asai (tracking-V09-01-04) 22 - Fixing bug of fN2ndaries variables in G4STeppingManager2.cc 23 20 24 02 Oct 2008 T.Sasaki (tracking-V09-01-03) 21 25 - G4SteppingManager2.cc: PhyscalStep etc was not updated when -
trunk/source/tracking/include/G4RichTrajectory.hh
r850 r1011 26 26 // 27 27 // $Id: G4RichTrajectory.hh,v 1.4 2006/06/29 21:15:23 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4RichTrajectoryPoint.hh
r850 r1011 26 26 // 27 27 // $Id: G4RichTrajectoryPoint.hh,v 1.5 2006/09/27 20:42:52 asaim Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4SmoothTrajectory.hh
r850 r1011 26 26 // 27 27 // $Id: G4SmoothTrajectory.hh,v 1.11 2006/06/29 21:15:27 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4SmoothTrajectoryPoint.hh
r850 r1011 26 26 // 27 27 // $Id: G4SmoothTrajectoryPoint.hh,v 1.13 2006/06/29 21:15:29 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4SteppingManager.hh
r850 r1011 26 26 // 27 27 // $Id: G4SteppingManager.hh,v 1.31 2007/10/09 03:51:06 tsasaki Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4SteppingVerbose.hh
r850 r1011 26 26 // 27 27 // $Id: G4SteppingVerbose.hh,v 1.12 2006/06/29 21:15:33 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4TrackingManager.hh
r850 r1011 26 26 // 27 27 // $Id: G4TrackingManager.hh,v 1.21 2006/11/14 10:58:47 tsasaki Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4TrackingMessenger.hh
r850 r1011 26 26 // 27 27 // $Id: G4TrackingMessenger.hh,v 1.10 2006/06/29 21:15:39 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4Trajectory.hh
r850 r1011 26 26 // 27 27 // $Id: G4Trajectory.hh,v 1.24 2006/06/29 21:15:41 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4TrajectoryPoint.hh
r850 r1011 26 26 // 27 27 // $Id: G4TrajectoryPoint.hh,v 1.17 2006/06/29 21:15:43 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4UserSteppingAction.hh
r850 r1011 26 26 // 27 27 // $Id: G4UserSteppingAction.hh,v 1.12 2006/06/29 21:15:45 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4UserTrackingAction.hh
r850 r1011 26 26 // 27 27 // $Id: G4UserTrackingAction.hh,v 1.11 2006/06/29 21:15:47 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 // -
trunk/source/tracking/include/G4VSteppingVerbose.hh
r850 r1011 26 26 // 27 27 // $Id: G4VSteppingVerbose.hh,v 1.24 2006/11/14 10:58:47 tsasaki Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4VTrajectory.hh
r850 r1011 26 26 // 27 27 // $Id: G4VTrajectory.hh,v 1.17 2006/06/29 21:15:51 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/include/G4VTrajectoryPoint.hh
r850 r1011 26 26 // 27 27 // $Id: G4VTrajectoryPoint.hh,v 1.15 2006/06/29 21:15:53 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/src/G4RichTrajectory.cc
r850 r1011 26 26 // 27 27 // $Id: G4RichTrajectory.cc,v 1.6 2006/10/16 13:43:43 allison Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 // --------------------------------------------------------------- -
trunk/source/tracking/src/G4RichTrajectoryPoint.cc
r850 r1011 26 26 // 27 27 // $Id: G4RichTrajectoryPoint.cc,v 1.3 2006/09/27 20:42:52 asaim Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 // -
trunk/source/tracking/src/G4SmoothTrajectory.cc
r850 r1011 26 26 // 27 27 // $Id: G4SmoothTrajectory.cc,v 1.18 2006/10/16 13:37:17 allison Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 // -
trunk/source/tracking/src/G4SmoothTrajectoryPoint.cc
r850 r1011 26 26 // 27 27 // $Id: G4SmoothTrajectoryPoint.cc,v 1.15 2006/06/29 21:16:01 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 // -
trunk/source/tracking/src/G4SteppingManager.cc
r850 r1011 26 26 // 27 27 // $Id: G4SteppingManager.cc,v 1.49 2008/05/06 12:52:48 tsasaki Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/src/G4SteppingManager2.cc
r850 r1011 25 25 // 26 26 // 27 // $Id: G4SteppingManager2.cc,v 1. 29 2006/06/29 21:16:05 gunterExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4SteppingManager2.cc,v 1.35 2008/12/05 22:15:04 asaim Exp $ 28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- … … 170 170 171 171 switch (fCondition) { 172 case ExclusivelyForced: 173 (*fSelectedPostStepDoItVector)[np] = ExclusivelyForced; 174 fStepStatus = fExclusivelyForcedProc; 175 fStep->GetPostStepPoint() 176 ->SetProcessDefinedStep(fCurrentProcess); 177 break; 178 case Conditionally: 179 (*fSelectedPostStepDoItVector)[np] = Conditionally; 180 break; 181 case Forced: 182 (*fSelectedPostStepDoItVector)[np] = Forced; 183 break; 184 case StronglyForced: 185 (*fSelectedPostStepDoItVector)[np] = StronglyForced; 186 break; 187 default: 188 (*fSelectedPostStepDoItVector)[np] = InActivated; 189 if(physIntLength < PhysicalStep ){ 190 PhysicalStep = physIntLength; 191 fStepStatus = fPostStepDoItProc; 192 fPostStepDoItProcTriggered = G4int(np); 193 fStep->GetPostStepPoint() 194 ->SetProcessDefinedStep(fCurrentProcess); 195 } 172 case ExclusivelyForced: 173 (*fSelectedPostStepDoItVector)[np] = ExclusivelyForced; 174 fStepStatus = fExclusivelyForcedProc; 175 fStep->GetPostStepPoint() 176 ->SetProcessDefinedStep(fCurrentProcess); 177 break; 178 case Conditionally: 179 (*fSelectedPostStepDoItVector)[np] = Conditionally; 180 break; 181 case Forced: 182 (*fSelectedPostStepDoItVector)[np] = Forced; 183 break; 184 case StronglyForced: 185 (*fSelectedPostStepDoItVector)[np] = StronglyForced; 186 break; 187 default: 188 (*fSelectedPostStepDoItVector)[np] = InActivated; 189 break; 196 190 } 191 192 193 197 194 if (fCondition==ExclusivelyForced) { 198 for(size_t nrest=np+1; nrest < MAXofPostStepLoops; nrest++){199 (*fSelectedPostStepDoItVector)[nrest] = InActivated;200 }195 for(size_t nrest=np+1; nrest < MAXofPostStepLoops; nrest++){ 196 (*fSelectedPostStepDoItVector)[nrest] = InActivated; 197 } 201 198 return; // Take note the 'return' at here !!! 202 199 } 203 } 204 205 if(fPostStepDoItProcTriggered<MAXofPostStepLoops) 206 (*fSelectedPostStepDoItVector)[fPostStepDoItProcTriggered] = NotForced; 207 200 else{ 201 if(physIntLength < PhysicalStep ){ 202 PhysicalStep = physIntLength; 203 fStepStatus = fPostStepDoItProc; 204 fPostStepDoItProcTriggered = G4int(np); 205 fStep->GetPostStepPoint() 206 ->SetProcessDefinedStep(fCurrentProcess); 207 } 208 } 209 210 211 } 212 213 if (fPostStepDoItProcTriggered<MAXofPostStepLoops) { 214 if ((*fSelectedPostStepDoItVector)[fPostStepDoItProcTriggered] == 215 InActivated) { 216 (*fSelectedPostStepDoItVector)[fPostStepDoItProcTriggered] = 217 NotForced; 218 } 219 } 208 220 209 221 // GPIL for AlongStep … … 335 347 336 348 num2ndaries = fParticleChange->GetNumberOfSecondaries(); 337 fN2ndariesAtRestDoIt += num2ndaries;338 349 339 350 for(G4int DSecLoop=0 ; DSecLoop< num2ndaries; DSecLoop++){ … … 356 367 tempSecondaryTrack->SetTrackStatus( fStopButAlive ); 357 368 fSecondary->push_back( tempSecondaryTrack ); 369 fN2ndariesAtRestDoIt++; 358 370 } else { 359 371 delete tempSecondaryTrack; … … 361 373 } else { 362 374 fSecondary->push_back( tempSecondaryTrack ); 375 fN2ndariesAtRestDoIt++; 363 376 } 364 377 } //end of loop on secondary … … 409 422 410 423 num2ndaries = fParticleChange->GetNumberOfSecondaries(); 411 fN2ndariesAlongStepDoIt += num2ndaries;412 424 413 425 for(G4int DSecLoop=0 ; DSecLoop< num2ndaries; DSecLoop++){ … … 430 442 tempSecondaryTrack->SetTrackStatus( fStopButAlive ); 431 443 fSecondary->push_back( tempSecondaryTrack ); 444 fN2ndariesAlongStepDoIt++; 432 445 } else { 433 446 delete tempSecondaryTrack; … … 435 448 } else { 436 449 fSecondary->push_back( tempSecondaryTrack ); 450 fN2ndariesAlongStepDoIt++; 437 451 } 438 452 } //end of loop on secondary … … 520 534 521 535 num2ndaries = fParticleChange->GetNumberOfSecondaries(); 522 fN2ndariesPostStepDoIt += num2ndaries;523 536 524 537 for(G4int DSecLoop=0 ; DSecLoop< num2ndaries; DSecLoop++){ … … 541 554 tempSecondaryTrack->SetTrackStatus( fStopButAlive ); 542 555 fSecondary->push_back( tempSecondaryTrack ); 556 fN2ndariesPostStepDoIt++; 543 557 } else { 544 558 delete tempSecondaryTrack; … … 546 560 } else { 547 561 fSecondary->push_back( tempSecondaryTrack ); 562 fN2ndariesPostStepDoIt++; 548 563 } 549 564 } //end of loop on secondary -
trunk/source/tracking/src/G4SteppingVerbose.cc
r850 r1011 26 26 // 27 27 // $Id: G4SteppingVerbose.cc,v 1.23 2006/07/14 14:13:57 tsasaki Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/src/G4TrackingManager.cc
r850 r1011 26 26 // 27 27 // $Id: G4TrackingManager.cc,v 1.22 2006/11/14 10:58:47 tsasaki Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/src/G4TrackingMessenger.cc
r850 r1011 26 26 // 27 27 // $Id: G4TrackingMessenger.cc,v 1.15 2006/11/03 11:13:38 allison Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/src/G4Trajectory.cc
r850 r1011 26 26 // 27 27 // $Id: G4Trajectory.cc,v 1.32 2006/10/16 13:39:35 allison Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 // --------------------------------------------------------------- -
trunk/source/tracking/src/G4TrajectoryPoint.cc
r850 r1011 26 26 // 27 27 // $Id: G4TrajectoryPoint.cc,v 1.19 2006/06/29 21:16:15 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 // --------------------------------------------------------------- -
trunk/source/tracking/src/G4UserSteppingAction.cc
r850 r1011 26 26 // 27 27 // $Id: G4UserSteppingAction.cc,v 1.10 2006/06/29 21:16:17 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 // --------------------------------------------------------------- -
trunk/source/tracking/src/G4UserTrackingAction.cc
r850 r1011 26 26 // 27 27 // $Id: G4UserTrackingAction.cc,v 1.10 2006/06/29 21:16:19 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 // --------------------------------------------------------------- -
trunk/source/tracking/src/G4VSteppingVerbose.cc
r850 r1011 26 26 // 27 27 // $Id: G4VSteppingVerbose.cc,v 1.18 2006/11/14 10:58:47 tsasaki Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //--------------------------------------------------------------- -
trunk/source/tracking/src/G4VTrajectory.cc
r850 r1011 26 26 // 27 27 // $Id: G4VTrajectory.cc,v 1.12 2006/10/16 13:45:01 allison Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 // --------------------------------------------------------------- -
trunk/source/tracking/src/G4VTrajectoryPoint.cc
r850 r1011 26 26 // 27 27 // $Id: G4VTrajectoryPoint.cc,v 1.4 2006/06/29 21:16:26 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: geant4-09-02-ref-02 $ 29 29 // 30 30 //---------------------------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.