From e48322ded45e2d30ca365813cd207d9e26a2a56d Mon Sep 17 00:00:00 2001 From: scott snyder <snyder@bnl.gov> Date: Wed, 17 Jun 2020 17:15:19 +0200 Subject: [PATCH] SCT_ConditionsAlgorithms: Fix broken conditions dependencies in tests. Don't request conditions dependencies that don't exist. --- .../SCT_ConditionsAlgorithms/share/testReadout.py | 1 + .../SCT_ConditionsAlgorithms/share/testTdaqEnabled.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testReadout.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testReadout.py index 4da660eb533..b317d7d7963 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testReadout.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testReadout.py @@ -88,6 +88,7 @@ conddb.addFolderSplitMC("SCT", "/SCT/DAQ/Config/MUR", "/SCT/DAQ/Config/MUR") from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_ReadoutTestAlg SCT_ReadoutTestAlg = SCT_ReadoutTestAlg() +SCT_ReadoutTestAlg.SCT_ReadoutTool.SCT_CablingTool = '' # Module type and link status #SCT_ReadoutTestAlg.ModuleId = 143704064 # Endcap (default is barrel) diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testTdaqEnabled.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testTdaqEnabled.py index 044eafd34f3..ae84c18198a 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testTdaqEnabled.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testTdaqEnabled.py @@ -85,6 +85,12 @@ condSeq = AthSequencer("AthCondSeq") from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg condSeq+=xAODMaker__EventInfoCnvAlg(OutputLevel=2) +condAlgName = "SCT_CablingCondAlgFromCoraCool" +if not hasattr(condSeq, condAlgName): + from AthenaCommon.CfgGetter import getAlgorithm + SCT_CablingCondAlgFromCoraCool = getAlgorithm(condAlgName) + condSeq += SCT_CablingCondAlgFromCoraCool + from SCT_ConditionsTools.SCT_TdaqEnabledToolSetup import SCT_TdaqEnabledToolSetup sct_TdaqEnabledToolSetup = SCT_TdaqEnabledToolSetup() sct_TdaqEnabledToolSetup.setup() -- GitLab