Merge branch 'regsel_legacy' into '24.0'

RegionSelector: delete legacy configuration methods

See merge request atlas/athena!69594

DetectorDescription/RegionSelector/python/RegSelToolConfig.py

@@ -76,141 +76,6 @@ def _createRegSelTool( detector, enable ):
     return tool
 
 
-
-def _makeRegSelTool( detector, enable, CondAlgConstructor ):
-
-    from AthenaCommon.AlgSequence import AthSequencer
-    condseq = AthSequencer('AthCondSeq')
-
-    if enable and not hasattr( condseq, _condAlgName( detector ) ):
-        from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-        condseq += _createRegSelCondAlg( detector, CondAlgConstructor, athenaCommonFlags.isOnline )
-
-    return _createRegSelTool( detector, enable )
-
-
-
-# inner detector tools
-
-def makeRegSelTool_Pixel() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.pixel_on()
-    from InDetRegionSelector.InDetRegionSelectorConf import SiRegSelCondAlg
-    return _makeRegSelTool( 'Pixel', enabled, SiRegSelCondAlg )
-
-def makeRegSelTool_SCT() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.SCT_on()
-    from InDetRegionSelector.InDetRegionSelectorConf import SiRegSelCondAlg
-    return _makeRegSelTool( 'SCT', enabled, SiRegSelCondAlg )
-
-def makeRegSelTool_TRT() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.TRT_on()
-    from InDetRegionSelector.InDetRegionSelectorConf import TRT_RegSelCondAlg
-    return _makeRegSelTool( 'TRT', enabled, TRT_RegSelCondAlg )
-
-
-# muon spectrimeter tools 
-
-def makeRegSelTool_MDT() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.MDT_on()
-    from MuonRegionSelector.MuonRegionSelectorConf import MDT_RegSelCondAlg
-    from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-    if enabled and not athenaCommonFlags.isOnline:
-        from AthenaCommon.AlgSequence import AthSequencer
-        from MuonCondAlg.MuonTopCondAlgConfigRUN2 import MdtCondDbAlg
-        condseq = AthSequencer('AthCondSeq')
-        if not hasattr(condseq, "MdtCondDbAlg"): condseq+= MdtCondDbAlg()
-    return _makeRegSelTool( "MDT", enabled, MDT_RegSelCondAlg )
-
-def makeRegSelTool_RPC() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.RPC_on()
-    from MuonRegionSelector.MuonRegionSelectorConf import RPC_RegSelCondAlg
-    return _makeRegSelTool( "RPC", enabled, RPC_RegSelCondAlg )
-
-def makeRegSelTool_TGC() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.TGC_on()
-    from MuonRegionSelector.MuonRegionSelectorConf import TGC_RegSelCondAlg
-    return _makeRegSelTool( "TGC", enabled, TGC_RegSelCondAlg )
-
-def makeRegSelTool_CSC() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.CSC_on()
-    from MuonRegionSelector.MuonRegionSelectorConf import CSC_RegSelCondAlg
-    return _makeRegSelTool( "CSC", enabled, CSC_RegSelCondAlg )
-
-
-# new small wheel 
-
-def makeRegSelTool_MM() :
-    from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = False
-    if MuonGeometryFlags.hasMM() :
-        enabled = DetFlags.detdescr.MM_on()
-    from MuonRegionSelector.MuonRegionSelectorConf import MM_RegSelCondAlg
-    return _makeRegSelTool( "MM", enabled, MM_RegSelCondAlg )
-
-def makeRegSelTool_sTGC() :
-    from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = False
-    if MuonGeometryFlags.hasSTGC() :
-        enabled = DetFlags.detdescr.sTGC_on()
-    from MuonRegionSelector.MuonRegionSelectorConf import sTGC_RegSelCondAlg
-    return _makeRegSelTool( "sTGC", enabled, sTGC_RegSelCondAlg )
-
-
-
-# calorimeter 
-
-def makeRegSelTool_TTEM() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.Calo_on()
-    from LArRecUtils.LArRoIMapCondAlgDefault import LArRoIMapCondAlgDefault
-    LArRoIMapCondAlgDefault()
-    from LArRegionSelector.LArRegionSelectorConf import RegSelCondAlg_LAr
-    return _makeRegSelTool( "TTEM", enabled, RegSelCondAlg_LAr )
-
-def makeRegSelTool_TTHEC() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.Calo_on()
-    from LArRecUtils.LArRoIMapCondAlgDefault import LArRoIMapCondAlgDefault
-    LArRoIMapCondAlgDefault()
-    from LArRegionSelector.LArRegionSelectorConf import RegSelCondAlg_LAr
-    return _makeRegSelTool( "TTHEC", enabled, RegSelCondAlg_LAr )
-            
-def makeRegSelTool_FCALEM() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.Calo_on()
-    from LArRecUtils.LArRoIMapCondAlgDefault import LArRoIMapCondAlgDefault
-    LArRoIMapCondAlgDefault()
-    from LArRegionSelector.LArRegionSelectorConf import RegSelCondAlg_LAr
-    return _makeRegSelTool( "FCALEM", enabled, RegSelCondAlg_LAr )
-
-def makeRegSelTool_FCALHAD() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.Calo_on()
-    from LArRecUtils.LArRoIMapCondAlgDefault import LArRoIMapCondAlgDefault
-    LArRoIMapCondAlgDefault()
-    from LArRegionSelector.LArRegionSelectorConf import RegSelCondAlg_LAr
-    return _makeRegSelTool( "FCALHAD", enabled, RegSelCondAlg_LAr )
-
-# tile calorimeter
-
-def makeRegSelTool_TILE() :
-    from AthenaCommon.DetFlags import DetFlags
-    enabled = DetFlags.detdescr.Calo_on()
-    from TileRawUtils.TileRawUtilsConf import RegSelCondAlg_Tile
-    return _makeRegSelTool( "TILE", enabled, RegSelCondAlg_Tile )
-
-
-##### new JO counterparts
-
 def regSelToolCfg(flags, detector, algorithm, readout_geometry=None, conditions=None):
     ca = ComponentAccumulator()
     if readout_geometry: