Import Geant4 3.1.0 source tree

2016-06-08 16:03:00 +02:00
parent cfcb558cfe
commit 137e303ecc
2843 changed files with 37082 additions and 38426 deletions
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2DetectorConstruction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2DetectorMessenger.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2EventAction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2EventActionMessenger.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2PhysicsList.hh,v 1.3 2000/04/17 11:25:52 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2PhysicsListMessenger.hh,v 1.1 2000/04/17 11:25:52 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 

@@ -5,10 +5,12 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2RunAction.hh,v 1.5 2000/12/07 12:14:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em2RunAction.hh,v 1.7 2001/03/08 14:28:14 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
-// 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+// 08.03.01 Hisaya: Adapted MyVector for STL   

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -24,8 +26,9 @@
 #include "G4Positron.hh"
 #include "globals.hh"

-#include "g4rw/tvvector.h"
-typedef G4RWTValVector<G4double> MyVector;
+#include "g4std/vector"
+
+typedef  G4std::vector<G4double> MyVector;

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

@@ -35,6 +38,11 @@ class Em2RunActionMessenger;

 class G4Run;

+#ifndef G4NOHIST
+ class HepTupleManager;
+ class HepHistogram;
+#endif
+
 class Em2RunAction : public G4UserRunAction
 {
  public:
@@ -91,7 +99,16 @@ class Em2RunAction : public G4UserRunAction
    G4double sum2NeutrTrLength;
    
    Em2RunActionMessenger* runMessenger;        
-    G4int saveRndm;    
+    G4int saveRndm;
+                  
+#ifndef G4NOHIST        
+    HepTupleManager* hbookManager;
+    HepHistogram *histo1, *histo2, *histo3;    
+    HepHistogram *histo4, *histo5, *histo6;
+    HepHistogram *histo7, *histo8, *histo9;
+    HepHistogram *hist10, *hist11, *hist12;
+#endif
+    
 };

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -101,10 +118,10 @@ void Em2RunAction::initializePerEvent()
 {
  //initialize arrays of energy deposit per bin     
  for (G4int i=0; i<nLbin; i++)
-     { dEdL(i) = 0.; }
+     { dEdL[i] = 0.; }
     
  for (G4int j=0; j<nRbin; j++)
-     { dEdR(j) = 0.; }     
+     { dEdR[j] = 0.; }     
  
  //initialize tracklength 
    ChargTrLength = NeutrTrLength = 0.;
@@ -124,7 +141,7 @@ void Em2RunAction::fillPerTrack(G4double charge, G4double trkLength)
 inline
 void Em2RunAction::fillPerStep(G4double dEstep, G4int Lbin, G4int Rbin)
 {
-  dEdL(Lbin) += dEstep; dEdR(Rbin) += dEstep;
+  dEdL[Lbin] += dEstep; dEdR[Rbin] += dEstep;
 }

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -132,9 +149,9 @@ void Em2RunAction::fillPerStep(G4double dEstep, G4int Lbin, G4int Rbin)
 inline
 void Em2RunAction::particleFlux(G4ParticleDefinition* particle, G4int Lplan)
 {
-       if (particle == G4Gamma::Gamma())          gammaFlux(Lplan)++;
-  else if (particle == G4Electron::Electron()) electronFlux(Lplan)++;
-  else if (particle == G4Positron::Positron()) positronFlux(Lplan)++;
+       if (particle == G4Gamma::Gamma())          gammaFlux[Lplan]++;
+  else if (particle == G4Electron::Electron()) electronFlux[Lplan]++;
+  else if (particle == G4Positron::Positron()) positronFlux[Lplan]++;
 }

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2RunActionMessenger.hh,v 1.3 2000/01/21 10:56:15 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2SteppingAction.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 // 

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: Em2SteppingVerbose.hh,v 1.4 2000/12/06 14:12:16 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: Em2SteppingVerbose.hh,v 1.5 2001/02/19 14:06:06 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
@@ -15,8 +15,6 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....

-class Em2SteppingVerbose;
-
 #ifndef Em2SteppingVerbose_h
 #define Em2SteppingVerbose_h 1

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2TrackingAction.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //

@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: Em2VisManager.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 //