Import Geant4 9.6.0 source tree

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

@@ -31,9 +31,7 @@
 #ifndef B4Analysis_h
 #define B4Analysis_h 1
 
-#include "g4analysis_defs.hh"
-
-using namespace G4Root;
-//using namespace G4Xml;
+#include "g4root.hh"
+//#include "g4xml.hh"
 
 #endif

examples/basic/B4/B4d/include/B4dDetectorConstruction.hh

@@ -34,11 +34,10 @@
 #include "G4VUserDetectorConstruction.hh"
 #include "globals.hh"
 
-#include "B4dDetectorMessenger.hh"
-
 class G4Box;
 class G4VPhysicalVolume;
 class G4UniformMagField;
+class G4GenericMessenger;
 
 /// Detector construction class to define materials and geometry.
 /// The calorimeter is a box made of a given number of layers. A layer consists
@@ -57,7 +56,8 @@ class G4UniformMagField;
 ///
 /// In addition a transverse uniform magnetic field is defined in
 /// SetMagField() method which can be activated
-/// via a command defined in the B4DetectorMessenger class. 
+/// via a command defined using G4GenericMessenger class: 
+/// - /B4/det/setMagField value unit
 
 
 class B4dDetectorConstruction : public G4VUserDetectorConstruction
@@ -81,8 +81,8 @@ class B4dDetectorConstruction : public G4VUserDetectorConstruction
   
     // data members
     //
-    B4dDetectorMessenger  fMessenger; // messenger 
-    G4UniformMagField*    fMagField;  // magnetic field
+    G4GenericMessenger*  fMessenger; // messenger 
+    G4UniformMagField*   fMagField;  // magnetic field
 
     G4bool  fCheckOverlaps; // option to activate checking of volumes overlaps
 };

examples/basic/B4/B4d/include/B4dDetectorMessenger.hh

@@ -1,65 +0,0 @@
-//
-// ********************************************************************
-// * 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$
-//
-/// \file B4dDetectorMessenger.hh
-/// \brief Definition of the B4dDetectorMessenger class
-
-#ifndef B4dDetectorMessenger_h
-#define B4dDetectorMessenger_h 1
-
-#include "globals.hh"
-#include "G4UImessenger.hh"
-
-class B4dDetectorConstruction;
-class G4UIdirectory;
-class G4UIcmdWithADoubleAndUnit;
-
-/// Messenger class that defines commands for B4dDetectorConstruction.
-///
-/// It implements commands:
-/// - /B4/det/setMagField value unit
-
-class B4dDetectorMessenger: public G4UImessenger
-{
-  public:
-    B4dDetectorMessenger(B4dDetectorConstruction* detectorConstruction);
-    virtual ~B4dDetectorMessenger();
-    
-    virtual void SetNewValue(G4UIcommand*, G4String);
-    
-  private:
-    B4dDetectorConstruction*  fDetectorConstruction;
-    
-    G4UIdirectory*             fB4Directory;
-    G4UIdirectory*             fDetDirectory;
-    G4UIcmdWithADoubleAndUnit* fSetMagFieldCmd;
-};
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-#endif
-

examples/basic/B4/B4d/include/B4dEventAction.hh

@@ -33,20 +33,21 @@
 
 #include "G4UserEventAction.hh"
 
-#include "B4dEventActionMessenger.hh"
-
 #include "G4THitsMap.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 the hits collections.
 ///
-/// The data member fPrintModulo defines the frequency of printing.
-/// Its value can be changed via a command defined in B4dEventActionMassenger 
-/// class. 
+/// 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 B4dEventAction : public G4UserEventAction
 {
@@ -69,7 +70,7 @@ private:
                             G4double gapEdep, G4double gapTrackLength) const;
   
   // data members                   
-  B4dEventActionMessenger  fMessenger;
+  G4GenericMessenger*  fMessenger;
   G4int  fPrintModulo;
 };
 

examples/basic/B4/B4d/include/B4dEventActionMessenger.hh

@@ -1,62 +0,0 @@
-//
-// ********************************************************************
-// * 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$
-//
-/// \file B4dEventActionMessenger.hh
-/// \brief Definition of the B4dEventActionMessenger class
-
-#ifndef B4dEventActionMessenger_h
-#define B4dEventActionMessenger_h 1
-
-#include "G4UImessenger.hh"
-#include "globals.hh"
-
-class B4dEventAction;
-class G4UIdirectory;
-class G4UIcmdWithAnInteger;
-
-/// Messenger class that defines commands for B4dEventAction class.
-///
-/// It implements commands:
-/// - /B4/event/setPrintModulo value
-
-class B4dEventActionMessenger: public G4UImessenger
-{
-public:
-  B4dEventActionMessenger(B4dEventAction* eventAction);
-  virtual ~B4dEventActionMessenger();
-    
-  virtual void SetNewValue(G4UIcommand* command, G4String value);
-    
-private:
-  B4dEventAction*       fEventAction;
-  G4UIdirectory*        fDirectory;   
-  G4UIcmdWithAnInteger* fSetPrintModuloCmd;    
-};
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-#endif