diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.cxx
index cff3a18595804d71ced744bdbbaa5aed661bb15e..128c2f490f152e2714eca03321e1812a546a5c51 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.cxx
@@ -12,8 +12,7 @@
TrigL2MuonSA::MuFastDataPreparator::MuFastDataPreparator(const std::string& type,
const std::string& name,
const IInterface* parent):
- AthAlgTool(type,name,parent),
- m_regionSelector("RegSelSvc", name)
+ AthAlgTool(type,name,parent)
{
}
@@ -33,9 +32,6 @@ StatusCode TrigL2MuonSA::MuFastDataPreparator::initialize()
ATH_CHECK(m_readKey.initialize());
- ATH_CHECK(m_regionSelector.retrieve());
- ATH_MSG_DEBUG("Retrieved the RegionSelector service ");
-
if (m_use_rpc) {
ATH_CHECK(m_rpcDataPreparator.retrieve());
ATH_MSG_DEBUG("Retrieved service " << m_rpcDataPreparator);
@@ -65,10 +61,6 @@ StatusCode TrigL2MuonSA::MuFastDataPreparator::initialize()
ATH_CHECK(m_rpcPatFinder.retrieve());
ATH_MSG_DEBUG("Retrieved service " << m_rpcPatFinder);
- // set the geometry tools
- m_rpcRoadDefiner->setMdtGeometry(m_regionSelector);
- m_tgcRoadDefiner->setMdtGeometry(m_regionSelector);
-
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.h b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.h
index 0f896e18374be9f4368ac61c76d35bda3bdfee29..f86150842b7879249788a3cf2f6ebc3216af5d0d 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.h
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastDataPreparator.h
@@ -12,7 +12,6 @@
#include "MuonCnvToolInterfaces/IMuonRawDataProviderTool.h"
#include "ByteStreamCnvSvcBase/ROBDataProviderSvc.h"
-#include "RegionSelector/IRegSelSvc.h"
#include "TrigT1Interfaces/RecMuonRoI.h"
#include "TrigT1Interfaces/RecMuonRoiSvc.h"
@@ -102,8 +101,6 @@ class MuFastDataPreparator: public AthAlgTool {
TrigL2MuonSA::MuFastDataPreparatorOptions m_options;
SG::ReadCondHandleKey<RpcCablingCondData> m_readKey{this, "ReadKey", "RpcCablingCondData", "Key of RpcCablingCondData"};
- ServiceHandle<IRegSelSvc> m_regionSelector;
-
ServiceHandle<LVL1RPC::RPCRecRoiSvc> m_recRPCRoiSvc{this, "RPCRecRoiSvc", "LVL1RPC::RPCRecRoiSvc"};
ToolHandle<RpcDataPreparator> m_rpcDataPreparator{this, "RPCDataPreparator", "TrigL2MuonSA::RpcDataPreparator"};
ToolHandle<TgcDataPreparator> m_tgcDataPreparator{this, "TGCDataPreparator", "TrigL2MuonSA::TgcDataPreparator"};
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcRoadDefiner.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcRoadDefiner.cxx
index 5741838c0e371b027084475d61defaa220d67d9b..5445ae2d65fbebf86cef50cf8039b06c7b5d0f2f 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcRoadDefiner.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcRoadDefiner.cxx
@@ -14,8 +14,7 @@
TrigL2MuonSA::RpcRoadDefiner::RpcRoadDefiner(const std::string& type,
const std::string& name,
const IInterface* parent):
- AthAlgTool(type, name, parent),
- m_regionSelector( "RegSelSvc", name )
+ AthAlgTool(type, name, parent)
{
}
@@ -25,6 +24,10 @@ TrigL2MuonSA::RpcRoadDefiner::RpcRoadDefiner(const std::string& type,
StatusCode TrigL2MuonSA::RpcRoadDefiner::initialize()
{
ATH_CHECK(m_idHelperSvc.retrieve());
+
+ ATH_CHECK(m_regionSelector.retrieve());
+ ATH_MSG_DEBUG("Retrieved the RegionSelector tool ");
+
return StatusCode::SUCCESS;
}
@@ -159,8 +162,11 @@ StatusCode TrigL2MuonSA::RpcRoadDefiner::defineRoad(const LVL1::RecMuonRoI*
const IRoiDescriptor* iroi = (IRoiDescriptor*) roi;
- if (iroi) m_regionSelector->DetHashIDList(MDT, *iroi, mdtHashList);
- else m_regionSelector->DetHashIDList(MDT, mdtHashList);
+ if (iroi) m_regionSelector->HashIDList(*iroi, mdtHashList);
+ else {
+ TrigRoiDescriptor fullscan_roi( true );
+ m_regionSelector->HashIDList(fullscan_roi, mdtHashList);
+ }
if(roi) delete roi;
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcRoadDefiner.h b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcRoadDefiner.h
index 895a783c3e88633a0591a8c0467961b1b1d48304..a5c332386d611e7fc2d651963f13adc29bf0f200 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcRoadDefiner.h
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcRoadDefiner.h
@@ -17,7 +17,7 @@
#include "RpcFitResult.h"
#include "BarrelRoadData.h"
#include "TrigT1Interfaces/RecMuonRoI.h"
-#include "RegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include <string>
@@ -50,7 +50,6 @@ class RpcRoadDefiner: public AthAlgTool
double roiEtaMinHigh,
double roiEtaMaxHigh) const;
- void setMdtGeometry(const ServiceHandle<IRegSelSvc>& regionSelector){ m_regionSelector = regionSelector; };
void setRoadWidthForFailure(double rWidth_RPC_Failed){ m_rWidth_RPC_Failed = rWidth_RPC_Failed; };
void setRpcGeometry(bool use_rpc){ m_use_rpc = use_rpc; };
@@ -62,7 +61,7 @@ class RpcRoadDefiner: public AthAlgTool
double m_rWidth_RPC_Failed{0};
bool m_use_rpc{true};
- ServiceHandle<IRegSelSvc> m_regionSelector;
+ ToolHandle<IRegSelTool> m_regionSelector{this, "RegionSelectionTool", "RegSelTool/RegSelTool_MDT", "MDT Region Selector Tool"};
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
};
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcRoadDefiner.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcRoadDefiner.cxx
index 7511369023e3682798d62c7c3fd66c73747dc78e..ef4b19d5bc2bea5a2da39c4b3e26ceb3d393b739 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcRoadDefiner.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcRoadDefiner.cxx
@@ -19,8 +19,7 @@
TrigL2MuonSA::TgcRoadDefiner::TgcRoadDefiner(const std::string& type,
const std::string& name,
const IInterface* parent):
- AthAlgTool(type, name, parent),
- m_regionSelector( "RegSelSvc", name )
+ AthAlgTool(type, name, parent)
{
}
@@ -32,6 +31,9 @@ StatusCode TrigL2MuonSA::TgcRoadDefiner::initialize()
ATH_CHECK(AthAlgTool::initialize());
+ ATH_CHECK(m_regionSelector.retrieve());
+ ATH_MSG_DEBUG("Retrieved the RegionSelector tool ");
+
ATH_CHECK(m_tgcFit.retrieve());
ATH_MSG_DEBUG("Retrieved service " << m_tgcFit);
@@ -333,8 +335,11 @@ StatusCode TrigL2MuonSA::TgcRoadDefiner::defineRoad(const LVL1::RecMuonRoI*
if(phiMin < M_PI*-1) phiMin += M_PI*2.;
TrigRoiDescriptor* roi = new TrigRoiDescriptor( p_roi->eta(), etaMin, etaMax, p_roi->phi(), phiMin, phiMax );
const IRoiDescriptor* iroi = (IRoiDescriptor*) roi;
- if (iroi) m_regionSelector->DetHashIDList(MDT, *iroi, mdtHashList);
- else m_regionSelector->DetHashIDList(MDT, mdtHashList);
+ if (iroi) m_regionSelector->HashIDList(*iroi, mdtHashList);
+ else {
+ TrigRoiDescriptor fullscan_roi( true );
+ m_regionSelector->HashIDList(fullscan_roi, mdtHashList);
+ }
if(roi) delete roi;
for(const IdentifierHash& i_hash : mdtHashList ){
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcRoadDefiner.h b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcRoadDefiner.h
index 6987ce71bf4d95a295d67d7bc64ba246b93f8d46..0fed868b83f86834e2005dd177d6758ab74068d8 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcRoadDefiner.h
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcRoadDefiner.h
@@ -17,7 +17,7 @@
#include "MuonRoad.h"
#include "MdtRegion.h"
#include "TrigT1Interfaces/RecMuonRoI.h"
-#include "RegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include <string>
@@ -42,7 +42,6 @@ class TgcRoadDefiner: public AthAlgTool
TrigL2MuonSA::MuonRoad& muonRoad,
TrigL2MuonSA::TgcFitResult& tgcFitResult) const;
- void setMdtGeometry(const ServiceHandle<IRegSelSvc>& regionSelector) { m_regionSelector = regionSelector; };
void setPtLUT(const TrigL2MuonSA::PtEndcapLUTSvc* ptEndcapLUTSvc) { m_ptEndcapLUT = ptEndcapLUTSvc->ptEndcapLUT(); };
void setRoadWidthForFailure(double rWidth_TGC_Failed) { m_rWidth_TGC_Failed = rWidth_TGC_Failed; };
void setExtrapolatorTool(ToolHandle<ITrigMuonBackExtrapolator>* backExtrapolator) { m_backExtrapolatorTool = backExtrapolator; };
@@ -63,7 +62,7 @@ class TgcRoadDefiner: public AthAlgTool
double m_rWidth_TGC_Failed {0};
- ServiceHandle<IRegSelSvc> m_regionSelector;
+ ToolHandle<IRegSelTool> m_regionSelector{this, "RegionSelectionTool", "RegSelTool/RegSelTool_MDT", "MDT Region Selector Tool"};
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
};