Import Geant4 10.0.0 source tree

examples/advanced/dnaphysics/include/ActionInitialization.hh

@@ -22,38 +22,35 @@
 // * use  in  resulting  scientific  publications,  and indicate your *
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
+//
+// This example is provided by the Geant4-DNA collaboration
+// Any report or published results obtained using the Geant4-DNA software 
+// shall cite the following Geant4-DNA collaboration publication:
+// Med. Phys. 37 (2010) 4692-4708
+// The Geant4-DNA web site is available at http://geant4-dna.org
+//
 
-#ifndef HistoManager_h
-#define HistoManager_h 1
+#ifndef ActionInitialization_h
+#define ActionInitialization_h 1
 
-#include "globals.hh"
-#include "g4root.hh"
+#include "G4VUserActionInitialization.hh"
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+class DetectorConstruction;
+class PrimaryGeneratorAction;
 
-class HistoManager
+class ActionInitialization : public G4VUserActionInitialization
 {
   public:
+    ActionInitialization(DetectorConstruction*);
+    virtual ~ActionInitialization();
 
-    HistoManager();
-   ~HistoManager();
+    virtual void BuildForMaster() const;
+    virtual void Build() const;
 
-    void SetFileName   (const G4String& name) { fileName[0] = name;};
-    void book();
-    void save();
-    void FillNtuple(G4int id, G4int col, G4double e, G4double weight = 1.0);
-    void FillNtupleIColumn(G4int icol, G4int ival);
-    void FillNtupleFColumn(G4int icol, G4float ival);
-    void FillNtupleDColumn(G4int icol, G4double ival);
-    void AddNtupleRow();
-    
   private:
-
-    G4String         fileName[2];
-    G4bool           factoryOn;       
+    DetectorConstruction* fDetectorConstruction;
 };
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
 #endif
 
+    

examples/advanced/dnaphysics/include/Analysis.hh

@@ -23,29 +23,16 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// -------------------------------------------------------------------
-// $Id$
-// -------------------------------------------------------------------
+// This example is provided by the Geant4-DNA collaboration
+// Any report or published results obtained using the Geant4-DNA software 
+// shall cite the following Geant4-DNA collaboration publication:
+// Med. Phys. 37 (2010) 4692-4708
+// The Geant4-DNA web site is available at http://geant4-dna.org
+//
 
-class SteppingVerbose;
+#ifndef Analysis_h
+#define Analysis_h 1
 
-#ifndef SteppingVerbose_h
-#define SteppingVerbose_h 1
+#include "g4root.hh"
 
-#include "G4SteppingVerbose.hh"
-#include "G4UnitsTable.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-class SteppingVerbose : public G4SteppingVerbose 
-{
-public:   
-  
-  SteppingVerbose();
-  ~SteppingVerbose();
-  
-  void StepInfo();
-  void TrackingStarted();
-
-};
 #endif

examples/advanced/dnaphysics/include/DetectorConstruction.hh

@@ -23,60 +23,54 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// -------------------------------------------------------------------
-// $Id$
-// -------------------------------------------------------------------
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+// This example is provided by the Geant4-DNA collaboration
+// Any report or published results obtained using the Geant4-DNA software 
+// shall cite the following Geant4-DNA collaboration publication:
+// Med. Phys. 37 (2010) 4692-4708
+// The Geant4-DNA web site is available at http://geant4-dna.org
+//
 
 #ifndef DetectorConstruction_h
 #define DetectorConstruction_h 1
 
 #include "G4VUserDetectorConstruction.hh"
-#include "G4VPhysicalVolume.hh"
-#include "G4LogicalVolume.hh"
 #include "G4Box.hh"
-#include "G4Sphere.hh"
-#include "G4Material.hh"
 #include "G4NistManager.hh"
 #include "G4PVPlacement.hh"
-#include "G4UserLimits.hh"
 #include "G4VisAttributes.hh"
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
 class G4Region;
 class DetectorMessenger;
 
 class DetectorConstruction : public G4VUserDetectorConstruction
 {
-public:
+  public:
 
-  DetectorConstruction();
+    DetectorConstruction();
 
-  ~DetectorConstruction();
+    ~DetectorConstruction();
 
-  G4VPhysicalVolume* Construct();
+    G4VPhysicalVolume* Construct();
   
-  void SetMaterial (G4String);            
-  void UpdateGeometry();
+    void SetMaterial (G4String);            
+    void UpdateGeometry();
                          
-private:
+  private:
    
-  G4double           WorldSizeX;
-  G4double           WorldSizeY;
-  G4double           WorldSizeZ;
+    G4double           fWorldSizeX;
+    G4double           fWorldSizeY;
+    G4double           fWorldSizeZ;
 
-  G4VPhysicalVolume* physiWorld;
-  G4LogicalVolume*   logicWorld;  
-  G4Box*             solidWorld;
+    G4VPhysicalVolume* fPhysiWorld;
+    G4LogicalVolume*   fLogicWorld;  
+    G4Box*             fSolidWorld;
 
-  G4Material*        waterMaterial;
+    G4Material*        fWaterMaterial;
 
-  void DefineMaterials();
+    void DefineMaterials();
 
-  G4VPhysicalVolume* ConstructDetector();     
-  DetectorMessenger*  fDetectorMessenger;
+    G4VPhysicalVolume* ConstructDetector();     
+    DetectorMessenger* fDetectorMessenger;
 
 };
 #endif

examples/advanced/dnaphysics/include/DetectorMessenger.hh

@@ -22,6 +22,13 @@
 // * use  in  resulting  scientific  publications,  and indicate your *
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
+//
+// This example is provided by the Geant4-DNA collaboration
+// Any report or published results obtained using the Geant4-DNA software 
+// shall cite the following Geant4-DNA collaboration publication:
+// Med. Phys. 37 (2010) 4692-4708
+// The Geant4-DNA web site is available at http://geant4-dna.org
+//
 
 #ifndef DetectorMessenger_h
 #define DetectorMessenger_h 1
@@ -35,8 +42,6 @@ class G4UIcommand;
 class G4UIcmdWithAString;
 class G4UIcmdWithoutParameter;
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
 class DetectorMessenger: public G4UImessenger
 {
   public:
@@ -54,7 +59,5 @@ class DetectorMessenger: public G4UImessenger
     G4UIcmdWithoutParameter*   fUpdateCmd;
 };
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
 #endif
 

examples/advanced/dnaphysics/include/PhysicsList.hh

@@ -23,7 +23,12 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+// This example is provided by the Geant4-DNA collaboration
+// Any report or published results obtained using the Geant4-DNA software 
+// shall cite the following Geant4-DNA collaboration publication:
+// Med. Phys. 37 (2010) 4692-4708
+// The Geant4-DNA web site is available at http://geant4-dna.org
+//
 
 #ifndef PhysicsList_h
 #define PhysicsList_h 1

examples/advanced/dnaphysics/include/PrimaryGeneratorAction.hh

@@ -23,11 +23,12 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// -------------------------------------------------------------------
-// $Id$
-// -------------------------------------------------------------------
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+// This example is provided by the Geant4-DNA collaboration
+// Any report or published results obtained using the Geant4-DNA software 
+// shall cite the following Geant4-DNA collaboration publication:
+// Med. Phys. 37 (2010) 4692-4708
+// The Geant4-DNA web site is available at http://geant4-dna.org
+//
 
 #ifndef PrimaryGeneratorAction_h
 #define PrimaryGeneratorAction_h 1
@@ -35,23 +36,18 @@
 #include "G4VUserPrimaryGeneratorAction.hh"
 #include "G4ParticleGun.hh"
 #include "DetectorConstruction.hh"
-#include "G4Event.hh"
-#include "G4ParticleTable.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
 {
-public:
+  public:
 
-  PrimaryGeneratorAction(DetectorConstruction*);    
-  ~PrimaryGeneratorAction();
+    PrimaryGeneratorAction();    
+    ~PrimaryGeneratorAction();
   
-  void GeneratePrimaries(G4Event*);
+    virtual void GeneratePrimaries(G4Event*);
 
-private:
+  private:
 
-  G4ParticleGun*           particleGun;
-  DetectorConstruction*    Detector;
+    G4ParticleGun*           fParticleGun;
 };
 #endif

examples/advanced/dnaphysics/include/RunAction.hh

@@ -23,38 +23,33 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// -------------------------------------------------------------------
-// $Id$
-// -------------------------------------------------------------------
+// This example is provided by the Geant4-DNA collaboration
+// Any report or published results obtained using the Geant4-DNA software 
+// shall cite the following Geant4-DNA collaboration publication:
+// Med. Phys. 37 (2010) 4692-4708
+// The Geant4-DNA web site is available at http://geant4-dna.org
+//
 
 #ifndef RunAction_h
 #define RunAction_h 1
 
 #include "DetectorConstruction.hh"
-#include "HistoManager.hh"
 
 #include "G4UserRunAction.hh"
 #include "globals.hh"
 #include <iostream>
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
 class G4Run;
 
 class RunAction : public G4UserRunAction
 {
-public:
+  public:
   
-  RunAction(DetectorConstruction*, HistoManager *);
-  ~RunAction();
+    RunAction(DetectorConstruction*);
+    ~RunAction();
 
-  void BeginOfRunAction(const G4Run*);
-  void EndOfRunAction(const G4Run*);
+    void BeginOfRunAction(const G4Run*);
+    void EndOfRunAction(const G4Run*);
 
-private:
-
-  DetectorConstruction* Detector;    
-  HistoManager* Histo;
-  
 };
 #endif

examples/advanced/dnaphysics/include/SteppingAction.hh

@@ -23,11 +23,12 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// -------------------------------------------------------------------
-// $Id$
-// -------------------------------------------------------------------
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+// This example is provided by the Geant4-DNA collaboration
+// Any report or published results obtained using the Geant4-DNA software 
+// shall cite the following Geant4-DNA collaboration publication:
+// Med. Phys. 37 (2010) 4692-4708
+// The Geant4-DNA web site is available at http://geant4-dna.org
+//
 
 #ifndef SteppingAction_h
 #define SteppingAction_h 1
@@ -37,25 +38,15 @@
 class RunAction;
 class DetectorConstruction;
 class PrimaryGeneratorAction;
-class HistoManager;
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 class SteppingAction : public G4UserSteppingAction
 {
-public:
+  public:
 
-  SteppingAction(RunAction*, DetectorConstruction*, PrimaryGeneratorAction*, HistoManager *);
-  ~SteppingAction();
+    SteppingAction();
+    ~SteppingAction();
   
-  void UserSteppingAction(const G4Step*);
-  
-private:
-
-  RunAction*              Run;
-  DetectorConstruction*   Detector; 
-  PrimaryGeneratorAction* Primary;
-  HistoManager* 	  Histo;
-      
+    void UserSteppingAction(const G4Step*);
+        
 };
 #endif