diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx index 23f7e4a4c8b4cb0315726c1a6ac8ad51a7d00eaf..9e44fb69eb32028094e2cee0317b70aeeb1e5416 100644 --- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx +++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx @@ -9,12 +9,14 @@ #include "ByteStreamData/ByteStreamMetadata.h" #include "ByteStreamData/ByteStreamMetadataContainer.h" #include "StoreGate/ReadCondHandle.h" +#include "GaudiKernel/DirSearchPath.h" #include "GaudiKernel/IJobOptionsSvc.h" #include "eformat/DetectorMask.h" #include "eformat/SourceIdentifier.h" #include <algorithm> #include <fstream> +#include <list> #include <boost/algorithm/string.hpp> @@ -316,16 +318,8 @@ void TrigOpMonitor::fillReleaseDataHist() return; } - // Find entries in LD_LIBRARY_PATH matching our project(s) - std::vector<std::string> paths, file_list; - boost::split(paths, ld_lib_path, boost::is_any_of(":")); - for (const std::string& p : paths) { - for (const std::string& proj : m_projects) { - if (p.find("/" + proj + "/") != std::string::npos) { - file_list.push_back(p + "/" + m_releaseData); - } - } - } + // Find all release metadata files + std::list<DirSearchPath::path> file_list = DirSearchPath(ld_lib_path, ":").find_all(m_releaseData.value()); if (file_list.empty()) { ATH_MSG_WARNING("Could not find release metadata file " << m_releaseData @@ -337,7 +331,7 @@ void TrigOpMonitor::fillReleaseDataHist() for (const auto& f : file_list) { // Read metadata file std::map<std::string, std::string> result; - if (readReleaseData(f, result).isFailure()) { + if (readReleaseData(f.string(), result).isFailure()) { ATH_MSG_WARNING("Could not read release metadata from " << f); m_releaseHist->Fill("Release ?", 1); return; diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.h b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.h index 5844264af72d816948bfa68d9f55d3f51bb5308c..8aad47414dcbac226fe6d0f910a6f29e74c9f680 100644 --- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.h +++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.h @@ -92,9 +92,6 @@ private: Gaudi::Property<unsigned short int> m_maxLB{this, "MaxLumiblocks", 3000, "Number of lumiblocks for histograms"}; - - Gaudi::Property<std::vector<std::string>> m_projects{ - this, "ProjectNames", {"AthenaP1", "Athena"}, "Valid projects names for release"}; }; #endif // TRIGSTEERMONITOR_TRIGOPMONI_H