From dc9e682ed6f48018bece79b864d4b2733d162f83 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Wed, 24 Mar 2021 17:44:13 +0100
Subject: [PATCH] TrigT1CTMonitoring: Migrate from muon RoI services to tools

Migrate muon rec RoI services to tools (ATR-21660).
---
 Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt |  4 ++--
 .../TrigT1CTMonitoring/src/BSMonitoring.cxx      | 16 ++++++++--------
 .../TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h | 12 ++++--------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt b/Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt
index 3c1c89b35df9..584fadba3621 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigT1CTMonitoring )
@@ -13,7 +13,7 @@ find_package( ROOT COMPONENTS Core MathCore Hist )
 atlas_add_component( TrigT1CTMonitoring
    src/*.h src/*.cxx src/components/*.cxx
    INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${Boost_LIBRARIES} ${COOL_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib AthenaPoolUtilities CoraCool EventInfo GaudiKernel LWHists MuonDigitContainer MuonRDO MuonTrigCoinData TrigConfInterfaces TrigConfL1Data TrigConfStorage TrigT1CaloEventLib TrigT1Interfaces TrigT1Result )
+   LINK_LIBRARIES ${Boost_LIBRARIES} ${COOL_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib AthenaPoolUtilities CoraCool EventInfo GaudiKernel LWHists MuonDigitContainer MuonRDO MuonTrigCoinData TrigConfData TrigConfInterfaces TrigConfL1Data TrigConfStorage TrigT1CaloEventLib TrigT1Interfaces TrigT1Result )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
index 85b337cfa4a2..e198fc1aa616 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /// Gaudi includes
@@ -39,9 +39,9 @@
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
 
 // ROOT includes
-#include "Rtypes.h"// for Int_t
-#include "TH1F.h"// for SetRangeUser
-#include "TH2F.h"// for SetRangeUser
+#include "Rtypes.h" // for Int_t
+#include "TH1F.h" // for SetRangeUser
+#include "TH2F.h" // for SetRangeUser
 #include "TMath.h" // for Pi()
 
 //LWHists includes:
@@ -49,7 +49,7 @@
 #include "LWHists/TH2F_LW.h"
 #include "LWHists/TProfile_LW.h"
 
-#include "AthenaMonitoring/AthenaMonManager.h"//for environment
+#include "AthenaMonitoring/AthenaMonManager.h" //for environment
 #include "EventInfo/EventInfo.h"
 #include "EventInfo/EventID.h"
 #include <cmath>
@@ -73,10 +73,10 @@ TrigT1CTMonitoring::BSMonitoring::initialize()
   // connect to the config service
   ATH_CHECK( m_configSvc.retrieve() );
 
-  // connect to RPC and TGC RoI services
+  // connect to RPC and TGC RoI tools
   if ( m_processMuctpi ) {
-    ATH_CHECK( m_rpcRoiSvc.retrieve() );
-    ATH_CHECK( m_tgcRoiSvc.retrieve() );
+    ATH_CHECK( m_rpcRoiTool.retrieve() );
+    ATH_CHECK( m_tgcRoiTool.retrieve() );
   }
 
   return StatusCode::SUCCESS;
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
index 72f219976460..1023d73d527c 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1_CTMONITORING_BSMONITORING_H
@@ -15,13 +15,12 @@
 
 #include "AthenaMonitoring/ManagedMonitorToolBase.h"
 #include "GaudiKernel/ServiceHandle.h"
-//#include "TrigConfigSvc/ILVL1ConfigSvc.h"
 #include "TrigConfInterfaces/ILVL1ConfigSvc.h"
 #include "CoolKernel/IFolder.h"
 #include "CoolKernel/ChannelSelection.h"
 #include "CoolKernel/IObjectIterator.h"
 #include "CoolKernel/IObject.h"
-#include "TrigT1Interfaces/RecMuonRoiSvc.h"
+#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
 
 // RPC and TGC includes for access to SL data
 #include "MuonTrigCoinData/TgcCoinDataContainer.h"
@@ -68,9 +67,6 @@ namespace LVL1 {
 
 namespace TrigT1CTMonitoring {
 
-  const std::string ID_RecRpcRoiSvc = "LVL1RPC::RPCRecRoiSvc";
-  const std::string ID_RecTgcRoiSvc = "LVL1TGC::TGCRecRoiSvc";
-
   typedef std::map<std::string, LWHist*> HistMap_t;
 
   // enum for the LHC beam modes, see https://edms.cern.ch/document/1070479/
@@ -167,8 +163,8 @@ namespace TrigT1CTMonitoring {
     unsigned int m_eventNumber{0};
 
     ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc{ this, "TrigConfigSvc", "TrigConf::TrigConfigSvc/TrigConfigSvc", "Trigger Config Service" };
-    ServiceHandle< LVL1::RecMuonRoiSvc > m_rpcRoiSvc{ this, "RPCRecRoiSvc", "LVL1RPC::RPCRecRoiSvc"}; 
-    ServiceHandle< LVL1::RecMuonRoiSvc > m_tgcRoiSvc{ this, "TGCRecRoiSvc", "LVL1TGC::TGCRecRoiSvc"}; 
+    ToolHandle< LVL1::ITrigT1MuonRecRoiTool > m_rpcRoiTool{ this, "RPCRecRoiTool", "LVL1::TrigT1RPCRecRoiTool/TrigT1RPCRecRoiTool", "RPC Rec Roi Tool"};
+    ToolHandle< LVL1::ITrigT1MuonRecRoiTool > m_tgcRoiTool{ this, "TGCRecRoiTool", "LVL1::TrigT1TGCRecRoiTool/TrigT1TGCRecRoiTool", "TGC Rec Roi Tool"};
 
     Gaudi::Property<bool> m_useNewConfig { this, "UseNewConfig", false, "When true, read the menu from detector store, when false use the L1ConfigSvc" };
 
-- 
GitLab