Import Geant4 11.0.1 source tree
This commit is contained in:
@@ -16,6 +16,13 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
February 24, 2022 Makoto Asai (run-V10-07-14)
|
||||
- Adding verbosity control to some G4cout. Addressing to bug report #2397.
|
||||
|
||||
December 11, 2021 Laurie Nevay
|
||||
- Fix missing AnnihToTauTau entry from default physics list ordering that
|
||||
would cause a fatal exception if EmExtra is used with PositronToMuMu=True.
|
||||
|
||||
October 25, 2021 B.Morgan (run-V10-07-13)
|
||||
- Use G4StrUtil functions replacing deprecated G4String member functions
|
||||
|
||||
|
||||
@@ -191,8 +191,9 @@ G4MTRunManager::G4MTRunManager()
|
||||
if(forcedNwokers > 0)
|
||||
{
|
||||
nworkers = forcedNwokers;
|
||||
G4cout << "### Number of threads is forced to " << forcedNwokers
|
||||
<< " by Environment variable G4FORCENUMBEROFTHREADS." << G4endl;
|
||||
if(verboseLevel > 0)
|
||||
{ G4cout << "### Number of threads is forced to " << forcedNwokers
|
||||
<< " by Environment variable G4FORCENUMBEROFTHREADS." << G4endl; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -334,6 +335,7 @@ void G4MTRunManager::CreateAndStartWorkers()
|
||||
// number of threads: threads area created once
|
||||
if(threads.size() == 0)
|
||||
{
|
||||
if(verboseLevel > 0)
|
||||
{
|
||||
// for consistency with G4TaskRunManager
|
||||
std::stringstream msg;
|
||||
|
||||
@@ -714,12 +714,22 @@ void G4PhysicsListHelper::ReadInDefaultOrderingParameter()
|
||||
theTable->push_back(tmp);
|
||||
sizeOfTable += 1;
|
||||
|
||||
tmp.processTypeName = "AnnihToTauTau";
|
||||
tmp.processType = fElectromagnetic;
|
||||
tmp.processSubType = fAnnihilationToTauTau;
|
||||
tmp.ordering[0] = -1;
|
||||
tmp.ordering[1] = -1;
|
||||
tmp.ordering[2] = 7;
|
||||
tmp.isDuplicable = false;
|
||||
theTable->push_back(tmp);
|
||||
sizeOfTable += 1;
|
||||
|
||||
tmp.processTypeName = "AnnihToHad";
|
||||
tmp.processType = fElectromagnetic;
|
||||
tmp.processSubType = fAnnihilationToHadrons;
|
||||
tmp.ordering[0] = -1;
|
||||
tmp.ordering[1] = -1;
|
||||
tmp.ordering[2] = 7;
|
||||
tmp.ordering[2] = 8;
|
||||
tmp.isDuplicable = false;
|
||||
theTable->push_back(tmp);
|
||||
sizeOfTable += 1;
|
||||
@@ -728,7 +738,7 @@ void G4PhysicsListHelper::ReadInDefaultOrderingParameter()
|
||||
tmp.processType = fElectromagnetic;
|
||||
tmp.processSubType = fNuclearStopping;
|
||||
tmp.ordering[0] = -1;
|
||||
tmp.ordering[1] = 8;
|
||||
tmp.ordering[1] = 9;
|
||||
tmp.ordering[2] = -1;
|
||||
tmp.isDuplicable = false;
|
||||
theTable->push_back(tmp);
|
||||
|
||||
@@ -949,7 +949,7 @@ void G4RunManagerKernel::CheckRegions()
|
||||
G4ProductionCuts* cuts = region->GetProductionCuts();
|
||||
if(cuts == nullptr)
|
||||
{
|
||||
if(region->IsInMassGeometry())
|
||||
if(region->IsInMassGeometry() && verboseLevel > 0)
|
||||
{
|
||||
G4cout << "Warning : Region <" << region->GetName()
|
||||
<< "> does not have specific production cuts," << G4endl
|
||||
|
||||
@@ -645,12 +645,14 @@ void G4VUserPhysicsList::BuildPhysicsTable(G4ParticleDefinition* particle)
|
||||
{
|
||||
if (auto *trackingManager = particle->GetTrackingManager())
|
||||
{
|
||||
#ifdef G4VERBOSE
|
||||
if(verboseLevel > 2)
|
||||
{
|
||||
G4cout << "G4VUserPhysicsList::BuildPhysicsTable "
|
||||
<< "Calculate Physics Table for " << particle->GetParticleName()
|
||||
<< " via custom TrackingManager" << G4endl;
|
||||
}
|
||||
#endif
|
||||
trackingManager->BuildPhysicsTable(*particle);
|
||||
return;
|
||||
}
|
||||
@@ -659,9 +661,12 @@ void G4VUserPhysicsList::BuildPhysicsTable(G4ParticleDefinition* particle)
|
||||
|
||||
if(particle->GetMasterProcessManager() == nullptr)
|
||||
{
|
||||
G4cout
|
||||
#ifdef G4VERBOSE
|
||||
if(verboseLevel > 0)
|
||||
{ G4cout
|
||||
<< "#### G4VUserPhysicsList::BuildPhysicsTable() - BuildPhysicsTable("
|
||||
<< particle->GetParticleName() << ") skipped..." << G4endl;
|
||||
<< particle->GetParticleName() << ") skipped..." << G4endl; }
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
if(fRetrievePhysicsTable)
|
||||
|
||||
Reference in New Issue
Block a user