Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HadronicProcessStore.cc 105940 2017-09-01 07:33:44Z gcosmo $
|
||||
// $Id: G4HadronicProcessStore.cc 110586 2018-05-31 12:01:42Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -59,12 +59,11 @@
|
||||
#include "G4HadronicInteractionRegistry.hh"
|
||||
#include "G4CrossSectionDataSetRegistry.hh"
|
||||
#include "G4HadronicEPTestMessenger.hh"
|
||||
#ifdef G4USE_STD11
|
||||
#include <algorithm> //transform
|
||||
#endif
|
||||
#include <algorithm>
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
|
||||
|
||||
G4ThreadLocal G4HadronicProcessStore* G4HadronicProcessStore::instance = 0;
|
||||
G4ThreadLocal G4HadronicProcessStore* G4HadronicProcessStore::instance = nullptr;
|
||||
|
||||
G4HadronicProcessStore* G4HadronicProcessStore::Instance()
|
||||
{
|
||||
@@ -95,6 +94,7 @@ void G4HadronicProcessStore::Clean()
|
||||
//G4cout << "G4HadronicProcessStore::Clean() delete hadronic "
|
||||
// << i << " " << process[i]->GetProcessName() << G4endl;
|
||||
delete process[i];
|
||||
process[i] = nullptr;
|
||||
}
|
||||
}
|
||||
for(i=0; i<n_extra; ++i) {
|
||||
@@ -102,7 +102,7 @@ void G4HadronicProcessStore::Clean()
|
||||
// G4cout << "G4HadronicProcessStore::Clean() delete extra proc "
|
||||
//<< i << " " << extraProcess[i]->GetProcessName() << G4endl;
|
||||
delete extraProcess[i];
|
||||
extraProcess[i] = 0;
|
||||
extraProcess[i] = nullptr;
|
||||
}
|
||||
}
|
||||
//std::cout << "G4HadronicProcessStore::Clean() done" << std::endl;
|
||||
@@ -118,14 +118,16 @@ G4HadronicProcessStore::G4HadronicProcessStore()
|
||||
n_part = 0;
|
||||
n_model= 0;
|
||||
n_extra= 0;
|
||||
currentProcess = 0;
|
||||
currentParticle = 0;
|
||||
currentProcess = nullptr;
|
||||
currentParticle = nullptr;
|
||||
theGenericIon =
|
||||
G4ParticleTable::GetParticleTable()->FindParticle("GenericIon");
|
||||
verbose = 1;
|
||||
buildTableStart = true;
|
||||
buildXSTable = false;
|
||||
theEPTestMessenger = new G4HadronicEPTestMessenger(this);
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
|
||||
|
||||
G4double G4HadronicProcessStore::GetCrossSectionPerAtom(
|
||||
@@ -478,7 +480,7 @@ void G4HadronicProcessStore::DeRegister(G4HadronicProcess* proc)
|
||||
{
|
||||
for(G4int i=0; i<n_proc; ++i) {
|
||||
if(process[i] == proc) {
|
||||
process[i] = 0;
|
||||
process[i] = nullptr;
|
||||
DeRegisterExtraProcess((G4VProcess*)proc);
|
||||
return;
|
||||
}
|
||||
@@ -543,7 +545,7 @@ void G4HadronicProcessStore::DeRegisterExtraProcess(G4VProcess* proc)
|
||||
{
|
||||
for(G4int i=0; i<n_extra; ++i) {
|
||||
if(extraProcess[i] == proc) {
|
||||
extraProcess[i] = 0;
|
||||
extraProcess[i] = nullptr;
|
||||
if(1 < verbose) {
|
||||
G4cout << "Extra Process: " << i << " "
|
||||
<<proc->GetProcessName()<< " is deregisted " << G4endl;
|
||||
@@ -555,6 +557,20 @@ void G4HadronicProcessStore::DeRegisterExtraProcess(G4VProcess* proc)
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
|
||||
|
||||
void G4HadronicProcessStore::SetBuildXSTable(G4bool val)
|
||||
{
|
||||
buildXSTable = val;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
|
||||
|
||||
G4bool G4HadronicProcessStore::GetBuildXSTable() const
|
||||
{
|
||||
return buildXSTable;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
|
||||
|
||||
void G4HadronicProcessStore::PrintInfo(const G4ParticleDefinition* part)
|
||||
{
|
||||
// Trigger particle/process/model printout only when last particle is
|
||||
|
||||
Reference in New Issue
Block a user