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

Import Geant4 11.3.1 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2025-03-24 16:45:22 +01:00
parent 32390e802b
commit df176550b3
388 changed files with 29491 additions and 29435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/analysis/History
+8
View File
@@ -6,6 +6,14 @@ It must **not** be used as a substitute for writing good git commit messages!
-------------------------------------------------------------------------------
## 2025-03-14 I. Hrivnacova (analysis-V11-02-09)
- Removed false warnings about non-existing ntuple
and debug messages when filling inactivated ntuple
## 2025-01-09 Ben Morgan
- Qualify use of `G4Accumulables` namespace to avoid clashes and order
dependence of inclusion of headers.
## 2024-11-04 I. Hrivnacova (analysis-V11-02-08)
- Coverity fixes:
- Correct usage of std::move
source/analysis/accumulables/include/G4AccArray.icc
+4 -4
View File
@@ -38,7 +38,7 @@ G4AccArray<T, N>::G4AccArray(
const G4String& name, const T& value, G4MergeMode mergeMode)
: G4VAccumulable(name, mergeMode),
fInitValue(value),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccArray ctor1" << G4endl;
@@ -54,7 +54,7 @@ template <class T, std::size_t N>
template <typename... Args>
G4AccArray<T, N>::G4AccArray(Args&&... args)
: G4VAccumulable(),
fArray{{std::forward<Args>(args)...}}, fMergeFunction(GetMergeFunction<T>(fMergeMode))
fArray{{std::forward<Args>(args)...}}, fMergeFunction(G4Accumulables::GetMergeFunction<T>(fMergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccArray ctor2" << G4endl;
@@ -67,7 +67,7 @@ template <typename First, typename... Args>
G4AccArray<T, N>::G4AccArray(const First& firstArg, Args&&... args)
: G4VAccumulable(firstArg),
fArray{{std::forward<Args>(args)...}},
fMergeFunction(GetMergeFunction<T>(fMergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(fMergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccArray ctor3" << G4endl;
@@ -136,7 +136,7 @@ template <class T, std::size_t N>
void G4AccArray<T, N>::SetMergeMode(G4MergeMode value)
{
G4VAccumulable::SetMergeMode(value);
fMergeFunction = GetMergeFunction<T>(value);
fMergeFunction = G4Accumulables::GetMergeFunction<T>(value);
}
//_____________________________________________________________________________
source/analysis/accumulables/include/G4AccMap.icc
+8 -8
View File
@@ -40,7 +40,7 @@ G4AccMap<Key, T, Compare, Allocator>::G4AccMap(
G4MergeMode mergeMode)
: G4VAccumulable(name, mergeMode),
fMap(),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccMap ctor1" << G4endl;
@@ -56,7 +56,7 @@ G4AccMap<Key, T, Compare, Allocator>::G4AccMap(
const Allocator& allocator)
: G4VAccumulable(mergeMode),
fMap(comp, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccMap ctor2" << G4endl;
@@ -73,7 +73,7 @@ G4AccMap<Key, T, Compare, Allocator>::G4AccMap(
const Allocator& allocator)
: G4VAccumulable(name, mergeMode),
fMap(comp, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccMap ctor2n" << G4endl;
@@ -88,7 +88,7 @@ G4AccMap<Key, T, Compare, Allocator>::G4AccMap(
G4MergeMode mergeMode)
: G4VAccumulable(mergeMode),
fMap(allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccMap ctor3" << G4endl;
@@ -104,7 +104,7 @@ G4AccMap<Key, T, Compare, Allocator>::G4AccMap(
G4MergeMode mergeMode)
: G4VAccumulable(name, mergeMode),
fMap(allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccMap ctor3n" << G4endl;
@@ -121,7 +121,7 @@ G4AccMap<Key, T, Compare, Allocator>::G4AccMap(
const Allocator& allocator)
: G4VAccumulable(mergeMode),
fMap(init, comp, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccMap ctor10" << G4endl;
@@ -139,7 +139,7 @@ G4AccMap<Key, T, Compare, Allocator>::G4AccMap(
const Allocator& allocator)
: G4VAccumulable(name, mergeMode),
fMap(init, comp, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccMap ctor10n" << G4endl;
@@ -232,7 +232,7 @@ template <class Key, class T, class Compare, class Allocator>
void G4AccMap<Key, T, Compare, Allocator>::SetMergeMode(G4MergeMode value)
{
G4VAccumulable::SetMergeMode(value);
fMergeFunction = GetMergeFunction<T>(fMergeMode);
fMergeFunction = G4Accumulables::GetMergeFunction<T>(fMergeMode);
}
//_____________________________________________________________________________
source/analysis/accumulables/include/G4AccUnorderedMap.icc
+12 -12
View File
@@ -40,7 +40,7 @@ G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::G4AccUnorderedMap(
G4MergeMode mergeMode)
: G4VAccumulable(name, mergeMode),
fUMap(),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccUnorderedMap ctor1" << G4endl;
@@ -56,7 +56,7 @@ G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::G4AccUnorderedMap(
const Allocator& allocator)
: G4VAccumulable(mergeMode),
fUMap(bucket_count, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccUnorderedMap ctor2" << G4endl;
@@ -73,7 +73,7 @@ G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::G4AccUnorderedMap(
const Allocator& allocator)
: G4VAccumulable(name, mergeMode),
fUMap(bucket_count, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccUnorderedMap ctor2n" << G4endl;
@@ -89,7 +89,7 @@ G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::G4AccUnorderedMap(
G4MergeMode mergeMode)
: G4VAccumulable(mergeMode),
fUMap(bucket_count, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccUnorderedMap ctor3" << G4endl;
@@ -106,7 +106,7 @@ G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::G4AccUnorderedMap(
G4MergeMode mergeMode)
: G4VAccumulable(name, mergeMode),
fUMap(bucket_count, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccUnorderedMap ctor3n" << G4endl;
@@ -123,7 +123,7 @@ G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::G4AccUnorderedMap(
G4MergeMode mergeMode)
: G4VAccumulable(mergeMode),
fUMap(bucket_count, hash, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccUnorderedMap ctor4" << G4endl;
@@ -141,7 +141,7 @@ G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::G4AccUnorderedMap(
G4MergeMode mergeMode)
: G4VAccumulable(name, mergeMode),
fUMap(bucket_count, hash, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccUnorderedMap ctor4n" << G4endl;
@@ -156,7 +156,7 @@ G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::G4AccUnorderedMap(
G4MergeMode mergeMode)
: G4VAccumulable(mergeMode),
fUMap(allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccUnorderedMap ctor5" << G4endl;
@@ -172,7 +172,7 @@ G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::G4AccUnorderedMap(
G4MergeMode mergeMode)
: G4VAccumulable(name, mergeMode),
fUMap(allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccUnorderedMap ctor5n" << G4endl;
@@ -191,7 +191,7 @@ G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::G4AccUnorderedMap(
const Allocator& allocator)
: G4VAccumulable(mergeMode),
fUMap(init, bucket_count, hash, equal, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccUnorderedMap ctor13" << G4endl;
@@ -211,7 +211,7 @@ G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::G4AccUnorderedMap(
const Allocator& allocator)
: G4VAccumulable(name, mergeMode),
fUMap(init, bucket_count, hash, equal, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccUnorderedMap ctor13n" << G4endl;
@@ -304,7 +304,7 @@ template <class Key, class T, class Hash, class KeyEqual, class Allocator>
void G4AccUnorderedMap<Key, T, Hash, KeyEqual, Allocator>::SetMergeMode(G4MergeMode value)
{
G4VAccumulable::SetMergeMode(value);
fMergeFunction = GetMergeFunction<T>(fMergeMode);
fMergeFunction = G4Accumulables::GetMergeFunction<T>(fMergeMode);
}
//_____________________________________________________________________________
source/analysis/accumulables/include/G4AccValue.icc
+3 -5
View File
@@ -30,8 +30,6 @@
// public functions
//
using namespace G4Accumulables;
//_____________________________________________________________________________
template <typename T>
G4AccValue<T>::G4AccValue(
@@ -39,7 +37,7 @@ G4AccValue<T>::G4AccValue(
: G4VAccumulable(name, mergeMode),
fValue(initValue),
fInitValue(initValue),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{}
//_____________________________________________________________________________
@@ -48,7 +46,7 @@ G4AccValue<T>::G4AccValue(T initValue, G4MergeMode mergeMode)
: G4VAccumulable(),
fValue(initValue),
fInitValue(initValue),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{}
//_____________________________________________________________________________
@@ -223,7 +221,7 @@ template <class T>
void G4AccValue<T>::SetMergeMode(G4MergeMode value)
{
G4VAccumulable::SetMergeMode(value);
fMergeFunction = GetMergeFunction<T>(fMergeMode);
fMergeFunction = G4Accumulables::GetMergeFunction<T>(fMergeMode);
}
//_____________________________________________________________________________
source/analysis/accumulables/include/G4AccVector.icc
+10 -10
View File
@@ -40,7 +40,7 @@ G4AccVector<T, Allocator>::G4AccVector(
G4MergeMode mergeMode)
: G4VAccumulable(name, mergeMode),
fVector(),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccVector ctor1" << G4endl;
@@ -55,7 +55,7 @@ G4AccVector<T, Allocator>::G4AccVector(
G4MergeMode mergeMode)
: G4VAccumulable(mergeMode),
fVector(allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccVector ctor2" << G4endl;
@@ -71,7 +71,7 @@ G4AccVector<T, Allocator>::G4AccVector(
G4MergeMode mergeMode)
: G4VAccumulable(name, mergeMode),
fVector(allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccVector ctor2n" << G4endl;
@@ -87,7 +87,7 @@ G4AccVector<T, Allocator>::G4AccVector(
: G4VAccumulable(mergeMode),
fVector(count, value, allocator),
fInitValue(value),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccVector ctor3" << G4endl;
@@ -104,7 +104,7 @@ G4AccVector<T, Allocator>::G4AccVector(
: G4VAccumulable(name, mergeMode),
fVector(count, value, allocator),
fInitValue(value),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccVector ctor3n" << G4endl;
@@ -119,7 +119,7 @@ G4AccVector<T, Allocator>::G4AccVector(
G4MergeMode mergeMode, const Allocator& allocator)
: G4VAccumulable(mergeMode),
fVector(count, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccVector ctor4" << G4endl;
@@ -135,7 +135,7 @@ G4AccVector<T, Allocator>::G4AccVector(
G4MergeMode mergeMode, const Allocator& allocator)
: G4VAccumulable(name, mergeMode),
fVector(count, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccVector ctor4n" << G4endl;
@@ -150,7 +150,7 @@ G4AccVector<T, Allocator>::G4AccVector(
G4MergeMode mergeMode, const Allocator& allocator)
: G4VAccumulable(mergeMode),
fVector(init, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccVector ctor10" << G4endl;
@@ -166,7 +166,7 @@ G4AccVector<T, Allocator>::G4AccVector(
G4MergeMode mergeMode, const Allocator& allocator)
: G4VAccumulable(name, mergeMode),
fVector(init, allocator),
fMergeFunction(GetMergeFunction<T>(mergeMode))
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
{
if (G4Accumulables::VerboseLevel > 1 ) {
G4cout << "G4AccVector ctor10n" << G4endl;
@@ -250,5 +250,5 @@ template <class T, class Allocator>
void G4AccVector<T, Allocator>::SetMergeMode(G4MergeMode value)
{
G4VAccumulable::SetMergeMode(value);
fMergeFunction = GetMergeFunction<T>(fMergeMode);
fMergeFunction = G4Accumulables::GetMergeFunction<T>(fMergeMode);
}
source/analysis/management/src/G4VAnalysisManager.cc
-6
View File
@@ -1514,9 +1514,6 @@ void G4VAnalysisManager::SetNtupleActivation(G4int id, G4bool activation)
// Set activation to a given ntuple object
fNtupleBookingManager->SetActivation(id, activation);
if ( fVNtupleManager ) {
fVNtupleManager->SetActivation(id, activation);
}
}
//_____________________________________________________________________________
@@ -1525,9 +1522,6 @@ void G4VAnalysisManager::SetNtupleActivation(G4bool activation)
// Set activation to all ntuple objects
fNtupleBookingManager->SetActivation(activation);
if ( fVNtupleManager ) {
fVNtupleManager->SetActivation(activation);
}
}
//_____________________________________________________________________________
source/analysis/root/include/G4RootPNtupleManager.icc
+2 -2
View File
@@ -34,7 +34,7 @@ inline G4bool G4RootPNtupleManager::FillNtupleTColumn(
G4int ntupleId, G4int columnId, const std::string& value)
{
if ( fState.GetIsActivation() && ( ! GetActivation(ntupleId) ) ) {
G4cout << "Skipping FillNtupleIColumn for " << ntupleId << G4endl;
// G4cout << "Skipping FillNtupleIColumn for " << ntupleId << G4endl;
return false;
}
@@ -92,7 +92,7 @@ G4bool G4RootPNtupleManager::FillNtupleTColumn(
CreateNtuplesIfNeeded();
if ( fState.GetIsActivation() && ( ! GetActivation(ntupleId) ) ) {
G4cout << "Skipping FillNtupleIColumn for " << ntupleId << G4endl;
// G4cout << "Skipping FillNtupleIColumn for " << ntupleId << G4endl;
return false;
}