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

Import Geant4 10.7.1 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2021-02-05 15:10:05 +01:00
parent dab42d2018
commit 3dfcdb544e
281 changed files with 37738 additions and 47638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/analysis/root/src/G4RootNtupleFileManager.cc
+6 -5
View File
@@ -312,7 +312,7 @@ std::shared_ptr<G4VNtupleManager> G4RootNtupleFileManager::CreateNtupleManager()
= fNtupleManager->GetMainNtupleManager(GetNtupleFileNumber());
fSlaveNtupleManager
= make_shared<G4RootPNtupleManager>(
fState, fgMasterInstance->fBookingManager, mainNtupleManager, fNtupleRowWise, fNtupleRowMode);
fState, fBookingManager, mainNtupleManager, fNtupleRowWise, fNtupleRowMode);
activeNtupleManager = fSlaveNtupleManager;
break;
}
@@ -374,10 +374,11 @@ G4bool G4RootNtupleFileManager::ActionAtOpenFile(const G4String& /*fileName*/)
#endif
}
if ( fNtupleMergeMode == G4NtupleMergeMode::kSlave ) {
// G4cout << "Going to create slave ntuples from main" << G4endl;
fSlaveNtupleManager->CreateNtuplesFromMain();
}
// Creating ntuples from main is triggered from the first Fill call
// if ( fNtupleMergeMode == G4NtupleMergeMode::kSlave ) {
// // G4cout << "Going to create slave ntuples from main" << G4endl;
// fSlaveNtupleManager->CreateNtuplesFromMain();
// }
return finalResult;
}