diff --git a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
index 1673c2949498814f408636b31e3dcbf63866f57b..2e7735f658bc01292eaecbb1835a708eb9f9425e 100644
--- a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
+++ b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
@@ -72,7 +72,8 @@ StatusCode RegSelTestAlg::dumpOne( const std::string& message, double eta, const
StatusCode RegSelTestAlg::dump() const {
// generate list of RoIs for ID
-
+
+ /// commented as a reminder until a fix for the new RegSelTools is added
// CHECK( dumpOne("Inner Detector ", 2.5, { PIXEL, SCT, TRT } ) );
CHECK( dumpOne("Calorimeters ", 5., { LAR, TTEM, TTHEC, TILE, FCALEM, FCALHAD } ) );
CHECK( dumpOne("Muons ", 5., { MDT, RPC, TGC, CSC } ) );
@@ -184,7 +185,7 @@ StatusCode RegSelTestAlg::mt() const {
std::vector<ParallelCallTest*> tests;
-
+ /// commented as a reminder until a fix is added for the new RegSelTools
// for ( auto detector: {PIXEL, SCT, TRT, LAR, TTEM, TTHEC, TILE, MDT, RPC, TGC, CSC, FCALEM, FCALHAD, FTK} ) {
for ( auto detector: { LAR, TTEM, TTHEC, TILE, MDT, RPC, TGC, CSC, FCALEM, FCALHAD } ) {
for ( auto& roi : rois ) {
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py
index 304e723bf901dccbaf9de716b5681615591221f9..a080d7b9f4e808c1df6dbac9ab07f3e10eb5ad8e 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py
@@ -69,10 +69,6 @@ if DetFlags.overlay.pixel_on() or DetFlags.overlay.SCT_on() or DetFlags.overlay.
#ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "SCT_RDO_Container/SCT_RDOs" ]
#ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "Trk::SCT_ClusterContainer/SCT_OnlineClusters" ]
-# from RegionSelector.RegSelToolConfig import makeRegSelTool_SCT
-# job.InDetSCTRawDataProvider.RegSelTool_SCT = makeRegSelTool_SCT()
-
-
if DetFlags.overlay.TRT_on():
if overlayFlags.isDataOverlay():
conddb.blockFolder("/TRT/Cond/DigVers")
@@ -100,9 +96,6 @@ if DetFlags.overlay.pixel_on() or DetFlags.overlay.SCT_on() or DetFlags.overlay.
job.InDetTRTRawDataProvider.RDOKey = overlayFlags.dataStore()+"+TRT_RDOs"
#ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "TRT_RDO_Container/TRT_RDOs" ]
-# from RegionSelector.RegSelToolConfig import makeRegSelTool_TRT
-# job.InDetTRTRawDataProvider.RegSelTool = makeRegSelTool_TRT()
-
#from IOVDbSvc.CondDB import conddb
#conddb.addFolder("TRT","/TRT/Calib/T0","<tag>TrtCalibt0-UPD2-FDR2-01</tag>")
#conddb.addFolder("TRT","/TRT/Calib/RT","<tag>TrtCalibRt-UPD2-FDR2-01</tag>")
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
index 4e1d64da481b1ceb340148b514fafb10971c93e1..ba6d489b37855e57a413c6f5f59a07809f8bf463 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
@@ -75,8 +75,6 @@ SiRegionSelectorTable::initialize(){
msg(MSG::WARNING) << "Tool disabled." << endmsg;
}
- // ATH_CHECK(m_condCablingKey.initialize());
-
ATH_MSG_WARNING("So far, this prevents the conditions migration!! The createTable() should NOT be used in the initilization step...");
return StatusCode::SUCCESS;
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py
index 95ba698ec6e69faf866a6ec504f5541b32250249..b4b209b8d95f96abc150d3b0f5c2d2f9699a72ef 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py
@@ -180,6 +180,7 @@ class TRT_TrigSeededTrackFinder_EF( InDet__TRT_TrigSeededTrackFinder ):
InDetTrigTRT_SeededSpacePointFinder.PRDtoTrackMap = 'InDetTrigPRDtoTrackMap_Photon_EF'
elif InDetTrigFlags.loadSimpleTRTSeededSPFinder():
+ # Old RegSelSvc configuration - leave commented until the dust has settled
# from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
# InDetTrigRegSelSvc = RegSelSvcDefault()
# InDetTrigRegSelSvc.enablePixel = DetFlags.pixel_on()
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
index e5fdf17b536a0bde961a73a09d61df4b9dd0a064..e83655fb0d6077d61aa7d73ea22dd4886252efcd 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
@@ -330,12 +330,6 @@ class SiTrigSpacePointFinder_EF( InDet__SiTrigSpacePointFinder ):
self.ProcessSCTs = True
self.ProcessOverlaps = InDetTrigFlags.doOverlapSP()
-# from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
-# from RegionSelector.RegSelToolConfig import makeRegSelTool_SCT
-
-# self.RegSelTool_Pixel = makeRegSelTool_Pixel()
-# self.RegSelTool_SCT = makeRegSelTool_SCT()
-
if type=='cosmicsN':
from InDetTrigRecExample.InDetTrigConfigRecLoadToolsCosmics import \
InDetTrigSiSpacePointMakerToolCosmics, SCT_TrigSpacePointToolCosmics
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py
index 85d5fbef1c05eb74f711282530f6a1455cfddfd0..5f120409dab5ade8930a8133165421e4ccb28435 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py
@@ -59,7 +59,9 @@ if InDetTrigFlags.useConditionsClasses():
else:
include ("InDetRecExample/InDetRecConditionsAccess.py")
-#manipulate RegSelSvc settings to be aware of the inactive detelems
+# remove all the old RegSelSvc setting - leave commented
+# while we determinte whether the RegSel migration has been successful
+# manipulate RegSelSvc settings to be aware of the inactive detelems
# from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
# RegSelSvc = RegSelSvcDefault()
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/python/GenericDummyUnseededAllTEAlgoConfig.py b/Trigger/TrigAlgorithms/TrigGenericAlgs/python/GenericDummyUnseededAllTEAlgoConfig.py
index 60a4ecd26471522ac7779b0b9f1b67943d7b7d17..54131fc50a168fd7bb8fa0edc2e4033ba390f4d0 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/python/GenericDummyUnseededAllTEAlgoConfig.py
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/python/GenericDummyUnseededAllTEAlgoConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.cxx b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.cxx
index de106f1762c84715fc7fcb27056c4a5aa2c51a33..5a5b19a347d7cde6caa00881195a9d472195b155 100644
--- a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.cxx
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.cxx
@@ -101,14 +101,6 @@ PEBInfoWriterToolBase::PEBInfo RoIPEBInfoWriterTool::createPEBInfo(const PEBInfo
TrigRoiDescriptor roiForPEB(eta, etaMin, etaMax, phi, phiMin, phiMax);
-#if 0
- std::vector<IRegSelTool*> tools = {
- m_regionSelectot_pix,
- m_regionSelectot_sct,
- m_regionSelectot_trt
- };
-#endif
-
for ( auto tool : m_tools ) {
std::vector<uint32_t> detROBs;
tool->ROBIDList( roiForPEB, detROBs);
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
index c35b373ab85d011f6f9cc34518c46cdb531bc0f0..af506b4c5f2f3470962383a2482f1dd1a4b6c7a9 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
@@ -665,9 +665,9 @@ def TrigInDetConfig( flags, roisKey="EMRoIs", signatureName='' ):
DoPhiFiltering = True,
UseBeamTilt = False,
UseNewLayerScheme = True,
- RegSel_Pixel = pixRegSelTool,
- RegSel_SCT = sctRegSelTool,
- layerNumberTool = acc.getPublicTool("TrigL2LayerNumberTool_FTF") ) )
+ RegSelTool_Pixel = pixRegSelTool,
+ RegSelTool_SCT = sctRegSelTool,
+ layerNumberTool = acc.getPublicTool("TrigL2LayerNumberTool_FTF") ) )
# TODO remove once offline configured counterparts are available?
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py
index a76295d395ac369b9863f61fb524fabde87a2622..cdd5b876965ec573bd57f11e3d248b2fe671aa00 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py
@@ -113,11 +113,6 @@ class L2EFChain_Beamspot(L2EFChainDef):
dummyAllTEAlgo = GenericDummyUnseededAllTEAlgo("L2DummyAlgo")
-# from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
-# from RegionSelector.RegSelToolConfig import makeRegSelTool_SCT
-# dummyAllTEAlgo.RegSelTool_Pixel = makeRegSelTool_Pixel()
-# dummyAttTEAlgo.RegSelTool_SCT = makeRegSelTool_SCT()
-
self.L2sequenceList += [ [[""], [dummyAllTEAlgo]+trk_alg, 'L2_BeamSpottracks']]
self.L2sequenceList +=[[['L2_BeamSpottracks'], [theFex], 'L2_fex']]