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

Import Geant4 11.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2022-12-09 14:43:28 +01:00
parent c07cea1fe0
commit 9f34590941
3810 changed files with 200490 additions and 182326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/analysis/hdf5/include/G4Hdf5AnalysisManager.hh
+3 -9
View File
@@ -41,7 +41,6 @@
#include <string_view>
class G4Hdf5AnalysisManager;
class G4Hdf5FileManager;
class G4Hdf5NtupleFileManager;
template <class T>
class G4ThreadLocalSingleton;
@@ -51,7 +50,7 @@ class G4Hdf5AnalysisManager : public G4ToolsAnalysisManager
friend class G4ThreadLocalSingleton<G4Hdf5AnalysisManager>;
public:
virtual ~G4Hdf5AnalysisManager();
~G4Hdf5AnalysisManager() override;
// Static methods
static G4Hdf5AnalysisManager* Instance();
@@ -69,23 +68,18 @@ class G4Hdf5AnalysisManager : public G4ToolsAnalysisManager
protected:
// Virtual methods from base class
virtual G4bool OpenFileImpl(const G4String& fileName) final;
virtual G4bool WriteImpl() final;
virtual G4bool CloseFileImpl(G4bool reset) final;
virtual G4bool ResetImpl() final;
virtual G4bool IsOpenFileImpl() const final;
G4bool OpenFileImpl(const G4String& fileName) final;
G4bool CloseFileImpl(G4bool reset) final;
private:
G4Hdf5AnalysisManager();
// Static data members
inline static G4Hdf5AnalysisManager* fgMasterInstance { nullptr };
inline static G4ThreadLocal G4bool fgIsInstance { false };
static constexpr std::string_view fkClass { "G4Hdf5AnalysisManager" };
// Data members
std::shared_ptr<G4Hdf5NtupleFileManager> fNtupleFileManager { nullptr };
std::shared_ptr<G4Hdf5FileManager> fFileManager { nullptr };
};
#include "G4Hdf5AnalysisManager.icc"
source/analysis/hdf5/include/G4Hdf5AnalysisManager.icc
-7
View File
@@ -30,13 +30,6 @@
#include "G4Hdf5NtupleManager.hh"
#include "G4Hdf5FileManager.hh"
//_____________________________________________________________________________
inline
G4bool G4Hdf5AnalysisManager::IsOpenFileImpl() const
{
return fFileManager->IsOpenFile();
}
//_____________________________________________________________________________
inline
toolx::hdf5::ntuple* G4Hdf5AnalysisManager::GetNtuple() const
source/analysis/hdf5/include/G4Hdf5AnalysisReader.hh
+2 -2
View File
@@ -51,7 +51,7 @@ class G4Hdf5AnalysisReader : public G4ToolsAnalysisReader
friend class G4ThreadLocalSingleton<G4Hdf5AnalysisReader>;
public:
virtual ~G4Hdf5AnalysisReader();
~G4Hdf5AnalysisReader() override;
// Static methods
static G4Hdf5AnalysisReader* Instance();
@@ -63,7 +63,7 @@ class G4Hdf5AnalysisReader : public G4ToolsAnalysisReader
protected:
// Virtual methods from base class
virtual G4bool CloseFilesImpl(G4bool reset) final;
G4bool CloseFilesImpl(G4bool reset) final;
private:
G4Hdf5AnalysisReader();
source/analysis/hdf5/include/G4Hdf5FileManager.hh
+6 -6
View File
@@ -49,16 +49,16 @@ class G4Hdf5FileManager : public G4VTFileManager<G4Hdf5File>
public:
explicit G4Hdf5FileManager(const G4AnalysisManagerState& state);
G4Hdf5FileManager() = delete;
~G4Hdf5FileManager() = default;
~G4Hdf5FileManager() override = default;
using G4BaseFileManager::GetNtupleFileName;
using G4VTFileManager<G4Hdf5File>::WriteFile;
using G4VTFileManager<G4Hdf5File>::CloseFile;
// Methods to manipulate output files
virtual G4bool OpenFile(const G4String& fileName) final;
G4bool OpenFile(const G4String& fileName) final;
virtual G4String GetFileType() const final { return "hdf5"; }
G4String GetFileType() const final { return "hdf5"; }
// Specific methods for files per objects
G4bool CreateNtupleFile(Hdf5NtupleDescription* ntupleDescription);
@@ -74,9 +74,9 @@ class G4Hdf5FileManager : public G4VTFileManager<G4Hdf5File>
protected:
// // Methods derived from base class
virtual std::shared_ptr<G4Hdf5File> CreateFileImpl(const G4String& fileName) final;
virtual G4bool WriteFileImpl(std::shared_ptr<G4Hdf5File> file) final;
virtual G4bool CloseFileImpl(std::shared_ptr<G4Hdf5File> file) final;
std::shared_ptr<G4Hdf5File> CreateFileImpl(const G4String& fileName) final;
G4bool WriteFileImpl(std::shared_ptr<G4Hdf5File> file) final;
G4bool CloseFileImpl(std::shared_ptr<G4Hdf5File> file) final;
private:
hid_t CreateDirectory(hid_t& file, const G4String& directoryName,
source/analysis/hdf5/include/G4Hdf5HnFileManager.hh
+4 -4
View File
@@ -45,14 +45,14 @@ class G4Hdf5HnFileManager : public G4VTHnFileManager<HT>
public:
explicit G4Hdf5HnFileManager(G4Hdf5FileManager* fileManger)
: G4VTHnFileManager<HT>(), fFileManager(fileManger) {}
G4Hdf5HnFileManager() = delete;
virtual ~G4Hdf5HnFileManager() = default;
G4Hdf5HnFileManager() = delete;
~G4Hdf5HnFileManager() override = default;
// Methods for writing objects
// Write to a new file (the file is closed after write)
virtual G4bool WriteExtra(HT* ht, const G4String& htName, const G4String& fileName) final;
G4bool WriteExtra(HT* ht, const G4String& htName, const G4String& fileName) final;
// Write to the default file (handled with OpenFile()/CloseFile methods)
virtual G4bool Write(HT* ht, const G4String& htName, G4String& fileName) final;
G4bool Write(HT* ht, const G4String& htName, G4String& fileName) final;
private:
// Methods
source/analysis/hdf5/include/G4Hdf5HnFileManager.icc
-2
View File
@@ -36,8 +36,6 @@
#include "tools/histo/p1d"
#include "tools/histo/p2d"
#include "toolx/hdf5/h2file"
//_____________________________________________________________________________
template <>
inline
source/analysis/hdf5/include/G4Hdf5HnRFileManager.hh
+3 -3
View File
@@ -46,11 +46,11 @@ class G4Hdf5HnRFileManager : public G4VTHnRFileManager<HT>
explicit G4Hdf5HnRFileManager(G4Hdf5RFileManager* rfileManger)
: G4VTHnRFileManager<HT>(), fRFileManager(rfileManger) {}
G4Hdf5HnRFileManager() = delete;
virtual ~G4Hdf5HnRFileManager() = default;
~G4Hdf5HnRFileManager() override = default;
// Methods for writing objects
virtual HT* Read(const G4String& htName, const G4String& fileName,
const G4String& dirName, G4bool isUserFileName) final;
HT* Read(const G4String& htName, const G4String& fileName, const G4String& dirName,
G4bool isUserFileName) final;
private:
// Methods
source/analysis/hdf5/include/G4Hdf5HnRFileManager.icc
-2
View File
@@ -36,8 +36,6 @@
#include "tools/histo/p1d"
#include "tools/histo/p2d"
#include "toolx/hdf5/h2file"
//_____________________________________________________________________________
template <typename HT>
inline
source/analysis/hdf5/include/G4Hdf5NtupleFileManager.hh
+10 -10
View File
@@ -35,6 +35,7 @@
#include "globals.hh"
#include <string_view>
#include <utility>
class G4Hdf5FileManager;
class G4Hdf5NtupleManager;
@@ -48,24 +49,21 @@ class G4Hdf5NtupleFileManager : public G4VNtupleFileManager
public:
explicit G4Hdf5NtupleFileManager(const G4AnalysisManagerState& state);
G4Hdf5NtupleFileManager() = delete;
virtual ~G4Hdf5NtupleFileManager() = default;
~G4Hdf5NtupleFileManager() override = default;
virtual std::shared_ptr<G4VNtupleManager> CreateNtupleManager() override;
std::shared_ptr<G4VNtupleManager> CreateNtupleManager() override;
// Methods to be performed at file management
virtual G4bool ActionAtOpenFile(const G4String& fileName) override;
virtual G4bool ActionAtWrite() override;
virtual G4bool ActionAtCloseFile(G4bool reset) override;
virtual G4bool Reset() override;
G4bool ActionAtOpenFile(const G4String& fileName) override;
G4bool ActionAtWrite() override;
G4bool ActionAtCloseFile() override;
G4bool Reset() override;
void SetFileManager(std::shared_ptr<G4Hdf5FileManager> fileManager);
std::shared_ptr<G4Hdf5NtupleManager> GetNtupleManager() const;
private:
// Methods
G4bool CloseNtupleFiles();
// Static data members
static constexpr std::string_view fkClass { "G4Hdf5NtupleFileManager" };
@@ -76,7 +74,9 @@ class G4Hdf5NtupleFileManager : public G4VNtupleFileManager
inline void G4Hdf5NtupleFileManager::SetFileManager(
std::shared_ptr<G4Hdf5FileManager> fileManager)
{ fFileManager = fileManager; }
{
fFileManager = std::move(fileManager);
}
inline std::shared_ptr<G4Hdf5NtupleManager> G4Hdf5NtupleFileManager::GetNtupleManager() const
{ return fNtupleManager; }
source/analysis/hdf5/include/G4Hdf5NtupleManager.hh
+10 -10
View File
@@ -37,8 +37,9 @@
#include "toolx/hdf5/ntuple"
#include <vector>
#include <memory>
#include <utility>
#include <vector>
class G4Hdf5FileManager;
@@ -63,7 +64,7 @@ class G4Hdf5NtupleManager : public G4TNtupleManager<toolx::hdf5::ntuple,
public:
explicit G4Hdf5NtupleManager(const G4AnalysisManagerState& state);
G4Hdf5NtupleManager() = delete;
virtual ~G4Hdf5NtupleManager() = default;
~G4Hdf5NtupleManager() override = default;
private:
// Set methods
@@ -77,12 +78,9 @@ class G4Hdf5NtupleManager : public G4TNtupleManager<toolx::hdf5::ntuple,
// Methods from the templated base class
//
virtual void CreateTNtupleFromBooking(
Hdf5NtupleDescription* ntupleDescription) final;
void CreateTNtupleFromBooking(Hdf5NtupleDescription* ntupleDescription) final;
virtual void FinishTNtuple(
Hdf5NtupleDescription* ntupleDescription,
G4bool fromBooking) final;
void FinishTNtuple(Hdf5NtupleDescription* ntupleDescription, G4bool fromBooking) final;
// Static data members
static constexpr std::string_view fkClass { "G4Hdf5NtupleManager" };
@@ -97,7 +95,9 @@ using std::to_string;
inline void
G4Hdf5NtupleManager::SetFileManager(std::shared_ptr<G4Hdf5FileManager> fileManager)
{ fFileManager = fileManager; }
{
fFileManager = std::move(fileManager);
}
inline const std::vector<Hdf5NtupleDescription*>&
G4Hdf5NtupleManager::GetNtupleDescriptionVector() const
@@ -115,7 +115,7 @@ inline G4bool G4TNtupleManager<toolx::hdf5::ntuple, G4Hdf5File>::FillNtupleTColu
// get ntuple
auto ntuple = GetNtupleInFunction(ntupleId, "FillNtupleTColumn");
if ( ! ntuple ) return false;
if (ntuple == nullptr) return false;
// get generic column
auto index = columnId - fFirstNtupleColumnId;
@@ -129,7 +129,7 @@ inline G4bool G4TNtupleManager<toolx::hdf5::ntuple, G4Hdf5File>::FillNtupleTColu
// get column and check its type
auto column = dynamic_cast<toolx::hdf5::ntuple::column_string* >(icolumn);
if ( ! column ) {
if (column == nullptr) {
G4Analysis::Warn(
"Column type does not match: ntupleId " + to_string(ntupleId) +
" columnId " + to_string(columnId) + " value " + value,
source/analysis/hdf5/include/G4Hdf5RFileManager.hh
+3 -3
View File
@@ -47,12 +47,12 @@ class G4Hdf5RFileManager : public G4VRFileManager
public:
explicit G4Hdf5RFileManager(const G4AnalysisManagerState& state);
G4Hdf5RFileManager() = delete;
virtual ~G4Hdf5RFileManager() = default;
~G4Hdf5RFileManager() override = default;
virtual G4String GetFileType() const final { return "hdf5"; }
G4String GetFileType() const final { return "hdf5"; }
// Methods from base class
virtual void CloseFiles() final;
void CloseFiles() final;
// Get methods
G4Hdf5File* GetRFile(const G4String& fileName, G4bool isPerThread);
source/analysis/hdf5/include/G4Hdf5RNtupleManager.hh
+8 -5
View File
@@ -38,6 +38,7 @@
#include "toolx/hdf5/ntuple"
#include <string_view>
#include <utility>
class G4Hdf5RFileManager;
@@ -48,16 +49,16 @@ class G4Hdf5RNtupleManager : public G4TRNtupleManager<toolx::hdf5::ntuple>
public:
explicit G4Hdf5RNtupleManager(const G4AnalysisManagerState& state);
G4Hdf5RNtupleManager() = delete;
virtual ~G4Hdf5RNtupleManager() = default;
~G4Hdf5RNtupleManager() override = default;
private:
// Set methods
void SetFileManager(std::shared_ptr<G4Hdf5RFileManager> fileManager);
// Methods from the base class
virtual G4int ReadNtupleImpl(const G4String& ntupleName, const G4String& fileName,
const G4String& dirName, G4bool isUserFileName) final;
virtual G4bool GetTNtupleRow(G4TRNtupleDescription<toolx::hdf5::ntuple>* ntupleDescription) final;
G4int ReadNtupleImpl(const G4String& ntupleName, const G4String& fileName,
const G4String& dirName, G4bool isUserFileName) final;
G4bool GetTNtupleRow(G4TRNtupleDescription<toolx::hdf5::ntuple>* ntupleDescription) final;
// Static data members
static constexpr std::string_view fkClass { "G4Hdf5RNtupleManager" };
@@ -70,7 +71,9 @@ class G4Hdf5RNtupleManager : public G4TRNtupleManager<toolx::hdf5::ntuple>
inline void
G4Hdf5RNtupleManager::SetFileManager(std::shared_ptr<G4Hdf5RFileManager> fileManager)
{ fFileManager = fileManager; }
{
fFileManager = std::move(fileManager);
}
#endif