Import Geant4 11.3.0 source tree
This commit is contained in:
@@ -125,25 +125,22 @@ G4int G4FluoData::StartShellId(G4int initIndex, G4int vacancyIndex) const
|
||||
{
|
||||
G4int n = -1;
|
||||
|
||||
if (vacancyIndex<0 || vacancyIndex>=numberOfVacancies)
|
||||
{
|
||||
G4Exception("G4FluoData::StartShellId()","de0002",FatalErrorInArgument,
|
||||
"vacancyIndex outside boundaries");
|
||||
}
|
||||
else
|
||||
{
|
||||
auto pos = idMap.find(vacancyIndex);
|
||||
|
||||
G4DataVector dataSet = *((*pos).second);
|
||||
if (vacancyIndex<0 || vacancyIndex>=numberOfVacancies) {
|
||||
G4Exception("G4FluoData::StartShellId()","de0002",FatalErrorInArgument,
|
||||
"vacancyIndex outside boundaries");
|
||||
} else {
|
||||
auto pos = idMap.find(vacancyIndex);
|
||||
if (pos != idMap.end()) {
|
||||
G4DataVector* dataSet = (*pos).second;
|
||||
|
||||
G4int nData = (G4int)dataSet.size();
|
||||
G4int nData = (G4int)dataSet->size();
|
||||
// The first Element of idMap's dataSets is the original shell of
|
||||
// the vacancy, so we must start from the first element of dataSet
|
||||
if (initIndex >= 0 && initIndex < nData)
|
||||
{
|
||||
n = dataSet[initIndex+1];
|
||||
}
|
||||
if (initIndex >= 0 && initIndex < nData) {
|
||||
n = (*dataSet)[initIndex+1];
|
||||
}
|
||||
}
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user