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

Import Geant4 10.4.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-06-30 10:49:55 +02:00
parent 3a5407696b
commit 1a1316fea4
2180 changed files with 237880 additions and 59109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/analysis/xml/include/G4XmlAnalysisManager.icc
+3
View File
@@ -52,6 +52,9 @@ G4bool G4XmlAnalysisManager::WriteT(const std::vector<T*>& htVector,
G4String path = "/";
path.append(directoryName);
std::shared_ptr<std::ofstream> hnFile = fFileManager->GetHnFile();
// Do nothing if there is no file
if ( ! hnFile.get() ) return false;
G4bool result
= tools::waxml::write(*hnFile, *ht, path, name);
if ( ! result ) {
source/analysis/xml/src/G4XmlAnalysisManager.cc
+2 -2
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4XmlAnalysisManager.cc 93815 2015-11-02 11:32:20Z gcosmo $
// $Id: G4XmlAnalysisManager.cc 103532 2017-04-13 14:00:35Z gcosmo $
// Author: Ivana Hrivnacova, 18/06/2013 (ivana@ipno.in2p3.fr)
@@ -310,7 +310,7 @@ G4bool G4XmlAnalysisManager::OpenFileImpl(const G4String& fileName)
#ifdef G4VERBOSE
if ( fState.GetVerboseL1() )
fState.GetVerboseL1()->Message("open", "analysis file", name);
fState.GetVerboseL1()->Message("open", "analysis file", name, finalResult);
#endif
return finalResult;
source/analysis/xml/src/G4XmlFileManager.cc
+5
View File
@@ -91,6 +91,7 @@ G4bool G4XmlFileManager::CreateHnFile()
fHnFile = std::make_shared<std::ofstream>(GetFullFileName());
if ( fHnFile->fail() ) {
fHnFile = nullptr;
G4ExceptionDescription description;
description << " " << "Cannot open file " << GetFullFileName();
G4Exception("G4XmlFileManager::CreateHnFile()",
@@ -146,6 +147,7 @@ G4bool G4XmlFileManager::CreateNtupleFile(
auto ntupleFile = new std::ofstream(GetNtupleFileName(ntupleName));
if ( ntupleFile->fail() ) {
delete ntupleFile;
G4ExceptionDescription description;
description << " " << "Cannot open file "
<< GetNtupleFileName(ntupleName);
@@ -170,6 +172,9 @@ G4bool G4XmlFileManager::CreateNtupleFile(
G4bool G4XmlFileManager::CloseNtupleFile(
G4TNtupleDescription<tools::waxml::ntuple>* ntupleDescription)
{
// Do nothing if there is no file
if ( ! ntupleDescription->fFile ) return true;
G4String ntupleName = ntupleDescription->fNtupleBooking.name();
#ifdef G4VERBOSE