From 61961b649669655180366d92bf797ec287990b94 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 10 Jul 2020 16:40:07 +0200
Subject: [PATCH] PixelDigitization: Conditions dependency fixes
Don't declare dependencies on conditions objects that we won't read.
(This is for the old configuration. The new-style configuration should
already be ok.)
---
.../PixelDigitization/python/PixelDigitizationConfig.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
index 9616e6c23a20..b28499e81e01 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
@@ -342,11 +342,13 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
if not hasattr(condSeq, "PixelDCSCondStateAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDCSCondStateAlg
- condSeq += PixelDCSCondStateAlg(name="PixelDCSCondStateAlg")
+ condSeq += PixelDCSCondStateAlg(name="PixelDCSCondStateAlg",
+ ReadKeyState = '')
if not hasattr(condSeq, "PixelDCSCondStatusAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDCSCondStatusAlg
- condSeq += PixelDCSCondStatusAlg(name="PixelDCSCondStatusAlg")
+ condSeq += PixelDCSCondStatusAlg(name="PixelDCSCondStatusAlg",
+ ReadKeyStatus = '')
if not conddb.folderRequested("/PIXEL/DCS/HV"):
conddb.addFolder("DCS_OFL", "/PIXEL/DCS/HV", className="CondAttrListCollection")
@@ -395,13 +397,16 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelReadoutSpeedAlg
condSeq += PixelReadoutSpeedAlg(name="PixelReadoutSpeedAlg")
+ pixelReadKey = ''
if (globalflags.DataSource=='data' and conddb.dbdata == 'CONDBR2'): # for data overlay
+ pixelReaddKey = '/PIXEL/CablingMap'
if not conddb.folderRequested("/PIXEL/CablingMap"):
conddb.addFolderSplitOnline("PIXEL", "/PIXEL/Onl/CablingMap","/PIXEL/CablingMap", className="AthenaAttributeList")
if not hasattr(condSeq, 'PixelCablingCondAlg'):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelCablingCondAlg
condSeq += PixelCablingCondAlg(name="PixelCablingCondAlg",
+ ReadKey = pixelReadKey,
MappingFile=IdMappingDat,
RodIDForSingleLink40=0)
--
GitLab