diff --git a/cmake/CPackOptions.cmake.in b/cmake/CPackOptions.cmake.in index 8ca0a012..4858f338 100644 --- a/cmake/CPackOptions.cmake.in +++ b/cmake/CPackOptions.cmake.in @@ -24,12 +24,12 @@ set (CPACK_SET_DESTDIR "OFF") set (CPACK_PACKAGE_RELOCATABLE "true") if (${CPACK_GENERATOR} STREQUAL "RPM") - set (CPACK_RPM_PACKAGE_REQUIRES "root >= 6.16.00") + set (CPACK_RPM_PACKAGE_REQUIRES "root >= 6.22.00") set (CPACK_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") set (CPACK_PACKAGING_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") set (CPACK_RPM_FILE_NAME "RPM-DEFAULT") set (CPACK_RPM_PACKAGE_RELEASE "1") - # next variable for RHEL, CentOS, Fedfora + # next variable for RHEL, CentOS, Fedora set (CPACK_RPM_PACKAGE_RELEASE_DIST "") set (CPACK_RPM_PACKAGE_LICENSE "GPLv2") set (CPACK_RPM_PACKAGE_VENDOR "Paul Scherrer Institute - LMU - LEM") diff --git a/src/external/MusrRoot/TMusrRunHeader.cpp b/src/external/MusrRoot/TMusrRunHeader.cpp index 58872ba3..dab7e10f 100644 --- a/src/external/MusrRoot/TMusrRunHeader.cpp +++ b/src/external/MusrRoot/TMusrRunHeader.cpp @@ -394,6 +394,68 @@ Bool_t TMusrRunHeader::FillFolder(TFolder *folder) return true; } +//-------------------------------------------------------------------------- +// GetTypeOfPath (public) +//-------------------------------------------------------------------------- +/** + *

Get type of path-name, e.g. RunInfo/Sample Name. + * + * @param pathName path-name for which the type is requested + * + * @return the type, or 'undef' if path-name is not found. + */ +TString TMusrRunHeader::GetTypeOfPath(TString pathName) +{ + TString type("undef"); + + // find pathName + for (Int_t i=0; i