Import Geant4 11.3.0 source tree
This commit is contained in:
+1
-1
@@ -84,7 +84,7 @@ public:
|
||||
G4double radius = -1,
|
||||
G4int atomsNumber = -1,
|
||||
G4double lifetime = -1,
|
||||
G4String aType = "",
|
||||
const G4String& aType = "",
|
||||
G4FakeParticleID ID = G4FakeParticleID::Create());
|
||||
|
||||
~G4MoleculeDefinition() override;
|
||||
|
||||
+4
-4
@@ -50,7 +50,7 @@ G4MoleculeDefinition::G4MoleculeDefinition(const G4String& name,
|
||||
G4double radius,
|
||||
G4int atomsNumber,
|
||||
G4double lifetime,
|
||||
G4String aType,
|
||||
const G4String& aType,
|
||||
G4FakeParticleID ID) :
|
||||
G4ParticleDefinition(name, mass, 0., charge, 0, 0, 0, 0, 0, 0, "Molecule",
|
||||
0, 0, ID, false, lifetime, nullptr, false, aType, 0, 0.0),
|
||||
@@ -119,7 +119,7 @@ void G4MoleculeDefinition::Serialize(std::ostream& out)
|
||||
}
|
||||
else
|
||||
{
|
||||
WRITE(out,(int) 0);
|
||||
WRITE(out,(G4int) 0);
|
||||
}
|
||||
WRITE(out,fVanDerVaalsRadius);
|
||||
WRITE(out,fAtomsNb);
|
||||
@@ -169,9 +169,9 @@ G4MolecularConfiguration*
|
||||
G4MoleculeDefinition::
|
||||
NewConfigurationWithElectronOccupancy(const G4String& exStId,
|
||||
const G4ElectronOccupancy& elecConf,
|
||||
double decayTime)
|
||||
G4double decayTime)
|
||||
{
|
||||
bool alreadyExist(false);
|
||||
G4bool alreadyExist(false);
|
||||
G4MolecularConfiguration* conf =
|
||||
G4MolecularConfiguration::CreateMolecularConfiguration(GetName()+"_"+
|
||||
exStId,
|
||||
|
||||
+1
-1
@@ -131,7 +131,7 @@ void G4MoleculeTableMessenger::SetNewValue(G4UIcommand* command,
|
||||
molConf->SetDiffusionCoefficient(diffusion_coefficient * (m2 / s));
|
||||
}
|
||||
|
||||
auto usedName = molConf->GetUserID();
|
||||
const auto& usedName = molConf->GetUserID();
|
||||
if(!usedName.empty())
|
||||
{
|
||||
molConf->PrintState();
|
||||
|
||||
@@ -45,7 +45,7 @@ G4HO2* G4HO2::theInstance = nullptr;
|
||||
G4HO2* G4HO2::Definition()
|
||||
{
|
||||
if (theInstance != nullptr) return theInstance;
|
||||
const G4String name = "HO_2";
|
||||
const G4String name = "HO_2°";
|
||||
// search in particle table]
|
||||
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
|
||||
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
|
||||
|
||||
@@ -45,7 +45,7 @@ G4OH* G4OH::theInstance = nullptr;
|
||||
G4OH* G4OH::Definition()
|
||||
{
|
||||
if (theInstance != nullptr) return theInstance;
|
||||
const G4String name = "OH";
|
||||
const G4String name = "°OH";
|
||||
// search in particle table]
|
||||
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
|
||||
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
|
||||
|
||||
@@ -44,7 +44,7 @@ G4Oxygen* G4Oxygen::theInstance = nullptr;
|
||||
G4Oxygen* G4Oxygen::Definition()
|
||||
{
|
||||
if (theInstance != nullptr) return theInstance;
|
||||
const G4String name = "O";
|
||||
const G4String name = "°O";
|
||||
// search in particle table]
|
||||
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
|
||||
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
|
||||
|
||||
Reference in New Issue
Block a user