diff --git a/Calorimeter/CaloRec/CMakeLists.txt b/Calorimeter/CaloRec/CMakeLists.txt index 673526ebff4834df826b118ed54471683b74afdd..43cd80384e62c53ce69d751fa775bf78c5f2e290 100644 --- a/Calorimeter/CaloRec/CMakeLists.txt +++ b/Calorimeter/CaloRec/CMakeLists.txt @@ -36,7 +36,7 @@ atlas_depends_on_subdirs( LArCalorimeter/LArRawConditions LumiBlock/LumiBlockComps Trigger/TrigAnalysis/TrigAnalysisInterfaces - Control/AthenaMonitoring ) + Control/AthenaMonitoringKernel ) # External dependencies: find_package( AIDA ) @@ -59,7 +59,7 @@ atlas_add_library( CaloRecLib StoreGateLib LArToolsLib LumiBlockCompsLib PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} AthAllocators IdDictParser EventKernel - FourMom NavFourMom AthenaMonitoringLib ) + FourMom NavFourMom AthenaMonitoringKernelLib ) atlas_add_component( CaloRec src/components/*.cxx diff --git a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx index e9489bd07d86cfd26482379a639b6f9c27f5930b..9e007766c504b29ad3c038fcfada6206608e0fb9 100644 --- a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx +++ b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx @@ -3,7 +3,7 @@ */ #include "CaloBCIDAvgAlg.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" //#define DONTDO diff --git a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h index 0cf87ac5edf274bd47658ca321d80a862ef00ffe..b4de720846fe12a608fb71a49d083570fb41ae14 100644 --- a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h +++ b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h @@ -18,7 +18,7 @@ #include "LArCabling/LArOnOffIdMapping.h" #include "LumiBlockData/LuminosityCondData.h" #include "TrigAnalysisInterfaces/IBunchCrossingTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" class CaloBCIDAvgAlg : public AthReentrantAlgorithm { public: diff --git a/Control/AthenaExamples/AthExMonitored/CMakeLists.txt b/Control/AthenaExamples/AthExMonitored/CMakeLists.txt index 0b7df1df2d8215c583874975d0bc1608eb1e5253..c20ba464c7f39f1aa15202f169da19e3a2bc5b55 100644 --- a/Control/AthenaExamples/AthExMonitored/CMakeLists.txt +++ b/Control/AthenaExamples/AthExMonitored/CMakeLists.txt @@ -10,13 +10,13 @@ atlas_depends_on_subdirs( PUBLIC GaudiKernel PRIVATE Control/AthenaBaseComps - Control/AthenaMonitoring ) + Control/AthenaMonitoringKernel ) # Component(s) in the package: atlas_add_component( AthExMonitored src/*.cxx src/components/*.cxx - LINK_LIBRARIES GaudiKernel AthenaBaseComps AthenaMonitoringLib) + LINK_LIBRARIES GaudiKernel AthenaBaseComps AthenaMonitoringKernelLib) # Install files from the package: atlas_install_joboptions( share/*.py ) diff --git a/Control/AthenaExamples/AthExMonitored/share/MonitoredOptions.py b/Control/AthenaExamples/AthExMonitored/share/MonitoredOptions.py index e55b216521c531b1df51945eb8f72f7aaa63b402..1f10282380584b6dd7fa8d634bac8cde07ff45b1 100644 --- a/Control/AthenaExamples/AthExMonitored/share/MonitoredOptions.py +++ b/Control/AthenaExamples/AthExMonitored/share/MonitoredOptions.py @@ -7,7 +7,7 @@ job = AlgSequence() from AthExMonitored.AthExMonitoredConf import MonitoredAlg job += MonitoredAlg('MonAlg') -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram monTool = GenericMonitoringTool('MonTool') diff --git a/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.cxx b/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.cxx index 9a4ddf5b5162461df10f5c48e19ff4b9d16c7452..2399c39e909c46010236c5739df1341b4fa4b816 100644 --- a/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.cxx +++ b/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.cxx @@ -3,7 +3,7 @@ */ #include "MonitoredAlg.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include #include diff --git a/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h b/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h index 0760c17d7e414a0dc274f77df49f168c37b554cc..c84ce038cf9e4dfc9c5ffe6a83a0309f6a5ed0cf 100644 --- a/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h +++ b/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h @@ -8,7 +8,7 @@ #include "GaudiKernel/ToolHandle.h" #include "GaudiKernel/Property.h" #include "AthenaBaseComps/AthAlgorithm.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include diff --git a/Control/AthenaMonitoring/AthenaMonitoring/GenericMonitoringTool.h b/Control/AthenaMonitoring/AthenaMonitoring/GenericMonitoringTool.h deleted file mode 100644 index 6c00b2212e7d8ab40ea4052a760e3eb2b9b9ddae..0000000000000000000000000000000000000000 --- a/Control/AthenaMonitoring/AthenaMonitoring/GenericMonitoringTool.h +++ /dev/null @@ -1 +0,0 @@ -#include "AthenaMonitoringKernel/GenericMonitoringTool.h" \ No newline at end of file diff --git a/Control/AthenaMonitoring/AthenaMonitoring/Monitored.h b/Control/AthenaMonitoring/AthenaMonitoring/Monitored.h deleted file mode 100644 index a12230d3c215c58d12bd77817196fb0b7598c1e4..0000000000000000000000000000000000000000 --- a/Control/AthenaMonitoring/AthenaMonitoring/Monitored.h +++ /dev/null @@ -1 +0,0 @@ -#include "AthenaMonitoringKernel/Monitored.h" \ No newline at end of file diff --git a/Control/AthenaMonitoring/AthenaMonitoring/OHLockedHist.h b/Control/AthenaMonitoring/AthenaMonitoring/OHLockedHist.h deleted file mode 100644 index fd0443279a77231fccc6b4d9c61fb1f2add3781f..0000000000000000000000000000000000000000 --- a/Control/AthenaMonitoring/AthenaMonitoring/OHLockedHist.h +++ /dev/null @@ -1 +0,0 @@ -#include "AthenaMonitoringKernel/OHLockedHist.h" \ No newline at end of file diff --git a/Control/AthenaMonitoring/CMakeLists.txt b/Control/AthenaMonitoring/CMakeLists.txt index 94795936c3d5b58420251aaf723cb8618b85faa9..7fe85456d7027ee6702c712bd53e8dbe97b8d4c7 100644 --- a/Control/AthenaMonitoring/CMakeLists.txt +++ b/Control/AthenaMonitoring/CMakeLists.txt @@ -10,7 +10,6 @@ atlas_depends_on_subdirs( PUBLIC Control/AthenaBaseComps Control/AthenaMonitoringKernel - GaudiKernel LumiBlock/LumiBlockComps LumiBlock/LumiBlockData Trigger/TrigEvent/TrigDecisionInterface @@ -18,10 +17,8 @@ atlas_depends_on_subdirs( PRIVATE AtlasTest/TestTools Control/AthenaKernel - Control/CxxUtils Control/SGMon/SGAudCore Database/AthenaPOOL/AthenaPoolUtilities - Event/xAOD/xAODEventInfo Event/EventInfo Tools/LWHists Trigger/TrigAnalysis/TrigAnalysisInterfaces @@ -31,7 +28,6 @@ atlas_depends_on_subdirs( # External dependencies: find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess ) find_package( Boost ) -find_package( ROOT COMPONENTS Core ) # Component(s) in the package: atlas_add_library( diff --git a/Control/AthenaMonitoring/python/GenericMonitoringTool.py b/Control/AthenaMonitoring/python/GenericMonitoringTool.py deleted file mode 100644 index 467e5028439295fe530a4be30d1ed2afb301cfe2..0000000000000000000000000000000000000000 --- a/Control/AthenaMonitoring/python/GenericMonitoringTool.py +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool,defineHistogram # noqa: F401 diff --git a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramDef.h b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramDef.h index 6bd15499d388ca73120767c6167ed7cb01950e54..129c89a852fd17fa9c40f0452977369314be8ba3 100644 --- a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramDef.h +++ b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramDef.h @@ -5,7 +5,6 @@ #ifndef AthenaMonitoringKernel_HistogramDef_h #define AthenaMonitoringKernel_HistogramDef_h -#include #include #include diff --git a/Control/AthenaMonitoringKernel/CMakeLists.txt b/Control/AthenaMonitoringKernel/CMakeLists.txt index 18a0fd3a54df570544f341d27f4e1a8390dbc194..7558cdab6760833c8645c39b03b488cd00b7c736 100644 --- a/Control/AthenaMonitoringKernel/CMakeLists.txt +++ b/Control/AthenaMonitoringKernel/CMakeLists.txt @@ -9,7 +9,8 @@ atlas_subdir( AthenaMonitoringKernel ) atlas_depends_on_subdirs( PUBLIC Control/AthenaBaseComps - Event/EventInfo + PRIVATE + AtlasTest/TestTools ) # External dependencies: @@ -20,13 +21,15 @@ atlas_add_library( src/*.cxx src/HistogramFiller/*.cxx PUBLIC_HEADERS AthenaMonitoringKernel - LINK_LIBRARIES AthenaBaseComps EventInfo nlohmann_json::nlohmann_json + PRIVATE_INCLUDE_DIRS nlohmann_json + LINK_LIBRARIES AthenaBaseComps + PRIVATE_LINK_LIBRARIES nlohmann_json ) atlas_add_component( AthenaMonitoringKernel src/components/*.cxx - LINK_LIBRARIES AthenaMonitoringKernelLib nlohmann_json::nlohmann_json + PRIVATE_LINK_LIBRARIES AthenaMonitoringKernelLib nlohmann_json ) # Install files from the package: @@ -43,7 +46,7 @@ foreach ( test_file ${CXX_TEST_FILES} ) file( MAKE_DIRECTORY ${rundir} ) atlas_add_test( ${name} SOURCES ${test_file} - LINK_LIBRARIES TestTools AthenaMonitoringKernelLib + LINK_LIBRARIES TestTools AthenaMonitoringKernelLib nlohmann_json ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" POST_EXEC_SCRIPT nopost.sh PROPERTIES TIMEOUT 300 diff --git a/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx b/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx index e3038d8f5f28b72e796c51e071756b91907d4c3c..99063ff81b2148f845a2aacc20ce26e7b5ee38f3 100644 --- a/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx +++ b/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx @@ -11,9 +11,6 @@ #include #include -#include "EventInfo/EventID.h" -#include "EventInfo/EventInfo.h" - #include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "AthenaMonitoringKernel/HistogramDef.h" #include "AthenaMonitoringKernel/HistogramFiller.h" diff --git a/Control/AthenaMonitoringKernel/src/HistogramDef.cxx b/Control/AthenaMonitoringKernel/src/HistogramDef.cxx index da3a0ba202a6242079868539827c57a703712c0a..91e4a8009098bf7187b9841c6296c6acc153ee1d 100644 --- a/Control/AthenaMonitoringKernel/src/HistogramDef.cxx +++ b/Control/AthenaMonitoringKernel/src/HistogramDef.cxx @@ -3,6 +3,7 @@ */ #include "AthenaMonitoringKernel/HistogramDef.h" +#include using namespace Monitored; using json = nlohmann::json; diff --git a/DataQuality/DataQualityTools/src/DQTDataFlowMonAlg.cxx b/DataQuality/DataQualityTools/src/DQTDataFlowMonAlg.cxx index 0229ffeb68c866a114e5e052a411b063de5317e2..45f030db21c3cffa0d1c8f10546e257f873d39f3 100644 --- a/DataQuality/DataQualityTools/src/DQTDataFlowMonAlg.cxx +++ b/DataQuality/DataQualityTools/src/DQTDataFlowMonAlg.cxx @@ -13,7 +13,7 @@ // ******************************************************************** #include "DataQualityTools/DQTDataFlowMonAlg.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" using xAOD::EventInfo; diff --git a/DataQuality/DataQualityTools/src/DQTDetSynchMonAlg.cxx b/DataQuality/DataQualityTools/src/DQTDetSynchMonAlg.cxx index 7592ac18bd5242b9959ec48b85e17f09e577c5cd..382b17b4fb63c589f0ba96ca791d820b7ee8f856 100644 --- a/DataQuality/DataQualityTools/src/DQTDetSynchMonAlg.cxx +++ b/DataQuality/DataQualityTools/src/DQTDetSynchMonAlg.cxx @@ -26,7 +26,7 @@ #include "MagFieldInterfaces/IMagFieldSvc.h" #include "TProfile.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #if ROOT_VERSION_CODE >= ROOT_VERSION(6,0,0) # define CAN_REBIN(hist) hist->SetCanExtend(TH1::kAllAxes) diff --git a/HLT/Event/TrigByteStreamCnvSvc/CMakeLists.txt b/HLT/Event/TrigByteStreamCnvSvc/CMakeLists.txt index 241c2612bfc994a37c69e23f1173d2bb8d4df71c..8bb57cdbbdf4d016ca5793681eb7684df4f92127 100644 --- a/HLT/Event/TrigByteStreamCnvSvc/CMakeLists.txt +++ b/HLT/Event/TrigByteStreamCnvSvc/CMakeLists.txt @@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PRIVATE GaudiKernel Control/AthenaBaseComps - Control/AthenaMonitoring + Control/AthenaMonitoringKernel Event/ByteStreamCnvSvcBase Event/ByteStreamCnvSvc Event/ByteStreamData @@ -29,7 +29,7 @@ atlas_add_component( ${TDAQ-COMMON_INCLUDE_DIRS} PRIVATE_LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps ByteStreamData - AthenaMonitoringLib ByteStreamCnvSvcBaseLib ByteStreamCnvSvcLib + AthenaMonitoringKernelLib ByteStreamCnvSvcBaseLib ByteStreamCnvSvcLib GaudiKernel xAODEventInfo TrigKernel ) # Install files from the package diff --git a/HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamCnvSvcConfig.py b/HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamCnvSvcConfig.py index 86856b418e2ce79540f82d896e61946782c86666..bcf66572d5ea9a215c8c9089de07f2f4bdc9d545 100644 --- a/HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamCnvSvcConfig.py +++ b/HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamCnvSvcConfig.py @@ -3,7 +3,7 @@ # from TrigByteStreamCnvSvc.TrigByteStreamCnvSvcConf import TrigByteStreamInputSvc as _TrigByteStreamInputSvc -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool class TrigByteStreamInputSvc(_TrigByteStreamInputSvc): def __init__(self, name='TrigByteStreamInputSvc'): diff --git a/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamInputSvc.h b/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamInputSvc.h index b757065688705dc86e682c0968da48f693eb3069..2dfe049c9e4f071c433ab6009e920906dded4e26 100644 --- a/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamInputSvc.h +++ b/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamInputSvc.h @@ -9,7 +9,7 @@ #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h" #include "ByteStreamData/RawEvent.h" #include "AthenaKernel/SlotSpecificObj.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include // Forward declarations diff --git a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt index 070ad8f428e4e8885fda14cbe8b58e036ce91125..ce5d7099971efdee087070f2a591f103865bb9bc 100644 --- a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt +++ b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt @@ -10,10 +10,11 @@ atlas_depends_on_subdirs( PRIVATE Control/AthenaBaseComps Control/AthenaInterprocess Control/AthenaKernel - Control/AthenaMonitoring + Control/AthenaMonitoringKernel Control/CxxUtils Control/StoreGate Database/AthenaPOOL/AthenaPoolUtilities + Database/RDBAccessSvc Event/ByteStreamCnvSvcBase Event/ByteStreamData Event/EventInfoUtils @@ -38,7 +39,7 @@ atlas_add_component( TrigServices ${TDAQ-COMMON_INCLUDE_DIRS} ${TDAQ_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${TDAQ_LIBRARIES} ${CORAL_LIBRARIES} - AthenaBaseComps AthenaInterprocess AthenaKernel AthenaMonitoringLib AthenaPoolUtilities + AthenaBaseComps AthenaInterprocess AthenaKernel AthenaMonitoringKernelLib AthenaPoolUtilities ByteStreamCnvSvcBaseLib ByteStreamData EventInfoUtils GaudiKernel StoreGateLib TrigKernel TrigOutputHandlingLib TrigSteeringEvent xAODEventInfo ) diff --git a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py index 72fdbf35789ed8f709d3762aba2be7b75f35b303..2f9463c1daef716830ddd9e5d950636aed502aa1 100644 --- a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py +++ b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py @@ -13,7 +13,7 @@ class TrigCOOLUpdateHelper(_TrigCOOLUpdateHelper): def __init__(self, name='TrigCOOLUpdateHelper'): super(TrigCOOLUpdateHelper, self).__init__(name) - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool self.MonTool = GenericMonitoringTool('MonTool', HistPath='HLTFramework/'+name) self.MonTool.defineHistogram('TIME_CoolFolderUpdate', path='EXPERT', type='TH1F', title='Time for conditions update;time [ms]', @@ -94,7 +94,7 @@ class HltROBDataProviderSvc(_HltROBDataProviderSvc): def __init__(self, name='ROBDataProviderSvc'): super(HltROBDataProviderSvc, self).__init__(name) - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool,defineHistogram + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool,defineHistogram self.MonTool = GenericMonitoringTool('MonTool', HistPath='HLTFramework/'+name) self.MonTool.Histograms = [ defineHistogram('TIME_ROBReserveData', path='EXPERT', type='TH1F', diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx index 2190306ca4ea939eb714283a4028fda692fb6e1a..633d87ba1814bd9a56283755345977a51e53925f 100644 --- a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx +++ b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx @@ -13,7 +13,7 @@ // Athena includes #include "AthenaInterprocess/Incidents.h" #include "AthenaKernel/AthStatusCode.h" -#include "AthenaMonitoring/OHLockedHist.h" +#include "AthenaMonitoringKernel/OHLockedHist.h" #include "ByteStreamData/ByteStreamMetadata.h" #include "ByteStreamData/ByteStreamMetadataContainer.h" #include "EventInfoUtils/EventInfoFromxAOD.h" diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.h b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.h index bccb4e92bfbdca898f97484e5f7ef12367588d8a..bb033aa73384c769ad6edf0f10588904aa13f110 100644 --- a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.h +++ b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.h @@ -17,7 +17,7 @@ // Framework includes #include "AthenaBaseComps/AthService.h" #include "AthenaKernel/SlotSpecificObj.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" // STL includes #include diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.h b/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.h index 4e760328b894b9e6569624650162cff4818d5b3f..e13efee0f524cdc81cee988c6d50efec104df00c 100644 --- a/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.h +++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.h @@ -20,7 +20,7 @@ #include "GaudiKernel/StatusCode.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "CxxUtils/checker_macros.h" #include "EventInfo/EventID.h" #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h" diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx index 144c72791e22027e3509c40c722882f58748f4f2..a62f134925926e5e2e7b7a537f68828305b4334c 100644 --- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx +++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx @@ -10,7 +10,7 @@ #include "GaudiKernel/StatusCode.h" #include "GaudiKernel/System.h" #include "AthenaInterprocess/Incidents.h" -#include "AthenaMonitoring/OHLockedHist.h" +#include "AthenaMonitoringKernel/OHLockedHist.h" #include "ers/ers.h" diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx index c004e73f447a21a02c3a72626126e8b592a3c320..261792955032631accedfc4b2aa7d69bb710b9c5 100644 --- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx +++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx @@ -7,7 +7,7 @@ #include "GaudiKernel/ISvcLocator.h" #include "CxxUtils/checker_macros.h" -#include "AthenaMonitoring/OHLockedHist.h" +#include "AthenaMonitoringKernel/OHLockedHist.h" #include "hltinterface/IInfoRegister.h" diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthClusterMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthClusterMonAlg.h index 027a1e557ac68e1b619ba3aadbea72f4b02a6adc..7c2aa8969d167fe399f34724da6736ddfc614ec4 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthClusterMonAlg.h +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthClusterMonAlg.h @@ -6,7 +6,7 @@ #define PIXELATHCLUSTERMONTOOL_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "PixelAthMonitoringBase.h" #include "AtlasDetDescr/AtlasDetectorID.h" diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthErrorMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthErrorMonAlg.h index 672cfb1ef4ddb3cce358aed1dd43db3d7549b41d..2333b4f10cc5e4e6a8e415b9ffd78b9f403811de 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthErrorMonAlg.h +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthErrorMonAlg.h @@ -6,7 +6,7 @@ #define PIXELATHERRORMONTOOL_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "InDetIdentifier/PixelID.h" #include "PixelConditionsTools/IPixelByteStreamErrorsTool.h" diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthHitMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthHitMonAlg.h index 6ab2b21873904a823c3efbf3de5a7fbec2daa3ba..93f3fdf5447a868ab6bafc1dad6a5867d04a79ef 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthHitMonAlg.h +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthHitMonAlg.h @@ -6,7 +6,7 @@ #define PIXELATHHITMONTOOL_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "InDetIdentifier/PixelID.h" #include "InDetConditionsSummaryService/IInDetConditionsTool.h" diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthMonitoringBase.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthMonitoringBase.h index 24fe1b76a694cbd63f8676f2416c90b3dea8dd90..8457de21adb07010330f4b58310bafa761b030dc 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthMonitoringBase.h +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthMonitoringBase.h @@ -6,7 +6,7 @@ #define PIXELATHMONITORINGBASE_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "InDetIdentifier/PixelID.h" diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTLorentzMonAlg.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTLorentzMonAlg.cxx index 35ddc8bcf899c00636f21c406fd784fdd4a430aa..f418b7807fc9e2f583b4dba697e2e14b8f654762 100644 --- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTLorentzMonAlg.cxx +++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTLorentzMonAlg.cxx @@ -4,7 +4,7 @@ #include "SCTLorentzMonAlg.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "InDetIdentifier/SCT_ID.h" #include "InDetReadoutGeometry/SiDetectorElement.h" #include "InDetPrepRawData/SiCluster.h" diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTTracksMonAlg.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTTracksMonAlg.cxx index 6c0fee00055c925c8a0cd60006cdab8df6aabbc4..32ff9bffada70beb6acc0e6f2bfc560d06199082 100644 --- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTTracksMonAlg.cxx +++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTTracksMonAlg.cxx @@ -1,7 +1,7 @@ #include "SCTTracksMonAlg.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "SCT_NameFormatter.h" #include "AthContainers/DataVector.h" diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/CMakeLists.txt b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/CMakeLists.txt index cf172b83ba110f206c1945fe47fe5ed61d3a2a05..29ea39acbca552a8a68034eff5d33949ae98f1a0 100644 --- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/CMakeLists.txt +++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/CMakeLists.txt @@ -8,7 +8,7 @@ atlas_subdir( InDetPriVxFinder ) # Declare the package's dependencies: atlas_depends_on_subdirs( PUBLIC Control/AthenaBaseComps - Control/AthenaMonitoring + Control/AthenaMonitoringKernel GaudiKernel InnerDetector/InDetConditions/BeamSpotConditionsData PRIVATE @@ -29,7 +29,7 @@ atlas_depends_on_subdirs( PUBLIC atlas_add_component( InDetPriVxFinder src/*.cxx src/components/*.cxx - LINK_LIBRARIES AthenaBaseComps GaudiKernel CxxUtils EventPrimitives xAODCore xAODTracking InDetRecToolInterfaces ITrackToVertex TrkSurfaces TrkParticleBase TrkTrack VxVertex TrkVertexFitterInterfaces AthenaMonitoringLib) + LINK_LIBRARIES AthenaBaseComps GaudiKernel CxxUtils EventPrimitives xAODCore xAODTracking InDetRecToolInterfaces ITrackToVertex TrkSurfaces TrkParticleBase TrkTrack VxVertex TrkVertexFitterInterfaces AthenaMonitoringKernelLib) # Install files from the package: atlas_install_headers( InDetPriVxFinder ) diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/InDetPriVxFinder/InDetPriVxFinder.h b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/InDetPriVxFinder/InDetPriVxFinder.h index 0547d445bf08e2ebd67545bc69fb01e14bac7268..905114c8fd399c0c080157ad6885ffcdbaa89a5f 100755 --- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/InDetPriVxFinder/InDetPriVxFinder.h +++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/InDetPriVxFinder/InDetPriVxFinder.h @@ -27,7 +27,7 @@ #include "xAODTracking/VertexContainer.h" #include "xAODTracking/VertexAuxContainer.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" /** Primary Vertex Finder. diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/python/InDetPriVxFinderMonitoring.py b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/python/InDetPriVxFinderMonitoring.py index 8d8b50be0f423f76d3eb81c89ef810efc6fe2310..b77583df96d60d823188415bd36f5cd9ed1b8519 100644 --- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/python/InDetPriVxFinderMonitoring.py +++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/python/InDetPriVxFinderMonitoring.py @@ -1,4 +1,4 @@ -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool def InDetPriVxFinderMonitoringTool(): newMonTool = GenericMonitoringTool("PriVxMonTool") diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx index b4a4335f3ef3f4f506fbb9d1b632245af5609733..3ce6d6ba6899b8c2c9b11de3eaec97c59cf24622 100755 --- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx +++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx @@ -22,7 +22,7 @@ // normal includes #include "TrkParticleBase/TrackParticleBaseCollection.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" namespace InDet { diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/CMakeLists.txt b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/CMakeLists.txt index 6dd0a7ca32c154e5d3532176d42af698a8e8eb26..a947a8996323b837432936586e64cce5ded9252f 100644 --- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/CMakeLists.txt +++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/CMakeLists.txt @@ -8,7 +8,7 @@ atlas_subdir( SiSpacePointFormation ) # Declare the package's dependencies: atlas_depends_on_subdirs( PUBLIC Control/AthenaBaseComps - Control/AthenaMonitoring + Control/AthenaMonitoringKernel Control/AthContainers DetectorDescription/GeoPrimitives DetectorDescription/Identifier @@ -32,7 +32,7 @@ atlas_add_library( SiSpacePointFormationLib src/*.cxx PUBLIC_HEADERS SiSpacePointFormation INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} - LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives Identifier GaudiKernel InDetReadoutGeometry InDetPrepRawData TrkSpacePoint VxVertex SiSpacePointToolLib BeamSpotConditionsData AthenaMonitoringLib + LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives Identifier GaudiKernel InDetReadoutGeometry InDetPrepRawData TrkSpacePoint VxVertex SiSpacePointToolLib BeamSpotConditionsData AthenaMonitoringKernelLib PRIVATE_LINK_LIBRARIES AtlasDetDescr xAODEventInfo InDetIdentifier ) atlas_add_component( SiSpacePointFormation diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h index 9f2a58c58fbb8331067b7a856ceceb89750ba3d0..1b3800fdbe47f1a7f89963634a649650164b59a1 100755 --- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h +++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h @@ -8,7 +8,7 @@ #define SiSpacePointFormation_SI_POINT_FINDER_H #include "AthenaBaseComps/AthReentrantAlgorithm.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "AthContainers/DataVector.h" #include "GeoPrimitives/GeoPrimitives.h" #include "Identifier/Identifier.h" diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/python/InDetOnlineMonitor.py b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/python/InDetOnlineMonitor.py index 0a6b6d7b18f4d92e9a03cd7f1a2a8507bf31eb2d..729bad5296c6d1ec02a95cbf202b684846e2ab0e 100644 --- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/python/InDetOnlineMonitor.py +++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/python/InDetOnlineMonitor.py @@ -1,4 +1,4 @@ -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool def InDetMonitoringTool(): newMonTool = GenericMonitoringTool("MonTool") diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx index 2ef7a47c807c4d02ca091c17ace9b1456ae0792f..3f0f2723034e3d4ef7862fdf9cde2a027ebe3848 100755 --- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx +++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx @@ -29,7 +29,7 @@ ATLAS Collaboration #include "xAODEventInfo/EventInfo.h" #include "StoreGate/ReadCondHandle.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" namespace InDet { //------------------------------------------------------------------------ diff --git a/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.h b/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.h index 3fab19e56bfef68d107d924d48ee66a78cf4737a..f20f6eab8356747ff4e81beae1083cf8058e5e9a 100644 --- a/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.h +++ b/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.h @@ -12,7 +12,7 @@ #define LARAFFECTEDREGIONSALG_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadCondHandleKey.h" #include "CaloConditions/CaloAffectedRegionInfoVec.h" diff --git a/LArCalorimeter/LArMonitoring/src/LArCollisionTimeMonAlg.h b/LArCalorimeter/LArMonitoring/src/LArCollisionTimeMonAlg.h index 6b31916cb23e5c70d8869945b512109e82427adb..7ec2114bd9d1b5185c29434b698f41e00ff80974 100755 --- a/LArCalorimeter/LArMonitoring/src/LArCollisionTimeMonAlg.h +++ b/LArCalorimeter/LArMonitoring/src/LArCollisionTimeMonAlg.h @@ -12,7 +12,7 @@ #define LAR_COLLISION_TIME_MON_TOOL_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" #include "LArRecEvent/LArCollisionTime.h" diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/CMakeLists.txt b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/CMakeLists.txt index 7952986a7b29e14bdbc638bec42ad794689584dd..735907c90f950386a1ea842ae38082557d696c46 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/CMakeLists.txt +++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/CMakeLists.txt @@ -8,7 +8,7 @@ atlas_subdir( MuonSegmentTrackMaker ) # Declare the package's dependencies: atlas_depends_on_subdirs( PUBLIC Control/AthenaBaseComps - Control/AthenaMonitoring + Control/AthenaMonitoringKernel GaudiKernel PRIVATE Control/StoreGate @@ -23,7 +23,7 @@ atlas_depends_on_subdirs( PUBLIC atlas_add_component( MuonSegmentTrackMaker src/*.cxx src/components/*.cxx - LINK_LIBRARIES AthenaBaseComps AthenaMonitoringLib GaudiKernel StoreGateLib SGtests MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces Particle TrkSegment TrkTrack ) + LINK_LIBRARIES AthenaBaseComps AthenaMonitoringKernelLib GaudiKernel StoreGateLib SGtests MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces Particle TrkSegment TrkTrack ) # Install files from the package: diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/python/MuonTrackMakerAlgsMonitoring.py b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/python/MuonTrackMakerAlgsMonitoring.py index 9ddc33abfab758401a67b0d4129229c59194abd8..6e08bf744c40f998cb7b9cce42417ee3b65d4d4b 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/python/MuonTrackMakerAlgsMonitoring.py +++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/python/MuonTrackMakerAlgsMonitoring.py @@ -1,7 +1,7 @@ # Author: Laurynas Mince # Created on 15.10.2019 -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool class MuPatTrackBuilderMonitoring(GenericMonitoringTool): def __init__ (self, name="MuPatTrackBuilderMonitoring"): diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/MuPatTrackBuilder.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/MuPatTrackBuilder.h index 2e5953705aae0d5b564f22537640cd2b36bd7fa1..1358676858349b38c63730f849a45bb09625c1b7 100755 --- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/MuPatTrackBuilder.h +++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/MuPatTrackBuilder.h @@ -15,8 +15,8 @@ #include "MuonRecHelperTools/IMuonEDMHelperSvc.h" #include "MuonRecToolInterfaces/IMuonTrackFinder.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/Monitored.h" class MuPatTrackBuilder : public AthAlgorithm { diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonAlg.h index 2b9e243d45be04e0b40e894ba6cedba79e5ca995..23034db18bdb60a567537b4181e2797259d7116a 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonAlg.h +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonitoring/MdtRawDataMonAlg.h @@ -17,7 +17,7 @@ //Core Include #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "GaudiKernel/ToolHandle.h" //Helper Includes diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.h index 8d1f5d0cd1f13f1575b8e42941719534179caca3..52b6b9e4223930ed0e89ac87dfada108ab734bcc 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.h +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.h @@ -6,7 +6,7 @@ #define TGCRAWDATAMONITORING_TGCRAWDATAMONITORALGORITHM_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" #include "xAODMuon/MuonContainer.h" diff --git a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.h b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.h index 083fa4298f1460c8cc81a2c75cc99042121b419c..98cde7d1519ace616d099f34552c96395a26f641 100755 --- a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.h +++ b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.h @@ -7,7 +7,7 @@ //Generic #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" #include "StoreGate/ReadHandle.h" diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetMonitoringAlg.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetMonitoringAlg.h index 39191fe24831a49ac646e06251f4eb276fa8b85d..322846245f98d33fc2e2aa94bc8254e0e25e69f7 100644 --- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetMonitoringAlg.h +++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetMonitoringAlg.h @@ -6,7 +6,7 @@ #define JETMONITORALGORITHM_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "xAODJet/JetContainer.h" #include "StoreGate/ReadHandleKey.h" #include "GaudiKernel/ToolHandle.h" diff --git a/Reconstruction/Jet/JetMonitoring/src/JetHistoAttributeFiller.cxx b/Reconstruction/Jet/JetMonitoring/src/JetHistoAttributeFiller.cxx index 6ed9750a02adf082c728e627566f3f53c9038dfc..d638013a50460167fc4bdad6730cde26ecf61512 100644 --- a/Reconstruction/Jet/JetMonitoring/src/JetHistoAttributeFiller.cxx +++ b/Reconstruction/Jet/JetMonitoring/src/JetHistoAttributeFiller.cxx @@ -1,7 +1,7 @@ /* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "JetMonitoring/JetHistoAttributeFiller.h" #include "JetMonitoring/JetMonitoringAlg.h" diff --git a/Reconstruction/Jet/JetMonitoring/src/JetHistoLeadingJetsRelations.cxx b/Reconstruction/Jet/JetMonitoring/src/JetHistoLeadingJetsRelations.cxx index 7746232ab0575fb5a3dbb7e5df62800605c2ba58..2e0ff060e4aa7e6b59a56be69fcb5d7d05b5a7dd 100644 --- a/Reconstruction/Jet/JetMonitoring/src/JetHistoLeadingJetsRelations.cxx +++ b/Reconstruction/Jet/JetMonitoring/src/JetHistoLeadingJetsRelations.cxx @@ -2,7 +2,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "JetMonitoring/JetHistoLeadingJetsRelations.h" #include "JetMonitoring/JetMonitoringAlg.h" diff --git a/Reconstruction/Jet/JetMonitoring/src/JetHistoPtTool.cxx b/Reconstruction/Jet/JetMonitoring/src/JetHistoPtTool.cxx index 1096607663ac5ddbb268f5535f894a808a3b493b..fe1ca8c21aa7e54a5e04334c57c17b3c447b70f3 100644 --- a/Reconstruction/Jet/JetMonitoring/src/JetHistoPtTool.cxx +++ b/Reconstruction/Jet/JetMonitoring/src/JetHistoPtTool.cxx @@ -2,7 +2,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "JetMonitoring/JetHistoPtTool.h" #include "JetMonitoring/JetMonitoringAlg.h" diff --git a/Reconstruction/Jet/JetMonitoring/src/JetHistoTriggEfficiency.cxx b/Reconstruction/Jet/JetMonitoring/src/JetHistoTriggEfficiency.cxx index fcd956737c224a105279f6c8bc8143640b3dad2e..fc8c173bd866647e4c1501d23099c01ac2c1ba65 100644 --- a/Reconstruction/Jet/JetMonitoring/src/JetHistoTriggEfficiency.cxx +++ b/Reconstruction/Jet/JetMonitoring/src/JetHistoTriggEfficiency.cxx @@ -1,7 +1,7 @@ /* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "JetMonitoring/JetHistoTriggEfficiency.h" #include "JetMonitoring/JetMonitoringAlg.h" diff --git a/Reconstruction/MissingETMonitoring/MissingETMonitoring/METMonTool.h b/Reconstruction/MissingETMonitoring/MissingETMonitoring/METMonTool.h index 30efafb1f4369a315958bbcdf3688207f36f84d1..5385981b6dfe9dd083eb89be7103128944864c3e 100755 --- a/Reconstruction/MissingETMonitoring/MissingETMonitoring/METMonTool.h +++ b/Reconstruction/MissingETMonitoring/MissingETMonitoring/METMonTool.h @@ -13,7 +13,7 @@ #include "AthenaMonitoring/ManagedMonitorToolBase.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "JetInterface/IJetSelector.h" diff --git a/Reconstruction/MissingETMonitoring/src/METMonitorAlgorithm.cxx b/Reconstruction/MissingETMonitoring/src/METMonitorAlgorithm.cxx index d248d2f1f5ac54fa0abc83867ca783dcfc1400d1..170e8e924d09de86b098126d07539c612096c9dc 100644 --- a/Reconstruction/MissingETMonitoring/src/METMonitorAlgorithm.cxx +++ b/Reconstruction/MissingETMonitoring/src/METMonitorAlgorithm.cxx @@ -3,7 +3,7 @@ */ #include "MissingETMonitoring/METMonitorAlgorithm.h" #include "xAODMissingET/MissingET.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "xAODJet/Jet.h" diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/CMakeLists.txt b/Reconstruction/MuonIdentification/MuonCombinedAlgs/CMakeLists.txt index a4138eb6c13014f4108dd98d139904e45ad6ca31..df289f94f8d7766a9149b6c1138528f737f19f06 100644 --- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/CMakeLists.txt +++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/CMakeLists.txt @@ -8,7 +8,7 @@ atlas_subdir( MuonCombinedAlgs ) # Declare the package's dependencies: atlas_depends_on_subdirs( PRIVATE Control/AthenaBaseComps - Control/AthenaMonitoring + Control/AthenaMonitoringKernel Event/xAOD/xAODCaloEvent Event/xAOD/xAODMuon Event/xAOD/xAODTracking @@ -27,6 +27,6 @@ atlas_depends_on_subdirs( PRIVATE atlas_add_component( MuonCombinedAlgs src/*.cxx src/components/*.cxx - LINK_LIBRARIES AthenaBaseComps AthenaMonitoringLib xAODCaloEvent xAODMuon xAODTruth xAODTracking GaudiKernel MuonSegment MuonRecToolInterfaces MuonLayerEvent MuonCombinedEvent MuonCombinedToolInterfaces TrkSegment TrkTrack TrkToolInterfaces) + LINK_LIBRARIES AthenaBaseComps AthenaMonitoringKernelLib xAODCaloEvent xAODMuon xAODTruth xAODTracking GaudiKernel MuonSegment MuonRecToolInterfaces MuonLayerEvent MuonCombinedEvent MuonCombinedToolInterfaces TrkSegment TrkTrack TrkToolInterfaces) atlas_install_python_modules( python/MuonCombinedAlgsMonitoring.py) diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/python/MuonCombinedAlgsMonitoring.py b/Reconstruction/MuonIdentification/MuonCombinedAlgs/python/MuonCombinedAlgsMonitoring.py index 105c01ec25e2e40417e5a487997ff5c2a6cdeeb9..22dcb9942866808cd141091031b7daf2d1af8c37 100644 --- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/python/MuonCombinedAlgsMonitoring.py +++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/python/MuonCombinedAlgsMonitoring.py @@ -1,7 +1,7 @@ # Author: Laurynas Mince # Created on 26.07.2019 -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool class MuonCreatorAlgMonitoring(GenericMonitoringTool): def __init__ (self, name="MuonCreatorAlgMonitoring"): diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.h b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.h index f0c7367e751a1cade53c4d0f2eba968e69ec3875..3eb75a87a06463a8672f2b2079b35dd83d773f13 100644 --- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.h +++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.h @@ -23,8 +23,8 @@ #include "TrkTrack/TrackCollection.h" #include "MuonSegment/MuonSegment.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/Monitored.h" class MuonCreatorAlg : public AthAlgorithm diff --git a/Reconstruction/tauMonitoring/tauMonitoring/tauMonitorAlgorithm.h b/Reconstruction/tauMonitoring/tauMonitoring/tauMonitorAlgorithm.h index a048446301abba11eedabae26ba30529636d3609..32ba312d101c53dbf422afa5b9469a31119b994f 100644 --- a/Reconstruction/tauMonitoring/tauMonitoring/tauMonitorAlgorithm.h +++ b/Reconstruction/tauMonitoring/tauMonitoring/tauMonitorAlgorithm.h @@ -6,7 +6,7 @@ #define TAUMONITORALGORITHM_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TRandom3.h" diff --git a/TileCalorimeter/TileMonitoring/src/TileCellMonitorAlgorithm.h b/TileCalorimeter/TileMonitoring/src/TileCellMonitorAlgorithm.h index e98b9dfd7172f8a561e5d99ddd07447f1acb0982..21a3883515f45965b8b91b4a7f83f732265cdec7 100644 --- a/TileCalorimeter/TileMonitoring/src/TileCellMonitorAlgorithm.h +++ b/TileCalorimeter/TileMonitoring/src/TileCellMonitorAlgorithm.h @@ -13,7 +13,7 @@ #include "CaloEvent/CaloCellContainer.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" #include "StoreGate/ReadCondHandleKey.h" diff --git a/TileCalorimeter/TileMonitoring/src/TileClusterMonitorAlgorithm.h b/TileCalorimeter/TileMonitoring/src/TileClusterMonitorAlgorithm.h index 3f4550f09c1a3fb685ab15e22c5f693a203b32f7..e7f1d5ff553d851c190e16c7069a9cc49412b3fa 100644 --- a/TileCalorimeter/TileMonitoring/src/TileClusterMonitorAlgorithm.h +++ b/TileCalorimeter/TileMonitoring/src/TileClusterMonitorAlgorithm.h @@ -9,7 +9,7 @@ #include "xAODCaloEvent/CaloClusterContainer.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" class TileID; diff --git a/TileCalorimeter/TileMonitoring/src/TileDQFragMonitorAlgorithm.h b/TileCalorimeter/TileMonitoring/src/TileDQFragMonitorAlgorithm.h index cf4862865b076e3b731c7f323d403c2fe86e4e63..ecc309ce887ac69bcc3b98f85aaba0c36eb69e38 100644 --- a/TileCalorimeter/TileMonitoring/src/TileDQFragMonitorAlgorithm.h +++ b/TileCalorimeter/TileMonitoring/src/TileDQFragMonitorAlgorithm.h @@ -13,7 +13,7 @@ #include "TileConditions/TileCablingSvc.h" #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" #include "StoreGate/ReadCondHandleKey.h" diff --git a/TileCalorimeter/TileMonitoring/src/TileDigitsFlxMonitorAlgorithm.h b/TileCalorimeter/TileMonitoring/src/TileDigitsFlxMonitorAlgorithm.h index c41de1ba9daba834c400fd752e59546d53214e75..a38d6d145d9314898aba17fc230068674a4e3ea0 100644 --- a/TileCalorimeter/TileMonitoring/src/TileDigitsFlxMonitorAlgorithm.h +++ b/TileCalorimeter/TileMonitoring/src/TileDigitsFlxMonitorAlgorithm.h @@ -11,7 +11,7 @@ // Atlas includes #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" class TileHWID; diff --git a/TileCalorimeter/TileMonitoring/src/TileJetMonitorAlgorithm.h b/TileCalorimeter/TileMonitoring/src/TileJetMonitorAlgorithm.h index 96c4ec49c263ad79be016634ba592c6e27de21a1..f6e9a8449f1722d46a0de4f14b5717849943d835 100644 --- a/TileCalorimeter/TileMonitoring/src/TileJetMonitorAlgorithm.h +++ b/TileCalorimeter/TileMonitoring/src/TileJetMonitorAlgorithm.h @@ -6,7 +6,7 @@ #define TILEMONITORING_TILEJETMONITORALGORITHM #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TileConditions/ITileBadChanTool.h" diff --git a/TileCalorimeter/TileMonitoring/src/TileMBTSMonitorAlgorithm.h b/TileCalorimeter/TileMonitoring/src/TileMBTSMonitorAlgorithm.h index 8d91b08fd874654a9b4f41b66b5b53c40379b59d..87ef912b36258ffbb1c68b3ae606c31ee3ff0283 100644 --- a/TileCalorimeter/TileMonitoring/src/TileMBTSMonitorAlgorithm.h +++ b/TileCalorimeter/TileMonitoring/src/TileMBTSMonitorAlgorithm.h @@ -12,7 +12,7 @@ #include "TileCalibBlobObjs/TileCalibUtils.h" #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" #include "GaudiKernel/ServiceHandle.h" diff --git a/TileCalorimeter/TileMonitoring/src/TileMuIdMonitorAlgorithm.h b/TileCalorimeter/TileMonitoring/src/TileMuIdMonitorAlgorithm.h index 45e5faab4df4f85f89a6c31cee33d0fae238e6d6..6dbae1df3508c38ef785e652af43ff47a14a2bf8 100644 --- a/TileCalorimeter/TileMonitoring/src/TileMuIdMonitorAlgorithm.h +++ b/TileCalorimeter/TileMonitoring/src/TileMuIdMonitorAlgorithm.h @@ -8,7 +8,7 @@ #include "TileMonitorAlgorithm.h" #include "TileEvent/TileMuContainer.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" /** @class TileMuIdMonitorAlgorithm diff --git a/TileCalorimeter/TileMonitoring/src/TileRawChannelFlxMonitorAlgorithm.h b/TileCalorimeter/TileMonitoring/src/TileRawChannelFlxMonitorAlgorithm.h index 5a5ccb77a1f8cc91bc1d30f4c39df6e3f6b6dbda..423fc7d03d73d072bb464bfc27705ec7c1c8b873 100644 --- a/TileCalorimeter/TileMonitoring/src/TileRawChannelFlxMonitorAlgorithm.h +++ b/TileCalorimeter/TileMonitoring/src/TileRawChannelFlxMonitorAlgorithm.h @@ -12,7 +12,7 @@ // Atlas includes #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" class TileHWID; diff --git a/TileCalorimeter/TileMonitoring/src/TileTowerMonitorAlgorithm.h b/TileCalorimeter/TileMonitoring/src/TileTowerMonitorAlgorithm.h index b50070863cdceb9d135777e6596e5d889a395b12..d6e013fb86f3f560efe2fe8866fc58c8a04e96ba 100644 --- a/TileCalorimeter/TileMonitoring/src/TileTowerMonitorAlgorithm.h +++ b/TileCalorimeter/TileMonitoring/src/TileTowerMonitorAlgorithm.h @@ -9,7 +9,7 @@ #include "CaloEvent/CaloTowerContainer.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" class TileID; diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigCaloRec/CMakeLists.txt index 68a7e77174610524b1559836bc335f4580a29f54..75cc8122634be1854c37794d708036eae15833bd 100644 --- a/Trigger/TrigAlgorithms/TrigCaloRec/CMakeLists.txt +++ b/Trigger/TrigAlgorithms/TrigCaloRec/CMakeLists.txt @@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC Calorimeter/CaloInterface Control/AthenaBaseComps Control/AthenaKernel - Control/AthenaMonitoring + Control/AthenaMonitoringKernel DetectorDescription/IRegionSelector Event/xAOD/xAODCaloEvent GaudiKernel @@ -41,7 +41,7 @@ atlas_depends_on_subdirs( PUBLIC atlas_add_library( TrigCaloRecLib src/*.cxx PUBLIC_HEADERS TrigCaloRec - LINK_LIBRARIES CaloEvent AthenaBaseComps AthenaKernel IRegionSelector xAODCaloEvent GaudiKernel TrigCaloEvent TrigSteeringEvent AthenaMonitoringLib TrigT2CaloCommonLib TrigInterfacesLib TrigTimeAlgsLib CaloDetDescrLib CaloRecLib CaloUtilsLib LArCablingLib + LINK_LIBRARIES CaloEvent AthenaBaseComps AthenaKernel IRegionSelector xAODCaloEvent GaudiKernel TrigCaloEvent TrigSteeringEvent AthenaMonitoringKernelLib TrigT2CaloCommonLib TrigInterfacesLib TrigTimeAlgsLib CaloDetDescrLib CaloRecLib CaloUtilsLib LArCablingLib PRIVATE_LINK_LIBRARIES CaloGeoHelpers CaloIdentifier EventKernel NavFourMom xAODTrigCalo xAODHIEvent xAODTrigL1Calo LArIdentifier TrigT1Interfaces ) atlas_add_component( TrigCaloRec diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx index 9c57517f8a796f455fa6182120b80e105563afe0..840d4626d198a5169b88ca9206a126abf5b15088 100644 --- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx +++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx @@ -16,7 +16,7 @@ #include "HLTCaloCellMaker.h" #include "TrigT2CaloCommon/ITrigCaloDataAccessSvc.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" HLTCaloCellMaker::HLTCaloCellMaker(const std::string & name, ISvcLocator* pSvcLocator) : AthReentrantAlgorithm(name, pSvcLocator), diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h index 6b896e1e1f7c38f5a6bb4ca85499271c4df80090..a48dd454323219d3a1620429bae213d182d0f21e 100644 --- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h +++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h @@ -31,7 +31,7 @@ #include "CaloEvent/CaloConstCellContainer.h" #include "TrigSteeringEvent/TrigRoiDescriptorCollection.h" #include "TileConditions/TileEMScale.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" class ITrigCaloDataAccessSvc; diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.cxx index 61ec454ad8ef5bdbf6dc4971a0c946dcba6b8ca3..6aa189516fcdb6406c5199cc99b16f5f70286995 100644 --- a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.cxx +++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.cxx @@ -23,7 +23,7 @@ #include "GaudiKernel/ListItem.h" #include "CaloInterface/ISetCaloCellContainerName.h" // -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h" // diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.h b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.h index 51ca0d0ecefcb58913c80e00da2017a80cda4776..106fc930a79e25736692c271446f6ebea3c95f89 100644 --- a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.h +++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.h @@ -25,7 +25,7 @@ #include "CaloRec/CaloClusterProcessor.h" #include "xAODCaloEvent/CaloClusterContainer.h" #include "TrigCaloRec/TrigCaloQuality.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "GaudiKernel/ToolHandle.h" #include "StoreGate/WriteDecorHandleKey.h" diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTowerMakerMT.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTowerMakerMT.cxx index 8a2397e938c128a6f130fcde3cb13d5c1a06e808..ad86ebed85f3134f3767b0e80f0e64a0eadc6db1 100644 --- a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTowerMakerMT.cxx +++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTowerMakerMT.cxx @@ -21,7 +21,7 @@ #include "GaudiKernel/StatusCode.h" #include "GaudiKernel/ListItem.h" // -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" // diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTowerMakerMT.h b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTowerMakerMT.h index 79898a0815d39520e0d82099dc6efd152fa8336a..af59dde9d33e7d24c87d33788e7c81d909530f1c 100644 --- a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTowerMakerMT.h +++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTowerMakerMT.h @@ -18,7 +18,7 @@ #include "AthenaBaseComps/AthAlgorithm.h" #include "CaloEvent/CaloTowerContainer.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" class IAlgToolEFCalo; diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/doc/METMenuSequences.md b/Trigger/TrigAlgorithms/TrigEFMissingET/doc/METMenuSequences.md index 153761f7f0e9fdece0d9a917d6c058fb805a02d9..85942a71072bc078cffb46a7fcb076905d903d92 100644 --- a/Trigger/TrigAlgorithms/TrigEFMissingET/doc/METMenuSequences.md +++ b/Trigger/TrigAlgorithms/TrigEFMissingET/doc/METMenuSequences.md @@ -61,7 +61,7 @@ topSequence = AlgSequence() import math from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc#, TestCaloDataAccess -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram mon = GenericMonitoringTool("CaloDataAccessSvcMon") mon.Histograms += [defineHistogram( "TIME_locking_LAr_RoI", path='EXPERT', title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ), diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/python/TrigEFMissingETMTConfig.py b/Trigger/TrigAlgorithms/TrigEFMissingET/python/TrigEFMissingETMTConfig.py index 907d0a14f08f395e1d794dc771f3120245a49c5f..f87ce6a6525f4030aa371c3baa77f00a08f0f7b1 100644 --- a/Trigger/TrigAlgorithms/TrigEFMissingET/python/TrigEFMissingETMTConfig.py +++ b/Trigger/TrigAlgorithms/TrigEFMissingET/python/TrigEFMissingETMTConfig.py @@ -1,6 +1,6 @@ # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool def getMETMonTool(name = "MonTool"): """ diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.cxx b/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.cxx index 3328d934386f69e51d93a924365fcaee7652c135..e3620f0b9cde113809fceb1609142e998b48548c 100644 --- a/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.cxx +++ b/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.cxx @@ -14,7 +14,7 @@ #include "xAODTrigMissingET/TrigMissingETAuxContainer.h" #include "TrigEFMissingET/METComponent.h" #include "TrigEFMissingET/StatusFlags.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include #include #include diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h b/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h index 566de1708e6f26a8fdc2844db5dd2fa0f85b4796..debb6771b4c16bb49dd305871edce6db08d9cd8d 100644 --- a/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h +++ b/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h @@ -14,7 +14,7 @@ #define TRIGEFMISSINGET_FEXBASE_H 1 #include "AthenaBaseComps/AthReentrantAlgorithm.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "GaudiKernel/Property.h" #include "xAODTrigMissingET/TrigMissingETContainer.h" #include "GaudiKernel/SystemOfUnits.h" diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h b/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h index 894adc17b17b720f73b81d1c6e0d1317de8d8531..17b9f98908421c929e2a9e778fd47fea2e4a5046 100644 --- a/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h +++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h @@ -34,7 +34,7 @@ #include "xAODTrigMuon/L2StandAloneMuonContainer.h" #include "xAODTrigger/TrigCompositeAuxContainer.h" #include "xAODTrigger/TrigCompositeContainer.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" //using namespace TrigL2MuonSA; class IRegSelSvc; diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py index ab21d5cdb5be63e274175b7d9d2b84ac547d79a4..98df3f5064097221591c4f0ce654cf85108a5928 100755 --- a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py +++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py @@ -1,7 +1,7 @@ # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool class TrigL2MuonSAMonitoring(GenericMonitoringTool): def __init__ (self, name = "TrigL2MuonSAMonitoring"): diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx index 71900d1fa0bfa7eb4da6f49df37fe123e9706a57..d9683f1db37f69b38614e15ed2e3712c8ebf8a48 100644 --- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx +++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx @@ -20,7 +20,7 @@ #include "AthenaBaseComps/AthMsgStreamMacros.h" #include "AthenaInterprocess/Incidents.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" using namespace SG; // -------------------------------------------------------------------------------- diff --git a/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt index 17691f326e3929e59d579605d05f12dc74543c35..f819b6f9998a05d7d2d0bd42417ed3279bd367e0 100644 --- a/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt +++ b/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt @@ -18,12 +18,12 @@ atlas_depends_on_subdirs( PRIVATE Tracking/TrkEvent/TrkParameters Trigger/TrigTools/TrigTimeAlgs Event/xAOD/xAODTrigger - Control/AthenaMonitoring) + Control/AthenaMonitoringKernel) # Component(s) in the package: atlas_add_component( TrigMinBias src/*.cxx src/components/*.cxx - LINK_LIBRARIES DecisionHandlingLib AthenaMonitoringLib xAODTracking xAODTrigMinBias TrkTrack TrigInDetEvent TrigInterfacesLib StoreGateLib GaudiKernel TrkParameters TrigTimeAlgsLib) + LINK_LIBRARIES DecisionHandlingLib AthenaMonitoringKernelLib xAODTracking xAODTrigMinBias TrkTrack TrigInDetEvent TrigInterfacesLib StoreGateLib GaudiKernel TrkParameters TrigTimeAlgsLib) # Install files from the package: atlas_install_python_modules( python/*.py ) diff --git a/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py b/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py index 6de8f6769c8f7e04419ab73da95dd3f8c82cdfc7..19dfcf830c781caead43146a6a98557b57b88fe3 100644 --- a/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py +++ b/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py @@ -1,6 +1,6 @@ def TrackCountMonitoring(): - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool monTool = GenericMonitoringTool('MonTool') monTool.defineHistogram('ntrks', path='EXPERT', type='TH1I', title='ntrks',xbins=100, xmin=-0, xmax=2000) monTool.defineHistogram('counts', path='EXPERT', type='TH1I', title='counts',xbins=50, xmin=-0.5, xmax=4.5) diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h index 2443c1db9634ecca0194d807b31b687d69c41b9a..a264e0fa483e1ea9fca56b532950a7f64992a594 100644 --- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h +++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h @@ -10,7 +10,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration #include "TrackCountHypoTool.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "xAODTracking/TrackParticleContainer.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" // STL includes #include diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx index eb01834af683c34ddbbb8258c28d2b7f26ec3aa4..38e1b4866a6336a203ac07d7ff34bfc5758c18d1 100644 --- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx +++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx @@ -5,7 +5,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration #include "DecisionHandling/HLTIdentifier.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrackCountHypoTool.h" diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFTrackIsolationAlgMT.h b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFTrackIsolationAlgMT.h index 862a2d80db726829899f679cef96e00f0133d42f..cdf1148990e24b992e5316b052710c26ece197ff 100644 --- a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFTrackIsolationAlgMT.h +++ b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFTrackIsolationAlgMT.h @@ -18,7 +18,7 @@ #include "AthenaBaseComps/AthAlgorithm.h" #include "StoreGate/ReadHandleKey.h" #include "StoreGate/WriteHandleKey.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" // Retrieve containers #include "Particle/TrackParticleContainer.h" @@ -27,10 +27,10 @@ #include "xAODTrigMuon/L2IsoMuonContainer.h" #include "TrigMuonToolInterfaces/IMuonEFTrackIsolationTool.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" -//#include "AthenaMonitoring/GenericMonitoringTool.h" +//#include "AthenaMonitoringKernel/GenericMonitoringTool.h" class TrigMuonEFTrackIsolationAlgMT : public AthAlgorithm { diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt index a4ba98b9c78bbfa29a8806cea7eacea97a01b642..4fd6a08a0b935019ba5d4040b03ca63f6b702bb7 100644 --- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt +++ b/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt @@ -31,7 +31,7 @@ atlas_add_component( TrigT2BeamSpot src/*.cxx src/components/TrigT2*.cxx INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib TrigSteeringEvent TrigInterfacesLib AthContainers EventInfo EventPrimitives GaudiKernel TrkParameters TrkTrack TrkTrackSummary TrigInDetEvent TrigNavigationLib TrigTimeAlgsLib ) + LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringKernelLib TrigSteeringEvent TrigInterfacesLib AthContainers EventInfo EventPrimitives GaudiKernel TrkParameters TrkTrack TrkTrackSummary TrigInDetEvent TrigNavigationLib TrigTimeAlgsLib ) # Install files from the package: atlas_install_headers( TrigT2BeamSpot ) diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpot.h b/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpot.h index cba5b92247a5cfd33b5cb28b9ce728bc4de25859..f3bc248d997c954e350727558199b79f421d6e28 100644 --- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpot.h +++ b/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpot.h @@ -24,7 +24,7 @@ #ifndef TRIGT2BEAMSPOT_T2VERTEXBEAMSPOT_H #define TRIGT2BEAMSPOT_T2VERTEXBEAMSPOT_H -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "xAODEventInfo/EventInfo.h" /// trigger EDM #include "TrigInterfaces/AllTEAlgo.h" diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpotTool.h b/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpotTool.h index 52edbb877e1a8ba5eb52b772073760a633f48939..47e9f4d9095d5e3e55a93113e23c2ff37e67feb6 100644 --- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpotTool.h +++ b/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpotTool.h @@ -47,7 +47,7 @@ //To get TEVec and HLT::Error messaging #include "TrigInterfaces/Algo.h" //Monitoring tool -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" class TrigVertexCollection; diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/python/T2VertexBeamSpotMonitoring.py b/Trigger/TrigAlgorithms/TrigT2BeamSpot/python/T2VertexBeamSpotMonitoring.py index b5713d017f0ee894cb466970db570f6033ed837f..abc86306a47896c78e411718408e8e01a390bc0c 100644 --- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/python/T2VertexBeamSpotMonitoring.py +++ b/Trigger/TrigAlgorithms/TrigT2BeamSpot/python/T2VertexBeamSpotMonitoring.py @@ -9,7 +9,7 @@ #Adding new monitoring tool -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool #monTool = GenericMonitoringTool("MonTool") diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py index fd6bb32df44d6dac4d7215fc2e1e7e4c0fdcf1ae..13f0d0758b4a7c32a77f409494a4a3c3a2bfad6e 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py @@ -60,7 +60,7 @@ def trigCaloDataAccessSvcCfg( flags ): from TileConditions.TileBadChannelsConfig import TileBadChannelsCondAlgCfg acc.merge( TileBadChannelsCondAlgCfg(flags) ) - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool import math mon = GenericMonitoringTool("TrigCaloDataAccessSvcMon") mon.defineHistogram("TIME_locking_LAr_RoI", diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py index d14233ac32e319d8ccf580cd0611c5c80778bbf1..8c57957616fc7ded5cd7c0c21d7b672ea910fffd 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py @@ -20,7 +20,7 @@ from AthenaCommon.AlgSequence import AthSequencer if TriggerFlags.doCalo: if ( True ) : - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram from TrigT2CaloCommon.TrigT2CaloCommonConfig import TrigCaloDataAccessSvc#, TestCaloDataAccess import math diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx index a8157dd1952b18e2e9b7052d8507eebfef055238..7025961c80825dd0557f867524aa5189b4f275fa 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx @@ -1,7 +1,7 @@ /* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigCaloDataAccessSvc.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "CaloDetDescr/CaloDetDescrManager.h" diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h index 819615d3a8bedf65985475948872b1742f4d2db3..81daf716c2fba3d8b3d3b891daa4427d70e61840 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h @@ -20,7 +20,7 @@ #include "IRegionSelector/IRoiDescriptor.h" #include "IRegionSelector/IRegSelSvc.h" #include "TrigT2CaloCommon/ITrigCaloDataAccessSvc.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "StoreGate/ReadHandleKey.h" #include "CaloEvent/CaloBCIDAverage.h" diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaConfig.py b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaConfig.py index 1fb30068e740c190c9a87f3b71cd5dbaf366f1c0..342708d077d1ac96aeac04a2990da7e68389afba 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaConfig.py +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaConfig.py @@ -383,7 +383,7 @@ class RingerReFexConfig( RingerReFex ): Layer.HEC1, Layer.HEC2, Layer.TileBar1, Layer.TileGap0, Layer.TileExt1, Layer.HEC3, Layer.TileBar2, Layer.TileGap1, Layer.TileExt2 ] - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool monTool = GenericMonitoringTool('MonTool') monTool.defineHistogram( "TIME_total", title="Total Time;time[ms]",xbins=50, xmin=0, xmax=5,type='TH1F', path='EXPERT') monTool.defineHistogram( "TIME_load_cells", title="Load Cells Time;time[ms]",xbins=50, xmin=0, xmax=5,type='TH1F', path='EXPERT') diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.cxx index 7aefa42bbb410541e2916bdfe2875870ab0b33ca..5fa15c07914445168b0189cf357fc7775aac74d0 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.cxx @@ -27,8 +27,8 @@ #include "TrigT2CaloCommon/IReAlgToolCalo.h" #include "GaudiKernel/ThreadLocalContext.h" #include "CaloDetDescr/CaloDetDescrElement.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "PhiComps.h" using namespace Monitored; diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.h index 96a672db1bca5cab567d795f4e5bbbab5ad3130e..1bef833979e9f69c86509a571c4624f7199c3cf4 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.h +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.h @@ -17,7 +17,7 @@ #include "xAODTrigRinger/TrigRingerRings.h" #include "xAODTrigRinger/TrigRingerRingsContainer.h" #include "xAODTrigRinger/TrigRingerRingsAuxContainer.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "PhiComps.h" /* diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx index 93c76ff6ac4dce430a1bf5ee519ec3cbf0f00264..88c5d8216e047df25368a39d7ae023d94f59c1d8 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx @@ -20,7 +20,7 @@ #include "TrigT2CaloCommon/phiutils.h" #include "xAODTrigCalo/TrigEMClusterAuxContainer.h" #include "xAODTrigCalo/TrigEMClusterContainer.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" class ISvcLocator; diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h index 54441b26e2a362d3b3c8d1baf50bcfe9e6dfd991..e0691b9ff2193eacac08fd2878822df73ecb0179 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h @@ -28,7 +28,7 @@ #include "xAODTrigCalo/TrigEMCluster.h" #include "xAODTrigCalo/TrigEMClusterContainer.h" #include "xAODTrigCalo/TrigEMClusterAuxContainer.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt index 79e5486a0e47eba89e12dc67e637c97e171494cc..9404394476ebd827c4adb7ba282e0e29fa18925e 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt @@ -29,7 +29,7 @@ atlas_depends_on_subdirs( PRIVATE Trigger/TrigEvent/TrigSteeringEvent Trigger/TrigTools/TrigTimeAlgs Event/xAOD/xAODTrigger - Control/AthenaMonitoring ) + Control/AthenaMonitoringKernel ) # External dependencies: find_package( tdaq-common ) diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py index a91c9427e812e4f96dbf095f899693fffff3d5f3..5d35bd8efd93aad0fb55c470cab6f78fcbf00636 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py @@ -1,7 +1,7 @@ def SpCountMonitoring(): - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool monTool = GenericMonitoringTool('MonTool') monTool.defineHistogram('totNumPixCL_1', path='EXPERT', type='TH1I', title='totNumPixCL_1',xbins=100, xmin=-0, xmax=2000) monTool.defineHistogram('totPixBeforeCuts', path='EXPERT', type='TH1I', title='totPixBeforeCuts', xbins = 250, xmin=-0.5, xmax=4999.5) diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.cxx index d9bbb10fbc883f51c7baf5c1d2dae6ef8de94126..14e32039871f4acfc15f2e80abd821cab9e79ec8 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.cxx +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.cxx @@ -4,7 +4,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #include "DecisionHandling/HLTIdentifier.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "SPCountHypoTool.h" diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsMT.h b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsMT.h index 95bb75b8869e149a41ccc0cef8b1e33dc81f23ae..ea4f94b71ca16118c7e8f8a3bd134bddb84b7de9 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsMT.h +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsMT.h @@ -13,7 +13,7 @@ #include "InDetIdentifier/SCT_ID.h" #include "xAODTrigger/TrigCompositeContainer.h" #include "xAODTrigger/TrigCompositeAuxContainer.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include class PixelID; diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py index 123301bd20043cf6b4d65312830a061c9a794dd9..7dc04482185be8ef179077eb3fba1c8146c1e2f4 100644 --- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py +++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py @@ -104,7 +104,7 @@ class TrigTauRecValidationMonitoring(TrigTauRecOnlineMonitoring): -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool def tauMonitoringCaloOnly(): monTool = GenericMonitoringTool('MonTool') diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx index 9e31a93a3ac7c44c3b6839896c9cbf393396a9ac..bc38e67ede9cf03688e3656604a9089a9aa6c2b4 100644 --- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx +++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx @@ -33,7 +33,7 @@ #include "LumiBlockComps/ILumiBlockMuTool.h" #include "TrigTauRecMergedMT.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" using namespace std; diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h index 58108fb0c191875f0644c17848813dd8f7fd62e4..b1fcd9fbace3bb15908dc5405a76ba795ef47652 100755 --- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h +++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h @@ -16,7 +16,7 @@ #include "AthenaBaseComps/AthAlgorithm.h" #include "StoreGate/ReadHandleKey.h" #include "StoreGate/WriteHandleKey.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include #include "tauRecTools/ITauToolBase.h" diff --git a/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h b/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h index 395cc97bfb84373eb55ecb83dc30f3023c7eb84b..59d8d67df8d0b99c806d401585fda8e0d21d20fb 100644 --- a/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h +++ b/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h @@ -41,7 +41,7 @@ //#include "TrigSteeringEvent/TrigRoiDescriptor.h" //#include "TrigT1Interfaces/RecMuonRoI.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "CLHEP/Units/SystemOfUnits.h" /** Main LVL2 Algorithm. Sided by a xAOD::L2StandaloneMuon, match the muon spectrometer track with an ID track, and produces a xAOD::L2CombinedMuon. */ diff --git a/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombMTConfig.py b/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombMTConfig.py index 59167da9578b8e9d4447af9c587420d00d4fa655..7cb0abda0a3b3a207599d64a55955be76df23471 100755 --- a/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombMTConfig.py +++ b/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombMTConfig.py @@ -13,7 +13,7 @@ from AthenaCommon.GlobalFlags import globalflags from MuonByteStream.MuonByteStreamFlags import muonByteStreamFlags from AthenaCommon.AppMgr import ServiceMgr from AthenaCommon.AppMgr import ToolSvc -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool,defineHistogram +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool,defineHistogram from TrigmuComb.TrigmuCombMonitoring import TrigMuCombMonitoring class TrigmuCombMTConfig (muCombMT): diff --git a/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombMonitoring.py b/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombMonitoring.py index 5b527eb98d65933e35de7fea62ef41a97c9506b9..7bd36660dc437c9452f3caa9054944f85fa26168 100755 --- a/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombMonitoring.py +++ b/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombMonitoring.py @@ -1,6 +1,6 @@ # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool class TrigMuCombMonitoring(GenericMonitoringTool): def __init__ (self, name = "TrigMuCombMonitoring"): diff --git a/Trigger/TrigAlgorithms/TrigmuComb/src/muCombMT.cxx b/Trigger/TrigAlgorithms/TrigmuComb/src/muCombMT.cxx index b4cfbfd6b5a0200a03560da0bf1413edcfa315d3..f19fb8208749973cb90b830dfca154872b767ac7 100644 --- a/Trigger/TrigAlgorithms/TrigmuComb/src/muCombMT.cxx +++ b/Trigger/TrigAlgorithms/TrigmuComb/src/muCombMT.cxx @@ -24,7 +24,7 @@ #include "xAODTrigMuon/L2CombinedMuonAuxContainer.h" #include "xAODTracking/TrackParticleContainer.h" #include "TrigSiSpacePointTool/ISpacePointProvider.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "CLHEP/Units/SystemOfUnits.h" class ISvcLocator; diff --git a/Trigger/TrigAlgorithms/TrigmuIso/TrigmuIso/muIso.h b/Trigger/TrigAlgorithms/TrigmuIso/TrigmuIso/muIso.h index 3ac763aa3bba71284eeabaf9dd75dd6f1cd5988d..a336b7bbb13908dbf1b15bad103246d6fe6bf89d 100755 --- a/Trigger/TrigAlgorithms/TrigmuIso/TrigmuIso/muIso.h +++ b/Trigger/TrigAlgorithms/TrigmuIso/TrigmuIso/muIso.h @@ -31,7 +31,7 @@ #include "AthenaBaseComps/AthAlgorithm.h" #include "StoreGate/ReadHandleKey.h" #include "StoreGate/WriteHandleKey.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "CxxUtils/checker_macros.h" ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // legacy trigger code diff --git a/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx b/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx index 3dbb9a6c412017f6b99058cd108e993f254d374c..09ef059bdba653b3042dd6e13961bc1aa10c097d 100644 --- a/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx +++ b/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx @@ -42,7 +42,7 @@ #include "CLHEP/Units/SystemOfUnits.h" #include "AthenaBaseComps/AthMsgStreamMacros.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // legacy trigger code diff --git a/Trigger/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIMonitoring.py b/Trigger/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIMonitoring.py index c57b0a3e01305d00843d56e544cc4b4093770adb..1223c7b430a2da5e3e7f031b3318840d0d3e7bf6 100755 --- a/Trigger/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIMonitoring.py +++ b/Trigger/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIMonitoring.py @@ -1,7 +1,7 @@ # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool class TrigmuRoIValidationMonitoring(TrigGenericMonitoringToolConfig): def __init__ (self, name="TrigmuRoIValidationMonitoring"): diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetBtagHypoTool.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetBtagHypoTool.py index d039cf5b1ef468620e8f8d9b847669f4aaa33b33..b7e549ade384751a8b16c7ddb19a816fc295aa30 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetBtagHypoTool.py +++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetBtagHypoTool.py @@ -95,7 +95,7 @@ def getBjetBtagHypoConfiguration( name,conf_dict ): # tool.MonTool = "" # from TriggerJobOpts.TriggerFlags import TriggerFlags # if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring(): -# from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram +# from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram # monTool = GenericMonitoringTool("MonTool"+name) # monTool.Histograms = [] diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.cxx index cc4e14cff40de13c2bbb8ecf3b1238468f3f321f..e6f63c15226f265217e0355a6bd94768fa8115f9 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.cxx @@ -15,7 +15,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "TrigBjetBtagHypoTool.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" TrigBjetBtagHypoTool::TrigBjetBtagHypoTool( const std::string& type, diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.h index ebc5d0db81b85f15799085c4fee46531b002c161..c60b46fb93773cf38013c02ccc713dc2d258472d 100755 --- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.h +++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.h @@ -20,7 +20,7 @@ #include "CLHEP/Units/SystemOfUnits.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "xAODBTagging/BTaggingAuxContainer.h" #include "xAODBTagging/BTaggingContainer.h" #include "xAODBTagging/BTagging.h" diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTMonitoringConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTMonitoringConfig.py index e350dc9ce3e7a57cef19063892346959bcc2027d..dc240361fe96580432a840635c64f5371b3672c4 100644 --- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTMonitoringConfig.py +++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTMonitoringConfig.py @@ -1,6 +1,6 @@ # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram class TrigMultiTrkHypoAlgMTMonitoring(GenericMonitoringTool): def __init__ (self, name): diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.h index 8f89114dd25d19ebc42db249e0b8f15012d10fe7..62fec45efcbf11dffd4efa4d30da85c73d0235e5 100644 --- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.h +++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.h @@ -39,8 +39,8 @@ #include "Constants.h" -#include "AthenaMonitoring/Monitored.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/Monitored.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" class TrigMultiTrkHypoMT: public ::HypoBase { diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.cxx index a836e32fe49994ecfd7b98b0322e38959a089adc..ab5171ffabdbad560c9fd0abd29cd98cc2cc88d5 100644 --- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.cxx +++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.cxx @@ -24,7 +24,7 @@ #include "xAODTrigBphys/TrigBphys.h" #include "xAODTrigBphys/TrigBphysContainer.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "DecisionHandling/TrigCompositeUtils.h" diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.h index 2d3bb0cc153582cbb4f6d0fd3f733ff80343ae6b..34049804ad700f3621823707efa088fed2f17c4e 100644 --- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.h +++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.h @@ -32,7 +32,7 @@ #include "xAODTrigBphys/TrigBphysContainer.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/Combinators.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigEgammaHypo/CMakeLists.txt index c6e7efe76ba3239e85bcc439eed84b7badd1ccf5..76d11f68d5000754f2b8af8beedb1eb63e406a5a 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/CMakeLists.txt +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/CMakeLists.txt @@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC Calorimeter/CaloUtils Control/AthLinks Control/StoreGate - Control/AthenaMonitoring + Control/AthenaMonitoringKernel Event/xAOD/xAODCaloEvent Event/xAOD/xAODEgamma Event/xAOD/xAODTracking @@ -57,7 +57,7 @@ atlas_add_component( TrigEgammaHypo src/*.cxx src/components/*.cxx INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloUtilsLib AthLinks AthenaBaseComps StoreGateLib SGtests AthenaMonitoringLib xAODCaloEvent xAODEgamma xAODTracking xAODTrigCalo xAODTrigEgamma GaudiKernel LumiBlockCompsLib PATCoreLib EgammaAnalysisInterfacesLib TrkSurfaces VxVertex TrigCaloEvent TrigInDetEvent TrigParticle TrigSteeringEvent TrigInterfacesLib TrigT1Interfaces TrigTimeAlgsLib CaloEvent CxxUtils ITrackToVertex RecoToolInterfaces egammaEvent egammaMVACalibLib TrkCaloExtension TrigCaloRecLib TrigMissingEtEvent TrigNavigationLib DecisionHandlingLib AthViews ) + LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloUtilsLib AthLinks AthenaBaseComps StoreGateLib SGtests AthenaMonitoringKernelLib xAODCaloEvent xAODEgamma xAODTracking xAODTrigCalo xAODTrigEgamma GaudiKernel LumiBlockCompsLib PATCoreLib EgammaAnalysisInterfacesLib TrkSurfaces VxVertex TrigCaloEvent TrigInDetEvent TrigParticle TrigSteeringEvent TrigInterfacesLib TrigT1Interfaces TrigTimeAlgsLib CaloEvent CxxUtils ITrackToVertex RecoToolInterfaces egammaEvent egammaMVACalibLib TrkCaloExtension TrigCaloRecLib TrigMissingEtEvent TrigNavigationLib DecisionHandlingLib AthViews ) # Install files from the package: atlas_install_headers( TrigEgammaHypo ) diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionCaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionCaloHypoTool.py index 5b4aa99077515e9520fa641b530af24bee7ed462..c96378c006fe8745f5c2ba456f953bd3a45cbbcb 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionCaloHypoTool.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionCaloHypoTool.py @@ -8,7 +8,7 @@ def _IncTool(name, threshold, sel): tool = TrigEgammaPrecisionCaloHypoToolInc( name ) - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram monTool = GenericMonitoringTool("MonTool_"+name) monTool.Histograms = [ defineHistogram('dEta', type='TH1F', path='EXPERT', title="PrecisionCalo Hypo #Delta#eta_{L2 L1}; #Delta#eta_{L2 L1}", xbins=80, xmin=-0.01, xmax=0.01), defineHistogram('dPhi', type='TH1F', path='EXPERT', title="PrecisionCalo Hypo #Delta#phi_{L2 L1}; #Delta#phi_{L2 L1}", xbins=80, xmin=-0.01, xmax=0.01), diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py index 4e4d4dc0783df8f5a1dd090f8e1dee29d314d55f..9a753222ac2f4dccdb4eb757b62a315072da11fd 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py @@ -16,7 +16,7 @@ def _IncTool(name, threshold, sel): tool = TrigEgammaPrecisionElectronHypoToolInc( name ) - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram monTool = GenericMonitoringTool("MonTool_"+name) monTool.Histograms = [ defineHistogram('dEta', type='TH1F', path='EXPERT', title="PrecisionElectron Hypo #Delta#eta_{EF L1}; #Delta#eta_{EF L1}", xbins=80, xmin=-0.01, xmax=0.01), defineHistogram('dPhi', type='TH1F', path='EXPERT', title="PrecisionElectron Hypo #Delta#phi_{EF L1}; #Delta#phi_{EF L1}", xbins=80, xmin=-0.01, xmax=0.01), diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonHypoTool.py index 8f1a6e2adda68b488ec2b19c556d3fdc4c1b2099..bf25b772590dad9ffe196d711b1ba12542c5d177 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonHypoTool.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonHypoTool.py @@ -12,7 +12,7 @@ def _IncTool(name, threshold, sel): tool = TrigEgammaPrecisionPhotonHypoToolInc( name ) - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram monTool = GenericMonitoringTool("MonTool_"+name) monTool.Histograms = [ defineHistogram('dEta', type='TH1F', path='EXPERT', title="PrecisionPhoton Hypo #Delta#eta_{EF L1}; #Delta#eta_{EF L1}", xbins=80, xmin=-0.01, xmax=0.01), defineHistogram('dPhi', type='TH1F', path='EXPERT', title="PrecisionPhoton Hypo #Delta#phi_{EF L1}; #Delta#phi_{EF L1}", xbins=80, xmin=-0.01, xmax=0.01), diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py index 4eca5247cb35cf31eb7ebc572abd478c3ff31d2b..dd6874fd8991632d44133a56782730220f62cd24 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py @@ -1,7 +1,7 @@ # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration from AthenaCommon.SystemOfUnits import GeV -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool from TriggerJobOpts.TriggerFlags import TriggerFlags from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2CaloHypoToolInc diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronFexMTConfig.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronFexMTConfig.py index 8d3cf826895146e3e52eea2cd87c11d67f13f84d..5bf6d921356a4019f821af5e70edc6051cb1d5c9 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronFexMTConfig.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronFexMTConfig.py @@ -3,7 +3,7 @@ from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2ElectronFexMT from AthenaCommon.SystemOfUnits import GeV, mm -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool from TrackToCalo.TrackToCaloConf import Trk__ParticleCaloExtensionTool from TrkExTools.AtlasExtrapolator import AtlasExtrapolator diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py index 5b2f0fdad7a76d20b5c6f59e791ed908344441e5..ccddead7ace53260d8cd17e17c036b2e1d6dc919 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py @@ -2,7 +2,7 @@ from AthenaCommon.SystemOfUnits import GeV from AthenaCommon.Logging import logging -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2ElectronHypoTool diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoTool.py index 2cd5ebcd27dac2dc52a4dec272817e4a2ff18955..12437d0e5043ef3f3df38bd9a0045d75e3ec8177 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoTool.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoTool.py @@ -2,7 +2,7 @@ from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2PhotonHypoTool from AthenaCommon.SystemOfUnits import GeV -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool from AthenaCommon.Logging import logging log = logging.getLogger('TrigL2PhotonHypoTool') diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.cxx index 2a460fc512dd9065acb46afad334e127338e3fce..4f511d555b5be85aa640f9303f06004db6bc1b6c 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.cxx @@ -5,7 +5,7 @@ #include #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/Combinators.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigEgammaPrecisionCaloHypoToolInc.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.h index 8256349402bd9c065cdcdab251c8a2961eb60e25..c9b9b4f62b2dae9c08da8b8532354c0798d04e79 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.h @@ -11,7 +11,7 @@ #include "xAODCaloEvent/CaloClusterContainer.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "ITrigEgammaPrecisionCaloHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolMult.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolMult.h index 8b3b160321c9547bdd6c4835979349e2df26f6d9..6b4169415096f92d2cca00fcd9b642e3c2b37e08 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolMult.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolMult.h @@ -9,7 +9,7 @@ #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "AthenaBaseComps/AthAlgTool.h" #include "xAODCaloEvent/CaloCluster.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "ITrigEgammaPrecisionCaloHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.cxx index b018a96230ded3f282f8cb6d4d78b95bef619fdc..1f6f530832cf26747093bc48b0a45071e935ac89 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.cxx @@ -5,7 +5,7 @@ #include #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/Combinators.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigEgammaPrecisionElectronHypoToolInc.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.h index 8d5b8029224621d1f89ca87d57d62524375ae1ef..2894f967b0da8f0bb952b93a4b7b39dcad9880d1 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.h @@ -10,7 +10,7 @@ #include "xAODEgamma/Electron.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "ITrigEgammaPrecisionElectronHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolMult.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolMult.h index aefe12e70b8fc21a7eb4639c204296bd7b84e7b0..27c568938121dcfa037ef0e275b1275996230cf3 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolMult.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolMult.h @@ -9,7 +9,7 @@ #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "AthenaBaseComps/AthAlgTool.h" #include "xAODEgamma/Electron.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "ITrigEgammaPrecisionElectronHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.cxx index 58c6f31721e8e98847d15c0a63e881c6a4a94a6c..1406494f3f91a9cf792f8c76ffb0a2e74745b9d3 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.cxx @@ -5,7 +5,7 @@ #include #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/Combinators.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigEgammaPrecisionPhotonHypoToolInc.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.h index 3dc8fcc9776ba7cdcc54177db070314b0027b322..dc7d7987bde1b73af87049f21880b5df720b967c 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.h @@ -10,7 +10,7 @@ #include "xAODEgamma/Photon.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "ITrigEgammaPrecisionPhotonHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolMult.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolMult.h index 9eee51813ac6c01b51a28182f90e9aa262573cb4..33cc1a723bbc459e7e5f03d93e9fadaa66d8f3a6 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolMult.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolMult.h @@ -9,7 +9,7 @@ #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "AthenaBaseComps/AthAlgTool.h" #include "xAODEgamma/Photon.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "ITrigEgammaPrecisionPhotonHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.cxx index 2a30f17ffe2fee8fccfa34aa706a7afc4f603a3d..171fc821a01b8c6cabe1cbe38d0ce38b99e26981 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.cxx @@ -5,7 +5,7 @@ #include #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/Combinators.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigL2CaloHypoToolInc.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h index f1e966110da7362bf90c8740a5db904be7375925..156747ca3fd68afeae8dc2af8c2cf3b4c80b93e3 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h @@ -9,7 +9,7 @@ #include "xAODTrigCalo/TrigEMCluster.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "ITrigL2CaloHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h index 0dd3817a3a4423f546db5eeb761f2ded84a7cdf7..5fdfcaadb29c7feb956964a32e24c8f4b26604a9 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h @@ -9,7 +9,7 @@ #include "xAODTrigCalo/TrigEMCluster.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "ITrigL2CaloHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.cxx index 91c6fcf7451e9125a851c71e63ce952b225d1420..d1f204304658def3134ffc3903a350b96bd9f838 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.cxx @@ -23,7 +23,7 @@ #include "TrigL2ElectronFexMT.h" #include "xAODTrigCalo/TrigEMClusterContainer.h" #include "xAODTrigCalo/TrigEMClusterAuxContainer.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" class ISvcLocator; template diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h index fae84c9e14debd3926f3ed8203e25e570602c22c..51f8352966e12c62cd582410a3c85912d74cda48 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h @@ -45,7 +45,7 @@ #include "xAODTrigEgamma/TrigElectronContainer.h" #include "RecoToolInterfaces/IParticleCaloExtensionTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "CLHEP/Units/SystemOfUnits.h" //namespace Trk diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.cxx index 49cf4ab3c1a8ca59937fef6ab7efc85f53311d48..0ed73ef29d9e996974f9af722f4cc894b3ffc9a6 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.cxx @@ -5,7 +5,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/Combinators.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigL2ElectronHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h index 883dfe97170b3f1224630e6ec1040a6a744e1420..b4fffd62f68e12cd0250bf6a7786da6375b39bde 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h @@ -9,7 +9,7 @@ #include "xAODTrigCalo/TrigEMCluster.h" #include "xAODTrigEgamma/TrigElectronContainer.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoTool.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoTool.cxx index 3ffaba4c3351e7769e5d022ce382cb6f0654647a..ff3a892e0e193fdc031f2771d6e8cc2e07046e1e 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoTool.cxx @@ -6,7 +6,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/Combinators.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigL2PhotonHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoTool.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoTool.h index d15e5fbb84416cd5b7f2388648a0b151f44bad7f..669a92ba4632885389921965821ee16462c064d3 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoTool.h +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoTool.h @@ -9,7 +9,7 @@ #include "xAODTrigCalo/TrigEMCluster.h" #include "xAODTrigEgamma/TrigPhotonContainer.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_combgen.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_combgen.h index c035f90cbfbabc717dbdbfbd820e27ad5998b3cf..26760b8b9539bf3c5d23edad145f7953e454ffe1 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_combgen.h +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_combgen.h @@ -18,7 +18,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "AthenaBaseComps/AthAlgTool.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "TrigHLTJetHypo/ITrigJetHypoToolHelperMT.h" diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_dijet.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_dijet.h index fe04f2a625e10116136d2f127b9a5a7e4ecae5e1..249a3296cf782bdb2c4d26cf0c446135962a27b0 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_dijet.h +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_dijet.h @@ -18,7 +18,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "AthenaBaseComps/AthAlgTool.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "./ConditionsDefsMT.h" #include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ICleaner.h" diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.h index 4930e040b89e2df9233dbff649d98a64faf628a8..78817f6b26b457a7af3caf8cf0c11247dbb06797 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.h +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.h @@ -18,7 +18,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "AthenaBaseComps/AthAlgTool.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "./ConditionsDefsMT.h" #include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ICleaner.h" diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_leaf.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_leaf.h index 609bf9d49fb9d69c471d785a9398dd7cd81e0e34..3ef2e190b04b7815435b8e961cdc575b5cda38eb 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_leaf.h +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_leaf.h @@ -19,7 +19,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "AthenaBaseComps/AthAlgTool.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "./ConditionsDefsMT.h" #include "./ITrigJetConditionConfig.h" diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_partgen.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_partgen.h index 2b32207dbd7668ed2860deea99656eba49648ca4..35cca4f12ed368516ed6a81c9f5cbfbe4144c07a 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_partgen.h +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_partgen.h @@ -19,7 +19,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "AthenaBaseComps/AthAlgTool.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "TrigHLTJetHypo/ITrigJetHypoToolHelperMT.h" diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_simple.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_simple.h index c9e92db3d90dc02694003deb4f1d3a370cd9c459..daad470ee602e1886a27b93e0e1e030ea43933c9 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_simple.h +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_simple.h @@ -18,7 +18,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "AthenaBaseComps/AthAlgTool.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "./ConditionsDefsMT.h" #include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ICleaner.h" diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_simple_partition.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_simple_partition.h index 301624a90af1bf5495d2b679b88b223fd44fcc83..3bb41a8364d27e8562340b7fecd7d0d898518e40 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_simple_partition.h +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_simple_partition.h @@ -18,7 +18,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "AthenaBaseComps/AthAlgTool.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "./ConditionsDefsMT.h" #include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ICleaner.h" diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.h index 77370ff5e6573371574a91cb89c0de112cc4bd6b..076f10fcc41a1d8c955a944d4d1a9bd95e8661ad 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.h +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.h @@ -16,7 +16,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "AthenaBaseComps/AthAlgTool.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "TrigHLTJetHypo/ITrigJetHypoToolHelperMT.h" diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoMonitoringTool.py b/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoMonitoringTool.py index 089bc43d20e9f2335c29273133744c9d98556967..173c17555b1b8e5a84ef03247fcb27f5181931a2 100644 --- a/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoMonitoringTool.py +++ b/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoMonitoringTool.py @@ -1,6 +1,6 @@ # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram class TrigMissingETHypoMonitoringToolBase(GenericMonitoringTool): diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.h b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.h index 650355ce289557bb4b6aaa91ccc7986a0cf3a272..6dada7207de5564e69b83a610159ebe4e1531a30 100644 --- a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.h +++ b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.h @@ -8,7 +8,7 @@ #include "AthenaBaseComps/AthReentrantAlgorithm.h" #include "DecisionHandling/HypoBase.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "ITrigMissingETHypoToolMT.h" diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoToolMT.h b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoToolMT.h index c022b767c82d0cee22621ca8626c6c7e2728d0ca..f1268d941412c05f39068698cefc16e9e038044d 100644 --- a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoToolMT.h +++ b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoToolMT.h @@ -16,7 +16,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "AthenaBaseComps/AthAlgTool.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "xAODTrigMissingET/TrigMissingETContainer.h" #include "ITrigMissingETHypoToolMT.h" diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigMultiVarHypo/CMakeLists.txt index 2139e2f935daf6f1af2c2e7d82258f2b9db1bfc6..348fd430d13881f8ffb54bf7cbd65f41e89cbb16 100644 --- a/Trigger/TrigHypothesis/TrigMultiVarHypo/CMakeLists.txt +++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/CMakeLists.txt @@ -24,7 +24,7 @@ atlas_depends_on_subdirs( PUBLIC GaudiKernel Control/AthViews Control/AthContainers - Control/AthenaMonitoring + Control/AthenaMonitoringKernel ) # Component(s) in the package: @@ -37,7 +37,7 @@ atlas_add_library( TrigMultiVarHypoLib LINK_LIBRARIES AsgTools xAODTrigCalo xAODTrigRinger TrigCaloEvent TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib DecisionHandlingLib LumiBlockCompsLib PathResolver - AthenaMonitoringLib + AthenaMonitoringKernelLib PRIVATE_LINK_LIBRARIES GaudiKernel AthViews ) @@ -46,7 +46,7 @@ atlas_add_component( TrigMultiVarHypo LINK_LIBRARIES AsgTools xAODTrigCalo xAODTrigRinger TrigCaloEvent TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib GaudiKernel TrigMultiVarHypoLib DecisionHandlingLib LumiBlockCompsLib - PathResolver AthenaMonitoringLib) + PathResolver AthenaMonitoringKernelLib) # Install files from the package: atlas_install_python_modules( python/*.py ) diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py index 8f8139af5e1b08fcb55cae0031b2df34995cc342..cb61d14a28a0a2c6365d165341e5d14eeb454d9b 100644 --- a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py +++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py @@ -55,7 +55,7 @@ def _HypoTool(name, cand, threshold, sel): from TriggerJobOpts.TriggerFlags import TriggerFlags if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring(): - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool,defineHistogram + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool,defineHistogram monTool = GenericMonitoringTool('MonTool'+name) monTool.Histograms = [ defineHistogram( "TIME_total", path='EXPERT',title="Total Time;time[ms]",xbins=50, xmin=0,xmax=5,type='TH1F'), diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoToolMT.cxx b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoToolMT.cxx index 4e59ecef61ee20b369bc25c7423c3a62314f6e51..f92a049308a68661dbc5f954730f0da23c338fab 100644 --- a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoToolMT.cxx +++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoToolMT.cxx @@ -5,11 +5,11 @@ #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/Combinators.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "GaudiKernel/SystemOfUnits.h" #include "TrigL2CaloRingerHypoToolMT.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/Monitored.h" using namespace Monitored; using namespace TrigCompositeUtils; diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoToolMT.h b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoToolMT.h index 802a1d8c216919428534c236c959899d136cb0a7..5648c169fd8ec79fc6197a577eefe6869f40674c 100644 --- a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoToolMT.h +++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoToolMT.h @@ -8,7 +8,7 @@ #include "GaudiKernel/Property.h" #include "CLHEP/Units/SystemOfUnits.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "xAODTrigRinger/TrigRingerRings.h" diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/CMakeLists.txt b/Trigger/TrigHypothesis/TrigMuonHypoMT/CMakeLists.txt index e03130284be35d165292ce485100fcbfaddebec7..3c41eeeac2a79f511ea8261eaaaabb725586bb9f 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/CMakeLists.txt +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/CMakeLists.txt @@ -12,7 +12,7 @@ atlas_depends_on_subdirs( PUBLIC Control/AthViews PRIVATE Trigger/TrigT1/TrigT1Interfaces - Control/AthenaMonitoring + Control/AthenaMonitoringKernel Event/xAOD/xAODMuon GaudiKernel ) @@ -24,7 +24,7 @@ atlas_add_component( TrigMuonHypoMT src/*.cxx src/components/*.cxx INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} - LINK_LIBRARIES ${CLHEP_LIBRARIES} xAODTrigMuon TrigInterfacesLib DecisionHandlingLib AthViews xAODMuon GaudiKernel TrigT1Interfaces AthenaMonitoringLib ) + LINK_LIBRARIES ${CLHEP_LIBRARIES} xAODTrigMuon TrigInterfacesLib DecisionHandlingLib AthViews xAODMuon GaudiKernel TrigT1Interfaces AthenaMonitoringKernelLib ) # Install files from the package: atlas_install_python_modules( python/*.py ) diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMonitoringMT.py b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMonitoringMT.py index 6c9efc0072e001d30edd29457956cc875665ce6d..747930673fcc48dd3a5135d04d54ef66e8ea0173 100755 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMonitoringMT.py +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMonitoringMT.py @@ -1,6 +1,6 @@ # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool class TrigMufastHypoMonitoring(GenericMonitoringTool): def __init__ (self, name): diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.cxx index 4176ef55e65f4562154aecd1cbf0692164f344c6..64bef14d2f5953862f29acbe8d8a651e7f9f4146 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.cxx @@ -2,7 +2,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigL2MuonOverlapRemoverTool.h" #include "CLHEP/Units/SystemOfUnits.h" diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.h index e1ab88d36bf80b65ccd67ffd9091f0c1f83e598f..e47782aca8a23573243cb09659f78b3067fb4321 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.h @@ -10,7 +10,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration #include "xAODTrigMuon/L2CombinedMuonContainer.h" #include "TrigT1Interfaces/RecMuonRoI.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" class StoreGateSvc; diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx index 4b3d5fc4b2ecb2f3a39277af8e5c07ed83d317d3..af4a2f308f5a6ab010fe0abad8992f8f87ef3fd0 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx @@ -2,7 +2,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "DecisionHandling/Combinators.h" #include "TrigMufastHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h index 8cc103318c172d56ae7b23eda68477a4fc699e93..8a7a9ea0c389de2d026a304712efcc28b8fcd2da 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h @@ -11,7 +11,7 @@ #include "xAODTrigMuon/L2StandAloneMuonContainer.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" class StoreGateSvc; diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.cxx index 49398a1ef72f5a518486ffeabfc694ed5438340c..2008143f11be445c886bde0c1d104bf08696045b 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.cxx @@ -2,7 +2,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigMuisoHypoTool.h" #include "CLHEP/Units/SystemOfUnits.h" diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.h index 531180fab0524c9bc5af45479dc87676475e2c0a..2a6034871f0234c721dc0689bd555612412132cb 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.h @@ -7,7 +7,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "xAODTrigMuon/L2IsoMuonContainer.h" diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.cxx index 8820a702bc452ea5e16452a074172f6606958e0c..95281a8a1f5c91c91f4f02790a1d9a23b47155bf 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.cxx @@ -4,7 +4,7 @@ #include "DecisionHandling/Combinators.h" #include "TrigMuonEFCombinerHypoTool.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" class ISvcLocator; TrigMuonEFCombinerHypoTool::TrigMuonEFCombinerHypoTool(const std::string & type, const std::string & name, const IInterface* parent): AthAlgTool(type, name, parent), diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.h index a87ca35fb4435fe86cc767f612f05133359ae732..9e4e5c6a81319d8681615efb591dc10a44eff8d7 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.h @@ -6,7 +6,7 @@ #define TRIGMUONHYPOMT_TRIGMUONEFCOMBINERHYPOTOOL_H 1 #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "xAODMuon/MuonContainer.h" #include "CLHEP/Units/SystemOfUnits.h" class StoreGateSvc; diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx index f1cbe23a273db3a2464bab4dafcba88fb2c510a0..bbd088f1891b35b9441194a50a5a3452f282f61d 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx @@ -4,7 +4,7 @@ #include "TrigMuonEFInvMassHypoTool.h" #include "CLHEP/Units/SystemOfUnits.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" class ISvcLocator; TrigMuonEFInvMassHypoTool::TrigMuonEFInvMassHypoTool(const std::string & type, const std::string & name, const IInterface* parent): diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.h index a210e7646b42762bb505b947e08a30b4a1ec6a60..48dd559ac19d4677929b77d3684ebb6d658ad6a8 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.h @@ -8,7 +8,7 @@ #include "AthenaBaseComps/AthAlgTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "xAODMuon/MuonContainer.h" class StoreGateSvc; diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.cxx index c0f90b91fb8243e4ba97a76b1d5ca5e1ec105936..ef20ec5a0b83859d1bc4b2ac30ef9fe8dd69676e 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.cxx @@ -4,7 +4,7 @@ #include "DecisionHandling/Combinators.h" #include "TrigMuonEFMSonlyHypoTool.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" class ISvcLocator; TrigMuonEFMSonlyHypoTool::TrigMuonEFMSonlyHypoTool(const std::string & type, const std::string & name, const IInterface* parent): AthAlgTool(type, name, parent), diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.h index 6615c340ab590abb38d21ea5535c3e6abde9a901..aebc3af39d7ec82b40f7b4ae41e5b77342f8de0b 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.h @@ -6,7 +6,7 @@ #define TRIGMUONHYPOMT_TRIGMUONEFMSONLYHYPOTOOL_H 1 #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "xAODMuon/MuonContainer.h" #include "CLHEP/Units/SystemOfUnits.h" diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.cxx index dd686e646a02ff31c9952a96afc636bec17867d4..8c8f2bf770e1829dfb63ec15db577c8bc2a7f959 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.cxx @@ -2,7 +2,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigMuonEFTrackIsolationHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.h index 9e9c3a3993477b894ce61c02b7c44950816d2c2b..95f52cfdfab4912936590f0113ccdb0d6850175c 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.h @@ -10,7 +10,7 @@ #include "DecisionHandling/TrigCompositeUtils.h" #include "xAODMuon/MuonContainer.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" class StoreGateSvc; diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx index e573c8c75dd2faed24d007df7c091b321031470f..e251535234834c5c0a0d8d9c5b1636ea1560e28f 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx @@ -2,7 +2,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "DecisionHandling/Combinators.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "TrigmuCombHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h index 390c9d316957e3a02c2995de3b804b730524cf77..26b2230d17def1dd9a2ba1ded6609373e2ab154c 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h @@ -10,7 +10,7 @@ #include "xAODTrigMuon/L2CombinedMuonContainer.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" class StoreGateSvc; diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoTool.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoTool.cxx index 28a1c6c4cfbf697fbaee9c81060b610aef876483..d126229085804de7634dfe1ffd989cc8776b3272 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoTool.cxx @@ -13,7 +13,7 @@ #include "TrigSteeringEvent/TrigRoiDescriptor.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigEFTauMVHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoTool.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoTool.h index 80bb7bdcec316098b4c4834df796b9ec4472fa25..9d8089a267c0b92f9dffefc2f8afa7ac55cd3da5 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoTool.h +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoTool.h @@ -6,7 +6,7 @@ #define TRIGEFTAUMVHYPOTOOL_H #include "TrigInterfaces/HypoAlgo.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "ITrigEFTauMVHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.cxx index a3563570f33e5acfc1ea956604add8998652404c..fd35a3a9c35eb4b947626812c32aa3842796632b 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.cxx +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.cxx @@ -44,7 +44,7 @@ #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/Combinators.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" //class ISvcLocator; diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h index 4b44ed10f72af4730af21d960f6f45e6896cd33b..8a04f18ec3c57cf4f886ee2c179f49d38a4d7bdb 100755 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h @@ -30,7 +30,7 @@ #include "xAODTau/TauJetContainer.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.cxx index 6b663cfbb0675b40dbb2e67587aa50ba577efffc..bdc186fc3196bcc544dd9b8cdfd5a484d0a5b7df 100755 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.cxx +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.cxx @@ -27,7 +27,7 @@ #include "TrkTrack/Track.h" #include "TrkTrack/TrackCollection.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigTrackPreSelHypoTool.h" diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h index ed081dc0815d48c1f51d6c266e63e6acacf0b484..c6a5ad44d8015cd6683a7883a24f7183bbd2e228 100755 --- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h +++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h @@ -11,7 +11,7 @@ #include "xAODTau/TauJetContainer.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" #include "DecisionHandling/TrigCompositeUtils.h" diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h index 4881c6b9d556494a91af1b1950f7a02c9503af0a..b81f1209b3c7342002a2f2d23854bf78be005883 100644 --- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h +++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h @@ -6,7 +6,7 @@ #define TRIGBJETMONITORING_TRIGBJETMONITORALGORITHM_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TRandom3.h" diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/TrigBphysMonitorAlgorithm.h b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/TrigBphysMonitorAlgorithm.h index 299824490da9ec5799bc9818d38f131198cba52a..52fa20fdc8be8c2c4f1a539ef140009873a33e54 100644 --- a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/TrigBphysMonitorAlgorithm.h +++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/TrigBphysMonitorAlgorithm.h @@ -6,7 +6,7 @@ #define TRIGBPHYSMONITORING_TRIGBPHYSMONITORALGORITHM_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "xAODTrigBphys/TrigBphysContainer.h" #include "xAODTrigBphys/TrigBphys.h" diff --git a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_L2CaloEMClustersMonitor.h b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_L2CaloEMClustersMonitor.h index 809fff9d79562a21d7c8bd571e3b7d3eeb43ea31..de484d02565a8d6dd7f4d0cbc3000b7211defdac 100644 --- a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_L2CaloEMClustersMonitor.h +++ b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_L2CaloEMClustersMonitor.h @@ -6,7 +6,7 @@ #define TRIGCALOMONITORING_HLTCALO_L2CALOEMCLUSTERSMONITOR_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" #include "xAODTrigCalo/TrigEMClusterContainer.h" #include "xAODCaloEvent/CaloClusterContainer.h" diff --git a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_TopoCaloClustersMonitor.h b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_TopoCaloClustersMonitor.h index 9047fdd739bc73e525d0b3dbbaf17b8bf870b0bf..f68faef5471d3b0f157c31f06c275ad191f4d9b5 100644 --- a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_TopoCaloClustersMonitor.h +++ b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_TopoCaloClustersMonitor.h @@ -6,7 +6,7 @@ #define TRIGCALOMONITORING_HLTCALO_TOPOCALOCLUSTERSMONITOR_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" #include "xAODCaloEvent/CaloClusterContainer.h" diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAlgorithm.h b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAlgorithm.h index 3798904e8f4823114e36167d7a61f591eb30ebb0..2797a4feb4f24097b6d5796a6aeb5cf7894003aa 100644 --- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAlgorithm.h +++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAlgorithm.h @@ -6,7 +6,7 @@ #define TRIGEGAMMAMONITORING_TRIGEGAMMAMONITORALGORITHM_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" class TrigEgammaMonitorAlgorithm : public AthMonitorAlgorithm { diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/src/TrigHLTMonitorAlgorithm.h b/Trigger/TrigMonitoring/TrigHLTMonitoring/src/TrigHLTMonitorAlgorithm.h index 0936ddecf748c71b2e1bb74039ee22320a1306f5..dc099685e095f472cc2eff0f80a2bd47af042be4 100644 --- a/Trigger/TrigMonitoring/TrigHLTMonitoring/src/TrigHLTMonitorAlgorithm.h +++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/src/TrigHLTMonitorAlgorithm.h @@ -6,7 +6,7 @@ #define TRIGHLTMONITORING_TRIGHLTMONITORALGORITHM_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigSteeringEvent/HLTResultMT.h" #include "StoreGate/ReadHandleKey.h" diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.h b/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.h index 7e5332a74632d89104f530786b17f763c8a1cce6..919f9d3ce91b1e7c440386f216ca49a9eaa571f8 100644 --- a/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.h +++ b/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.h @@ -6,7 +6,7 @@ #define TRIGMETMONITORING_TRIGMETMONITORALGORITHM_H #include "AthenaMonitoring/AthMonitorAlgorithm.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "StoreGate/ReadHandleKey.h" #include "xAODTrigger/EnergySumRoI.h" diff --git a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt index 70819b80cbf1c904644dae8fe7bb06cf9e76a8f6..65de2627ccf55f00db8b319921036c5afdce8768 100644 --- a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt +++ b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt @@ -25,13 +25,13 @@ atlas_depends_on_subdirs( PUBLIC Trigger/TrigEvent/TrigSteeringEvent Trigger/TrigTools/TrigTimeAlgs Trigger/TrigMonitoring/TrigCostMonitorMT - Control/AthenaMonitoring ) + Control/AthenaMonitoringKernel ) atlas_add_library( DecisionHandlingLib src/*.cxx PUBLIC_HEADERS DecisionHandling LINK_LIBRARIES xAODTrigger GaudiKernel TrigSteeringEvent - PRIVATE_LINK_LIBRARIES AthenaBaseComps CxxUtils TrigConfHLTData TrigTimeAlgsLib AthenaMonitoringLib ) + PRIVATE_LINK_LIBRARIES AthenaBaseComps CxxUtils TrigConfHLTData TrigTimeAlgsLib AthenaMonitoringKernelLib ) # Component(s) in the package: atlas_add_component( DecisionHandling diff --git a/Trigger/TrigSteer/DecisionHandling/python/DecisionHandlingConfig.py b/Trigger/TrigSteer/DecisionHandling/python/DecisionHandlingConfig.py index 61435831939eabf3e40413f314ba8a7d9d75f8b1..468899edd32684386894dc05342aef02d8ebd3ac 100644 --- a/Trigger/TrigSteer/DecisionHandling/python/DecisionHandlingConfig.py +++ b/Trigger/TrigSteer/DecisionHandling/python/DecisionHandlingConfig.py @@ -3,7 +3,7 @@ # def setupFilterMonitoring( filterAlg ): - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool monTool = GenericMonitoringTool('MonTool') inputKeys = filterAlg.Input @@ -21,7 +21,7 @@ def setupFilterMonitoring( filterAlg ): def TriggerSummaryAlg( name ): from DecisionHandling.DecisionHandlingConf import TriggerSummaryAlg as Alg alg = Alg( name ) - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool monTool = GenericMonitoringTool('MonTool', HistPath='HLTFramework/'+name) monTool.defineHistogram('TIME_SinceEventStart', path='EXPERT', type='TH1F', title='Time since beginning of event processing;time [ms]', diff --git a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx index 75c307fc9a9ab3eeb9f6e5f826efc25479d2fb08..a4d05fcce7da991f09c211e3b3c03d5a920ec234 100644 --- a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx +++ b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx @@ -4,7 +4,7 @@ // DecisionHandling includes #include "RoRSeqFilter.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "GaudiKernel/Property.h" using TrigCompositeUtils::DecisionContainer; diff --git a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.h b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.h index f3d0c2e7f53ee72d37826259636a69b6549fb9aa..54b6825dc1eee470c323201d6e422a92949863d6 100644 --- a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.h +++ b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.h @@ -11,7 +11,7 @@ #include "AthContainers/ConstDataVector.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "DecisionHandling/HLTIdentifier.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" /** * @class Filtering algorithm for HLT Step sequencer diff --git a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx index 38503b165b7d5d0c06183e705fdab2e78abc3097..176f7c02fa6823658a64971e16787a24c6df7ff8 100644 --- a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx +++ b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx @@ -4,7 +4,7 @@ #include "GaudiKernel/Property.h" #include "TriggerSummaryAlg.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" TriggerSummaryAlg::TriggerSummaryAlg( const std::string& name, ISvcLocator* pSvcLocator ) : diff --git a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h index e92c9632ef5eb68410539a0684844339a84b2e3a..83453cbc596c01655664d6c737b031e6e7ee15de 100644 --- a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h +++ b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h @@ -13,7 +13,7 @@ #include "DecisionHandling/TrigCompositeUtils.h" #include "DecisionHandling/IHLTOutputTool.h" #include "TrigCostMonitorMT/ITrigCostMTSvc.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" /** * @class TriggerSummaryAlg * @brief In addition, a merged decisions collection is prepared. But not currently written. diff --git a/Trigger/TrigSteer/L1Decoder/CMakeLists.txt b/Trigger/TrigSteer/L1Decoder/CMakeLists.txt index a101e9295991f24c854037021cdf844fab1e55b5..86910e050a6254d3181153f60c859c8732309470 100644 --- a/Trigger/TrigSteer/L1Decoder/CMakeLists.txt +++ b/Trigger/TrigSteer/L1Decoder/CMakeLists.txt @@ -13,7 +13,7 @@ atlas_depends_on_subdirs( PUBLIC PRIVATE Control/AthViews Control/AthenaBaseComps - Control/AthenaMonitoring + Control/AthenaMonitoringKernel Event/xAOD/xAODTrigger Trigger/TrigConfiguration/TrigConfHLTData Trigger/TrigConfiguration/TrigConfData @@ -33,7 +33,7 @@ atlas_add_library( L1DecoderLib src/*.cxx INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} PUBLIC_HEADERS L1Decoder - LINK_LIBRARIES GaudiKernel AthViews AthenaBaseComps AthenaMonitoringLib + LINK_LIBRARIES GaudiKernel AthViews AthenaBaseComps AthenaMonitoringKernelLib xAODTrigger TrigConfHLTData TrigConfData TrigConfL1Data TrigSteeringEvent TrigT1Interfaces TrigT1Result DecisionHandlingLib LINK_LIBRARIES ${CLHEP_LIBRARIES} diff --git a/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py b/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py index 0712598d8b2ef61c3b3f1f1474860dd33511a4c8..34c5d8a27044f70c304b1ac20e0db8c0e72dbd85 100644 --- a/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py +++ b/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py @@ -1,7 +1,7 @@ # # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration # -from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram +from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram import math def CTPUnpackingMonitoring( maxItems, maxChains ): diff --git a/Trigger/TrigSteer/L1Decoder/src/CTPUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/CTPUnpackingTool.cxx index c325687cb6809dc48eee3b0cd2ae7fadeb4bef78..8a99299c310571ed57bcad5f07641aa848e6de71 100644 --- a/Trigger/TrigSteer/L1Decoder/src/CTPUnpackingTool.cxx +++ b/Trigger/TrigSteer/L1Decoder/src/CTPUnpackingTool.cxx @@ -4,7 +4,7 @@ #include #include "DecisionHandling/HLTIdentifier.h" #include "TrigT1Result/RoIBResult.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigConfL1Data/CTPConfig.h" #include "TrigConfL1Data/TriggerItem.h" #include "CTPUnpackingTool.h" diff --git a/Trigger/TrigSteer/L1Decoder/src/CTPUnpackingToolBase.h b/Trigger/TrigSteer/L1Decoder/src/CTPUnpackingToolBase.h index 26cc5a197843b2645c649b9fed366cfe26a199c9..9eeec96d33912397e784d13fbddf8625c32813bc 100644 --- a/Trigger/TrigSteer/L1Decoder/src/CTPUnpackingToolBase.h +++ b/Trigger/TrigSteer/L1Decoder/src/CTPUnpackingToolBase.h @@ -8,7 +8,7 @@ #include "ICTPUnpackingTool.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/HLTIdentifier.h" diff --git a/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx index 51b5e15a626b4bca4a2295eec47059a0c7b00262..8c2e0702977ad6af1ebf81b0136b31ceb6cb800c 100644 --- a/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx +++ b/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx @@ -5,7 +5,7 @@ #include "EMRoIsUnpackingTool.h" #include "TrigT1Result/RoIBResult.h" #include "TrigT1Interfaces/TrigT1CaloDefs.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigConfL1Data/CTPConfig.h" /////////////////////////////////////////////////////////////////// diff --git a/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.h b/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.h index 9f31b15ac343dbe779ccd29fe75747d1427d528d..7236bf93f1a73138f7703d6369bcfd7f449495f6 100644 --- a/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.h +++ b/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.h @@ -12,7 +12,7 @@ #include "TrigConfL1Data/TriggerThreshold.h" #include "TrigT1Interfaces/RecEmTauRoI.h" #include "TrigSteeringEvent/TrigRoiDescriptorCollection.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" // FrameWork includes #include "AthenaBaseComps/AthAlgTool.h" diff --git a/Trigger/TrigSteer/L1Decoder/src/FakeRoI.cxx b/Trigger/TrigSteer/L1Decoder/src/FakeRoI.cxx index 4497e7950a0d5b0e49bc56f82fec0190d7a5506f..1ecb74df2d5f4a68a300ec768c608af74c4998c3 100644 --- a/Trigger/TrigSteer/L1Decoder/src/FakeRoI.cxx +++ b/Trigger/TrigSteer/L1Decoder/src/FakeRoI.cxx @@ -18,7 +18,7 @@ #include "TrigT1Result/RoIBResult.h" #include "TrigConfL1Data/L1DataDef.h" #include "TrigConfHLTData/HLTUtils.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "./FakeRoI.h" diff --git a/Trigger/TrigSteer/L1Decoder/src/FakeRoI.h b/Trigger/TrigSteer/L1Decoder/src/FakeRoI.h index 7d35aa03ba3c9a83ad46b6cfcd649c7bd65bc373..58a1e3eb8693a7e96f7824b69eb66afcab54dd9b 100644 --- a/Trigger/TrigSteer/L1Decoder/src/FakeRoI.h +++ b/Trigger/TrigSteer/L1Decoder/src/FakeRoI.h @@ -10,7 +10,7 @@ #define L1Decoder_FakeRoI_h #include "AthenaBaseComps/AthAlgorithm.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "TrigConfInterfaces/ILVL1ConfigSvc.h" #include "TrigConfL1Data/ThresholdConfig.h" diff --git a/Trigger/TrigSteer/L1Decoder/src/JRoIsUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/JRoIsUnpackingTool.cxx index d66f7d8bf63e4f4e82a190085badd859741e85c5..0c3fd6a7705d278489c196ef2d7a6d1909389312 100644 --- a/Trigger/TrigSteer/L1Decoder/src/JRoIsUnpackingTool.cxx +++ b/Trigger/TrigSteer/L1Decoder/src/JRoIsUnpackingTool.cxx @@ -5,7 +5,7 @@ #include "JRoIsUnpackingTool.h" #include "TrigT1Result/RoIBResult.h" #include "TrigT1Interfaces/TrigT1CaloDefs.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigConfL1Data/CTPConfig.h" JRoIsUnpackingTool::JRoIsUnpackingTool( const std::string& type, diff --git a/Trigger/TrigSteer/L1Decoder/src/JRoIsUnpackingTool.h b/Trigger/TrigSteer/L1Decoder/src/JRoIsUnpackingTool.h index 541a5da2fa465da0c1cb9264e70329b4ca4337cc..843fc9a0a636cfe078acf3233f31468ec5391bb1 100644 --- a/Trigger/TrigSteer/L1Decoder/src/JRoIsUnpackingTool.h +++ b/Trigger/TrigSteer/L1Decoder/src/JRoIsUnpackingTool.h @@ -10,7 +10,7 @@ #include "TrigConfL1Data/TriggerThreshold.h" #include "TrigT1Interfaces/RecJetRoI.h" #include "TrigSteeringEvent/TrigRoiDescriptorCollection.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "GaudiKernel/ServiceHandle.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "RoIsUnpackingToolBase.h" diff --git a/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx index e7b8cbec4661750e5b6e2380007df437d8cae005..d0326e06a5949690b954a354dffbcee1942cd053 100644 --- a/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx +++ b/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx @@ -3,7 +3,7 @@ */ #include "MURoIsUnpackingTool.h" #include "TrigT1Result/RoIBResult.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigConfL1Data/CTPConfig.h" /////////////////////////////////////////////////////////////////// diff --git a/Trigger/TrigSteer/L1Decoder/src/RoIsUnpackingToolBase.h b/Trigger/TrigSteer/L1Decoder/src/RoIsUnpackingToolBase.h index 576298f7726cd560ff5ea9c0bb55e6a3b650db9c..c24d55172ca4eac47438dc42be95dae1c54d5f54 100644 --- a/Trigger/TrigSteer/L1Decoder/src/RoIsUnpackingToolBase.h +++ b/Trigger/TrigSteer/L1Decoder/src/RoIsUnpackingToolBase.h @@ -7,7 +7,7 @@ #include "IRoIsUnpackingTool.h" #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "DecisionHandling/TrigCompositeUtils.h" #include "DecisionHandling/HLTIdentifier.h" #include "TrigConfL1Data/TriggerThreshold.h" diff --git a/Trigger/TrigSteer/L1Decoder/src/TAURoIsUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/TAURoIsUnpackingTool.cxx index a724ef690f55875aa907aa61e0f1c076f53a5925..177a07d54231659f478a18ffa3ccb90e2eecbed0 100644 --- a/Trigger/TrigSteer/L1Decoder/src/TAURoIsUnpackingTool.cxx +++ b/Trigger/TrigSteer/L1Decoder/src/TAURoIsUnpackingTool.cxx @@ -5,7 +5,7 @@ #include "TAURoIsUnpackingTool.h" #include "TrigT1Result/RoIBResult.h" #include "TrigT1Interfaces/TrigT1CaloDefs.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigConfL1Data/CTPConfig.h" /////////////////////////////////////////////////////////////////// diff --git a/Trigger/TrigSteer/L1Decoder/src/TAURoIsUnpackingTool.h b/Trigger/TrigSteer/L1Decoder/src/TAURoIsUnpackingTool.h index d284a69e9ff22f545c9a2464a6975f16ed3e3825..7ac52afcd914aa7d180599357333e9b46518658e 100644 --- a/Trigger/TrigSteer/L1Decoder/src/TAURoIsUnpackingTool.h +++ b/Trigger/TrigSteer/L1Decoder/src/TAURoIsUnpackingTool.h @@ -12,7 +12,7 @@ #include "TrigConfL1Data/TriggerThreshold.h" #include "TrigT1Interfaces/RecEmTauRoI.h" #include "TrigSteeringEvent/TrigRoiDescriptorCollection.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" // FrameWork includes #include "AthenaBaseComps/AthAlgTool.h" diff --git a/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt b/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt index cf2b035eb9eb678470e948c60741f78ae646d2cb..b10fb7b1f2a29bccbac6a5e86a7167136820ff77 100644 --- a/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt +++ b/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt @@ -28,7 +28,7 @@ atlas_depends_on_subdirs( PUBLIC Event/xAOD/xAODTrigBphys Event/xAOD/xAODJet Trigger/TrigSteer/DecisionHandling - Control/AthenaMonitoring + Control/AthenaMonitoringKernel Trigger/TrigMonitoring/TrigCostMonitorMT Trigger/TrigAlgorithms/TrigPartialEventBuilding Trigger/TrigDataAccess/TrigSerializeTP @@ -45,7 +45,7 @@ atlas_add_library( TrigOutputHandlingLib PUBLIC_HEADERS TrigOutputHandling INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} GaudiKernel AthViews AthenaBaseComps RootUtils TrigSteeringEvent TrigSerializeResultLib TrigConfData - xAODTrigCalo xAODTrigEgamma xAODEgamma xAODTrigger xAODTracking xAODTrigMuon xAODMuon xAODTau xAODTrigBphys xAODTrigMissingET DecisionHandlingLib AthenaMonitoringLib TrigPartialEventBuildingLib TrigSerializeTPLib AthContainersRoot ) + xAODTrigCalo xAODTrigEgamma xAODEgamma xAODTrigger xAODTracking xAODTrigMuon xAODMuon xAODTau xAODTrigBphys xAODTrigMissingET DecisionHandlingLib AthenaMonitoringKernelLib TrigPartialEventBuildingLib TrigSerializeTPLib AthContainersRoot ) atlas_add_component( TrigOutputHandling src/components/*.cxx diff --git a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/HLTResultMTMaker.h b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/HLTResultMTMaker.h index 5253b40d6c92fdbd76c42ee08fb78b944d92f0f8..868ca21e79de11682c33d48144500f7a1f8cf082 100644 --- a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/HLTResultMTMaker.h +++ b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/HLTResultMTMaker.h @@ -11,7 +11,7 @@ // Athena includes #include "AthenaBaseComps/AthAlgTool.h" -#include "AthenaMonitoring/GenericMonitoringTool.h" +#include "AthenaMonitoringKernel/GenericMonitoringTool.h" #include "StoreGate/WriteHandle.h" // Forward declarations diff --git a/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py b/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py index 27068d73e22bcf55c1e6674e9938d472a8a7544a..7bdf1cc6c954c629990977a208bbbeb645926e25 100644 --- a/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py +++ b/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py @@ -2,7 +2,7 @@ def HLTResultMTMakerCfg(name="HLTResultMTMaker"): from TrigOutputHandlingConf import HLTResultMTMaker - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram m = HLTResultMTMaker(name) @@ -96,7 +96,7 @@ def TriggerEDMSerialiserToolCfg(name="TriggerEDMSerialiserTool"): serialiser.TruncationThresholds = truncThresholds # Configure monitoring histograms - from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool serialiser.MonTool = GenericMonitoringTool('MonTool', HistPath='HLTFramework/'+name) serialiser.MonTool.defineHistogram('Truncation_ModuleId', path='EXPERT', type='TH1F', title='Module IDs of truncated HLT results;Module ID;Num of truncated results', diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMaker.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMaker.cxx index c67390928b88b0e2715ddc648ae6a80b31acb47b..c1a593fa9fe088dbd73cde88390104459a271069 100644 --- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMaker.cxx +++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMaker.cxx @@ -3,7 +3,7 @@ */ #include "TrigOutputHandling/HLTResultMTMaker.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "GaudiKernel/IJobOptionsSvc.h" #include diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.h b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.h index 4b5ef8da79f0af7539f312607e6ae9d3667fdd28..42a4dade53985fbd901c0b013ef307e6698c834a 100644 --- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.h +++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.h @@ -12,7 +12,7 @@ #include "AthenaKernel/IClassIDSvc.h" #include "AthenaKernel/IAthenaSerializeSvc.h" #include "AthenaKernel/IDictLoaderSvc.h" -#include "AthenaMonitoring/Monitored.h" +#include "AthenaMonitoringKernel/Monitored.h" #include "TrigOutputHandling/HLTResultMTMakerTool.h" #include "TrigSerializeTP/TrigSerTPTool.h" #include "Gaudi/Parsers/Factory.h" // Needed to declare less common Property types