Import Geant4 10.6.2 source tree
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
############################################
|
||||
|
||||
**************************************************************
|
||||
Geant4 version Name: geant4-10-06-patch-01 (14-February-2020)
|
||||
Geant4 version Name: geant4-10-06-patch-02 (29-May-2020)
|
||||
Copyright : Geant4 Collaboration
|
||||
References : NIM A 506 (2003), 250-303
|
||||
: IEEE-TNS 53 (2006), 270-278
|
||||
@@ -719,7 +719,7 @@ Limit excitation energy for Fermi BreakUp (MeV) 20
|
||||
Level density (1/MeV) 0.075
|
||||
Use simple level density model 1
|
||||
Use discrete excitation energy of the residual 0
|
||||
Time limit for long lived isomeres (ns) 1e+12
|
||||
Time limit for long lived isomeres (ns) 1000
|
||||
Internal e- conversion flag 1
|
||||
Store e- internal conversion data 0
|
||||
Electron internal conversion ID 2
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
############################################
|
||||
|
||||
**************************************************************
|
||||
Geant4 version Name: geant4-10-06-patch-01 (14-February-2020)
|
||||
Geant4 version Name: geant4-10-06-patch-02 (29-May-2020)
|
||||
Copyright : Geant4 Collaboration
|
||||
References : NIM A 506 (2003), 250-303
|
||||
: IEEE-TNS 53 (2006), 270-278
|
||||
@@ -1046,7 +1046,7 @@ Event = 0 z0 = -779.999 Primary direction = (0,0,1)
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Number of events processed : 100
|
||||
User=0.570000s Real=0.662627s Sys=0.000000s
|
||||
User=0.600000s Real=0.606270s Sys=0.000000s
|
||||
RunAction: End of run actions are started 1 Nevt= 100 Edep= 3722.43
|
||||
====================================================
|
||||
Beam Particle: proton
|
||||
|
||||
@@ -14,6 +14,13 @@ track of all tags.
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
21 February 2020: V.Ivantchenko (monopole-V10-05-03)
|
||||
- G4MonopolePhysics - minor code clean-up for thread safety
|
||||
- monopole.cc - do not instantiate VisManager in the batch mode;
|
||||
fixed typos
|
||||
- G4MonopoleTransportation - removed check on if monopole is
|
||||
opticalphoton or not
|
||||
|
||||
26 November 2019 I. Hrivnacova (monopole-V10-05-02)
|
||||
- Fixed Doxygen warnings
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ namespace {
|
||||
void PrintUsage() {
|
||||
G4cerr
|
||||
<< " Usage: " << G4endl
|
||||
<< " exampleB4a [-m macro ] [-s setupMonopole] [-t nThreads]" << G4endl
|
||||
<< " monopole [-m macro ] [-s setupMonopole] [-t nThreads]" << G4endl
|
||||
<< " Note: " << G4endl
|
||||
<< " -s should be followed by a composed string, eg. \'1 0 100 GeV\'" << G4endl
|
||||
<< " -t option is available only for multi-threaded mode." << G4endl
|
||||
@@ -80,7 +80,7 @@ int main(int argc,char** argv)
|
||||
G4String macro;
|
||||
G4String setupMonopole;
|
||||
#ifdef G4MULTITHREADED
|
||||
G4int nThreads = 0;
|
||||
G4int nThreads = 1;
|
||||
#endif
|
||||
for ( G4int i=1; i<argc; i=i+2 ) {
|
||||
if ( G4String(argv[i]) == "-m" ) macro = argv[i+1];
|
||||
@@ -95,27 +95,27 @@ int main(int argc,char** argv)
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
// Instantiate G4UIExecutive if interactive mode
|
||||
G4UIExecutive* ui = nullptr;
|
||||
if ( ! macro.size() ) {
|
||||
ui = new G4UIExecutive(argc, argv);
|
||||
}
|
||||
|
||||
//choose the Random engine
|
||||
CLHEP::HepRandom::setTheEngine(new CLHEP::MixMaxRng);
|
||||
|
||||
|
||||
// Construct the default run manager
|
||||
#ifdef G4MULTITHREADED
|
||||
G4MTRunManager* runManager = new G4MTRunManager;
|
||||
G4MTRunManager* runManager = new G4MTRunManager();
|
||||
if ( nThreads > 0 ) {
|
||||
runManager->SetNumberOfThreads(nThreads);
|
||||
}
|
||||
G4cout << "===== Monopole is started with "
|
||||
G4cout << "===== Example is started with "
|
||||
<< runManager->GetNumberOfThreads() << " threads =====" << G4endl;
|
||||
#else
|
||||
G4RunManager* runManager = new G4RunManager();
|
||||
#endif
|
||||
|
||||
// Instantiate G4UIExecutive if interactive
|
||||
G4UIExecutive* ui = nullptr;
|
||||
if ( macro.empty() ) {
|
||||
ui = new G4UIExecutive(argc, argv);
|
||||
}
|
||||
|
||||
//get the pointer to the User Interface manager
|
||||
G4UImanager* UImanager = G4UImanager::GetUIpointer();
|
||||
|
||||
//create physicsList
|
||||
// Physics List is defined via environment variable PHYSLIST
|
||||
@@ -125,8 +125,6 @@ int main(int argc,char** argv)
|
||||
// monopole physics is added
|
||||
G4MonopolePhysics * theMonopole = new G4MonopolePhysics();
|
||||
|
||||
//get the pointer to the User Interface manager
|
||||
G4UImanager* UImanager = G4UImanager::GetUIpointer();
|
||||
// Setup monopole
|
||||
if ( setupMonopole.size() ) {
|
||||
UImanager->ApplyCommand("/control/verbose 1");
|
||||
@@ -135,11 +133,11 @@ int main(int argc,char** argv)
|
||||
|
||||
// regsiter monopole physics
|
||||
phys->RegisterPhysics(theMonopole);
|
||||
|
||||
runManager->SetUserInitialization(phys);
|
||||
|
||||
// visualization manager
|
||||
G4VisManager* visManager = new G4VisExecutive();
|
||||
visManager->Initialize();
|
||||
G4VisManager* visManager = nullptr;
|
||||
|
||||
// set detector construction
|
||||
DetectorConstruction* det = new DetectorConstruction();
|
||||
@@ -157,6 +155,8 @@ int main(int argc,char** argv)
|
||||
}
|
||||
else {
|
||||
// interactive mode : define UI session
|
||||
visManager = new G4VisExecutive();
|
||||
visManager->Initialize();
|
||||
UImanager->ApplyCommand("/control/execute init_vis.mac");
|
||||
ui->SessionStart();
|
||||
delete ui;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
############################################
|
||||
|
||||
**************************************************************
|
||||
Geant4 version Name: geant4-10-06-patch-01 (14-February-2020)
|
||||
Geant4 version Name: geant4-10-06-patch-02 (29-May-2020)
|
||||
Copyright : Geant4 Collaboration
|
||||
References : NIM A 506 (2003), 250-303
|
||||
: IEEE-TNS 53 (2006), 270-278
|
||||
@@ -18,51 +18,6 @@ G4PhysListFactory::GetReferencePhysList <FTFP_BERT> EMoption= 0
|
||||
<<< Reference Physics List FTFP_BERT is built
|
||||
|
||||
Monopole is created: m(GeV)= 100 Qel= 0 Qmag= 68.518
|
||||
Visualization Manager instantiating with verbosity "warnings (3)"...
|
||||
Visualization Manager initialising...
|
||||
Registering graphics systems...
|
||||
|
||||
You have successfully registered the following graphics systems.
|
||||
Current available graphics systems are:
|
||||
ASCIITree (ATree)
|
||||
DAWNFILE (DAWNFILE)
|
||||
G4HepRep (HepRepXML)
|
||||
G4HepRepFile (HepRepFile)
|
||||
RayTracer (RayTracer)
|
||||
VRML1FILE (VRML1FILE)
|
||||
VRML2FILE (VRML2FILE)
|
||||
gMocrenFile (gMocrenFile)
|
||||
OpenGLImmediateXm (OGLIXm, OGLI)
|
||||
OpenGLStoredXm (OGLSXm, OGL, OGLS)
|
||||
OpenGLImmediateX (OGLIX, OGLIXm_FALLBACK)
|
||||
OpenGLStoredX (OGLSX, OGLSXm_FALLBACK)
|
||||
RayTracerX (RayTracerX)
|
||||
|
||||
Registering model factories...
|
||||
|
||||
You have successfully registered the following model factories.
|
||||
Registered model factories:
|
||||
generic
|
||||
drawByAttribute
|
||||
drawByCharge
|
||||
drawByOriginVolume
|
||||
drawByParticleID
|
||||
drawByEncounteredVolume
|
||||
|
||||
Registered filter factories:
|
||||
attributeFilter
|
||||
chargeFilter
|
||||
originVolumeFilter
|
||||
particleFilter
|
||||
encounteredVolumeFilter
|
||||
|
||||
You have successfully registered the following user vis actions.
|
||||
Run Duration User Vis Actions: none
|
||||
End of Event User Vis Actions: none
|
||||
End of Run User Vis Actions: none
|
||||
|
||||
Some /vis commands (optionally) take a string to specify colour.
|
||||
"/vis/list" to see available colours.
|
||||
/control/cout/ignoreThreadsExcept 0
|
||||
/run/verbose 0
|
||||
/tracking/verbose 0
|
||||
@@ -775,7 +730,7 @@ Limit excitation energy for Fermi BreakUp (MeV) 20
|
||||
Level density (1/MeV) 0.075
|
||||
Use simple level density model 1
|
||||
Use discrete excitation energy of the residual 0
|
||||
Time limit for long lived isomeres (ns) 1e+12
|
||||
Time limit for long lived isomeres (ns) 1000
|
||||
Internal e- conversion flag 1
|
||||
Store e- internal conversion data 0
|
||||
Electron internal conversion ID 2
|
||||
@@ -783,8 +738,6 @@ Correlated gamma emission flag 0
|
||||
Max 2J for sampling of angular correlations 10
|
||||
Upload data before 1st event for Z < 9
|
||||
=======================================================================
|
||||
G4VisManager: Using G4TrajectoryDrawByCharge as fallback trajectory model.
|
||||
See commands in /vis/modeling/trajectories/ for other options.
|
||||
### Run 0 starts.
|
||||
|
||||
========= Table of registered couples ==============================
|
||||
@@ -820,7 +773,7 @@ Index : 1 used in the geometry : Yes
|
||||
|
||||
The run consists of 100 monopole of 100 GeV
|
||||
through 10 cm of G4_Si (density: 2.33 g/cm3 )
|
||||
Projected Range= 7.7925 cm rms= 181.99 um
|
||||
Projected Range= 7.7964 cm rms= 173.04 um
|
||||
|
||||
##################################################################
|
||||
### Stopping Powers and Cross Sections
|
||||
@@ -931,5 +884,3 @@ Index : 1 used in the geometry : Yes
|
||||
##################################################################
|
||||
... write Root file : monopole.root - done
|
||||
... close Root file : monopole.root - done
|
||||
Graphics systems deleted.
|
||||
Visualization Manager deleting...
|
||||
|
||||
@@ -90,7 +90,11 @@ G4MonopolePhysics::~G4MonopolePhysics()
|
||||
|
||||
void G4MonopolePhysics::ConstructParticle()
|
||||
{
|
||||
fMpl = G4Monopole::MonopoleDefinition(fMonopoleMass, fMagCharge, fElCharge);
|
||||
if(!fMpl) {
|
||||
fMpl = G4Monopole::MonopoleDefinition(fMonopoleMass, fMagCharge, fElCharge);
|
||||
} else {
|
||||
G4Monopole::Monopole();
|
||||
}
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -414,9 +414,6 @@ AlongStepGetPhysicalInteractionLength( const G4Track& track,
|
||||
G4VParticleChange* G4MonopoleTransportation::AlongStepDoIt(
|
||||
const G4Track& track, const G4Step& stepData )
|
||||
{
|
||||
const G4ParticleDefinition* fOpticalPhoton =
|
||||
G4ParticleTable::GetParticleTable()->FindParticle("opticalphoton");
|
||||
|
||||
++noCalls;
|
||||
|
||||
fParticleChange.Initialize(track) ;
|
||||
@@ -445,14 +442,7 @@ G4VParticleChange* G4MonopoleTransportation::AlongStepDoIt(
|
||||
G4double stepLength = track.GetStepLength() ;
|
||||
|
||||
deltaTime= 0.0; // in case initialVelocity = 0
|
||||
const G4DynamicParticle* fpDynamicParticle = track.GetDynamicParticle();
|
||||
if (fpDynamicParticle->GetDefinition()== fOpticalPhoton)
|
||||
{
|
||||
// A photon is in the medium of the final point
|
||||
// during the step, so it has the final velocity.
|
||||
deltaTime = stepLength/finalVelocity ;
|
||||
}
|
||||
else if (finalVelocity > 0.0)
|
||||
if (finalVelocity > 0.0)
|
||||
{
|
||||
G4double meanInverseVelocity ;
|
||||
// deltaTime = stepLength/finalVelocity ;
|
||||
@@ -464,7 +454,7 @@ G4VParticleChange* G4MonopoleTransportation::AlongStepDoIt(
|
||||
{
|
||||
deltaTime = stepLength/initialVelocity ;
|
||||
}
|
||||
fCandidateEndGlobalTime = startTime + deltaTime ;
|
||||
fCandidateEndGlobalTime = startTime + deltaTime ;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
############################################
|
||||
|
||||
**************************************************************
|
||||
Geant4 version Name: geant4-10-06-patch-01 (14-February-2020)
|
||||
Geant4 version Name: geant4-10-06-patch-02 (29-May-2020)
|
||||
Copyright : Geant4 Collaboration
|
||||
References : NIM A 506 (2003), 250-303
|
||||
: IEEE-TNS 53 (2006), 270-278
|
||||
@@ -1479,7 +1479,7 @@ Terminate current event processing.
|
||||
Run terminated.
|
||||
Run Summary
|
||||
Number of events processed : 1
|
||||
User=0.030000s Real=0.031555s Sys=0.000000s
|
||||
User=0.030000s Real=0.033122s Sys=0.000000s
|
||||
Sum NoMT: 0
|
||||
Sum NoMRT: 0
|
||||
Sum NoMRCondition: 0
|
||||
|
||||
Reference in New Issue
Block a user