From ffcf359055f2b789fc04bd140d932af91b51980f Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Thu, 15 Oct 2020 17:21:46 +0200
Subject: [PATCH] Include cabling dependencies in new-style RegSelToolConfig
---
.../RegionSelector/python/RegSelToolConfig.py | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/DetectorDescription/RegionSelector/python/RegSelToolConfig.py b/DetectorDescription/RegionSelector/python/RegSelToolConfig.py
index 738b154e955..c07406d4afc 100644
--- a/DetectorDescription/RegionSelector/python/RegSelToolConfig.py
+++ b/DetectorDescription/RegionSelector/python/RegSelToolConfig.py
@@ -17,7 +17,7 @@ def _condAlgName(detector):
def _createRegSelCondAlg( detector, CondAlgConstructor ):
"""
- Cretes conditions alg that provides dat to a RegSel Tool
+ Creates conditions alg that provides data to a RegSel Tool
"""
condAlg = CondAlgConstructor( name = _condAlgName( detector ),
ManagerName = detector,
@@ -178,10 +178,10 @@ def makeRegSelTool_TILE() :
##### new JO counterparts
-def regSelToolCfg(flags, detector, CondAlg, CablingConfigCfg=0):
+def regSelToolCfg(flags, detector, CondAlg, CablingConfigCfg=None):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
ca = ComponentAccumulator()
- if(CablingConfigCfg != 0):
+ if CablingConfigCfg:
ca.merge(CablingConfigCfg(flags))
ca.setPrivateTools(_createRegSelTool(detector, True))
ca.addCondAlgo(_createRegSelCondAlg(detector, CondAlg))
@@ -190,13 +190,17 @@ def regSelToolCfg(flags, detector, CondAlg, CablingConfigCfg=0):
# inner detector
def regSelTool_Pixel_Cfg(flags):
- return regSelToolCfg(flags, "Pixel", CompFactory.SiRegSelCondAlg)
+ from PixelConditionsAlgorithms.PixelConditionsConfig import PixelCablingCondAlgCfg
+ return regSelToolCfg(flags, "Pixel", CompFactory.SiRegSelCondAlg, CablingConfigCfg=PixelCablingCondAlgCfg)
def regSelTool_SCT_Cfg(flags):
- return regSelToolCfg(flags, "SCT", CompFactory.SiRegSelCondAlg)
+ from SCT_Cabling.SCT_CablingConfig import SCT_CablingCondAlgCfg
+ return regSelToolCfg(flags, "SCT", CompFactory.SiRegSelCondAlg, CablingConfigCfg=SCT_CablingCondAlgCfg)
def regSelTool_TRT_Cfg(flags):
- return regSelToolCfg(flags, "TRT", CompFactory.TRT_RegSelCondAlg)
+ # temporary
+ from PixelConditionsAlgorithms.PixelConditionsConfig import PixelCablingCondAlgCfg
+ return regSelToolCfg(flags, "TRT", CompFactory.TRT_RegSelCondAlg, CablingConfigCfg=PixelCablingCondAlgCfg)
# muon spectrometer
--
GitLab