Changeset 1011 for trunk

Timestamp:

Apr 22, 2009, 11:59:36 AM (15 years ago)

Author:

garnier

Message:

update

Location:

trunk/source/tracking

Files:

• History (modified) (2 diffs)
• include/G4RichTrajectory.hh (modified) (1 diff)
• include/G4RichTrajectoryPoint.hh (modified) (1 diff)
• include/G4SmoothTrajectory.hh (modified) (1 diff)
• 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) (1 diff)
• 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) (1 diff)
• src/G4RichTrajectoryPoint.cc (modified) (1 diff)
• src/G4SmoothTrajectory.cc (modified) (1 diff)
• src/G4SmoothTrajectoryPoint.cc (modified) (1 diff)
• src/G4SteppingManager.cc (modified) (1 diff)
• src/G4SteppingManager2.cc (modified) (11 diffs)
• src/G4SteppingVerbose.cc (modified) (1 diff)
• src/G4TrackingManager.cc (modified) (1 diff)
• src/G4TrackingMessenger.cc (modified) (1 diff)
• src/G4Trajectory.cc (modified) (1 diff)
• 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)

trunk/source/tracking/History

@@ -1 @@
-$Id: History,v 1.125 2008/10/02 01:08:23 tsasaki Exp $
-$Name: geant4-09-02-cand-01 $ 
+$Id: History,v 1.126 2008/12/09 01:37:25 asaim Exp $
+$Name: geant4-09-02-ref-02 $ 
 -------------------------------------------------------------------
 
@@ -18 +18 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+08 Doc 2008  M.Asai (tracking-V09-01-04)
+- Fixing bug of fN2ndaries variables in G4STeppingManager2.cc
+
 02 Oct 2008  T.Sasaki (tracking-V09-01-03)
 - G4SteppingManager2.cc: PhyscalStep etc was not updated when 

trunk/source/tracking/include/G4RichTrajectory.hh

@@ -26 +26 @@
 //
 // $Id: G4RichTrajectory.hh,v 1.4 2006/06/29 21:15:23 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4RichTrajectoryPoint.hh

@@ -26 +26 @@
 //
 // $Id: G4RichTrajectoryPoint.hh,v 1.5 2006/09/27 20:42:52 asaim Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4SmoothTrajectory.hh

@@ -26 +26 @@
 //
 // $Id: G4SmoothTrajectory.hh,v 1.11 2006/06/29 21:15:27 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4SmoothTrajectoryPoint.hh

@@ -26 +26 @@
 //
 // $Id: G4SmoothTrajectoryPoint.hh,v 1.13 2006/06/29 21:15:29 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4SteppingManager.hh

@@ -26 +26 @@
 //
 // $Id: G4SteppingManager.hh,v 1.31 2007/10/09 03:51:06 tsasaki Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 // 
 //---------------------------------------------------------------

trunk/source/tracking/include/G4SteppingVerbose.hh

@@ -26 +26 @@
 //
 // $Id: G4SteppingVerbose.hh,v 1.12 2006/06/29 21:15:33 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4TrackingManager.hh

@@ -26 +26 @@
 //
 // $Id: G4TrackingManager.hh,v 1.21 2006/11/14 10:58:47 tsasaki Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4TrackingMessenger.hh

@@ -26 +26 @@
 //
 // $Id: G4TrackingMessenger.hh,v 1.10 2006/06/29 21:15:39 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4Trajectory.hh

@@ -26 +26 @@
 //
 // $Id: G4Trajectory.hh,v 1.24 2006/06/29 21:15:41 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4TrajectoryPoint.hh

@@ -26 +26 @@
 //
 // $Id: G4TrajectoryPoint.hh,v 1.17 2006/06/29 21:15:43 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4UserSteppingAction.hh

@@ -26 +26 @@
 //
 // $Id: G4UserSteppingAction.hh,v 1.12 2006/06/29 21:15:45 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4UserTrackingAction.hh

@@ -26 +26 @@
 //
 // $Id: G4UserTrackingAction.hh,v 1.11 2006/06/29 21:15:47 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/tracking/include/G4VSteppingVerbose.hh

@@ -26 +26 @@
 //
 // $Id: G4VSteppingVerbose.hh,v 1.24 2006/11/14 10:58:47 tsasaki Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4VTrajectory.hh

@@ -26 +26 @@
 //
 // $Id: G4VTrajectory.hh,v 1.17 2006/06/29 21:15:51 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/include/G4VTrajectoryPoint.hh

@@ -26 +26 @@
 //
 // $Id: G4VTrajectoryPoint.hh,v 1.15 2006/06/29 21:15:53 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/src/G4RichTrajectory.cc

@@ -26 +26 @@
 //
 // $Id: G4RichTrajectory.cc,v 1.6 2006/10/16 13:43:43 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ---------------------------------------------------------------

trunk/source/tracking/src/G4RichTrajectoryPoint.cc

@@ -26 +26 @@
 //
 // $Id: G4RichTrajectoryPoint.cc,v 1.3 2006/09/27 20:42:52 asaim Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/tracking/src/G4SmoothTrajectory.cc

@@ -26 +26 @@
 //
 // $Id: G4SmoothTrajectory.cc,v 1.18 2006/10/16 13:37:17 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/tracking/src/G4SmoothTrajectoryPoint.cc

@@ -26 +26 @@
 //
 // $Id: G4SmoothTrajectoryPoint.cc,v 1.15 2006/06/29 21:16:01 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/tracking/src/G4SteppingManager.cc

@@ -26 +26 @@
 //
 // $Id: G4SteppingManager.cc,v 1.49 2008/05/06 12:52:48 tsasaki Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/src/G4SteppingManager2.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4SteppingManager2.cc,v 1.29 2006/06/29 21:16:05 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4SteppingManager2.cc,v 1.35 2008/12/05 22:15:04 asaim Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------
@@ -170 +170 @@
 
      switch (fCondition) {
-     case ExclusivelyForced:
-       (*fSelectedPostStepDoItVector)[np] = ExclusivelyForced;
-       fStepStatus = fExclusivelyForcedProc;
-           fStep->GetPostStepPoint()
-                                 ->SetProcessDefinedStep(fCurrentProcess);
-       break;
-     case Conditionally:
-       (*fSelectedPostStepDoItVector)[np] = Conditionally;
-       break;
-     case Forced:
-       (*fSelectedPostStepDoItVector)[np] = Forced;
-       break;
-     case StronglyForced:
-       (*fSelectedPostStepDoItVector)[np] = StronglyForced;
-       break;
-     default:
-       (*fSelectedPostStepDoItVector)[np] = InActivated;
-       if(physIntLength < PhysicalStep ){
-         PhysicalStep = physIntLength;
-         fStepStatus = fPostStepDoItProc;
-         fPostStepDoItProcTriggered = G4int(np);
-         fStep->GetPostStepPoint()
-              ->SetProcessDefinedStep(fCurrentProcess);
-       }
+         case ExclusivelyForced:
+             (*fSelectedPostStepDoItVector)[np] = ExclusivelyForced;
+             fStepStatus = fExclusivelyForcedProc;
+             fStep->GetPostStepPoint()
+                 ->SetProcessDefinedStep(fCurrentProcess);
+             break;
+         case Conditionally:
+             (*fSelectedPostStepDoItVector)[np] = Conditionally;
+             break;
+         case Forced:
+             (*fSelectedPostStepDoItVector)[np] = Forced;
+             break;
+         case StronglyForced:
+             (*fSelectedPostStepDoItVector)[np] = StronglyForced;
+             break;
+         default:
+             (*fSelectedPostStepDoItVector)[np] = InActivated;
+             break;
      }
+       
+
+
      if (fCondition==ExclusivelyForced) { 
-         for(size_t nrest=np+1; nrest < MAXofPostStepLoops; nrest++){ 
-             (*fSelectedPostStepDoItVector)[nrest] = InActivated; 
-         } 
+         for(size_t nrest=np+1; nrest < MAXofPostStepLoops; nrest++){ 
+             (*fSelectedPostStepDoItVector)[nrest] = InActivated; 
+         } 
          return;  // Take note the 'return' at here !!! 
      } 
-   }
-
-   if(fPostStepDoItProcTriggered<MAXofPostStepLoops)
-     (*fSelectedPostStepDoItVector)[fPostStepDoItProcTriggered] = NotForced;
-
+     else{
+         if(physIntLength < PhysicalStep ){
+             PhysicalStep = physIntLength;
+             fStepStatus = fPostStepDoItProc;
+             fPostStepDoItProcTriggered = G4int(np);
+             fStep->GetPostStepPoint()
+                 ->SetProcessDefinedStep(fCurrentProcess);
+         }
+     }
+     
+
+   }
+
+   if (fPostStepDoItProcTriggered<MAXofPostStepLoops) {
+       if ((*fSelectedPostStepDoItVector)[fPostStepDoItProcTriggered] == 
+           InActivated) {
+           (*fSelectedPostStepDoItVector)[fPostStepDoItProcTriggered] = 
+               NotForced;
+       }
+   }
 
 // GPIL for AlongStep
@@ -335 +347 @@
 
        num2ndaries = fParticleChange->GetNumberOfSecondaries();
-       fN2ndariesAtRestDoIt += num2ndaries;
 
        for(G4int DSecLoop=0 ; DSecLoop< num2ndaries; DSecLoop++){
@@ -356 +367 @@
              tempSecondaryTrack->SetTrackStatus( fStopButAlive );
              fSecondary->push_back( tempSecondaryTrack );
+             fN2ndariesAtRestDoIt++;
            } else {
              delete tempSecondaryTrack;
@@ -361 +373 @@
          } else {
            fSecondary->push_back( tempSecondaryTrack );
+           fN2ndariesAtRestDoIt++;
          }      
        } //end of loop on secondary 
@@ -409 +422 @@
 
      num2ndaries = fParticleChange->GetNumberOfSecondaries();
-     fN2ndariesAlongStepDoIt += num2ndaries;
 
      for(G4int DSecLoop=0 ; DSecLoop< num2ndaries; DSecLoop++){
@@ -430 +442 @@
              tempSecondaryTrack->SetTrackStatus( fStopButAlive );
              fSecondary->push_back( tempSecondaryTrack );
+             fN2ndariesAlongStepDoIt++;
            } else {
              delete tempSecondaryTrack;
@@ -435 +448 @@
          } else {
            fSecondary->push_back( tempSecondaryTrack );
+           fN2ndariesAlongStepDoIt++;
          }
      } //end of loop on secondary 
@@ -520 +534 @@
 
          num2ndaries = fParticleChange->GetNumberOfSecondaries();
-         fN2ndariesPostStepDoIt += num2ndaries;
 
          for(G4int DSecLoop=0 ; DSecLoop< num2ndaries; DSecLoop++){
@@ -541 +554 @@
                 tempSecondaryTrack->SetTrackStatus( fStopButAlive );
                 fSecondary->push_back( tempSecondaryTrack );
+                fN2ndariesPostStepDoIt++;
               } else {
                 delete tempSecondaryTrack;
@@ -546 +560 @@
             } else {
               fSecondary->push_back( tempSecondaryTrack );
+              fN2ndariesPostStepDoIt++;
             }
          } //end of loop on secondary 

trunk/source/tracking/src/G4SteppingVerbose.cc

@@ -26 +26 @@
 //
 // $Id: G4SteppingVerbose.cc,v 1.23 2006/07/14 14:13:57 tsasaki Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/src/G4TrackingManager.cc

@@ -26 +26 @@
 //
 // $Id: G4TrackingManager.cc,v 1.22 2006/11/14 10:58:47 tsasaki Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/src/G4TrackingMessenger.cc

@@ -26 +26 @@
 //
 // $Id: G4TrackingMessenger.cc,v 1.15 2006/11/03 11:13:38 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/src/G4Trajectory.cc

@@ -26 +26 @@
 //
 // $Id: G4Trajectory.cc,v 1.32 2006/10/16 13:39:35 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ---------------------------------------------------------------

trunk/source/tracking/src/G4TrajectoryPoint.cc

@@ -26 +26 @@
 //
 // $Id: G4TrajectoryPoint.cc,v 1.19 2006/06/29 21:16:15 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ---------------------------------------------------------------

trunk/source/tracking/src/G4UserSteppingAction.cc

@@ -26 +26 @@
 //
 // $Id: G4UserSteppingAction.cc,v 1.10 2006/06/29 21:16:17 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ---------------------------------------------------------------

trunk/source/tracking/src/G4UserTrackingAction.cc

@@ -26 +26 @@
 //
 // $Id: G4UserTrackingAction.cc,v 1.10 2006/06/29 21:16:19 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ---------------------------------------------------------------

trunk/source/tracking/src/G4VSteppingVerbose.cc

@@ -26 +26 @@
 //
 // $Id: G4VSteppingVerbose.cc,v 1.18 2006/11/14 10:58:47 tsasaki Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------

trunk/source/tracking/src/G4VTrajectory.cc

@@ -26 +26 @@
 //
 // $Id: G4VTrajectory.cc,v 1.12 2006/10/16 13:45:01 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ---------------------------------------------------------------

trunk/source/tracking/src/G4VTrajectoryPoint.cc

@@ -26 +26 @@
 //
 // $Id: G4VTrajectoryPoint.cc,v 1.4 2006/06/29 21:16:26 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //---------------------------------------------------------------