lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 11.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2022-12-09 14:43:28 +01:00
parent c07cea1fe0
commit 9f34590941
3810 changed files with 200490 additions and 182326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/basic/B4/B4a/exampleB4a.out
+30 -22
View File
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
**************************************************************
Geant4 version Name: geant4-11-01-beta-01 (30-June-2022)
Geant4 version Name: geant4-11-01-ref-00 (9-December-2022)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
@@ -33,6 +33,8 @@ Registered graphics systems are:
RayTracer (RayTracer)
VRML2FILE (VRML2FILE)
gMocrenFile (gMocrenFile)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN, TSG_FILE)
OpenGLImmediateQt (OGLIQt, OGLI)
OpenGLStoredQt (OGLSQt, OGL, OGLS)
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
@@ -134,6 +136,7 @@ Apply cuts on all EM processes 0
Use combined TransportationWithMsc Disabled
Use general process 1
Enable linear polarisation for gamma 0
Enable photoeffect sampling below K-shell 1
Enable sampling of quantum entanglement 0
X-section factor for integral approach 0.8
Min kinetic energy for tables 100 eV
@@ -161,7 +164,7 @@ Lowest e+e- kinetic energy 1 keV
Lowest muon/hadron kinetic energy 1 keV
Use ICRU90 data 0
Fluctuations of dE/dx are enabled 1
Type of fluctuation model 2
Type of fluctuation model for leptons and hadrons Urban
Use built-in Birks satuaration 0
Build CSDA range enabled 0
Use cut as a final range enabled 0
@@ -212,8 +215,8 @@ conv: for gamma SubType=14 BuildTable=1
BetheHeitlerLPM : Emin= 0 eV Emax= 100 TeV ModifiedTsai
Rayl: for gamma SubType=11 BuildTable=1
Lambda table from 100 eV to 100 keV, 7 bins/decade, spline: 0
LambdaPrime table from 100 keV to 100 TeV in 63 bins
Lambda table from 100 eV to 150 keV, 7 bins/decade, spline: 0
LambdaPrime table from 150 keV to 100 TeV in 62 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
LivermoreRayleigh : Emin= 0 eV Emax= 100 TeV CullenGenerator
@@ -695,6 +698,11 @@ CoulombScat: for pi- XStype:1 SubType=1 BuildTable=1
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_hypertriton
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_lambda
@@ -977,15 +985,15 @@ Setting was ignored.
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 265.157 MeV total track length: 19.1896 cm
Gap: total energy: 9.08988 MeV total track length: 4.65633 cm
Absorber: total energy: 259.894 MeV total track length: 18.9569 cm
Gap: total energy: 17.4244 MeV total track length: 8.74398 cm
----> print histograms statistic for the entire run
EAbs : mean = 265.157 MeV rms = 0 eV
EGap : mean = 9.08988 MeV rms = 0 eV
LAbs : mean = 19.1896 cm rms = 0 fm
LGap : mean = 4.65633 cm rms = 0 fm
EAbs : mean = 259.894 MeV rms = 0 eV
EGap : mean = 17.4244 MeV rms = 0 eV
LAbs : mean = 18.9569 cm rms = 0 fm
LGap : mean = 8.74398 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
@@ -1056,15 +1064,15 @@ hFritiofCaptureAtRest,hBertiniCaptureAtRest,muMinusCaptureAtRest, dInela
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 263.024 MeV total track length: 19.1493 cm
Gap: total energy: 23.8653 MeV total track length: 12.0298 cm
Absorber: total energy: 278.136 MeV total track length: 20.1737 cm
Gap: total energy: 19.9095 MeV total track length: 10.0917 cm
----> print histograms statistic for the entire run
EAbs : mean = 263.024 MeV rms = 0 eV
EGap : mean = 23.8653 MeV rms = 0 eV
LAbs : mean = 19.1493 cm rms = 0 fm
LGap : mean = 12.0298 cm rms = 0 fm
EAbs : mean = 278.136 MeV rms = 0 eV
EGap : mean = 19.9095 MeV rms = 0 eV
LAbs : mean = 20.1737 cm rms = 0 fm
LGap : mean = 10.0917 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
@@ -1081,15 +1089,15 @@ View them with "/vis/plot" or "/vis/reviewPlots".
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 452.086 MeV total track length: 32.6243 cm
Gap: total energy: 26.9004 MeV total track length: 13.1264 cm
Absorber: total energy: 435.043 MeV total track length: 31.1955 cm
Gap: total energy: 37.3961 MeV total track length: 18.5223 cm
----> print histograms statistic for the entire run
EAbs : mean = 452.086 MeV rms = 0 eV
EGap : mean = 26.9004 MeV rms = 0 eV
LAbs : mean = 32.6243 cm rms = 0 fm
LGap : mean = 13.1264 cm rms = 0 fm
EAbs : mean = 435.043 MeV rms = 0 eV
EGap : mean = 37.3961 MeV rms = 0 eV
LAbs : mean = 31.1955 cm rms = 0 fm
LGap : mean = 18.5223 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
examples/basic/B4/B4a/include/ActionInitialization.hh
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file ActionInitialization.hh
/// \brief Definition of the ActionInitialization class
/// \file B4/B4a/include/ActionInitialization.hh
/// \brief Definition of the B4a::ActionInitialization class
#ifndef B4aActionInitialization_h
#define B4aActionInitialization_h 1
@@ -47,7 +47,7 @@ class ActionInitialization : public G4VUserActionInitialization
{
public:
ActionInitialization(B4::DetectorConstruction*);
~ActionInitialization() override;
~ActionInitialization() override = default;
void BuildForMaster() const override;
void Build() const override;
examples/basic/B4/B4a/include/DetectorConstruction.hh
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.hh
/// \brief Definition of the DetectorConstruction class
/// \file B4/B4a/include/DetectorConstruction.hh
/// \brief Definition of the B4::DetectorConstruction class
#ifndef B4DetectorConstruction_h
#define B4DetectorConstruction_h 1
@@ -56,8 +56,8 @@ namespace B4
class DetectorConstruction : public G4VUserDetectorConstruction
{
public:
DetectorConstruction();
~DetectorConstruction() override;
DetectorConstruction() = default;
~DetectorConstruction() override = default;
public:
G4VPhysicalVolume* Construct() override;
examples/basic/B4/B4a/include/EventAction.hh
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file EventAction.hh
/// \brief Definition of the EventAction class
/// \file B4/B4a/include/EventAction.hh
/// \brief Definition of the B4a::EventAction class
#ifndef B4aEventAction_h
#define B4aEventAction_h 1
@@ -47,8 +47,8 @@ namespace B4a
class EventAction : public G4UserEventAction
{
public:
EventAction();
~EventAction() override;
EventAction() = default;
~EventAction() override = default;
void BeginOfEventAction(const G4Event* event) override;
void EndOfEventAction(const G4Event* event) override;
examples/basic/B4/B4a/include/PrimaryGeneratorAction.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.hh
/// \brief Definition of the PrimaryGeneratorAction class
/// \file B4/B4a/include/PrimaryGeneratorAction.hh
/// \brief Definition of the B4::PrimaryGeneratorAction class
#ifndef B4PrimaryGeneratorAction_h
#define B4PrimaryGeneratorAction_h 1
examples/basic/B4/B4a/include/RunAction.hh
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file RunAction.hh
/// \brief Definition of the RunAction class
/// \file B4/B4a/include/RunAction.hh
/// \brief Definition of the B4::RunAction class
#ifndef B4RunAction_h
#define B4RunAction_h 1
@@ -60,7 +60,7 @@ class RunAction : public G4UserRunAction
{
public:
RunAction();
~RunAction() override;
~RunAction() override = default;
void BeginOfRunAction(const G4Run*) override;
void EndOfRunAction(const G4Run*) override;
examples/basic/B4/B4a/include/SteppingAction.hh
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file SteppingAction.hh
/// \brief Definition of the SteppingAction class
/// \file B4/B4a/include/SteppingAction.hh
/// \brief Definition of the B4a::SteppingAction class
#ifndef B4aSteppingAction_h
#define B4aSteppingAction_h 1
@@ -53,7 +53,7 @@ class SteppingAction : public G4UserSteppingAction
public:
SteppingAction(const B4::DetectorConstruction* detConstruction,
EventAction* eventAction);
~SteppingAction() override;
~SteppingAction() override = default;
void UserSteppingAction(const G4Step* step) override;
examples/basic/B4/B4a/src/ActionInitialization.cc
+3 -9
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file ActionInitialization.cc
/// \brief Implementation of the ActionInitialization class
/// \file B4/B4a/src/ActionInitialization.cc
/// \brief Implementation of the B4a::ActionInitialization class
#include "ActionInitialization.hh"
#include "PrimaryGeneratorAction.hh"
@@ -41,18 +41,12 @@ namespace B4a
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::ActionInitialization
(DetectorConstruction* detConstruction)
ActionInitialization::ActionInitialization(DetectorConstruction* detConstruction)
: fDetConstruction(detConstruction)
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::~ActionInitialization()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void ActionInitialization::BuildForMaster() const
{
SetUserAction(new RunAction);
examples/basic/B4/B4a/src/DetectorConstruction.cc
+34 -53
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.cc
/// \brief Implementation of the DetectorConstruction class
/// \file B4/B4a/src/DetectorConstruction.cc
/// \brief Implementation of the B4::DetectorConstruction class
#include "DetectorConstruction.hh"
@@ -60,18 +60,6 @@ G4GlobalMagFieldMessenger* DetectorConstruction::fMagFieldMessenger = nullptr;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
DetectorConstruction::DetectorConstruction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
DetectorConstruction::~DetectorConstruction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4VPhysicalVolume* DetectorConstruction::Construct()
{
// Define materials
@@ -144,16 +132,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
defaultMaterial, // its material
"World"); // its name
auto worldPV
= new G4PVPlacement(
0, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
0, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
auto worldPV = new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
nullptr, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Calorimeter
@@ -168,15 +154,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
defaultMaterial, // its material
"Calorimeter"); // its name
new G4PVPlacement(
0, // no rotation
G4ThreeVector(), // at (0,0,0)
calorLV, // its logical volume
"Calorimeter", // its name
worldLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
calorLV, // its logical volume
"Calorimeter", // its name
worldLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Layer
@@ -212,16 +197,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
absorberMaterial, // its material
"Abso"); // its name
fAbsorberPV
= new G4PVPlacement(
0, // no rotation
G4ThreeVector(0., 0., -gapThickness/2), // its position
absorberLV, // its logical volume
"Abso", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
fAbsorberPV = new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., -gapThickness / 2), // its position
absorberLV, // its logical volume
"Abso", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Gap
@@ -236,16 +219,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
gapMaterial, // its material
"Gap"); // its name
fGapPV
= new G4PVPlacement(
0, // no rotation
G4ThreeVector(0., 0., absoThickness/2), // its position
gapLV, // its logical volume
"Gap", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
fGapPV = new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., absoThickness / 2), // its position
gapLV, // its logical volume
"Gap", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// print parameters
examples/basic/B4/B4a/src/EventAction.cc
+1 -11
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file EventAction.cc
/// \file B4/B4a/src/EventAction.cc
/// \brief Implementation of the B4a::EventAction class
#include "EventAction.hh"
@@ -43,16 +43,6 @@ namespace B4a
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::~EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void EventAction::BeginOfEventAction(const G4Event* /*event*/)
{
// initialisation per event
examples/basic/B4/B4a/src/PrimaryGeneratorAction.cc
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.cc
/// \brief Implementation of the PrimaryGeneratorAction class
/// \file B4/B4a/src/PrimaryGeneratorAction.cc
/// \brief Implementation of the B4::PrimaryGeneratorAction class
#include "PrimaryGeneratorAction.hh"
examples/basic/B4/B4a/src/RunAction.cc
+1 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunAction.cc
/// \file B4/B4a/src/RunAction.cc
/// \brief Implementation of the B4::RunAction class
#include "RunAction.hh"
@@ -78,12 +78,6 @@ RunAction::RunAction()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
RunAction::~RunAction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void RunAction::BeginOfRunAction(const G4Run* /*run*/)
{
//inform the runManager to save random number seed
examples/basic/B4/B4a/src/SteppingAction.cc
+2 -7
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file SteppingAction.cc
/// \brief Implementation of the SteppingAction class
/// \file B4/B4a/src/SteppingAction.cc
/// \brief Implementation of the B4a::SteppingAction class
#include "SteppingAction.hh"
#include "EventAction.hh"
@@ -49,11 +49,6 @@ SteppingAction::SteppingAction(const DetectorConstruction* detConstruction,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
SteppingAction::~SteppingAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void SteppingAction::UserSteppingAction(const G4Step* step)
{
// Collect energy and track length step by step
examples/basic/B4/B4b/exampleB4b.out
+30 -22
View File
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
**************************************************************
Geant4 version Name: geant4-11-01-beta-01 (30-June-2022)
Geant4 version Name: geant4-11-01-ref-00 (9-December-2022)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
@@ -33,6 +33,8 @@ Registered graphics systems are:
RayTracer (RayTracer)
VRML2FILE (VRML2FILE)
gMocrenFile (gMocrenFile)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN, TSG_FILE)
OpenGLImmediateQt (OGLIQt, OGLI)
OpenGLStoredQt (OGLSQt, OGL, OGLS)
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
@@ -134,6 +136,7 @@ Apply cuts on all EM processes 0
Use combined TransportationWithMsc Disabled
Use general process 1
Enable linear polarisation for gamma 0
Enable photoeffect sampling below K-shell 1
Enable sampling of quantum entanglement 0
X-section factor for integral approach 0.8
Min kinetic energy for tables 100 eV
@@ -161,7 +164,7 @@ Lowest e+e- kinetic energy 1 keV
Lowest muon/hadron kinetic energy 1 keV
Use ICRU90 data 0
Fluctuations of dE/dx are enabled 1
Type of fluctuation model 2
Type of fluctuation model for leptons and hadrons Urban
Use built-in Birks satuaration 0
Build CSDA range enabled 0
Use cut as a final range enabled 0
@@ -212,8 +215,8 @@ conv: for gamma SubType=14 BuildTable=1
BetheHeitlerLPM : Emin= 0 eV Emax= 100 TeV ModifiedTsai
Rayl: for gamma SubType=11 BuildTable=1
Lambda table from 100 eV to 100 keV, 7 bins/decade, spline: 0
LambdaPrime table from 100 keV to 100 TeV in 63 bins
Lambda table from 100 eV to 150 keV, 7 bins/decade, spline: 0
LambdaPrime table from 150 keV to 100 TeV in 62 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
LivermoreRayleigh : Emin= 0 eV Emax= 100 TeV CullenGenerator
@@ -695,6 +698,11 @@ CoulombScat: for pi- XStype:1 SubType=1 BuildTable=1
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_hypertriton
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_lambda
@@ -978,15 +986,15 @@ Setting was ignored.
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 265.157 MeV total track length: 19.1896 cm
Gap: total energy: 9.08988 MeV total track length: 4.65633 cm
Absorber: total energy: 259.894 MeV total track length: 18.9569 cm
Gap: total energy: 17.4244 MeV total track length: 8.74398 cm
----> print histograms statistic for the entire run
EAbs : mean = 265.157 MeV rms = 0 eV
EGap : mean = 9.08988 MeV rms = 0 eV
LAbs : mean = 19.1896 cm rms = 0 fm
LGap : mean = 4.65633 cm rms = 0 fm
EAbs : mean = 259.894 MeV rms = 0 eV
EGap : mean = 17.4244 MeV rms = 0 eV
LAbs : mean = 18.9569 cm rms = 0 fm
LGap : mean = 8.74398 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
@@ -1058,15 +1066,15 @@ hFritiofCaptureAtRest,hBertiniCaptureAtRest,muMinusCaptureAtRest, dInela
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 263.024 MeV total track length: 19.1493 cm
Gap: total energy: 23.8653 MeV total track length: 12.0298 cm
Absorber: total energy: 278.136 MeV total track length: 20.1737 cm
Gap: total energy: 19.9095 MeV total track length: 10.0917 cm
----> print histograms statistic for the entire run
EAbs : mean = 263.024 MeV rms = 0 eV
EGap : mean = 23.8653 MeV rms = 0 eV
LAbs : mean = 19.1493 cm rms = 0 fm
LGap : mean = 12.0298 cm rms = 0 fm
EAbs : mean = 278.136 MeV rms = 0 eV
EGap : mean = 19.9095 MeV rms = 0 eV
LAbs : mean = 20.1737 cm rms = 0 fm
LGap : mean = 10.0917 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
@@ -1084,15 +1092,15 @@ View them with "/vis/plot" or "/vis/reviewPlots".
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 452.086 MeV total track length: 32.6243 cm
Gap: total energy: 26.9004 MeV total track length: 13.1264 cm
Absorber: total energy: 435.043 MeV total track length: 31.1955 cm
Gap: total energy: 37.3961 MeV total track length: 18.5223 cm
----> print histograms statistic for the entire run
EAbs : mean = 452.086 MeV rms = 0 eV
EGap : mean = 26.9004 MeV rms = 0 eV
LAbs : mean = 32.6243 cm rms = 0 fm
LGap : mean = 13.1264 cm rms = 0 fm
EAbs : mean = 435.043 MeV rms = 0 eV
EGap : mean = 37.3961 MeV rms = 0 eV
LAbs : mean = 31.1955 cm rms = 0 fm
LGap : mean = 18.5223 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
examples/basic/B4/B4b/include/ActionInitialization.hh
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file ActionInitialization.hh
/// \brief Definition of the ActionInitialization class
/// \file B4/B4b/include/ActionInitialization.hh
/// \brief Definition of the B4b::ActionInitialization class
#ifndef B4aActionInitialization_h
#define B4aActionInitialization_h 1
@@ -47,7 +47,7 @@ class ActionInitialization : public G4VUserActionInitialization
{
public:
ActionInitialization(B4::DetectorConstruction*);
~ActionInitialization() override;
~ActionInitialization() override = default;
void BuildForMaster() const override;
void Build() const override;
examples/basic/B4/B4b/include/DetectorConstruction.hh
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.hh
/// \file B4/B4b/include/DetectorConstruction.hh
/// \brief Definition of the DetectorConstruction class
#ifndef B4DetectorConstruction_h
@@ -56,8 +56,8 @@ namespace B4
class DetectorConstruction : public G4VUserDetectorConstruction
{
public:
DetectorConstruction();
~DetectorConstruction() override;
DetectorConstruction() = default;
~DetectorConstruction() override = default;
public:
G4VPhysicalVolume* Construct() override;
examples/basic/B4/B4b/include/EventAction.hh
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file EventAction.hh
/// \file B4/B4b/include/EventAction.hh
/// \brief Definition of the B4b::EventAction class
#ifndef B4bEventAction_h
@@ -45,8 +45,8 @@ namespace B4b
class EventAction : public G4UserEventAction
{
public:
EventAction();
~EventAction() override;
EventAction() = default;
~EventAction() override = default;
void BeginOfEventAction(const G4Event* event) override;
void EndOfEventAction(const G4Event* event) override;
examples/basic/B4/B4b/include/PrimaryGeneratorAction.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.hh
/// \file B4/B4b/include/PrimaryGeneratorAction.hh
/// \brief Definition of the PrimaryGeneratorAction class
#ifndef B4PrimaryGeneratorAction_h
examples/basic/B4/B4b/include/RunAction.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunAction.hh
/// \file B4/B4b/include/RunAction.hh
/// \brief Definition of the B4b::RunAction class
#ifndef B4bRunAction_h
@@ -60,7 +60,7 @@ class RunAction : public G4UserRunAction
{
public:
RunAction();
~RunAction() override;
~RunAction() override = default;
G4Run* GenerateRun() override;
examples/basic/B4/B4b/include/RunData.hh
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunData.hh
/// \file B4/B4b/include/RunData.hh
/// \brief Definition of the B4b::RunData class
#ifndef B4bRunData_h
@@ -60,8 +60,8 @@ const G4int kDim = 2;
class RunData : public G4Run
{
public:
RunData();
~RunData() override;
RunData() = default;
~RunData() override = default;
void Add(G4int id, G4double de, G4double dl);
void FillPerEvent();
examples/basic/B4/B4b/include/SteppingAction.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file SteppingAction.hh
/// \file B4/B4b/include/SteppingAction.hh
/// \brief Definition of the B4b::SteppingAction class
#ifndef B4bSteppingAction_h
@@ -50,7 +50,7 @@ class SteppingAction : public G4UserSteppingAction
{
public:
SteppingAction(const B4::DetectorConstruction* detConstruction);
~SteppingAction() override;
~SteppingAction() override = default;
void UserSteppingAction(const G4Step* step) override;
examples/basic/B4/B4b/src/ActionInitialization.cc
+2 -8
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file ActionInitialization.cc
/// \file B4/B4b/src/ActionInitialization.cc
/// \brief Implementation of the B4b::ActionInitialization class
#include "ActionInitialization.hh"
@@ -42,18 +42,12 @@ namespace B4b
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::ActionInitialization
(DetectorConstruction* detConstruction)
ActionInitialization::ActionInitialization(DetectorConstruction* detConstruction)
: fDetConstruction(detConstruction)
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::~ActionInitialization()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void ActionInitialization::BuildForMaster() const
{
SetUserAction(new RunAction);
examples/basic/B4/B4b/src/DetectorConstruction.cc
+33 -52
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.cc
/// \file B4/B4b/src/DetectorConstruction.cc
/// \brief Implementation of the B4:DetectorConstruction class
#include "DetectorConstruction.hh"
@@ -60,18 +60,6 @@ G4GlobalMagFieldMessenger* DetectorConstruction::fMagFieldMessenger = nullptr;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
DetectorConstruction::DetectorConstruction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
DetectorConstruction::~DetectorConstruction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4VPhysicalVolume* DetectorConstruction::Construct()
{
// Define materials
@@ -144,16 +132,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
defaultMaterial, // its material
"World"); // its name
auto worldPV
= new G4PVPlacement(
0, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
0, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
auto worldPV = new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
nullptr, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Calorimeter
@@ -168,15 +154,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
defaultMaterial, // its material
"Calorimeter"); // its name
new G4PVPlacement(
0, // no rotation
G4ThreeVector(), // at (0,0,0)
calorLV, // its logical volume
"Calorimeter", // its name
worldLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
calorLV, // its logical volume
"Calorimeter", // its name
worldLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Layer
@@ -212,16 +197,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
absorberMaterial, // its material
"Abso"); // its name
fAbsorberPV
= new G4PVPlacement(
0, // no rotation
G4ThreeVector(0., 0., -gapThickness/2), // its position
absorberLV, // its logical volume
"Abso", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
fAbsorberPV = new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., -gapThickness / 2), // its position
absorberLV, // its logical volume
"Abso", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Gap
@@ -236,16 +219,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
gapMaterial, // its material
"Gap"); // its name
fGapPV
= new G4PVPlacement(
0, // no rotation
G4ThreeVector(0., 0., absoThickness/2), // its position
gapLV, // its logical volume
"Gap", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
fGapPV = new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., absoThickness / 2), // its position
gapLV, // its logical volume
"Gap", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// print parameters
examples/basic/B4/B4b/src/EventAction.cc
+1 -11
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file EventAction.cc
/// \file B4/B4b/src/EventAction.cc
/// \brief Implementation of the B4b::EventAction class
#include "EventAction.hh"
@@ -42,16 +42,6 @@ namespace B4b
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::~EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void EventAction::PrintEventStatistics(
G4double absoEdep, G4double absoTrackLength,
G4double gapEdep, G4double gapTrackLength) const
examples/basic/B4/B4b/src/PrimaryGeneratorAction.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.cc
/// \file B4/B4b/src/PrimaryGeneratorAction.cc
/// \brief Implementation of the B4::PrimaryGeneratorAction class
#include "PrimaryGeneratorAction.hh"
examples/basic/B4/B4b/src/RunAction.cc
+1 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunAction.cc
/// \file B4/B4b/src/RunAction.cc
/// \brief Implementation of the B4b::RunAction class
#include "RunAction.hh"
@@ -79,12 +79,6 @@ RunAction::RunAction()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
RunAction::~RunAction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4Run* RunAction::GenerateRun()
{
return (new RunData);
examples/basic/B4/B4b/src/RunData.cc
+1 -11
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunData.cc
/// \file B4/B4b/src/RunData.cc
/// \brief Implementation of the B4b::RunData class
#include "RunData.hh"
@@ -38,16 +38,6 @@ namespace B4b
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
RunData::RunData()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
RunData::~RunData()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void RunData::FillPerEvent()
{
// get analysis manager
examples/basic/B4/B4b/src/SteppingAction.cc
+2 -8
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file SteppingAction.cc
/// \brief Implementation of the SteppingAction class
/// \file B4/B4b/src/SteppingAction.cc
/// \brief Implementation of the B4b::SteppingAction class
#include "SteppingAction.hh"
#include "RunData.hh"
@@ -48,12 +48,6 @@ SteppingAction::SteppingAction(const DetectorConstruction* detConstruction)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
SteppingAction::~SteppingAction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void SteppingAction::UserSteppingAction(const G4Step* step)
{
// Collect energy and track length step by step
examples/basic/B4/B4c/exampleB4c.out
+30 -22
View File
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
**************************************************************
Geant4 version Name: geant4-11-01-beta-01 (30-June-2022)
Geant4 version Name: geant4-11-01-ref-00 (9-December-2022)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
@@ -33,6 +33,8 @@ Registered graphics systems are:
RayTracer (RayTracer)
VRML2FILE (VRML2FILE)
gMocrenFile (gMocrenFile)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN, TSG_FILE)
OpenGLImmediateQt (OGLIQt, OGLI)
OpenGLStoredQt (OGLSQt, OGL, OGLS)
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
@@ -134,6 +136,7 @@ Apply cuts on all EM processes 0
Use combined TransportationWithMsc Disabled
Use general process 1
Enable linear polarisation for gamma 0
Enable photoeffect sampling below K-shell 1
Enable sampling of quantum entanglement 0
X-section factor for integral approach 0.8
Min kinetic energy for tables 100 eV
@@ -161,7 +164,7 @@ Lowest e+e- kinetic energy 1 keV
Lowest muon/hadron kinetic energy 1 keV
Use ICRU90 data 0
Fluctuations of dE/dx are enabled 1
Type of fluctuation model 2
Type of fluctuation model for leptons and hadrons Urban
Use built-in Birks satuaration 0
Build CSDA range enabled 0
Use cut as a final range enabled 0
@@ -212,8 +215,8 @@ conv: for gamma SubType=14 BuildTable=1
BetheHeitlerLPM : Emin= 0 eV Emax= 100 TeV ModifiedTsai
Rayl: for gamma SubType=11 BuildTable=1
Lambda table from 100 eV to 100 keV, 7 bins/decade, spline: 0
LambdaPrime table from 100 keV to 100 TeV in 63 bins
Lambda table from 100 eV to 150 keV, 7 bins/decade, spline: 0
LambdaPrime table from 150 keV to 100 TeV in 62 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
LivermoreRayleigh : Emin= 0 eV Emax= 100 TeV CullenGenerator
@@ -695,6 +698,11 @@ CoulombScat: for pi- XStype:1 SubType=1 BuildTable=1
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_hypertriton
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_lambda
@@ -977,15 +985,15 @@ Setting was ignored.
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 265.157 MeV total track length: 19.1896 cm
Gap: total energy: 9.08988 MeV total track length: 4.65633 cm
Absorber: total energy: 259.894 MeV total track length: 18.9569 cm
Gap: total energy: 17.4244 MeV total track length: 8.74398 cm
----> print histograms statistic for the entire run
EAbs : mean = 265.157 MeV rms = 0 eV
EGap : mean = 9.08988 MeV rms = 0 eV
LAbs : mean = 19.1896 cm rms = 0 fm
LGap : mean = 4.65633 cm rms = 0 fm
EAbs : mean = 259.894 MeV rms = 0 eV
EGap : mean = 17.4244 MeV rms = 0 eV
LAbs : mean = 18.9569 cm rms = 0 fm
LGap : mean = 8.74398 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
@@ -1056,15 +1064,15 @@ hFritiofCaptureAtRest,hBertiniCaptureAtRest,muMinusCaptureAtRest, dInela
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 263.024 MeV total track length: 19.1493 cm
Gap: total energy: 23.8653 MeV total track length: 12.0298 cm
Absorber: total energy: 278.136 MeV total track length: 20.1737 cm
Gap: total energy: 19.9095 MeV total track length: 10.0917 cm
----> print histograms statistic for the entire run
EAbs : mean = 263.024 MeV rms = 0 eV
EGap : mean = 23.8653 MeV rms = 0 eV
LAbs : mean = 19.1493 cm rms = 0 fm
LGap : mean = 12.0298 cm rms = 0 fm
EAbs : mean = 278.136 MeV rms = 0 eV
EGap : mean = 19.9095 MeV rms = 0 eV
LAbs : mean = 20.1737 cm rms = 0 fm
LGap : mean = 10.0917 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
@@ -1081,15 +1089,15 @@ View them with "/vis/plot" or "/vis/reviewPlots".
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 452.086 MeV total track length: 32.6243 cm
Gap: total energy: 26.9004 MeV total track length: 13.1264 cm
Absorber: total energy: 435.043 MeV total track length: 31.1955 cm
Gap: total energy: 37.3961 MeV total track length: 18.5223 cm
----> print histograms statistic for the entire run
EAbs : mean = 452.086 MeV rms = 0 eV
EGap : mean = 26.9004 MeV rms = 0 eV
LAbs : mean = 32.6243 cm rms = 0 fm
LGap : mean = 13.1264 cm rms = 0 fm
EAbs : mean = 435.043 MeV rms = 0 eV
EGap : mean = 37.3961 MeV rms = 0 eV
LAbs : mean = 31.1955 cm rms = 0 fm
LGap : mean = 18.5223 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
examples/basic/B4/B4c/include/ActionInitialization.hh
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file ActionInitialization.hh
/// \file B4/B4c/include/ActionInitialization.hh
/// \brief Definition of the B4c::ActionInitialization class
#ifndef B4cActionInitialization_h
@@ -40,8 +40,8 @@ namespace B4c
class ActionInitialization : public G4VUserActionInitialization
{
public:
ActionInitialization();
~ActionInitialization() override;
ActionInitialization() = default;
~ActionInitialization() override = default;
void BuildForMaster() const override;
void Build() const override;
examples/basic/B4/B4c/include/CalorHit.hh
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file CalorHit.hh
/// \file B4/B4c/include/CalorHit.hh
/// \brief Definition of the B4c::CalorHit class
#ifndef B4cCalorHit_h
@@ -48,9 +48,9 @@ namespace B4c
class CalorHit : public G4VHit
{
public:
CalorHit();
CalorHit() = default;
CalorHit(const CalorHit&) = default;
~CalorHit() override;
~CalorHit() override = default;
// operators
CalorHit& operator=(const CalorHit&) = default;
examples/basic/B4/B4c/include/CalorimeterSD.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file CalorimeterSD.hh
/// \file B4/B4c/include/CalorimeterSD.hh
/// \brief Definition of the B4c::CalorimeterSD class
#ifndef B4cCalorimeterSD_h
@@ -56,7 +56,7 @@ class CalorimeterSD : public G4VSensitiveDetector
CalorimeterSD(const G4String& name,
const G4String& hitsCollectionName,
G4int nofCells);
~CalorimeterSD() override;
~CalorimeterSD() override = default;
// methods from base class
void Initialize(G4HCofThisEvent* hitCollection) override;
examples/basic/B4/B4c/include/DetectorConstruction.hh
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.hh
/// \file B4/B4c/include/DetectorConstruction.hh
/// \brief Definition of the B4c::DetectorConstruction class
#ifndef B4cDetectorConstruction_h
@@ -58,8 +58,8 @@ namespace B4c
class DetectorConstruction : public G4VUserDetectorConstruction
{
public:
DetectorConstruction();
~DetectorConstruction() override;
DetectorConstruction() = default;
~DetectorConstruction() override = default;
public:
G4VPhysicalVolume* Construct() override;
examples/basic/B4/B4c/include/EventAction.hh
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file EventAction.hh
/// \file B4/B4c/include/EventAction.hh
/// \brief Definition of the B4c::EventAction class
#ifndef B4cEventAction_h
@@ -48,8 +48,8 @@ namespace B4c
class EventAction : public G4UserEventAction
{
public:
EventAction();
~EventAction() override;
EventAction() = default;
~EventAction() override = default;
void BeginOfEventAction(const G4Event* event) override;
void EndOfEventAction(const G4Event* event) override;
examples/basic/B4/B4c/include/PrimaryGeneratorAction.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.hh
/// \file B4/B4c/include/PrimaryGeneratorAction.hh
/// \brief Definition of the PrimaryGeneratorAction class
#ifndef B4PrimaryGeneratorAction_h
examples/basic/B4/B4c/include/RunAction.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunAction.hh
/// \file B4/B4c/include/RunAction.hh
/// \brief Definition of the B4::RunAction class
#ifndef B4RunAction_h
@@ -60,7 +60,7 @@ class RunAction : public G4UserRunAction
{
public:
RunAction();
~RunAction() override;
~RunAction() override = default;
void BeginOfRunAction(const G4Run*) override;
void EndOfRunAction(const G4Run*) override;
examples/basic/B4/B4c/src/ActionInitialization.cc
+1 -11
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file ActionInitialization.cc
/// \file B4/B4c/src/ActionInitialization.cc
/// \brief Implementation of the B4c::ActionInitialization class
#include "ActionInitialization.hh"
@@ -39,16 +39,6 @@ namespace B4c
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::ActionInitialization()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::~ActionInitialization()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void ActionInitialization::BuildForMaster() const
{
SetUserAction(new RunAction);
examples/basic/B4/B4c/src/CalorHit.cc
+1 -29
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file CalorHit.cc
/// \file B4/B4c/src/CalorHit.cc
/// \brief Implementation of the B4c::CalorHit class
#include "CalorHit.hh"
@@ -43,34 +43,6 @@ G4ThreadLocal G4Allocator<CalorHit>* CalorHitAllocator = nullptr;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
CalorHit::CalorHit()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
CalorHit::~CalorHit() {}
// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
// CalorHit::CalorHit(const CalorHit& right)
// : G4VHit()
// {
// fEdep = right.fEdep;
// fTrackLength = right.fTrackLength;
// }
// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
// const CalorHit& CalorHit::operator=(const CalorHit& right)
// {
// fEdep = right.fEdep;
// fTrackLength = right.fTrackLength;
// return *this;
// }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4bool CalorHit::operator==(const CalorHit& right) const
{
return ( this == &right ) ? true : false;
examples/basic/B4/B4c/src/CalorimeterSD.cc
+1 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file CalorimeterSD.cc
/// \file B4/B4c/src/CalorimeterSD.cc
/// \brief Implementation of the B4c::CalorimeterSD class
#include "CalorimeterSD.hh"
@@ -50,12 +50,6 @@ CalorimeterSD::CalorimeterSD(const G4String& name,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
CalorimeterSD::~CalorimeterSD()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void CalorimeterSD::Initialize(G4HCofThisEvent* hce)
{
// Create hits collection
examples/basic/B4/B4c/src/DetectorConstruction.cc
+33 -50
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.cc
/// \file B4/B4c/src/DetectorConstruction.cc
/// \brief Implementation of the B4c::DetectorConstruction class
#include "DetectorConstruction.hh"
@@ -57,18 +57,6 @@ G4GlobalMagFieldMessenger* DetectorConstruction::fMagFieldMessenger = nullptr;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
DetectorConstruction::DetectorConstruction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
DetectorConstruction::~DetectorConstruction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4VPhysicalVolume* DetectorConstruction::Construct()
{
// Define materials
@@ -141,16 +129,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
defaultMaterial, // its material
"World"); // its name
auto worldPV
= new G4PVPlacement(
0, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
0, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
auto worldPV = new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
nullptr, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Calorimeter
@@ -165,15 +151,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
defaultMaterial, // its material
"Calorimeter"); // its name
new G4PVPlacement(
0, // no rotation
G4ThreeVector(), // at (0,0,0)
calorLV, // its logical volume
"Calorimeter", // its name
worldLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
calorLV, // its logical volume
"Calorimeter", // its name
worldLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Layer
@@ -209,15 +194,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
absorberMaterial, // its material
"AbsoLV"); // its name
new G4PVPlacement(
0, // no rotation
G4ThreeVector(0., 0., -gapThickness/2), // its position
absorberLV, // its logical volume
"Abso", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., -gapThickness / 2), // its position
absorberLV, // its logical volume
"Abso", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Gap
@@ -232,15 +216,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
gapMaterial, // its material
"GapLV"); // its name
new G4PVPlacement(
0, // no rotation
G4ThreeVector(0., 0., absoThickness/2), // its position
gapLV, // its logical volume
"Gap", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., absoThickness / 2), // its position
gapLV, // its logical volume
"Gap", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// print parameters
examples/basic/B4/B4c/src/EventAction.cc
+1 -11
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file EventAction.cc
/// \file B4/B4c/src/EventAction.cc
/// \brief Implementation of the B4c::EventAction class
#include "EventAction.hh"
@@ -46,16 +46,6 @@ namespace B4c
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::~EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
CalorHitsCollection*
EventAction::GetHitsCollection(G4int hcID,
const G4Event* event) const
examples/basic/B4/B4c/src/PrimaryGeneratorAction.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.cc
/// \file B4/B4c/src/PrimaryGeneratorAction.cc
/// \brief Implementation of the B4::PrimaryGeneratorAction class
#include "PrimaryGeneratorAction.hh"
examples/basic/B4/B4c/src/RunAction.cc
+1 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunAction.cc
/// \file B4/B4c/src/RunAction.cc
/// \brief Implementation of the B4::RunAction class
#include "RunAction.hh"
@@ -78,12 +78,6 @@ RunAction::RunAction()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
RunAction::~RunAction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void RunAction::BeginOfRunAction(const G4Run* /*run*/)
{
//inform the runManager to save random number seed
examples/basic/B4/B4d/exampleB4d.cc
+8 -5
View File
@@ -135,12 +135,15 @@ int main(int argc,char** argv)
auto UImanager = G4UImanager::GetUIpointer();
// Activate score ntuple writer
// The Root output type (Root) is selected in B3Analysis.hh.
G4TScoreNtupleWriter<G4AnalysisManager> scoreNtupleWriter;
// The verbose level can be set via UI commands
// The verbose level can be also set via UI commands
// /score/ntuple/writerVerbose level
// or via the score ntuple writer function:
// scoreNtupleWriter.SetVerboseLevel(1);
// The default file type ("root") can be changed in xml, csv, hdf5
// scoreNtupleWriter.SetDefaultFileType("xml");
G4TScoreNtupleWriter<G4AnalysisManager> scoreNtupleWriter;
scoreNtupleWriter.SetVerboseLevel(1);
scoreNtupleWriter.SetNtupleMerging(true);
// Note: merging ntuples is available only with Root output
// (the default in G4TScoreNtupleWriter)
// Process macro or start UI session
//
examples/basic/B4/B4d/exampleB4d.out
+31 -23
View File
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
**************************************************************
Geant4 version Name: geant4-11-01-beta-01 (30-June-2022)
Geant4 version Name: geant4-11-01-ref-00 (9-December-2022)
Copyright : Geant4 Collaboration
References : NIM A 506 (2003), 250-303
: IEEE-TNS 53 (2006), 270-278
@@ -33,6 +33,8 @@ Registered graphics systems are:
RayTracer (RayTracer)
VRML2FILE (VRML2FILE)
gMocrenFile (gMocrenFile)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN)
TOOLSSG_OFFSCREEN (TSG_OFFSCREEN, TSG_FILE)
OpenGLImmediateQt (OGLIQt, OGLI)
OpenGLStoredQt (OGLSQt, OGL, OGLS)
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
@@ -138,6 +140,7 @@ Apply cuts on all EM processes 0
Use combined TransportationWithMsc Disabled
Use general process 1
Enable linear polarisation for gamma 0
Enable photoeffect sampling below K-shell 1
Enable sampling of quantum entanglement 0
X-section factor for integral approach 0.8
Min kinetic energy for tables 100 eV
@@ -165,7 +168,7 @@ Lowest e+e- kinetic energy 1 keV
Lowest muon/hadron kinetic energy 1 keV
Use ICRU90 data 0
Fluctuations of dE/dx are enabled 1
Type of fluctuation model 2
Type of fluctuation model for leptons and hadrons Urban
Use built-in Birks satuaration 0
Build CSDA range enabled 0
Use cut as a final range enabled 0
@@ -216,8 +219,8 @@ conv: for gamma SubType=14 BuildTable=1
BetheHeitlerLPM : Emin= 0 eV Emax= 100 TeV ModifiedTsai
Rayl: for gamma SubType=11 BuildTable=1
Lambda table from 100 eV to 100 keV, 7 bins/decade, spline: 0
LambdaPrime table from 100 keV to 100 TeV in 63 bins
Lambda table from 100 eV to 150 keV, 7 bins/decade, spline: 0
LambdaPrime table from 150 keV to 100 TeV in 62 bins
===== EM models for the G4Region DefaultRegionForTheWorld ======
LivermoreRayleigh : Emin= 0 eV Emax= 100 TeV CullenGenerator
@@ -699,6 +702,11 @@ CoulombScat: for pi- XStype:1 SubType=1 BuildTable=1
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_hypertriton
Process: hFritiofCaptureAtRest
---------------------------------------------------
Hadronic Processes for anti_lambda
@@ -981,15 +989,15 @@ Setting was ignored.
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 265.157 MeV total track length: 19.1896 cm
Gap: total energy: 9.08988 MeV total track length: 4.65633 cm
Absorber: total energy: 259.894 MeV total track length: 18.9569 cm
Gap: total energy: 17.4244 MeV total track length: 8.74398 cm
----> print histograms statistic for the entire run
EAbs : mean = 265.157 MeV rms = 0 eV
EGap : mean = 9.08988 MeV rms = 0 eV
LAbs : mean = 19.1896 cm rms = 0 fm
LGap : mean = 4.65633 cm rms = 0 fm
EAbs : mean = 259.894 MeV rms = 0 eV
EGap : mean = 17.4244 MeV rms = 0 eV
LAbs : mean = 18.9569 cm rms = 0 fm
LGap : mean = 8.74398 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
@@ -1060,15 +1068,15 @@ hFritiofCaptureAtRest,hBertiniCaptureAtRest,muMinusCaptureAtRest, dInela
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 263.024 MeV total track length: 19.1493 cm
Gap: total energy: 23.8653 MeV total track length: 12.0298 cm
Absorber: total energy: 278.136 MeV total track length: 20.1737 cm
Gap: total energy: 19.9095 MeV total track length: 10.0917 cm
----> print histograms statistic for the entire run
EAbs : mean = 263.024 MeV rms = 0 eV
EGap : mean = 23.8653 MeV rms = 0 eV
LAbs : mean = 19.1493 cm rms = 0 fm
LGap : mean = 12.0298 cm rms = 0 fm
EAbs : mean = 278.136 MeV rms = 0 eV
EGap : mean = 19.9095 MeV rms = 0 eV
LAbs : mean = 20.1737 cm rms = 0 fm
LGap : mean = 10.0917 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
@@ -1085,15 +1093,15 @@ View them with "/vis/plot" or "/vis/reviewPlots".
Using
--> Event 0 starts.
---> End of event: 0
Absorber: total energy: 452.086 MeV total track length: 32.6243 cm
Gap: total energy: 26.9004 MeV total track length: 13.1264 cm
Absorber: total energy: 435.043 MeV total track length: 31.1955 cm
Gap: total energy: 37.3961 MeV total track length: 18.5223 cm
----> print histograms statistic for the entire run
EAbs : mean = 452.086 MeV rms = 0 eV
EGap : mean = 26.9004 MeV rms = 0 eV
LAbs : mean = 32.6243 cm rms = 0 fm
LGap : mean = 13.1264 cm rms = 0 fm
EAbs : mean = 435.043 MeV rms = 0 eV
EGap : mean = 37.3961 MeV rms = 0 eV
LAbs : mean = 31.1955 cm rms = 0 fm
LGap : mean = 18.5223 cm rms = 0 fm
... write file : B4.root - done
... close file : B4.root - done
There are 4 h1 histograms
@@ -1105,4 +1113,4 @@ List them with "/analysis/list".
View them with "/vis/plot" or "/vis/reviewPlots".
Graphics systems deleted.
Visualization Manager deleting...
### deleting chargedFilter 0x102f630
### deleting chargedFilter 0x29dbec0
examples/basic/B4/B4d/include/ActionInitialization.hh
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file ActionInitialization.hh
/// \file B4/B4d/include/ActionInitialization.hh
/// \brief Definition of the B4d::ActionInitialization class
#ifndef B4dActionInitialization_h
@@ -40,8 +40,8 @@ namespace B4d
class ActionInitialization : public G4VUserActionInitialization
{
public:
ActionInitialization();
~ActionInitialization() override;
ActionInitialization() = default;
~ActionInitialization() override = default;
void BuildForMaster() const override;
void Build() const override;
examples/basic/B4/B4d/include/DetectorConstruction.hh
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.hh
/// \file B4/B4d/include/DetectorConstruction.hh
/// \brief Definition of the B4d::DetectorConstruction class
#ifndef B4dDetectorConstruction_h
@@ -58,8 +58,8 @@ namespace B4d
class DetectorConstruction : public G4VUserDetectorConstruction
{
public:
DetectorConstruction();
~DetectorConstruction() override;
DetectorConstruction() = default;
~DetectorConstruction() override = default;
public:
G4VPhysicalVolume* Construct() override;
examples/basic/B4/B4d/include/EventAction.hh
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
/// \file EventAction.hh
/// \brief Definition of the EventAction class
/// \file B4/B4d/include/EventAction.hh
/// \brief Definition of the B4d::EventAction class
#ifndef EventAction_h
#define EventAction_h 1
@@ -47,8 +47,8 @@ namespace B4d
class EventAction : public G4UserEventAction
{
public:
EventAction();
~EventAction() override;
EventAction() = default;
~EventAction() override = default;
void BeginOfEventAction(const G4Event* event) override;
void EndOfEventAction(const G4Event* event) override;
examples/basic/B4/B4d/include/PrimaryGeneratorAction.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.hh
/// \file B4/B4d/include/PrimaryGeneratorAction.hh
/// \brief Definition of the PrimaryGeneratorAction class
#ifndef B4PrimaryGeneratorAction_h
examples/basic/B4/B4d/include/RunAction.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunAction.hh
/// \file B4/B4d/include/RunAction.hh
/// \brief Definition of the B4::RunAction class
#ifndef B4RunAction_h
@@ -60,7 +60,7 @@ class RunAction : public G4UserRunAction
{
public:
RunAction();
~RunAction() override;
~RunAction() override = default;
void BeginOfRunAction(const G4Run*) override;
void EndOfRunAction(const G4Run*) override;
examples/basic/B4/B4d/src/ActionInitialization.cc
+1 -11
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file ActionInitialization.cc
/// \file B4/B4d/src/ActionInitialization.cc
/// \brief Implementation of the B4d::ActionInitialization class
#include "ActionInitialization.hh"
@@ -39,16 +39,6 @@ namespace B4d
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::ActionInitialization()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
ActionInitialization::~ActionInitialization()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void ActionInitialization::BuildForMaster() const
{
SetUserAction(new RunAction);
examples/basic/B4/B4d/src/DetectorConstruction.cc
+33 -50
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file DetectorConstruction.cc
/// \file B4/B4d/src/DetectorConstruction.cc
/// \brief Implementation of the B4d::DetectorConstruction class
#include "DetectorConstruction.hh"
@@ -62,18 +62,6 @@ G4GlobalMagFieldMessenger* DetectorConstruction::fMagFieldMessenger = nullptr;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
DetectorConstruction::DetectorConstruction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
DetectorConstruction::~DetectorConstruction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4VPhysicalVolume* DetectorConstruction::Construct()
{
// Define materials
@@ -146,16 +134,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
defaultMaterial, // its material
"World"); // its name
auto worldPV
= new G4PVPlacement(
0, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
0, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
auto worldPV = new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
worldLV, // its logical volume
"World", // its name
nullptr, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Calorimeter
@@ -170,15 +156,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
defaultMaterial, // its material
"Calorimeter"); // its name
new G4PVPlacement(
0, // no rotation
G4ThreeVector(), // at (0,0,0)
calorLV, // its logical volume
"Calorimeter", // its name
worldLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(), // at (0,0,0)
calorLV, // its logical volume
"Calorimeter", // its name
worldLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Layer
@@ -214,15 +199,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
absorberMaterial, // its material
"AbsoLV"); // its name
new G4PVPlacement(
0, // no rotation
G4ThreeVector(0., 0., -gapThickness/2), // its position
absorberLV, // its logical volume
"Abso", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., -gapThickness / 2), // its position
absorberLV, // its logical volume
"Abso", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// Gap
@@ -237,15 +221,14 @@ G4VPhysicalVolume* DetectorConstruction::DefineVolumes()
gapMaterial, // its material
"GapLV"); // its name
new G4PVPlacement(
0, // no rotation
G4ThreeVector(0., 0., absoThickness/2), // its position
gapLV, // its logical volume
"Gap", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
new G4PVPlacement(nullptr, // no rotation
G4ThreeVector(0., 0., absoThickness / 2), // its position
gapLV, // its logical volume
"Gap", // its name
layerLV, // its mother volume
false, // no boolean operation
0, // copy number
fCheckOverlaps); // checking overlaps
//
// print parameters
examples/basic/B4/B4d/src/EventAction.cc
+1 -11
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file EventAction.cc
/// \file B4/B4d/src/EventAction.cc
/// \brief Implementation of the B4d::EventAction class
#include "EventAction.hh"
@@ -44,16 +44,6 @@ namespace B4d
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
EventAction::~EventAction()
{}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4THitsMap<G4double>*
EventAction::GetHitsCollection(G4int hcID,
const G4Event* event) const
examples/basic/B4/B4d/src/PrimaryGeneratorAction.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file PrimaryGeneratorAction.cc
/// \file B4/B4d/src/PrimaryGeneratorAction.cc
/// \brief Implementation of the B4::PrimaryGeneratorAction class
#include "PrimaryGeneratorAction.hh"
examples/basic/B4/B4d/src/RunAction.cc
+1 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
/// \file RunAction.cc
/// \file B4/B4d/src/RunAction.cc
/// \brief Implementation of the B4::RunAction class
#include "RunAction.hh"
@@ -78,12 +78,6 @@ RunAction::RunAction()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
RunAction::~RunAction()
{
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void RunAction::BeginOfRunAction(const G4Run* /*run*/)
{
//inform the runManager to save random number seed
examples/basic/B4/History
+3
View File
@@ -5,6 +5,9 @@ which **must** added in reverse chronological order (newest at the top). It must
be used as a substitute for writing good git commit messages!
## 2022-11-29 I. Hrivnacova (exampleB4-V11-00-02)
- Activated merging ntuples with score ntuple writer in B4d
## 2021-12-10 Ben Morgan (exampleB4-V11-00-00)
- Change to new Markdown History format