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

Import Geant4 10.5.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2018-12-07 15:15:39 +01:00
parent 6aa23be517
commit db49709b53
11370 changed files with 187480 additions and 160142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/analysis/xml/src/G4XmlAnalysisManager.cc
+7 -3
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4XmlAnalysisManager.cc 103532 2017-04-13 14:00:35Z gcosmo $
// Author: Ivana Hrivnacova, 18/06/2013 (ivana@ipno.in2p3.fr)
@@ -384,7 +383,7 @@ G4bool G4XmlAnalysisManager::WriteImpl()
}
//_____________________________________________________________________________
G4bool G4XmlAnalysisManager::CloseFileImpl()
G4bool G4XmlAnalysisManager::CloseFileImpl(G4bool reset)
{
auto finalResult = true;
@@ -406,7 +405,12 @@ G4bool G4XmlAnalysisManager::CloseFileImpl()
finalResult = finalResult && result;
// reset data
result = Reset();
if ( reset ) {
result = Reset();
} else {
// ntuple must be reset
result = fNtupleManager->Reset(true);
}
if ( ! result ) {
G4ExceptionDescription description;
description << " " << "Resetting data failed";
source/analysis/xml/src/G4XmlAnalysisReader.cc
-1
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4XmlAnalysisReader.cc 74257 2013-10-02 14:24:55Z gcosmo $
// Author: Ivana Hrivnacova, 25/07/2014 (ivana@ipno.in2p3.fr)
source/analysis/xml/src/G4XmlFileManager.cc
-1
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4XmlFileManager.cc 70604 2013-06-03 11:27:06Z ihrivnac $
// Author: Ivana Hrivnacova, 18/06/2013 (ivana@ipno.in2p3.fr)
source/analysis/xml/src/G4XmlNtupleManager.cc
+6 -3
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4XmlNtupleManager.cc 70604 2013-06-03 11:27:06Z ihrivnac $
// Author: Ivana Hrivnacova, 18/06/2013 (ivana@ipno.in2p3.fr)
@@ -88,9 +87,13 @@ void G4XmlNtupleManager::CreateTNtupleFromBooking(
//_____________________________________________________________________________
void G4XmlNtupleManager::FinishTNtuple(
G4TNtupleDescription<tools::waxml::ntuple>* ntupleDescription)
G4TNtupleDescription<tools::waxml::ntuple>* ntupleDescription,
G4bool /*fromBooking*/)
{
if ( ! ntupleDescription->fNtuple ) return;
if ( ! ntupleDescription->fNtuple ) {
CreateTNtupleFromBooking(ntupleDescription);
}
G4String path = "/";
path.append(fFileManager->GetNtupleDirectoryName());
source/analysis/xml/src/G4XmlRFileManager.cc
-1
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4XmlRFileManager.cc 70604 2013-06-03 11:27:06Z ihrivnac $
// Author: Ivana Hrivnacova, 10/09/2014 (ivana@ipno.in2p3.fr)
source/analysis/xml/src/G4XmlRNtupleManager.cc
-1
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id$
// Author: Ivana Hrivnacova, 25/07/2014 (ivana@ipno.in2p3.fr)