lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 11.1.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2022-07-01 10:44:02 +02:00
parent b3bf75a2a1
commit c07cea1fe0
2172 changed files with 183300 additions and 123938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/electromagnetic/dna/utils/src/G4DNAScavengerMaterial.cc
+20 -29
View File
@@ -84,8 +84,6 @@ G4double G4DNAScavengerMaterial::GetNumberMoleculePerVolumeUnitForMaterialConf(
auto iter = fScavengerTable.find(matConf);
if(iter == fScavengerTable.end())
{
// G4cout<<matConf->GetName()<<G4endl;
// throw std::runtime_error("this material is not existed");
return 0;
}
else
@@ -218,7 +216,7 @@ void G4DNAScavengerMaterial::Reset()
fCounterMap[containedConf][1 * picosecond] =
floor(Avogadro * concentration * pConfinedBox->Volume());
}
PrintInfo();
if(fVerbose != 0){PrintInfo();}
}
//------------------------------------------------------------------------------
@@ -255,28 +253,12 @@ void G4DNAScavengerMaterial::AddAMoleculeAtTime(
counterMap_i->second[time] = newValue;
if(newValue != (floor)(fScavengerTable[molecule])) // protection
{
assert(false);
G4String errMsg = "You are trying to add wrong molecule ";
G4Exception("AddAMoleculeAtTime", "",
FatalErrorInArgument, errMsg);
}
// G4cout<<" AddAMoleculeAtTime : "<<molecule->GetName()<< " :
// "<<newValue<<G4endl;
}
// else
// {
//
// G4ExceptionDescription errMsg;
// errMsg << "Time of species "
// << molecule->GetName() << " is "
// << G4BestUnit(time, "Time") << " while "
// << " global time is "
// <<" end->first : "<<end->first
// //<<
// G4BestUnit(G4Scheduler::Instance()->GetGlobalTime(),
// "Time")
// << G4endl;
// G4Exception("G4DNAScavengerMaterial::AddAMoleculeAtTime",
// "TIME_DONT_MATCH",
// FatalException, errMsg);
// }
}
}
@@ -286,7 +268,7 @@ void G4DNAScavengerMaterial::RemoveAMoleculeAtTime(
MolType pMolecule, G4double time, const G4ThreeVector* /*position*/,
int number)
{
NbMoleculeAgainstTime& nbMolPerTime = fCounterMap[pMolecule];
NbMoleculeInTime& nbMolPerTime = fCounterMap[pMolecule];
if(fVerbose != 0)
{
@@ -356,7 +338,7 @@ void G4DNAScavengerMaterial::Dump()
{
auto pConfinedBox = fpChemistryInfo->GetChemistryBoundary();
auto V = pConfinedBox->Volume();
for(auto it : fCounterMap)
for(const auto& it : fCounterMap)
{
auto pReactant = it.first;
@@ -370,7 +352,7 @@ void G4DNAScavengerMaterial::Dump()
}
}
int G4DNAScavengerMaterial::GetNMoleculesAtTime(MolType molecule, G4double time)
int64_t G4DNAScavengerMaterial::GetNMoleculesAtTime(MolType molecule, G4double time)
{
if(!fCounterAgainstTime)
{
@@ -379,7 +361,16 @@ int G4DNAScavengerMaterial::GetNMoleculesAtTime(MolType molecule, G4double time)
}
G4bool sameTypeOfMolecule = SearchTimeMap(molecule);
return SearchUpperBoundTime(time, sameTypeOfMolecule);
auto output = SearchUpperBoundTime(time, sameTypeOfMolecule);
if(output < 0)
{
G4ExceptionDescription errMsg;
errMsg << "N molecules not valid < 0 : "<<
molecule->GetName() <<" N : "<< output << G4endl;
G4Exception("G4DNAScavengerMaterial::GetNMoleculesAtTime", "",
FatalErrorInArgument, errMsg);
}
return output;
}
G4bool G4DNAScavengerMaterial::SearchTimeMap(MolType molecule)
@@ -416,7 +407,7 @@ G4bool G4DNAScavengerMaterial::SearchTimeMap(MolType molecule)
//------------------------------------------------------------------------------
int G4DNAScavengerMaterial::SearchUpperBoundTime(G4double time,
int64_t G4DNAScavengerMaterial::SearchUpperBoundTime(G4double time,
G4bool sameTypeOfMolecule)
{
auto mol_it = fpLastSearch->fLastMoleculeSearched;
@@ -425,7 +416,7 @@ int G4DNAScavengerMaterial::SearchUpperBoundTime(G4double time,
return 0;
}
NbMoleculeAgainstTime& timeMap = mol_it->second;
NbMoleculeInTime& timeMap = mol_it->second;
if(timeMap.empty())
{
return 0;