diff --git a/src/external/MusrRoot/CMakeLists.txt b/src/external/MusrRoot/CMakeLists.txt index d30cac56..1a0e9eca 100644 --- a/src/external/MusrRoot/CMakeLists.txt +++ b/src/external/MusrRoot/CMakeLists.txt @@ -22,7 +22,7 @@ set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "\$\{prefix\}") set(libdir "\$\{exec_prefix\}/lib") set(includedir "\$\{prefix\}/include") -set(MUSR_ROOT_VERSION "1.0.0") +set(MUSR_ROOT_VERSION "1.1.0") set(MUSR_ROOT_LIBRARY_NAME "TMusrRunHeader") configure_file("TMusrRunHeader.pc.in" "TMusrRunHeader.pc" @ONLY) diff --git a/src/external/MusrRoot/TMusrRunHeader.cpp b/src/external/MusrRoot/TMusrRunHeader.cpp index 6806fdf4..040a2906 100644 --- a/src/external/MusrRoot/TMusrRunHeader.cpp +++ b/src/external/MusrRoot/TMusrRunHeader.cpp @@ -395,6 +395,23 @@ Bool_t TMusrRunHeader::FillFolder(TFolder *folder) return true; } +//-------------------------------------------------------------------------- +// FillDirectory (public) +//-------------------------------------------------------------------------- +/** + *

Fills the RunHeader directory. This is needed to write it to a ROOT file. + * It walks through all information and attaches it to the directory or replaces + * it, if it is already present. + * + * \param dir to be filled + */ +Bool_t TMusrRunHeader::FillDirectory(TDirectoryFile *dir) +{ + // NOT YET IMPLEMENTED + + return true; +} + //-------------------------------------------------------------------------- // GetTypeOfPath (public) //-------------------------------------------------------------------------- @@ -873,6 +890,22 @@ Bool_t TMusrRunHeader::ExtractAll(TFolder *folder) return true; } +//-------------------------------------------------------------------------- +// ExtractAll (public) +//-------------------------------------------------------------------------- +/** + *

Reads all data from an open ROOT-file structure and feeds all the necessary + * internal data objects. + * + * \param dir + */ +Bool_t TMusrRunHeader::ExtractAll(TDirectoryFile *dir) +{ + // NOT YET IMPLEMENTED + + return true; +} + //-------------------------------------------------------------------------- // ExtractHeaderInformation (public) //-------------------------------------------------------------------------- diff --git a/src/external/MusrRoot/TMusrRunHeader.h b/src/external/MusrRoot/TMusrRunHeader.h index b3afb61c..7456897c 100644 --- a/src/external/MusrRoot/TMusrRunHeader.h +++ b/src/external/MusrRoot/TMusrRunHeader.h @@ -38,6 +38,7 @@ #include #include #include +#include #define MRH_UNDEFINED -9.99e99 @@ -129,8 +130,10 @@ public: virtual TString GetFileName() { return fFileName; } virtual Bool_t FillFolder(TFolder *folder); + virtual Bool_t FillDirectory(TDirectoryFile *dir); virtual Bool_t ExtractAll(TFolder *folder); + virtual Bool_t ExtractAll(TDirectoryFile *folder); virtual Bool_t ExtractHeaderInformation(TObjArray *headerInfo, TString path); virtual TString GetTypeOfPath(TString pathName);