Import Geant4 11.0.0.beta source tree

2021-06-25 16:12:29 +02:00
parent c968e26a39
commit 6399a014b6
4200 changed files with 207479 additions and 237366 deletions
@@ -24,29 +24,20 @@
 // ********************************************************************
 //
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
 #ifndef CCalActionInitializer_h
 #define CCalActionInitializer_h 1

 #include "G4VUserActionInitialization.hh"

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

-class CCalActionInitializer : public G4VUserActionInitialization
-{
+class CCalActionInitializer : public G4VUserActionInitialization {
 public:
-
  CCalActionInitializer();
-  ~CCalActionInitializer(){;};
+  ~CCalActionInitializer() {;};
  
  void Build() const;
  void BuildForMaster() const;
-
 };

-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #endif
-
@@ -34,13 +34,19 @@
 #include "G4VUserDetectorConstruction.hh"
 #include "globals.hh"

+class CCalG4Hall;
+
+
 class CCalDetectorConstruction : public G4VUserDetectorConstruction {
 public:
  CCalDetectorConstruction();
-  ~CCalDetectorConstruction();
+  virtual ~CCalDetectorConstruction();

-public:
-  G4VPhysicalVolume* Construct();
+  virtual G4VPhysicalVolume* Construct();
+  virtual void ConstructSDandField();
+
+private:
+  CCalG4Hall* testBeamHCal96;
 };

 #endif
@@ -73,8 +73,8 @@ public:


 protected:
-  virtual G4int readFile();
-  virtual void constructDaughters();
+  virtual G4int readFile() override;
+  virtual void constructDaughters() override;

 private:
  G4String genMat;                            //General material
@@ -39,7 +39,7 @@ public:
  CCalEcalOrganization(){};
  ~CCalEcalOrganization();
         
-  virtual unsigned int GetUnitID(const G4Step* aStep) const ;
+  virtual unsigned int GetUnitID(const G4Step* aStep) const override;
      
 };

@@ -69,8 +69,8 @@ public:
  //Set the type of a logical volume to select its vis parameters.
  void setVisType(CCalVisualisable::visType, G4LogicalVolume*);

-
  //Sensitivity related
+  void sensitiveHandling();
  void setSensitivity(G4bool sens=true) {sensitivity=sens;}
  G4bool isSensitive() const {return sensitivity;}

@@ -78,7 +78,6 @@ public:
  G4String G4Name() const {return g4ableName;}
  void setName(const G4String& name) {g4ableName = name;}

-
  //Comparison operator needed for CCalG4AbleTable. Compares phys. volumes
  G4bool operator==(const CCalG4Able& right) const;
 
@@ -91,7 +90,7 @@ protected:

  //Constructs the sensitive detectors and associates them to the corresponding
  //logical volumes
-  virtual void constructSensitive() {}
+  virtual void constructSensitive() = 0;

 protected:
  //////////////////////////////////////////////////////////////////////////
@@ -45,18 +45,18 @@ public:
  CCalG4Ecal(const G4String &name);
  virtual ~CCalG4Ecal();

-  void setType(CMType ty)    {type = ty;}
+  void setType(CMType ty) {type = ty;}
  
  //Prefix to all names in the Detector
  static G4String idName;  

 protected:
  //This methods actually constructs the volume.
-  virtual G4VPhysicalVolume* constructIn(G4VPhysicalVolume*);
+  virtual G4VPhysicalVolume* constructIn(G4VPhysicalVolume*) override;

  //Constructs the sensitive detectors and associates them to the corresponding
  //logical volumes
-  virtual void constructSensitive() ;
+  virtual void constructSensitive() override;

 private:
  //Methods to construct the different parts of the detector
@@ -41,8 +41,9 @@ public:
  
 protected:
  //This methods actually constructs the volume.
-  virtual G4VPhysicalVolume* constructIn(G4VPhysicalVolume*);
-  virtual void constructDaughters();
+  virtual G4VPhysicalVolume* constructIn(G4VPhysicalVolume*) override;
+  virtual void constructDaughters() override;
+  virtual void constructSensitive() override;  
 };

 #endif
@@ -45,21 +45,21 @@ public:

 protected:
  //This methods actually constructs the volume.
-  virtual G4VPhysicalVolume* constructIn(G4VPhysicalVolume*);
-  virtual void constructDaughters();
+  virtual G4VPhysicalVolume* constructIn(G4VPhysicalVolume*) override;
+  virtual void constructDaughters() override;

  //Construct layer of scintillator or absorber
-  G4LogicalVolume*   constructScintillatorLayer (G4int);
-  G4LogicalVolume*   constructAbsorberLayer (G4int);
+  G4LogicalVolume* constructScintillatorLayer(G4int);
+  G4LogicalVolume* constructAbsorberLayer(G4int);

  //Constructs the sensitive detectors and associates them to the corresponding
  //logical volumes
-  virtual void constructSensitive() ;
+  virtual void constructSensitive() override;

 private:
  //Private data members
-  ptrG4Log*        sclLog;
-  ptrG4Log*        absLog;
+  ptrG4Log* sclLog;
+  ptrG4Log* absLog;

  // Logical volumes for sensitive detectors
  std::vector<ptrG4Log> allSensitiveLogs;
@@ -45,8 +45,8 @@ public:
  G4double   getDx_2Hall()                  const {return dx_2Hall;}

 protected:
-  virtual G4int readFile();
-  virtual void constructDaughters();
+  virtual G4int readFile() override;
+  virtual void constructDaughters() override;

 private:
  G4String genMaterial;            //General material
@@ -74,8 +74,8 @@ public:
  G4double   getDx_2Scnt(unsigned int i)    const {return dx_2Scintillator[i];}

 protected:
-  virtual G4int readFile();
-  virtual void constructDaughters();
+  virtual G4int readFile() override;
+  virtual void constructDaughters() override;

 private:
  G4String genMaterial;              //General material
@@ -39,7 +39,7 @@ public:
  CCalHcalOrganization(){}
  ~CCalHcalOrganization();
         
-  virtual unsigned int GetUnitID(const G4Step* aStep) const ;
+  virtual unsigned int GetUnitID(const G4Step* aStep) const override;
      
 };

@@ -38,8 +38,8 @@ class G4Run;
 class CCalRunAction: public G4UserRunAction
 {
 public:
-  CCalRunAction(){};
-  virtual ~CCalRunAction(){};
+  CCalRunAction();
+  virtual ~CCalRunAction();
      
  virtual void BeginOfRunAction(const G4Run* aRun);    
  virtual void EndOfRunAction(const G4Run* aRun);    
@@ -34,11 +34,13 @@

 #include <vector>
 #include "globals.hh"
+#include "G4ThreadLocalSingleton.hh"

 typedef G4String nameType;

 class CCalSDList
 {
+friend class G4ThreadLocalSingleton< CCalSDList >;
 private: 
  CCalSDList();
  ~CCalSDList();
@@ -58,7 +60,7 @@ public:
  G4int getNumberOfTrackerSD();
  
 private:
-  static CCalSDList* theList;
+  static G4ThreadLocal CCalSDList* theList;
  std::vector<nameType> caloSD;
  std::vector<nameType> trackerSD;
  
@@ -36,20 +36,21 @@
 #include <map>
 #include "globals.hh"
 #include "G4VSensitiveDetector.hh"
+#include "G4ThreadLocalSingleton.hh"

 class CCalSensAssign
 {
+friend class G4ThreadLocalSingleton< CCalSensAssign >;
 public:
  ~CCalSensAssign(){}
  static CCalSensAssign* getInstance();
  G4bool assign();
-  G4bool stackingAction();
  G4bool addCaloSD(G4String name, CCalVOrganization* numberingScheme);

 private:
  CCalSensAssign();

-  static CCalSensAssign* theInstance;
+  static G4ThreadLocal CCalSensAssign* theInstance;
  std::map<G4String,G4VSensitiveDetector*> sens_;

 };
@@ -35,11 +35,13 @@
 #include <map>
 #include "G4VSensitiveDetector.hh"
 #include "G4LogicalVolume.hh"
+#include "G4ThreadLocalSingleton.hh"

 typedef std::multimap< G4String, G4LogicalVolume*, std::less<G4String> > mmslv;

 class CCalSensitiveDetectors
 {
+friend class G4ThreadLocalSingleton< CCalSensitiveDetectors >;
 public:    
  ~CCalSensitiveDetectors(){};
  std::vector<G4LogicalVolume*> getVolumes (const G4String& name,
@@ -49,7 +51,7 @@ public:
  static CCalSensitiveDetectors* getInstance();
 private:
  CCalSensitiveDetectors(){};
-  static CCalSensitiveDetectors* theInstance;
+  static G4ThreadLocal CCalSensitiveDetectors* theInstance;
  // logical volume container: name, G4LogicalVolume*
  mmslv theLVs;
 };