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/csv/src/G4CsvAnalysisManager.cc
+7 -4
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4CsvAnalysisManager.cc 93815 2015-11-02 11:32:20Z gcosmo $
// Author: Ivana Hrivnacova, 18/06/2013 (ivana@ipno.in2p3.fr)
@@ -357,7 +356,7 @@ G4bool G4CsvAnalysisManager::WriteImpl()
}
//_____________________________________________________________________________
G4bool G4CsvAnalysisManager::CloseFileImpl()
G4bool G4CsvAnalysisManager::CloseFileImpl(G4bool reset)
{
auto finalResult = true;
@@ -372,13 +371,17 @@ G4bool G4CsvAnalysisManager::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";
G4Exception("G4CsvAnalysisManager::CloseFile()",
"Analysis_W021", JustWarning, description);
result = false;
}
finalResult = finalResult && result;
source/analysis/csv/src/G4CsvAnalysisReader.cc
-1
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4CsvAnalysisReader.cc 74257 2013-10-02 14:24:55Z gcosmo $
// Author: Ivana Hrivnacova, 05/09/2014 (ivana@ipno.in2p3.fr)
source/analysis/csv/src/G4CsvFileManager.cc
-1
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4CsvFileManager.cc 70604 2013-06-03 11:27:06Z ihrivnac $
// Author: Ivana Hrivnacova, 18/06/2013 (ivana@ipno.in2p3.fr)
source/analysis/csv/src/G4CsvNtupleManager.cc
+5 -3
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4CsvNtupleManager.cc 70604 2013-06-03 11:27:06Z ihrivnac $
// Author: Ivana Hrivnacova, 18/06/2013 (ivana@ipno.in2p3.fr)
@@ -92,9 +91,12 @@ void G4CsvNtupleManager::CreateTNtupleFromBooking(
//_____________________________________________________________________________
void G4CsvNtupleManager::FinishTNtuple(
G4TNtupleDescription<tools::wcsv::ntuple>* ntupleDescription)
G4TNtupleDescription<tools::wcsv::ntuple>* ntupleDescription,
G4bool /*fromBooking*/)
{
if ( ! ntupleDescription->fNtuple ) return;
if ( ! ntupleDescription->fNtuple ) {
CreateTNtupleFromBooking(ntupleDescription);
}
// Write header if ntuple already exists
if ( ! WriteHeader(ntupleDescription->fNtuple) ) {
source/analysis/csv/src/G4CsvRFileManager.cc
-1
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4CsvRFileManager.cc 70604 2013-06-03 11:27:06Z ihrivnac $
// Author: Ivana Hrivnacova, 21/10/2014 (ivana@ipno.in2p3.fr)
source/analysis/csv/src/G4CsvRNtupleManager.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)