Changeset 1342 for trunk/examples/extended/electromagnetic/TestEm7/include

Timestamp:

Nov 5, 2010, 4:08:39 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/examples/extended/electromagnetic/TestEm7/include

Files:

• RunAction.hh (modified) (5 diffs)
• SteppingAction.hh (modified) (4 diffs)
• TrackingAction.hh (modified) (4 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: RunAction.hh,v 1.14 2008/08/22 18:30:27 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: RunAction.hh,v 1.15 2010/09/17 18:45:43 maire Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -38 +38 @@
 class DetectorConstruction;
 class PhysicsList;
+class HistoManager;
 class PrimaryGeneratorAction;
+
 class G4Run;
-class Histo;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -47 +48 @@
 {
 public:
-  RunAction(DetectorConstruction*, PhysicsList*,
+  RunAction(DetectorConstruction*, PhysicsList*, HistoManager*,
             PrimaryGeneratorAction*);
   virtual ~RunAction();
@@ -56 +57 @@
   void FillTallyEdep(G4int n, G4double e)  {tallyEdep[n] += e;};
   void FillEdep(G4double de, G4double eni) {edeptot += de; eniel += eni;};
-       
-  G4double GetBinLength() {return binLength;};
-  G4double GetLength()    {return length;};
-  G4double GetOffsetX()   {return offsetX;}
- 
-  void FillHisto(G4int id, G4double x, G4double weight = 1.0);
     
   void AddProjRange (G4double x) 
@@ -71 +66 @@
   DetectorConstruction*   detector;
   PhysicsList*            physics;
+  HistoManager*           histoManager;
   PrimaryGeneratorAction* kinematic;
   G4double*               tallyEdep;   
-  G4double                binLength;
-  G4double                offsetX;
-  G4double                length;
   G4double                projRange, projRange2;
   G4double                edeptot, eniel;
   G4int                   nPrimarySteps;
   G4int                   nRange;
-
-  Histo*                  histo;
 };
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: SteppingAction.hh,v 1.2 2006/06/29 16:58:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: SteppingAction.hh,v 1.3 2010/09/17 18:45:43 maire Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -36 +36 @@
 
 class DetectorConstruction;
+class HistoManager;
 class RunAction;
 
@@ -43 +44 @@
 {
   public:
-    SteppingAction(DetectorConstruction*,RunAction*);
+    SteppingAction(DetectorConstruction*, HistoManager*, RunAction*);
    ~SteppingAction();
 
@@ -50 +51 @@
   private:
     DetectorConstruction* detector;
+    HistoManager*         histoManager;    
     RunAction*            runAction;
 };

trunk/examples/extended/electromagnetic/TestEm7/include/TrackingAction.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: TrackingAction.hh,v 1.2 2006/06/29 16:58:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: TrackingAction.hh,v 1.3 2010/09/17 18:45:43 maire Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -36 +36 @@
 #include "globals.hh"
 
+class DetectorConstruction;
+class HistoManager;
 class RunAction;
 
@@ -43 +45 @@
 
   public:  
-    TrackingAction(RunAction*);
+    TrackingAction(DetectorConstruction*, HistoManager*, RunAction*);
    ~TrackingAction() {};
    
@@ -49 +51 @@
     
   private:
-    RunAction* runAction;    
+    DetectorConstruction* detector; 
+    HistoManager*         histoManager;      
+    RunAction*            runAction;    
 };