Changeset 1315 for trunk/source/event

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

Files:

• History (modified) (2 diffs)
• include/G4SPSEneDistribution.hh (modified) (1 diff)
• src/G4PrimaryTransformer.cc (modified) (2 diffs)
• src/G4SmartTrackStack.cc (modified) (2 diffs)

trunk/source/event/History

@@ -1 @@
-$Id: History,v 1.127 2009/11/18 17:57:59 gcosmo Exp $
+$Id: History,v 1.130 2010/05/20 09:43:21 flei Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+May 20th, 2010, F.Lei (event-V09-03-02)
+- Added a number of Get methods to G4SPSEneDistribution.hh
+
+April 19th, 2010, M.Asai (event-V09-03-01)
+- Improving a logic in G4PrimaryTransformer. Addressing the problem report #1101.
+
+April 19th, 2010, M.Asai (event-V09-03-00)
+- Fix warning message in G4SmartTrackStack found with gcc 4.5.0.
 
 Movember 18th, 2009, G.Cosmo (event-V09-02-05)

trunk/source/event/include/G4SPSEneDistribution.hh

@@ -181 +181 @@
   void SetVerbosity(G4int a) {verbosityLevel = a; } ;
   //x
+
+  G4double GetMonoEnergy () {return MonoEnergy; }; //Mono-energteic energy
+  G4double GetSE() {return SE;}; // Standard deviation for Gaussion distrbution in energy
+  G4double Getalpha () {return alpha;}; // alpha (pow)
+  G4double GetEzero() {return Ezero;}; // E0 (exp)
+  G4double GetTemp() {return Temp;}; // Temp (bbody,brem)
+  G4double Getgrad() {return grad;}; // gradient and intercept for linear spectra
+  G4double Getcept() {return cept;};
+
+  inline G4PhysicsOrderedFreeVector  GetUserDefinedEnergyHisto(){return UDefEnergyH;};
+  inline G4PhysicsOrderedFreeVector  GetArbEnergyHisto(){return ArbEnergyH;};
+
   G4double GenerateOne(G4ParticleDefinition*);
   

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;
     }