Configure RegSelTool for MDT to be used in newJO trigger test

DetectorDescription/RegionSelector/python/RegSelToolConfig.py

@@ -10,54 +10,66 @@
 #   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration#                 
 #
 
-from AthenaCommon.Constants import INFO,ERROR,FALSE,TRUE,DEBUG,VERBOSE
+from AthenaConfiguration.ComponentFactory import CompFactory # CompFactory creates old or new configs depending on the enva
 
-def _makeRegSelTool( detector, enable, CondAlgConstructor ) :
-                
-    from RegionSelector.RegionSelectorConf import RegSelTool
+def _condAlgName(detector):
+    return "RegSelCondAlg_"+detector
+
+def _createRegSelCondAlg( detector,  CondAlgConstructor ):
+    """
+    Cretes conditions alg that provides dat to a RegSel Tool
+    """
+    condAlg = CondAlgConstructor( name = _condAlgName( detector ),
+                                  ManagerName = detector,
+                                  PrintTable  = False,
+                                  RegSelLUT = ("RegSelLUTCondData_"+detector) )
+
+    if detector == "Pixel":
+        condAlg.DetEleCollKey = "PixelDetectorElementCollection"
+    elif detector == "SCT":
+        condAlg.DetEleCollKey = "SCT_DetectorElementCollection"
+    return condAlg
+
+def _createRegSelTool( detector, enable ):
+    """
+    Creates RegSelTool and corresponding cond tool that is needed for its function
+
+    If the enable flag is set - the tool is properly configured, else it is configured NOT to provide the data.
+
+    """
 
-    tool = RegSelTool(name="RegSelTool_"+detector)
     
+    tool = CompFactory.RegSelTool(name="RegSelTool_"+detector)
+
     # should we enable the look up table access for this subsystem ?
 
-    if ( enable ) :
+    if not enable:
+        # detector not configured so don't enable
+        # lookup table access
+        tool.Initialised = False
+        return tool
         
-        # add the lookup table to retrieve
+    # add the lookup table to retrieve
         
-        tool.RegSelLUT = "RegSelLUTCondData_"+detector
-
-        tool.Initialised = True
+    tool.RegSelLUT = "RegSelLUTCondData_"+detector # has to match wiht appropriate RegSelCondAlg
+    tool.Initialised = True
+    return tool
 
-        # add the conditions algorithm to create the lookup table
 
-        from AthenaCommon.AlgSequence import AthSequencer
-        condseq = AthSequencer('AthCondSeq')
-        
-        if not hasattr( condseq, 'RegSelCondAlg_'+detector ) :
-            CondAlg = CondAlgConstructor( name = ("RegSelCondAlg_"+detector),
-                                          ManagerName = detector,
-                                          PrintTable  = False,
-                                          RegSelLUT = ("RegSelLUTCondData_"+detector) )
 
-            if detector == "Pixel":
-                CondAlg.DetEleCollKey = "PixelDetectorElementCollection"
-            elif detector == "SCT":
-                CondAlg.DetEleCollKey = "SCT_DetectorElementCollection"
+def _makeRegSelTool( detector, enable, CondAlgConstructor ):
 
-            condseq += CondAlg
+    from AthenaCommon.AlgSequence import AthSequencer
+    condseq = AthSequencer('AthCondSeq')
 
-    else:
-        # detector not configured so don't enable 
-        # lookup table access
+    if enable and not hasattr( condseq, _condAlgName( detector ) ):
+        condseq += _createRegSelCondAlg( detector, CondAlgConstructor )
 
-        tool.Initialised = False
-    
-    return tool
+    return _createRegSelTool( detector, enable )
 
 
 
 # inner detector toold
-
 def makeRegSelTool_Pixel() :
     from AthenaCommon.DetFlags import DetFlags
     enabled = DetFlags.detdescr.pixel_on()
@@ -160,3 +172,12 @@ def makeRegSelTool_TILE() :
     from TileRawUtils.TileRawUtilsConf import RegSelCondAlg_Tile
     return _makeRegSelTool( "TILE", enabled, RegSelCondAlg_Tile )
 
+
+##### new JO counterparts
+
+def regSelToolMDTCfg(flags):
+    from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+    ca = ComponentAccumulator()
+    ca.setPrivateTools( _createRegSelTool( "MDT", True ) )
+    ca.addCondAlgo( _createRegSelCondAlg( "MDT", CompFactory.MDT_RegSelCondAlg ) )
+    return ca

MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py

@@ -137,9 +137,8 @@ def MdtRDODecodeCfg(flags, forTrigger=False):
                                               DecodingTool  = MdtRdoToMdtPrepDataTool,
                                               PrintPrepData = False )
     # add RegSelTool
-    # Comented out since this needs to be replaced by new config for region selector
-    #from RegionSelector.RegSelToolConfig import makeRegSelTool_MDT
-    #MdtRdoToMdtPrepData.RegSel_MDT = makeRegSelTool_MDT()
+    from RegionSelector.RegSelToolConfig import regSelToolMDTCfg
+    MdtRdoToMdtPrepData.RegSel_MDT = acc.popToolsAndMerge( regSelToolMDTCfg( flags ) )
 
     if forTrigger:
         # Set the algorithm to RoI mode