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

Import Geant4 11.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2022-12-09 14:43:28 +01:00
parent c07cea1fe0
commit 9f34590941
3810 changed files with 200490 additions and 182326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/analysis/accumulables/src/G4AccumulableManager.cc
+3 -3
View File
@@ -102,7 +102,7 @@ G4bool G4AccumulableManager::RegisterAccumulable(G4VAccumulable* accumulable)
if ( ! CheckName(name, "RegisterAccumulable") ) return false;
// generate name if empty
if ( ! name.length() ) {
if (name.length() == 0u) {
name = GenerateName();
accumulable->fName = name;
}
@@ -154,10 +154,10 @@ void G4AccumulableManager::Merge()
{
// Do nothing if there are no accumulables registered
// or if master thread
if ( (! fVector.size()) || (! G4Threading::IsWorkerThread()) ) return;
if ((fVector.size() == 0u) || (! G4Threading::IsWorkerThread())) return;
// The manager on mastter must exist
if ( ! fgMasterInstance ) {
if (fgMasterInstance == nullptr) {
G4ExceptionDescription description;
description
<< "No master G4AccumulableManager instance exists." << G4endl
source/analysis/accumulables/src/G4MergeMode.cc
+11 -12
View File
@@ -32,18 +32,17 @@ namespace G4Accumulables
{
//_____________________________________________________________________________
G4MergeMode GetMergeMode(const G4String& mergeModeName) {
if ( mergeModeName == "+" ) { return G4MergeMode::kAddition; }
else if ( mergeModeName == "*" ) { return G4MergeMode::kMultiplication; }
else {
G4ExceptionDescription description;
description
<< "\"" << mergeModeName << "\" merge mode is not supported." << G4endl
<< "Addition will be applied.";
G4Exception("G4Analysis::GetMergeMode",
"Analysis_W001", JustWarning, description);
return G4MergeMode::kAddition;
}
G4MergeMode GetMergeMode(const G4String& mergeModeName)
{
if (mergeModeName == "+") return G4MergeMode::kAddition;
if (mergeModeName == "*") return G4MergeMode::kMultiplication;
G4ExceptionDescription description;
description << "\"" << mergeModeName << "\" merge mode is not supported." << G4endl
<< "Addition will be applied.";
G4Exception("G4Analysis::GetMergeMode", "Analysis_W001", JustWarning, description);
return G4MergeMode::kAddition;
}
}