Import Geant4 10.0.0 source tree

examples/advanced/amsEcal/include/DetectorConstruction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: DetectorConstruction.hh 68740 2013-04-05 09:56:39Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/advanced/amsEcal/include/DetectorMessenger.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: DetectorMessenger.hh 68740 2013-04-05 09:56:39Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/advanced/amsEcal/include/EventAction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: EventAction.hh 68740 2013-04-05 09:56:39Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/advanced/amsEcal/include/EventActionMessenger.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: EventActionMessenger.hh 68740 2013-04-05 09:56:39Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/advanced/amsEcal/include/HistoManager.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: HistoManager.hh 73008 2013-08-15 08:43:13Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -80,9 +80,11 @@ class HistoManager
     G4String                 fileName[2];
     G4String                 fileType;
     G4String                 fileOption;
-    G4bool                   factoryOn;                    
-    AIDA::IAnalysisFactory*  af;        
+#ifdef G4ANALYSIS_USE
+    G4bool                   factoryOn;
+    AIDA::IAnalysisFactory*  af;
     AIDA::ITree*             tree;
+#endif
     
     AIDA::IHistogram1D*      histo[MaxHisto];    
     G4bool                   exist[MaxHisto];

examples/advanced/amsEcal/include/HistoMessenger.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: HistoMessenger.hh 68740 2013-04-05 09:56:39Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/advanced/amsEcal/include/PhysListEmStandard.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: PhysListEmStandard.hh 68740 2013-04-05 09:56:39Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/advanced/amsEcal/include/PhysicsList.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: PhysicsList.hh 68740 2013-04-05 09:56:39Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/advanced/amsEcal/include/PhysicsListMessenger.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: PhysicsListMessenger.hh 68740 2013-04-05 09:56:39Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/advanced/amsEcal/include/PrimaryGeneratorAction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: PrimaryGeneratorAction.hh 73008 2013-08-15 08:43:13Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -35,17 +35,15 @@
 #include "G4ParticleGun.hh"
 #include "globals.hh"
 
-class G4Event;
 class DetectorConstruction;
 class PrimaryGeneratorMessenger;
-class HistoManager;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
 {
   public:
-    PrimaryGeneratorAction(DetectorConstruction*, HistoManager*);    
+    PrimaryGeneratorAction(DetectorConstruction*);    
    ~PrimaryGeneratorAction();
 
   public:
@@ -57,8 +55,7 @@ class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
   private:
     G4ParticleGun*         particleGun;
     DetectorConstruction*  Detector;
-    HistoManager*          histoManager;        
-    G4double               beam;          //lateral beam extension   
+    G4double               beam;          //lateral beam extension
     
     PrimaryGeneratorMessenger* gunMessenger; 
 };

examples/advanced/amsEcal/include/PrimaryGeneratorMessenger.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: PrimaryGeneratorMessenger.hh 68740 2013-04-05 09:56:39Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/advanced/amsEcal/include/RunAction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: RunAction.hh 68740 2013-04-05 09:56:39Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/advanced/amsEcal/include/SteppingAction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: SteppingAction.hh 73008 2013-08-15 08:43:13Z gcosmo $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -47,8 +47,8 @@ class G4LogicalVolume;
 class SteppingAction : public G4UserSteppingAction
 {
   public:
-    SteppingAction(DetectorConstruction*, RunAction*, PrimaryGeneratorAction*,
-                   EventAction*, HistoManager*);
+    SteppingAction(DetectorConstruction*,
+                   EventAction*);
    ~SteppingAction();
 
     void UserSteppingAction(const G4Step*);
@@ -57,10 +57,7 @@ class SteppingAction : public G4UserSteppingAction
     
   private:
     DetectorConstruction* detector;
-    RunAction*              runAct;
-    PrimaryGeneratorAction* primary;        
     EventAction*            eventAct;
-    HistoManager*           histoManager;
     
     G4bool           first;
     G4LogicalVolume* lvol_world;

examples/advanced/amsEcal/include/SteppingVerbose.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: SteppingVerbose.hh 68740 2013-04-05 09:56:39Z gcosmo $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.

examples/advanced/amsEcal/include/TrackingAction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: TrackingAction.hh 73008 2013-08-15 08:43:13Z gcosmo $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -36,17 +36,14 @@
 
 class DetectorConstruction;
 class RunAction;
-class PrimaryGeneratorAction;
-class EventAction;
-class HistoManager;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 class TrackingAction : public G4UserTrackingAction {
 
   public:  
-    TrackingAction(DetectorConstruction*,RunAction*, PrimaryGeneratorAction*,
-                   EventAction*,HistoManager* );
+    TrackingAction(DetectorConstruction*,RunAction*);
+    
    ~TrackingAction() {};
    
     void  PreUserTrackingAction(const G4Track*);   
@@ -55,9 +52,6 @@ class TrackingAction : public G4UserTrackingAction {
   private:
     DetectorConstruction*   detector;
     RunAction*              runAct;
-    PrimaryGeneratorAction* primary;                
-    EventAction*            eventAct;
-    HistoManager*           histoManager;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......