Import Geant4 11.1.0.beta source tree
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
#include "G4AnalysisUtilities.hh"
|
||||
#include "G4AutoLock.hh"
|
||||
|
||||
#include "tools/hdf5/h2file"
|
||||
#include "toolx/hdf5/h2file"
|
||||
|
||||
using namespace G4Analysis;
|
||||
using namespace tools;
|
||||
@@ -82,7 +82,7 @@ hid_t G4Hdf5FileManager::CreateDirectory(hid_t& file,
|
||||
auto success = true;
|
||||
|
||||
// create directory
|
||||
auto directory = tools_H5Gcreate(file, newDirectoryName, 0);
|
||||
auto directory = toolx_H5Gcreate(file, newDirectoryName, 0);
|
||||
// 0 seems to be an optional parameter. The web doc does not say what should
|
||||
// be the default value but 0 is what is found in examples, and in the code, if we pass 0, clearly some
|
||||
// default value is taken.
|
||||
@@ -93,7 +93,7 @@ hid_t G4Hdf5FileManager::CreateDirectory(hid_t& file,
|
||||
}
|
||||
else {
|
||||
// write atb (header?)
|
||||
auto result = hdf5::write_atb(directory, "type", "directory");
|
||||
auto result = toolx::hdf5::write_atb(directory, "type", "directory");
|
||||
if ( !result) {
|
||||
Warn("Write_atb class failed for " + directoryName,
|
||||
fkClass, "CreateDirectory");
|
||||
@@ -139,8 +139,8 @@ std::shared_ptr<G4Hdf5File> G4Hdf5FileManager::CreateFileImpl(const G4String& fi
|
||||
}
|
||||
|
||||
// create a header with general infos
|
||||
if(!tools::hdf5::write_header(file)) {
|
||||
Warn("tools::hdf5::write_header() failed for " + fileName,
|
||||
if(!toolx::hdf5::write_header(file)) {
|
||||
Warn("toolx::hdf5::write_header() failed for " + fileName,
|
||||
fkClass, "CreateFileImpl");
|
||||
return std::make_shared<G4Hdf5File>(-1, -1, -1);
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ using namespace G4Analysis;
|
||||
|
||||
//_____________________________________________________________________________
|
||||
G4Hdf5NtupleManager::G4Hdf5NtupleManager(const G4AnalysisManagerState& state)
|
||||
: G4TNtupleManager<tools::hdf5::ntuple, G4Hdf5File>(state)
|
||||
: G4TNtupleManager<toolx::hdf5::ntuple, G4Hdf5File>(state)
|
||||
{}
|
||||
|
||||
//
|
||||
@@ -73,7 +73,7 @@ void G4Hdf5NtupleManager::CreateTNtuple(
|
||||
|
||||
// create ntuple
|
||||
ntupleDescription->fNtuple
|
||||
= new tools::hdf5::ntuple(
|
||||
= new toolx::hdf5::ntuple(
|
||||
G4cout, directory, ntupleDescription->fNtupleBooking,
|
||||
compressionLevel, basketSize);
|
||||
|
||||
|
||||
@@ -31,9 +31,9 @@
|
||||
#include "G4AnalysisManagerState.hh"
|
||||
#include "G4AnalysisUtilities.hh"
|
||||
|
||||
#include "tools/hdf5/h2file"
|
||||
#include "tools/hdf5/group_exists"
|
||||
#include "tools/zlib"
|
||||
#include "toolx/hdf5/h2file"
|
||||
#include "toolx/hdf5/group_exists"
|
||||
#include "toolx/zlib"
|
||||
|
||||
using namespace G4Analysis;
|
||||
using namespace tools;
|
||||
@@ -70,7 +70,7 @@ hid_t G4Hdf5RFileManager::OpenRFile(const G4String& fileName,
|
||||
return kInvalidId;
|
||||
}
|
||||
|
||||
// newFile->add_unziper('Z',tools::decompress_buffer);
|
||||
// newFile->add_unziper('Z',toolx::decompress_buffer);
|
||||
|
||||
// add file in a map
|
||||
fRFiles[name] = G4Hdf5File(newFile, kInvalidId, kInvalidId);
|
||||
@@ -85,7 +85,7 @@ hid_t G4Hdf5RFileManager::OpenDirectory(hid_t file, const G4String& directoryNam
|
||||
{
|
||||
Message(kVL4, "open", "read directory", directoryName);
|
||||
|
||||
auto directory = tools_H5Gopen(file, directoryName);
|
||||
auto directory = toolx_H5Gopen(file, directoryName);
|
||||
if ( directory < 0 ) {
|
||||
Warn("Cannot open directory " + directoryName, fkClass, "OpenDirectory");
|
||||
return kInvalidId;
|
||||
|
||||
@@ -33,7 +33,7 @@ using namespace G4Analysis;
|
||||
|
||||
//_____________________________________________________________________________
|
||||
G4Hdf5RNtupleManager::G4Hdf5RNtupleManager(const G4AnalysisManagerState& state)
|
||||
: G4TRNtupleManager<tools::hdf5::ntuple>(state)
|
||||
: G4TRNtupleManager<toolx::hdf5::ntuple>(state)
|
||||
{}
|
||||
|
||||
//
|
||||
@@ -60,8 +60,8 @@ G4int G4Hdf5RNtupleManager::ReadNtupleImpl(const G4String& ntupleName,
|
||||
if ( directory < 0 ) return kInvalidId;
|
||||
|
||||
// Create ntuple
|
||||
auto rntuple = new tools::hdf5::ntuple(G4cout, directory, ntupleName);
|
||||
auto rntupleDescription = new G4TRNtupleDescription<tools::hdf5::ntuple>(rntuple);
|
||||
auto rntuple = new toolx::hdf5::ntuple(G4cout, directory, ntupleName);
|
||||
auto rntupleDescription = new G4TRNtupleDescription<toolx::hdf5::ntuple>(rntuple);
|
||||
auto id = SetNtuple(rntupleDescription);
|
||||
|
||||
Message(kVL2, "read", "ntuple", ntupleName, id > kInvalidId);
|
||||
@@ -71,7 +71,7 @@ G4int G4Hdf5RNtupleManager::ReadNtupleImpl(const G4String& ntupleName,
|
||||
|
||||
//_____________________________________________________________________________
|
||||
G4bool G4Hdf5RNtupleManager::GetTNtupleRow(
|
||||
G4TRNtupleDescription<tools::hdf5::ntuple>* ntupleDescription)
|
||||
G4TRNtupleDescription<toolx::hdf5::ntuple>* ntupleDescription)
|
||||
{
|
||||
auto ntuple = ntupleDescription->fNtuple;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user