Import Geant4 11.3.0 source tree

examples/extended/parameterisations/gflash/gflasha/include/ExGflashDetectorConstruction.hh

@@ -58,6 +58,7 @@ class ExGflashDetectorConstruction : public G4VUserDetectorConstruction
 
     void SetLBining(G4ThreeVector);
     void SetRBining(G4ThreeVector);
+
     void SetVerbose(G4int val) { fVerbose = val; }
 
     void SetMaterial(G4String mat);
@@ -70,8 +71,21 @@ class ExGflashDetectorConstruction : public G4VUserDetectorConstruction
     G4double GetdRradl() const { return fDRradl; }
 
     G4double GetSDRadLen() const { return fSDRadLen; }
+    G4double GetSDRm() const { return fSDRm; }
+
+    G4int GetNbOfCrystals() const { return fNbOfCrystals; }
+
+    G4double GetCrystalWidth() const { return fCrystalWidth; }
+    G4double GetCrystalLength() const { return fCrystalLength; }
+
+    void SetNbOfCrystals(G4int n) { fNbOfCrystals = n; }
+
+    void SetCrystalWidth(G4double cw) { fCrystalWidth = cw; }
+    void SetCrystalLength(G4double cl) { fCrystalLength = cl; }
 
   private:
+    void DefineMaterials();
+
     G4int fNbOfCrystals{10};  // cube of nb x nb crystals
 
     G4double fCrystalWidth;  // x,y size
@@ -79,15 +93,19 @@ class ExGflashDetectorConstruction : public G4VUserDetectorConstruction
 
     G4LogicalVolume* fCrystal_log{nullptr};
     G4Material* fDetMat{nullptr};
+    G4Material* fHallMat{nullptr};
+
     G4Region* fRegion{nullptr};
 
-    G4double fSDRadLen;  // SD material Rad Lenght
+    G4double fSDRadLen{1.0};  // SD material Rad Length
+    G4double fSDRm{1.0};  // SD material Moliere Radius
 
-    G4int fVerbose{0};
-    G4int fNLtot{40}, fNRtot{50};  // nb of bins: longitudinal and radial
-    G4double fDLradl{0.5}, fDRradl{0.1};  // bin thickness (in radl unit)
+    G4int fVerbose{1};
 
-    ExGflashMessenger* fGflashMessenger;
+    G4int fNLtot{112}, fNRtot{80};  // nb of bins: longitudinal and radial
+    G4double fDLradl{0.25}, fDRradl{0.05};  // bin thickness (in fraction of radl)
+
+    ExGflashMessenger* fGflashMessenger{nullptr};
 
     inline static G4ThreadLocal GFlashShowerModel* fFastShowerModel = nullptr;
     inline static G4ThreadLocal GFlashHomoShowerParameterisation* fParameterisation = nullptr;

examples/extended/parameterisations/gflash/gflasha/include/ExGflashEventAction.hh

@@ -46,6 +46,7 @@ class ExGflashEventAction : public G4UserEventAction
 
   private:
     G4int fCalorimeterCollectionId{-1};
-    ExGflashDetectorConstruction* fDet;
+    ExGflashDetectorConstruction* fDet{nullptr};
 };
+
 #endif

examples/extended/parameterisations/gflash/gflasha/include/ExGflashHistoManager.hh

@@ -44,10 +44,7 @@ class ExGflashHistoManager
     ~ExGflashHistoManager();
 
     void InitializePerEvent();
-    // void FillPerEvent();
-
-    // inline void FillPerTrack(G4double, G4double);
-    // inline void FillPerStep(G4double, G4int, G4int);
+    void SetBinning();
 
   private:
     void Book();
@@ -55,9 +52,7 @@ class ExGflashHistoManager
 
     ExGflashDetectorConstruction* fDet;
 
-    G4int fVerbose;
+    G4int fVerbose{1};
 };
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
 #endif

examples/extended/parameterisations/gflash/gflasha/include/ExGflashHit.hh

@@ -50,6 +50,7 @@ class ExGflashHit : public G4VHit
     inline void* operator new(size_t);
     inline void operator delete(void* aHit);
     void* operator new(size_t, void* p) { return p; }
+
 #ifndef G4NOT_ISO_DELETES
     void operator delete(void*, void*) {}
 #endif

examples/extended/parameterisations/gflash/gflasha/include/ExGflashMessenger.hh

@@ -41,6 +41,7 @@ class G4UIdirectory;
 class G4UIcmdWithAString;
 class G4UIcmdWithAnInteger;
 class G4UIcmdWith3Vector;
+class G4UIcmdWithADoubleAndUnit;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
@@ -61,8 +62,9 @@ class ExGflashMessenger : public G4UImessenger
     G4UIcmdWithAString* fMaterCmd;
     G4UIcmdWith3Vector* fLBinCmd;
     G4UIcmdWith3Vector* fRBinCmd;
+    G4UIcmdWithAnInteger* fNbCrysCmd;
+    G4UIcmdWithADoubleAndUnit* fWCrysCmd;
+    G4UIcmdWithADoubleAndUnit* fLCrysCmd;
 };
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
 #endif