Changeset 1315 for trunk/source/event/src

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:

trunk/source/event/src

Files:

• G4PrimaryTransformer.cc (modified) (2 diffs)
• G4SmartTrackStack.cc (modified) (2 diffs)

trunk/source/event/src/G4PrimaryTransformer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4PrimaryTransformer.cc,v 1.27 2006/06/29 18:09:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4PrimaryTransformer.cc,v 1.28 2010/04/19 19:49:54 asaim Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 
@@ -68 +68 @@
   { delete TV[ii]; }
   TV.clear();
-  G4int n_vertex = anEvent->GetNumberOfPrimaryVertex();
-  if(n_vertex==0) return 0; 
-  for( G4int i=0; i<n_vertex; i++ )
-  { GenerateTracks( anEvent->GetPrimaryVertex(i) ); }
+  G4PrimaryVertex* nextVertex = anEvent->GetPrimaryVertex();
+  while(nextVertex)
+  { 
+    GenerateTracks(nextVertex);
+    nextVertex = nextVertex->GetNext();
+  }
   return &TV;
 }

trunk/source/event/src/G4SmartTrackStack.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4SmartTrackStack.cc,v 1.3 2009/09/16 23:10:46 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4SmartTrackStack.cc,v 1.4 2010/04/19 18:21:52 asaim Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 
@@ -73 +73 @@
     if(stacks[fTurn]->GetNTrack()==0)
     {
-      fTurn = (++fTurn)%nTurn;
+      fTurn = (fTurn+1)%nTurn;
       //G4cout<<"++++++++ Shift to Stack ["<<fTurn<<"] with "<<stacks[fTurn]->GetNTrack()<<" stacked tracks."<<G4endl;
     }