Import Geant4 11.1.1 source tree
This commit is contained in:
@@ -734,7 +734,7 @@ void G4PhysicsListHelper::ReadInDefaultOrderingParameter()
|
||||
theTable->push_back(tmp);
|
||||
sizeOfTable += 1;
|
||||
|
||||
tmp.processTypeName = "NuclearStopp";
|
||||
tmp.processTypeName = "NuclearStopping";
|
||||
tmp.processType = fElectromagnetic;
|
||||
tmp.processSubType = fNuclearStopping;
|
||||
tmp.ordering[0] = -1;
|
||||
@@ -744,7 +744,7 @@ void G4PhysicsListHelper::ReadInDefaultOrderingParameter()
|
||||
theTable->push_back(tmp);
|
||||
sizeOfTable += 1;
|
||||
|
||||
tmp.processTypeName = "ElectronSuper";
|
||||
tmp.processTypeName = "ElectronGeneral";
|
||||
tmp.processType = fElectromagnetic;
|
||||
tmp.processSubType = fElectronGeneralProcess;
|
||||
tmp.ordering[0] = -1;
|
||||
@@ -814,7 +814,7 @@ void G4PhysicsListHelper::ReadInDefaultOrderingParameter()
|
||||
theTable->push_back(tmp);
|
||||
sizeOfTable += 1;
|
||||
|
||||
tmp.processTypeName = "GammaSuper";
|
||||
tmp.processTypeName = "GammaGeneral";
|
||||
tmp.processType = fElectromagnetic;
|
||||
tmp.processSubType = fGammaGeneralProcess;
|
||||
tmp.ordering[0] = -1;
|
||||
@@ -824,7 +824,7 @@ void G4PhysicsListHelper::ReadInDefaultOrderingParameter()
|
||||
theTable->push_back(tmp);
|
||||
sizeOfTable += 1;
|
||||
|
||||
tmp.processTypeName = "PositronSuper";
|
||||
tmp.processTypeName = "PositronGeneral";
|
||||
tmp.processType = fElectromagnetic;
|
||||
tmp.processSubType = fPositronGeneralProcess;
|
||||
tmp.ordering[0] = 1;
|
||||
@@ -834,6 +834,16 @@ void G4PhysicsListHelper::ReadInDefaultOrderingParameter()
|
||||
theTable->push_back(tmp);
|
||||
sizeOfTable += 1;
|
||||
|
||||
tmp.processTypeName = "MuPairByMuon";
|
||||
tmp.processType = fElectromagnetic;
|
||||
tmp.processSubType = fMuonPairProdByCharged;
|
||||
tmp.ordering[0] = -1;
|
||||
tmp.ordering[1] = -1;
|
||||
tmp.ordering[2] = 10;
|
||||
tmp.isDuplicable = false;
|
||||
theTable->push_back(tmp);
|
||||
sizeOfTable += 1;
|
||||
|
||||
tmp.processTypeName = "Cerenkov";
|
||||
tmp.processType = fElectromagnetic;
|
||||
tmp.processSubType = fCerenkov;
|
||||
@@ -1114,6 +1124,16 @@ void G4PhysicsListHelper::ReadInDefaultOrderingParameter()
|
||||
theTable->push_back(tmp);
|
||||
sizeOfTable += 1;
|
||||
|
||||
tmp.processTypeName = "NeutronGeneral";
|
||||
tmp.processType = fHadronic;
|
||||
tmp.processSubType = fNeutronGeneral;
|
||||
tmp.ordering[0] = -1;
|
||||
tmp.ordering[1] = -1;
|
||||
tmp.ordering[2] = 1000;
|
||||
tmp.isDuplicable = false;
|
||||
theTable->push_back(tmp);
|
||||
sizeOfTable += 1;
|
||||
|
||||
tmp.processTypeName = "HadInelastic";
|
||||
tmp.processType = fHadronic;
|
||||
tmp.processSubType = fHadronInelastic;
|
||||
|
||||
@@ -202,7 +202,7 @@ G4RunManager::~G4RunManager()
|
||||
// set the application state to the quite state
|
||||
if(pStateManager->GetCurrentState() != G4State_Quit)
|
||||
{
|
||||
if(verboseLevel > 0)
|
||||
if(verboseLevel > 1)
|
||||
G4cout << "G4 kernel has come to Quit state." << G4endl;
|
||||
pStateManager->SetNewState(G4State_Quit);
|
||||
}
|
||||
|
||||
@@ -356,7 +356,7 @@ G4RunManagerKernel::~G4RunManagerKernel()
|
||||
// set the application state to the quite state
|
||||
if(pStateManager->GetCurrentState() != G4State_Quit)
|
||||
{
|
||||
if(verboseLevel > 0)
|
||||
if(verboseLevel > 1)
|
||||
G4cout << "G4 kernel has come to Quit state." << G4endl;
|
||||
pStateManager->SetNewState(G4State_Quit);
|
||||
}
|
||||
@@ -410,12 +410,11 @@ G4RunManagerKernel::~G4RunManagerKernel()
|
||||
}
|
||||
|
||||
G4UImanager* pUImanager = G4UImanager::GetUIpointer();
|
||||
if((runManagerKernelType == workerRMK) && (verboseLevel > 0))
|
||||
if((runManagerKernelType == workerRMK) && (verboseLevel > 1))
|
||||
{
|
||||
G4cout << "Thread-local UImanager is to be deleted." << G4endl
|
||||
<< "There should not be any thread-local G4cout/G4cerr hereafter."
|
||||
<< G4endl;
|
||||
verboseLevel = 0;
|
||||
}
|
||||
delete pUImanager;
|
||||
if(verboseLevel > 1)
|
||||
@@ -425,7 +424,7 @@ G4RunManagerKernel::~G4RunManagerKernel()
|
||||
if(verboseLevel > 1)
|
||||
G4cout << "StateManager deleted." << G4endl;
|
||||
delete defaultExceptionHandler;
|
||||
if(verboseLevel > 0)
|
||||
if(verboseLevel > 1)
|
||||
G4cout << "RunManagerKernel is deleted. Good bye :)" << G4endl;
|
||||
fRunManagerKernel = nullptr;
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@ G4WorkerRunManager::~G4WorkerRunManager()
|
||||
userWorkerThreadInitialization = nullptr;
|
||||
userActionInitialization = nullptr;
|
||||
physicsList = nullptr;
|
||||
if(verboseLevel > 0)
|
||||
if(verboseLevel > 1)
|
||||
G4cout << "Destroying WorkerRunManager (" << this << ")" << G4endl;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user