Import Geant4 10.0.0 source tree

examples/basic/B4/B4b/include/B4Analysis.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: B4Analysis.hh 68058 2013-03-13 14:47:43Z gcosmo $
 //
 /// \file B4Analysis.hh
 /// \brief Selection of the analysis technology

examples/basic/B4/B4b/include/B4DetectorConstruction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: B4DetectorConstruction.hh 75215 2013-10-29 16:07:06Z gcosmo $
 // 
 /// \file B4DetectorConstruction.hh
 /// \brief Definition of the B4DetectorConstruction class
@@ -34,10 +34,8 @@
 #include "G4VUserDetectorConstruction.hh"
 #include "globals.hh"
 
-class G4Box;
 class G4VPhysicalVolume;
-class G4UniformMagField;
-class G4GenericMessenger;
+class G4GlobalMagFieldMessenger;
 
 /// Detector construction class to define materials and geometry.
 /// The calorimeter is a box made of a given number of layers. A layer consists
@@ -50,10 +48,8 @@ class G4GenericMessenger;
 /// - the number of layers,
 /// - the transverse size of the calorimeter (the input face is a square).
 ///
-/// In addition a transverse uniform magnetic field is defined in
-/// SetMagField() method which can be activated
-/// via a command defined using G4GenericMessenger class: 
-/// - /B4/det/setMagField value unit
+/// In addition a transverse uniform magnetic field is defined 
+/// via G4GlobalMagFieldMessenger class.
 
 class B4DetectorConstruction : public G4VUserDetectorConstruction
 {
@@ -63,11 +59,8 @@ class B4DetectorConstruction : public G4VUserDetectorConstruction
 
   public:
     virtual G4VPhysicalVolume* Construct();
+    virtual void ConstructSDandField();
 
-    // set methods
-    //
-    void SetMagField(G4double fieldValue);
-    
     // get methods
     //
     const G4VPhysicalVolume* GetAbsorberPV() const;
@@ -81,11 +74,11 @@ class B4DetectorConstruction : public G4VUserDetectorConstruction
   
     // data members
     //
-    G4GenericMessenger*  fMessenger; // messenger 
-    G4UniformMagField*   fMagField;  // magnetic field
-    
-    G4VPhysicalVolume* fAbsorberPV; // the absorber physical volume
-    G4VPhysicalVolume* fGapPV;      // the gap physical volume
+    static G4ThreadLocal G4GlobalMagFieldMessenger*  fMagFieldMessenger; 
+                                      // magnetic field messenger
+     
+    G4VPhysicalVolume*   fAbsorberPV; // the absorber physical volume
+    G4VPhysicalVolume*   fGapPV;      // the gap physical volume
     
     G4bool  fCheckOverlaps; // option to activate checking of volumes overlaps
 };

examples/basic/B4/B4b/include/B4PrimaryGeneratorAction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: B4PrimaryGeneratorAction.hh 68058 2013-03-13 14:47:43Z gcosmo $
 // 
 /// \file B4PrimaryGeneratorAction.hh
 /// \brief Definition of the B4PrimaryGeneratorAction class

examples/basic/B4/B4b/include/B4bActionInitialization.hh

@@ -0,0 +1,55 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+// $Id: B4bActionInitialization.hh 68058 2013-03-13 14:47:43Z gcosmo $
+//
+/// \file B4bActionInitialization.hh
+/// \brief Definition of the B4bActionInitialization class
+
+#ifndef B4bActionInitialization_h
+#define B4bActionInitialization_h 1
+
+#include "G4VUserActionInitialization.hh"
+
+class B4DetectorConstruction;
+
+/// Action initialization class.
+///
+
+class B4bActionInitialization : public G4VUserActionInitialization
+{
+  public:
+    B4bActionInitialization(B4DetectorConstruction*);
+    virtual ~B4bActionInitialization();
+
+    virtual void BuildForMaster() const;
+    virtual void Build() const;
+
+  private:
+    B4DetectorConstruction* fDetConstruction;
+};
+
+#endif
+

examples/basic/B4/B4b/include/B4bEventAction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: B4bEventAction.hh 75215 2013-10-29 16:07:06Z gcosmo $
 // 
 /// \file B4bEventAction.hh
 /// \brief Definition of the B4bEventAction class
@@ -34,18 +34,11 @@
 #include "G4UserEventAction.hh"
 #include "globals.hh"
 
-class G4GenericMessenger;
-
 /// Event action class
 ///
 /// In EndOfEventAction(), it prints the accumulated quantities of the energy 
 /// deposit and track lengths of charged particles in Absober and Gap layers 
 /// stored in B4bRunData object.
-///
-/// The data member fPrintModulo defines the frequency of printing.
-/// the accumulated quantities. Its value can be changed via a command
-/// defined using G4GenericMessenger class:
-/// - /B4/event/setPrintModulo value
 
 class B4bEventAction : public G4UserEventAction
 {
@@ -55,25 +48,12 @@ class B4bEventAction : public G4UserEventAction
 
     virtual void  BeginOfEventAction(const G4Event* event);
     virtual void    EndOfEventAction(const G4Event* event);
-                     
-    void SetPrintModulo(G4int value);
     
   private:
     // methods
     void PrintEventStatistics(G4double absoEdep, G4double absoTrackLength,
                               G4double gapEdep, G4double gapTrackLength) const;
-    
-    // data members
-    G4GenericMessenger*  fMessenger;
-                     
-    G4int  fPrintModulo;
 };
-
-// inline functions
-
-inline void B4bEventAction::SetPrintModulo(G4int value) {
-  fPrintModulo = value;
-}
                      
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 

examples/basic/B4/B4b/include/B4bRunAction.hh

@@ -23,13 +23,13 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: B4bRunAction.hh 66536 2012-12-19 14:32:36Z ihrivnac $
 // 
-/// \file B4RunAction.hh
-/// \brief Definition of the B4RunAction class
+/// \file B4bRunAction.hh
+/// \brief Definition of the B4bRunAction class
 
-#ifndef B4RunAction_h
-#define B4RunAction_h 1
+#ifndef B4bRunAction_h
+#define B4bRunAction_h 1
 
 #include "G4UserRunAction.hh"
 #include "globals.hh"
@@ -54,11 +54,13 @@ class G4Run;
 /// dispersion is printed.
 ///
 
-class B4RunAction : public G4UserRunAction
+class B4bRunAction : public G4UserRunAction
 {
   public:
-    B4RunAction();
-    virtual ~B4RunAction();
+    B4bRunAction();
+    virtual ~B4bRunAction();
+
+    virtual G4Run* GenerateRun();
 
     virtual void BeginOfRunAction(const G4Run*);
     virtual void   EndOfRunAction(const G4Run*);

examples/basic/B4/B4b/include/B4bRunData.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: B4bRunData.hh 69223 2013-04-23 12:36:10Z gcosmo $
 // 
 /// \file B4bRunData.hh
 /// \brief Definition of the B4bRunData class
@@ -31,6 +31,7 @@
 #ifndef B4bRunData_h
 #define B4bRunData_h 1
 
+#include "G4Run.hh"
 #include "globals.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -41,8 +42,6 @@ enum {
   kDim = 2
 };  
 
-class B4bRunData;
-
 ///  Run data class
 ///
 /// It defines data members to hold the energy deposit and track lengths
@@ -56,14 +55,12 @@ class B4bRunData;
 /// the accumulated values are filled in histograms and entuple
 /// event by event in B4EventAction.
 
-class B4bRunData
+class B4bRunData : public G4Run
 {
 public:
   B4bRunData();
   virtual ~B4bRunData();
 
-  static B4bRunData* GetInstance() { return fgInstance; }
-
   void Add(G4int id, G4double de, G4double dl);
   void FillPerEvent();
 
@@ -75,8 +72,6 @@ public:
   G4double  GetTrackLength(G4int id) const; 
 
 private:
-  static B4bRunData* fgInstance;
-
   G4String  fVolumeNames[kDim];
   G4double  fEdep[kDim];
   G4double  fTrackLength[kDim]; 

examples/basic/B4/B4b/include/B4bSteppingAction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id$
+// $Id: B4bSteppingAction.hh 68058 2013-03-13 14:47:43Z gcosmo $
 // 
 /// \file B4bSteppingAction.hh
 /// \brief Definition of the B4bSteppingAction class