Import Geant4 6.0.0 source tree

examples/extended/electromagnetic/TestEm4/include/DetectorConstruction.hh

@@ -21,28 +21,27 @@
 // ********************************************************************
 //
 //
-// $Id: Em4DetectorConstruction.hh,v 1.4 2001/10/17 14:04:13 maire Exp $
-// GEANT4 tag $Name: geant4-05-02 $
-//
+// $Id: DetectorConstruction.hh,v 1.2 2003/10/06 14:51:16 maire Exp $
+// GEANT4 tag $Name: geant4-06-00 $
 // 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-#ifndef Em4DetectorConstruction_h
-#define Em4DetectorConstruction_h 1
+#ifndef DetectorConstruction_h
+#define DetectorConstruction_h 1
 
 #include "G4VUserDetectorConstruction.hh"
 #include "globals.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class Em4DetectorConstruction : public G4VUserDetectorConstruction
+class DetectorConstruction : public G4VUserDetectorConstruction
 {
   public:
   
-    Em4DetectorConstruction();
-   ~Em4DetectorConstruction();
+    DetectorConstruction();
+   ~DetectorConstruction();
      
     G4VPhysicalVolume* Construct();
 };

examples/extended/electromagnetic/TestEm4/include/EventAction.hh

@@ -21,30 +21,30 @@
 // ********************************************************************
 //
 //
-// $Id: Em4EventAction.hh,v 1.4 2001/10/17 14:04:14 maire Exp $
-// GEANT4 tag $Name: geant4-05-02 $
+// $Id: EventAction.hh,v 1.1 2003/06/23 16:16:26 maire Exp $
+// GEANT4 tag $Name: geant4-06-00 $
 //
 // 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-#ifndef Em4EventAction_h
-#define Em4EventAction_h 1
+#ifndef EventAction_h
+#define EventAction_h 1
 
 #include "G4UserEventAction.hh"
 #include "globals.hh"
 
-class Em4RunAction;
-class Em4EventActionMessenger;
+class RunAction;
+class EventActionMessenger;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class Em4EventAction : public G4UserEventAction
+class EventAction : public G4UserEventAction
 {
   public:
-    Em4EventAction(Em4RunAction*);
-   ~Em4EventAction();
+    EventAction(RunAction*);
+   ~EventAction();
 
   public:
     void BeginOfEventAction(const G4Event*);
@@ -56,11 +56,11 @@ class Em4EventAction : public G4UserEventAction
     void SetPrintModulo(G4int val)  {printModulo = val;};
         
   private:
-    Em4RunAction* Em4Run;            
+    RunAction* Run;            
     G4double TotalEnergyDeposit;   // Energy deposited in c6f6
     G4String drawFlag;             // control the drawing of event
     G4int                     printModulo;          
-    Em4EventActionMessenger*  eventMessenger;
+    EventActionMessenger*  eventMessenger;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm4/include/EventActionMessenger.hh

@@ -21,37 +21,36 @@
 // ********************************************************************
 //
 //
-// $Id: Em4EventActionMessenger.hh,v 1.5 2002/12/10 17:20:30 maire Exp $
-// GEANT4 tag $Name: geant4-05-02 $
+// $Id: EventActionMessenger.hh,v 1.2 2003/10/06 14:51:16 maire Exp $
+// GEANT4 tag $Name: geant4-06-00 $
 //
-// 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-#ifndef Em4EventActionMessenger_h
-#define Em4EventActionMessenger_h 1
+#ifndef EventActionMessenger_h
+#define EventActionMessenger_h 1
 
-#include "globals.hh"
 #include "G4UImessenger.hh"
+#include "globals.hh"
 
-class Em4EventAction;
+class EventAction;
 class G4UIdirectory;
 class G4UIcmdWithAString;
 class G4UIcmdWithAnInteger;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class Em4EventActionMessenger: public G4UImessenger
+class EventActionMessenger: public G4UImessenger
 {
   public:
-    Em4EventActionMessenger(Em4EventAction*);
-   ~Em4EventActionMessenger();
+    EventActionMessenger(EventAction*);
+   ~EventActionMessenger();
     
     void SetNewValue(G4UIcommand*, G4String);
     
   private:
-    Em4EventAction* eventAction;
+    EventAction* eventAction;
     G4UIdirectory*        testemDir;   
     G4UIcmdWithAString*   DrawCmd;
     G4UIcmdWithAnInteger* PrintCmd;

examples/extended/electromagnetic/TestEm4/include/PhysicsList.hh

@@ -21,27 +21,27 @@
 // ********************************************************************
 //
 //
-// $Id: Em4PhysicsList.hh,v 1.4 2001/10/17 14:04:14 maire Exp $
-// GEANT4 tag $Name: geant4-05-02 $
+// $Id: PhysicsList.hh,v 1.1 2003/06/23 16:16:27 maire Exp $
+// GEANT4 tag $Name: geant4-06-00 $
 //
 // 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-#ifndef Em4PhysicsList_h
-#define Em4PhysicsList_h 1
+#ifndef PhysicsList_h
+#define PhysicsList_h 1
 
 #include "G4VUserPhysicsList.hh"
 #include "globals.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class Em4PhysicsList: public G4VUserPhysicsList
+class PhysicsList: public G4VUserPhysicsList
 {
   public:
-    Em4PhysicsList();
-   ~Em4PhysicsList();
+    PhysicsList();
+   ~PhysicsList();
 
   protected:
     // Construct particle and physics

examples/extended/electromagnetic/TestEm4/include/PrimaryGeneratorAction.hh

@@ -21,16 +21,16 @@
 // ********************************************************************
 //
 //
-// $Id: Em4PrimaryGeneratorAction.hh,v 1.4 2001/10/17 14:04:14 maire Exp $
-// GEANT4 tag $Name: geant4-05-02 $
+// $Id: PrimaryGeneratorAction.hh,v 1.1 2003/06/23 16:16:27 maire Exp $
+// GEANT4 tag $Name: geant4-06-00 $
 //
 // 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-#ifndef Em4PrimaryGeneratorAction_h
-#define Em4PrimaryGeneratorAction_h 1
+#ifndef PrimaryGeneratorAction_h
+#define PrimaryGeneratorAction_h 1
 
 #include "G4VUserPrimaryGeneratorAction.hh"
 #include "globals.hh"
@@ -40,11 +40,11 @@ class G4Event;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class Em4PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
+class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
 {
   public:
-    Em4PrimaryGeneratorAction();    
-   ~Em4PrimaryGeneratorAction();
+    PrimaryGeneratorAction();    
+   ~PrimaryGeneratorAction();
 
   public:
     void GeneratePrimaries(G4Event*);

examples/extended/electromagnetic/TestEm4/include/RunAction.hh

@@ -21,16 +21,16 @@
 // ********************************************************************
 //
 //
-// $Id: Em4RunAction.hh,v 1.10 2002/12/10 17:20:30 maire Exp $
-// GEANT4 tag $Name: geant4-05-02 $
+// $Id: RunAction.hh,v 1.2 2003/10/06 14:51:16 maire Exp $
+// GEANT4 tag $Name: geant4-06-00 $
 //
 // 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-#ifndef Em4RunAction_h
-#define Em4RunAction_h 1
+#ifndef RunAction_h
+#define RunAction_h 1
 
 #include "G4UserRunAction.hh"
 #include "globals.hh"
@@ -39,24 +39,24 @@
 
 class G4Run;
 
-#ifndef G4NOHIST
+#ifdef G4ANALYSIS_USE
 namespace AIDA {
   class ITree;
   class IHistogram1D;
 }  
 #endif
 
-class Em4RunAction : public G4UserRunAction
+class RunAction : public G4UserRunAction
 {
   public:
-    Em4RunAction();
-   ~Em4RunAction();
+    RunAction();
+   ~RunAction();
 
   public:
     void BeginOfRunAction(const G4Run*);
     void   EndOfRunAction(const G4Run*);
 
-#ifndef G4NOHIST    
+#ifdef G4ANALYSIS_USE    
     AIDA::IHistogram1D* GetHisto(G4int id) {return histo[id];}
 #endif
         
@@ -64,7 +64,7 @@ class Em4RunAction : public G4UserRunAction
     void bookHisto();
     
   private:      
-#ifndef G4NOHIST         
+#ifdef G4ANALYSIS_USE         
     AIDA::ITree* tree;             //the tree should only be deleted at the end
     AIDA::IHistogram1D* histo[1];  // (after writing the histos to file)
 #endif         

examples/extended/electromagnetic/TestEm4/include/SteppingAction.hh

@@ -21,34 +21,34 @@
 // ********************************************************************
 //
 //
-// $Id: Em4SteppingAction.hh,v 1.3 2001/07/11 09:57:44 gunter Exp $
-// GEANT4 tag $Name: geant4-05-02 $
+// $Id: SteppingAction.hh,v 1.1 2003/06/23 16:16:27 maire Exp $
+// GEANT4 tag $Name: geant4-06-00 $
 //
 // 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-#ifndef Em4SteppingAction_h
-#define Em4SteppingAction_h 1
+#ifndef SteppingAction_h
+#define SteppingAction_h 1
 
 #include "G4UserSteppingAction.hh"
 
-class Em4EventAction;
+class EventAction;
 class G4SteppingVerbose2;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-class Em4SteppingAction : public G4UserSteppingAction
+class SteppingAction : public G4UserSteppingAction
 {
   public:
-    Em4SteppingAction(Em4EventAction*);
-   ~Em4SteppingAction();
+    SteppingAction(EventAction*);
+   ~SteppingAction();
 
     void UserSteppingAction(const G4Step*);
     
   private:
-    Em4EventAction* eventAction;
+    EventAction* eventAction;
     G4SteppingVerbose2* myVerbose;    
 };
 

examples/extended/electromagnetic/TestEm4/include/SteppingVerbose.hh

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: Em4SteppingVerbose.hh,v 1.7 2001/10/17 14:04:14 maire Exp $
-// GEANT4 tag $Name: geant4-05-02 $
+// $Id: SteppingVerbose.hh,v 1.1 2003/06/23 16:16:27 maire Exp $
+// GEANT4 tag $Name: geant4-06-00 $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
@@ -31,19 +31,19 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-#ifndef Em4SteppingVerbose_h
-#define Em4SteppingVerbose_h 1
+#ifndef SteppingVerbose_h
+#define SteppingVerbose_h 1
 
 #include "G4SteppingVerbose.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class Em4SteppingVerbose : public G4SteppingVerbose {
+class SteppingVerbose : public G4SteppingVerbose {
 
 public:   
 
-  Em4SteppingVerbose();
- ~Em4SteppingVerbose();
+  SteppingVerbose();
+ ~SteppingVerbose();
 
   void StepInfo();
   void TrackingStarted();

examples/extended/electromagnetic/TestEm4/include/VisManager.hh

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: Em4VisManager.hh,v 1.4 2001/10/17 14:04:15 maire Exp $
-// GEANT4 tag $Name: geant4-05-02 $
+// $Id: VisManager.hh,v 1.1 2003/06/23 16:16:27 maire Exp $
+// GEANT4 tag $Name: geant4-06-00 $
 //
 // 
 
@@ -44,18 +44,18 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-#ifndef Em4VisManager_h
-#define Em4VisManager_h 1
+#ifndef VisManager_h
+#define VisManager_h 1
 
 #include "G4VisManager.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class Em4VisManager: public G4VisManager {
+class VisManager: public G4VisManager {
 
 public:
 
-  Em4VisManager ();
+  VisManager ();
 
 private: