Commit a2c4c49f authored by Robert Langenberg's avatar Robert Langenberg
Browse files

add lots of debug output for the CI tests. fix config Key

parent dc77f3f4
......@@ -93,13 +93,17 @@ if DetFlags.SCT_on() and ((not DetFlags.simulate.SCT_on()) or DetFlags.overlay.S
TRT_DetEltKey = ""
PixelAlignStore = ""
# To avoid setting up conditions algorithms in the right order, only set up for athena MT
print("ROBERT: InDetAlignFolders.py SCTDetEltCondAlg")
from AthenaCommon.ConcurrencyFlags import jobproperties as jp
if jp.ConcurrencyFlags.NumThreads() > 0:
if DetFlags.Muon_on():
print("Muons On")
MuonMgrKey = "MuonDetectorManager"
if DetFlags.TRT_on():
print("TRT On")
TRT_DetEltKey = "TRT_DetElementContainer"
if DetFlags.pixel_on():
print("Pixel On")
PixelAlignStore = "PixelAlignmentStore"
from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_DetectorElementCondAlg
......@@ -121,13 +125,17 @@ if DetFlags.pixel_on() and ((not DetFlags.simulate.pixel_on()) or DetFlags.overl
TRT_DetEltKey = ""
SCTAlignStore = ""
# To avoid setting up conditions algorithms in the right order, only set up for athena MT
print("ROBERT: InDetAlignFolders.py PixelDetEltCondAlg")
from AthenaCommon.ConcurrencyFlags import jobproperties as jp
if jp.ConcurrencyFlags.NumThreads() > 0:
if DetFlags.Muon_on():
print("Muons On")
MuonMgrKey = "MuonDetectorManager"
if DetFlags.TRT_on():
print("TRT On")
TRT_DetEltKey = "TRT_DetElementContainer"
if DetFlags.SCT_on():
print("SCT On")
SCTAlignStore = "SCTAlignmentStore"
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDetectorElementCondAlg
......
......@@ -73,14 +73,18 @@ if DetFlags.SCT_on():
MuonMgrKey = ""
TRT_DetEltKey = ""
PixelAlignStore = ""
print("ROBERT: InDetAlignFolders_FATRAS.py SCTDetEltCondAlg")
# To avoid setting up conditions algorithms in the right order, only set up for athena MT
from AthenaCommon.ConcurrencyFlags import jobproperties as jp
if jp.ConcurrencyFlags.NumThreads() > 0:
if DetFlags.Muon_on():
print("Muons On")
MuonMgrKey = "MuonDetectorManager"
if DetFlags.TRT_on():
print("TRT On")
TRT_DetEltKey = "TRT_DetElementContainer"
if DetFlags.pixel_on():
print("Pixel On")
PixelAlignStore = "PixelAlignmentStore"
from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_DetectorElementCondAlg
......@@ -95,6 +99,7 @@ if DetFlags.pixel_on():
condSeq += PixelAlignCondAlg(name = "PixelAlignCondAlg",
UseDynamicAlignFolders = InDetGeometryFlags.useDynamicAlignFolders())
if not hasattr(condSeq, "PixelDetectorElementCondAlg"):
print("ROBERT: InDetAlignFolders_FATRAS.py PixelDetEltCondAlg")
# set up dependencies to limit IOV Range for athena MT
MuonMgrKey = ""
TRT_DetEltKey = ""
......@@ -104,9 +109,12 @@ if DetFlags.pixel_on():
if jp.ConcurrencyFlags.NumThreads() > 0:
if DetFlags.Muon_on():
MuonMgrKey = "MuonDetectorManager"
print("Muons On")
if DetFlags.TRT_on():
TRT_DetEltKey = "TRT_DetElementContainer"
print("TRT On")
if DetFlags.SCT_on():
print("SCT On")
SCTAlignStore = "SCTAlignmentStore"
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDetectorElementCondAlg
......
......@@ -450,13 +450,17 @@ def PixelDetectorElementCondAlgCfg(flags, name="PixelDetectorElementCondAlg", **
TRT_DetEltKey = ""
SCTAlignStoreKey = ""
# To avoid setting up conditions algorithms in the right order, only set up for athena MT
print("ROBERT: PixelConditionsConfig.py PixelDetElCondAlg")
from AthenaCommon.ConcurrencyFlags import jobproperties as jp
if jp.ConcurrencyFlags.NumThreads() > 0:
if flags.Detector.GeometryMuon:
print("Muons On")
MuonMgrKey = "MuonDetectorManager"
if flags.Detector.GeometryTRT:
print("TRT On")
TRT_DetEltKey = "TRT_DetElementContainer"
if flags.Detector.GeometryPixel:
print("SCT On")
SCTAlignStoreKey = "SCTAlignmentStore"
kwargs.setdefault("MuonManagerKey", MuonMgrKey)
kwargs.setdefault("TRT_DetEltContKey", TRT_DetEltKey)
......
......@@ -3,7 +3,6 @@
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.Enums import ProductionStep
from IOVDbSvc.IOVDbSvcConfig import addFoldersSplitOnline
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
def PixelGeometryCfg( flags ):
from AtlasGeoModel.GeoModelConfig import GeoModelCfg
......@@ -37,6 +36,7 @@ def PixelGeometryCfg( flags ):
acc.merge(addFoldersSplitOnline(flags,"INDET","/Indet/Onl/Align","/Indet/Align"))
if flags.Common.Project != "AthSimulation": # Protection for AthSimulation builds
if flags.Common.ProductionStep != ProductionStep.Simulation or flags.Overlay.DataOverlay:
print("ROBERT: PixelGeoModelConfig.py calling PixelConditionsConfig.py (for pixel... obviously)")
from PixelConditionsAlgorithms.PixelConditionsConfig import PixelDetectorElementCondAlgCfg
acc.merge(PixelDetectorElementCondAlgCfg(flags))
return acc
......@@ -41,15 +41,19 @@ def SCT_DetectorElementCondAlgCfg(flags, name = "SCT_DetectorElementCondAlg", **
# set up dependencies to limit IOV Range for athena MT
MuonMgrKey = ""
TRT_DetEltKey = ""
PixelAlignStore = ""
PixelAlignStoreKey = ""
# To avoid setting up conditions algorithms in the right order, only set up for athena MT
print("ROBERT: SCT_GeoModelConfig.py SCT")
from AthenaCommon.ConcurrencyFlags import jobproperties as jp
if jp.ConcurrencyFlags.NumThreads() > 0:
if flags.Detector.GeometryMuon:
print("Muon On")
MuonMgrKey = "MuonDetectorManager"
if flags.Detector.GeometryTRT:
print("TRT On")
TRT_DetEltKey = "TRT_DetElementContainer"
if flags.Detector.GeometryPixel:
print("Pixel On")
PixelAlignStoreKey = "PixelAlignmentStore"
kwargs.setdefault("MuonManagerKey", MuonMgrKey)
kwargs.setdefault("TRT_DetEltContKey", TRT_DetEltKey)
......
......@@ -50,6 +50,7 @@ def tmpSetupTrackServices(inputFlags):
result.addCondAlgo(PixelAlignCondAlg(name = "PixelAlignCondAlg",UseDynamicAlignFolders = inputFlags.GeoModel.Align.Dynamic))
from PixelConditionsAlgorithms.PixelConditionsConfig import PixelDetectorElementCondAlgCfg
print("ROBERT: TrackCaloClusterConfig calling PixelConditionsConfig.py... for pixels")
result.merge(PixelDetectorElementCondAlgCfg(inputFlags))
#Setup SCT conditions
......@@ -58,6 +59,7 @@ def tmpSetupTrackServices(inputFlags):
from SCT_GeoModel.SCT_GeoModelConfig import SCT_DetectorElementCondAlgCfg
print("ROBERT: TrackCaloClusterConfig.py calling SCT_GeoModelConfig.py... for SCT")
result.merge(SCT_DetectorElementCondAlgCfg(inputFlags))
GeometryDBSvc=CompFactory.GeometryDBSvc
......
......@@ -61,6 +61,7 @@ def PFCfg(inputFlags,**kwargs):
result.addCondAlgo(PixelAlignCondAlg(name = "PixelAlignCondAlg",UseDynamicAlignFolders = inputFlags.GeoModel.Align.Dynamic))
from PixelConditionsAlgorithms.PixelConditionsConfig import PixelDetectorElementCondAlgCfg
print("ROBERT: PFRun3Config.py calling PixelConditionsConfig.py... for pixel")
result.merge(PixelDetectorElementCondAlgCfg(inputFlags))
#Setup SCT conditions
......@@ -68,6 +69,7 @@ def PFCfg(inputFlags,**kwargs):
result.addCondAlgo(SCT_AlignCondAlg(name = "SCT_AlignCondAlg",UseDynamicAlignFolders = inputFlags.GeoModel.Align.Dynamic))
from SCT_GeoModel.SCT_GeoModelConfig import SCT_DetectorElementCondAlgCfg
print("ROBERT: PFRun3Config.py calling SCT_GeoModelConfig.py... for SCT")
result.merge(SCT_DetectorElementCondAlgCfg(inputFlags))
GeometryDBSvc=CompFactory.GeometryDBSvc
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment