From 02463fd85f378434c99ca193a4bc1687e9795eec Mon Sep 17 00:00:00 2001
From: Rupert Tombs <rt500@cam.ac.uk>
Date: Thu, 7 Nov 2019 20:09:20 +0000
Subject: [PATCH] Remove old style config aspects.
---
.../python/PixelCablingConfigNew.py | 75 ++++++++-----------
1 file changed, 33 insertions(+), 42 deletions(-)
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/python/PixelCablingConfigNew.py b/InnerDetector/InDetDetDescr/PixelCabling/python/PixelCablingConfigNew.py
index 116fec70692..f9ab5edad8a 100644
--- a/InnerDetector/InDetDetDescr/PixelCabling/python/PixelCablingConfigNew.py
+++ b/InnerDetector/InDetDetDescr/PixelCabling/python/PixelCablingConfigNew.py
@@ -4,49 +4,46 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaCommon.Logging import logging
-from IOVDbSvc.CondDB import conddb
from IOVDbSvc.IOVDbSvcConfig import addFoldersSplitOnline, addFolders
from PixelCabling.PixelCablingConf import PixelCablingSvc
-from RecExConfig.AutoConfiguration import GetRunNumber
+from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelReadoutSpeedAlg
+from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelCablingCondAlg
+from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelHitDiscCnfgAlg
+
def PixelCablingSvcCfg(flags, name="PixelCablingSvc", **kwargs):
"""Return a ComponentAccumulator with configured PixelCablingSvc"""
acc = ComponentAccumulator()
logger = logging.getLogger("PixelCablingSvc")
- from AthenaCommon.AlgSequence import AthSequencer
- condSeq = AthSequencer("AthCondSeq")
-
if flags.Input.isMC:
acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/ReadoutSpeed", "/PIXEL/ReadoutSpeed", className="AthenaAttributeList"))
else:
acc.merge(addFolders(flags, "/PIXEL/ReadoutSpeed", "PIXEL", className="AthenaAttributeList"))
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelReadoutSpeedAlg
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelCablingCondAlg
- PixelCablingCondAlg.UseConditions=False
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
- PixelCablingCondAlg.RodIDForSingleLink40=0
- PixelCablingCondAlg.DumpMapToFile=False
+ # default arguments for PixelCablingCondAlg
+ AlgKwargs = {}
+ AlgKwargs["UseConditions"] = False
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
+ AlgKwargs["RodIDForSingleLink40"] = 0
+ AlgKwargs["DumpMapToFile"] = False
# Add the HitDiscCnfg folder
- if (conddb.dbdata=="CONDBR2" or (conddb.dbmc=="OFLP200" and flags.GeoModel.Run=="RUN2")) and not conddb.folderRequested("/PIXEL/HitDiscCnfg"):
+ if (flags.IOVDb.DatabaseInstance == "CONDBR2") or (flags.Input.isMC and flags.GeoModel.Run == "RUN2"):
acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/HitDiscCnfg", "/PIXEL/HitDiscCnfg", className="AthenaAttributeList"))
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelHitDiscCnfgAlg
- condSeq += PixelHitDiscCnfgAlg(name="PixelHitDiscCnfgAlg")
+ acc.addCondAlgo(PixelHitDiscCnfgAlg(name="PixelHitDiscCnfgAlg"))
# Online mode
if flags.Common.isOnline:
logger.debug("Running in online mode")
# Request the CablingMap folder
# (COOL is the default mapping type)
- if (conddb.dbdata == "CONDBR2"):
+ if flags.IOVDb.DatabaseInstance == "CONDBR2":
acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/CablingMap","/PIXEL/CablingMap", className="AthenaAttributeList"))
logger.debug("Requested CablingMap folder")
- PixelCablingCondAlg.UseConditions=False
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
- PixelCablingCondAlg.RodIDForSingleLink40=1300000
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
+ AlgKwargs["RodIDForSingleLink40"] = 1300000
# Offline mode
else:
@@ -55,8 +52,7 @@ def PixelCablingSvcCfg(flags, name="PixelCablingSvc", **kwargs):
if flags.Input.isMC:
logger.debug("Running on simulation")
- PixelCablingCondAlg.UseConditions=False
- PixelCablingCondAlg.RodIDForSingleLink40=0
+ AlgKwargs["RodIDForSingleLink40"] = 0
# ITk:
if flags.GeoModel.Run == "RUN4":
@@ -70,63 +66,58 @@ def PixelCablingSvcCfg(flags, name="PixelCablingSvc", **kwargs):
elif flags.GeoModel.Type == "BrlExt3.2_ref":
IdMappingDat = "ITk_Atlas_IdMapping_ExtBrl32.dat"
logger.info("Using ITk pixel mapping: %s", IdMappingDat)
- PixelCablingCondAlg.MappingFile=IdMappingDat
+ AlgKwargs["MappingFile"] = IdMappingDat
# IBL
elif flags.GeoModel.Run == "RUN2" or flags.GeoModel.Run == "RUN3":
# Planar IBL
if flags.GeoModel.IBLLayout == "planar":
# DBM or not
if flags.GeoModel.Run == "RUN2":
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping_inclIBL_DBM.dat"
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping_inclIBL_DBM.dat"
else:
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping_inclIBL.dat"
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping_inclIBL.dat"
# Hybrid IBL plus DBM
elif flags.GeoModel.IBLLayout == "3D":
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping_Run2.dat"
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping_Run2.dat"
elif flags.GeoModel.IBLLayout == "UNDEFINED":
logger.warning("IBL is required, but flags.GeoModel.IBLLayout is \"UNDEFINED\"")
logger.warning("Pixel cabling map cannot be set at this point")
# No IBL
else:
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping.dat"
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping.dat"
# DATA
elif not flags.Input.isMC:
- runNum = GetRunNumber()
+ runNum = flags.Input.RunNumber
logger.debug("Running on data, run number %d", runNum)
+ AlgKwargs["RodIDForSingleLink40"] = 1300000
# For data older than run number 222222, use the appropriate text file
if runNum < 222222:
- PixelCablingCondAlg.UseConditions=False
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
- PixelCablingCondAlg.RodIDForSingleLink40=1300000
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
# For Run-2 onwards, get cabling map from database
else:
- PixelCablingCondAlg.UseConditions=False
- PixelCablingCondAlg.RodIDForSingleLink40=1300000
-
# Request the CablingMap folder
- if not conddb.folderRequested("/PIXEL/CablingMap"):
- acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/CablingMap","/PIXEL/CablingMap", className="AthenaAttributeList"))
- logger.debug("Requested CablingMap folder")
+ acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/CablingMap","/PIXEL/CablingMap", className="AthenaAttributeList"))
+ logger.debug("Requested CablingMap folder")
# Even though we are reading from COOL, set the correct fallback map.
if (runNum >= 344494):
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
elif (runNum >= 314940 and runNum < 344494):
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping_314940.dat"
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping_314940.dat"
elif (runNum >= 289350 and runNum < 314940): # 2016
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
elif (runNum >= 222222 and runNum < 289350): # 2015
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping_Run2.dat"
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping_Run2.dat"
else:
- PixelCablingCondAlg.MappingFile="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
+ AlgKwargs["MappingFile"] = "PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
# Unknown input
else:
logger.warning("Unknown input source. Pixel cabling map cannot be set at this point")
- condSeq += PixelReadoutSpeedAlg(name="PixelReadoutSpeedAlg")
- condSeq += PixelCablingCondAlg(name="PixelCablingCondAlg")
+ acc.addCondAlgo(PixelReadoutSpeedAlg(name="PixelReadoutSpeedAlg"))
+ acc.addCondAlgo(PixelCablingCondAlg(name="PixelCablingCondAlg", **AlgKwargs))
acc.addService(PixelCablingSvc(name, **kwargs))
return acc
--
GitLab