Changeset 1337 for trunk/examples/extended/electromagnetic/TestEm14/include

Timestamp:

Sep 30, 2010, 2:47:17 PM (14 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

Location:

trunk/examples/extended/electromagnetic/TestEm14/include

Files:

• DetectorConstruction.hh (modified) (1 diff)
• DetectorMessenger.hh (modified) (1 diff)
• EventAction.hh (modified) (1 diff)
• EventActionMessenger.hh (modified) (1 diff)
• HistoManager.hh (modified) (1 diff)
• HistoMessenger.hh (modified) (1 diff)
• PhysListEmLivermore.hh (modified) (1 diff)
• PhysListEmPenelope.hh (modified) (1 diff)
• PhysListEmStandard.hh (modified) (1 diff)
• PhysicsList.hh (modified) (1 diff)
• PhysicsListMessenger.hh (modified) (1 diff)
• PrimaryGeneratorAction.hh (modified) (1 diff)
• RunAction.hh (modified) (3 diffs)
• SteppingAction.hh (modified) (3 diffs)
• SteppingVerbose.hh (modified) (1 diff)

trunk/examples/extended/electromagnetic/TestEm14/include/DetectorConstruction.hh

@@ -25 +25 @@
 //
 // $Id: DetectorConstruction.hh,v 1.3 2006/06/29 16:44:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/DetectorMessenger.hh

@@ -25 +25 @@
 //
 // $Id: DetectorMessenger.hh,v 1.3 2006/06/29 16:44:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/EventAction.hh

@@ -25 +25 @@
 //
 // $Id: EventAction.hh,v 1.3 2006/06/29 16:45:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/EventActionMessenger.hh

@@ -25 +25 @@
 //
 // $Id: EventActionMessenger.hh,v 1.3 2006/06/29 16:45:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/HistoManager.hh

@@ -25 +25 @@
 //
 // $Id: HistoManager.hh,v 1.4 2007/11/13 12:13:32 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/HistoMessenger.hh

@@ -25 +25 @@
 //
 // $Id: HistoMessenger.hh,v 1.4 2007/11/13 12:13:32 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/PhysListEmLivermore.hh

@@ -25 +25 @@
 //
 // $Id: PhysListEmLivermore.hh,v 1.4 2009/11/19 10:36:37 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/PhysListEmPenelope.hh

@@ -25 +25 @@
 //
 // $Id: PhysListEmPenelope.hh,v 1.4 2009/11/19 10:36:37 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/PhysListEmStandard.hh

@@ -25 +25 @@
 //
 // $Id: PhysListEmStandard.hh,v 1.3 2006/06/29 16:45:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/PhysicsList.hh

@@ -26 +26 @@
 //
 // $Id: PhysicsList.hh,v 1.3 2006/06/29 16:45:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/PhysicsListMessenger.hh

@@ -25 +25 @@
 //
 // $Id: PhysicsListMessenger.hh,v 1.3 2006/06/29 16:45:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/PrimaryGeneratorAction.hh

@@ -25 +25 @@
 //
 // $Id: PrimaryGeneratorAction.hh,v 1.3 2006/06/29 16:45:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm14/include/RunAction.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: RunAction.hh,v 1.4 2006/09/06 09:56:06 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: RunAction.hh,v 1.5 2010/04/05 18:02:39 maire Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -34 +34 @@
 
 #include "G4UserRunAction.hh"
-#include "ProcessesCount.hh"
 #include "globals.hh"
+#include <map>
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -56 +56 @@
     void   EndOfRunAction(const G4Run*);
 
-    void CountProcesses(G4String);
+    void CountProcesses(G4String procName) 
+                  {procCounter[procName]++;};
     void SumTrack (G4double track) 
-         {totalCount++; sumTrack += track; sumTrack2 += track*track;};
+                  {totalCount++; sumTrack += track; sumTrack2 += track*track;};
     void SumeTransf (G4double energy) 
-         {eTransfer += energy;};         
+                  {eTransfer += energy;};        
                     
   private:
-    DetectorConstruction*   detector;
-    PrimaryGeneratorAction* primary;
-    ProcessesCount*         ProcCounter;
-    HistoManager*           histoManager;
+    DetectorConstruction*      detector;
+    PrimaryGeneratorAction*    primary;
+    HistoManager*              histoManager;
         
+    std::map<G4String,G4int>   procCounter;            
     G4int totalCount;      //all processes counter
     G4double sumTrack;     //sum of trackLength

trunk/examples/extended/electromagnetic/TestEm14/include/SteppingAction.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: SteppingAction.hh,v 1.4 2006/09/06 09:56:06 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: SteppingAction.hh,v 1.5 2010/04/02 13:22:02 maire Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -39 +39 @@
 class RunAction;
 class HistoManager;
-class SteppingMessenger;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -51 +50 @@
     void UserSteppingAction(const G4Step*);
     
-    void SetMaxEdepForPlot(G4double value)  {fract = value;};
-    
   private:
     PrimaryGeneratorAction* primary;
     RunAction*              runAction;
     HistoManager*           histoManager;
-    SteppingMessenger*      stepMessenger;
-    
-    G4double                fract;   //max edep for plotting final state
 };
 

trunk/examples/extended/electromagnetic/TestEm14/include/SteppingVerbose.hh

@@ -25 +25 @@
 //
 // $Id: SteppingVerbose.hh,v 1.3 2006/06/29 16:45:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //   This class manages the verbose outputs in G4SteppingManager.