Import Geant4 11.3.0 source tree
This commit is contained in:
@@ -5,6 +5,11 @@ which **must** added in reverse chronological order (newest at the top). It must
|
||||
be used as a substitute for writing good git commit messages!
|
||||
|
||||
|
||||
## 2024-08-12 I. Hrivnacova (expol01-V11-02-00)
|
||||
- Updated for changes in accumulables:
|
||||
- G4VAccumulable::Print requires 'G4PrintOptions options' argument
|
||||
- Use new "Register" method with shorter name
|
||||
|
||||
## 2023-07-16 Vladimir Ivanchenko (expol01-V11-01-01)
|
||||
- removed annoining printout for the default macro
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ class ProcessesCount : public G4VAccumulable
|
||||
G4int GetCounter(const G4String& procName) { return fProcCounter[procName]; };
|
||||
void Count(const G4String& procName);
|
||||
|
||||
void Print();
|
||||
void Print(G4PrintOptions options = G4PrintOptions()) const override;
|
||||
|
||||
void Merge(const G4VAccumulable&) override;
|
||||
void Reset() override { fProcCounter.clear(); }
|
||||
|
||||
@@ -11,7 +11,7 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
|
||||
|
||||
|
||||
**************************************************************
|
||||
Geant4 version Name: geant4-11-02-ref-06 (28-June-2024)
|
||||
Geant4 version Name: geant4-11-03-ref-00 (6-December-2024)
|
||||
Copyright : Geant4 Collaboration
|
||||
References : NIM A 506 (2003), 250-303
|
||||
: IEEE-TNS 53 (2006), 270-278
|
||||
@@ -19,6 +19,10 @@ Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Fo
|
||||
WWW : http://geant4.org/
|
||||
**************************************************************
|
||||
|
||||
Accumulable registered as "PhotonStats"
|
||||
Accumulable registered as "ElectronStats"
|
||||
Accumulable registered as "PositronStats"
|
||||
Accumulable registered as "ProcCounter"
|
||||
/control/cout/ignoreThreadsExcept 0
|
||||
/run/verbose 1
|
||||
#
|
||||
@@ -70,10 +74,13 @@ Bremsstrahlung energy threshold above which
|
||||
primary e+- is added to the list of secondary 100 TeV
|
||||
Bremsstrahlung energy threshold above which primary
|
||||
muon/hadron is added to the list of secondary 100 TeV
|
||||
Positron annihilation at rest model SimplePositronium
|
||||
Enable 3 gamma annihilation on fly 0
|
||||
Lowest triplet kinetic energy 1 MeV
|
||||
Enable sampling of gamma linear polarisation 0
|
||||
5D gamma conversion model type 0
|
||||
5D gamma conversion model on isolated ion 0
|
||||
Use Ricardo-Gerardo pair production model 0
|
||||
Livermore data directory epics_2017
|
||||
=======================================================================
|
||||
====== Ionisation Parameters ========
|
||||
@@ -214,7 +221,7 @@ Index : 1 used in the geometry : Yes
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Number of events processed : 10000
|
||||
User=0.070000s Real=0.077526s Sys=0.000000s
|
||||
User=0.070000s Real=0.071468s Sys=0.000000s
|
||||
|
||||
The run consists of 10000 gamma of 10 MeV through 1.75 mm of G4_Fe (density: 7.874 g/cm3 )
|
||||
|
||||
|
||||
@@ -49,11 +49,11 @@ void ProcessesCount::Count(const G4String& procName)
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
void ProcessesCount::Print()
|
||||
void ProcessesCount::Print(G4PrintOptions /*options*/) const
|
||||
{
|
||||
G4int index = 0;
|
||||
std::map<G4String, G4int>::iterator it;
|
||||
for (it = fProcCounter.begin(); it != fProcCounter.end(); it++) {
|
||||
std::map<G4String, G4int>::const_iterator it;
|
||||
for (it = fProcCounter.cbegin(); it != fProcCounter.cend(); it++) {
|
||||
G4String procName = it->first;
|
||||
G4int count = it->second;
|
||||
G4cout << " " << std::setw(20) << procName << "=" << std::setw(7) << count
|
||||
|
||||
@@ -65,11 +65,11 @@ RunAction::RunAction(DetectorConstruction* det, PrimaryGeneratorAction* prim)
|
||||
auto fPositronStats = new ParticleStatistics("PositronStats");
|
||||
auto fProcCounter = new ProcessesCount("ProcCounter");
|
||||
|
||||
accumulableManager->RegisterAccumulable(fPhotonStats);
|
||||
accumulableManager->RegisterAccumulable(fElectronStats);
|
||||
accumulableManager->RegisterAccumulable(fPositronStats);
|
||||
accumulableManager->Register(fPhotonStats);
|
||||
accumulableManager->Register(fElectronStats);
|
||||
accumulableManager->Register(fPositronStats);
|
||||
|
||||
accumulableManager->RegisterAccumulable(fProcCounter);
|
||||
accumulableManager->Register(fProcCounter);
|
||||
|
||||
BookHisto();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user