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

restrict to MT so ST can run until condSeq is reordered

parent 36e0e10c
......@@ -89,18 +89,18 @@ class ConfiguredTrackingGeometryCondAlg( Trk__TrackingGeometryCondAlg ) :
# artifical dependencies to Si-DetectorElement conditions algs to ensure that
# the IOV is identical to the IOV of the tracking geoemtry
from AthenaCommon.ConcurrencyFlags import jobproperties as jp
if jp.ConcurrencyFlags.NumThreads() <= 0:
#REORDER cond_seq, NO INDENTATION BC STUFF IS MISSING TO PROVOKE ERROR
MuonManagerKey = ['MuonDetectorManager'] if (DetFlags.Muon_on() and not DetFlags.writeRDOPool.Muon_on()) else []
TRT_DetEltKey = ["TRT_DetElementContainer"] if DetFlags.TRT_on() else []
SCTAlignStore = ["SCTAlignmentStore"] if DetFlags.SCT_on() else []
PixelAlignStore = ["PixelAlignmentStore"] if DetFlags.pixel_on() else []
modifyCondAlg('SCT_DetectorElementCondAlg', MuonManagerKey = MuonManagerKey,
if jp.ConcurrencyFlags.NumThreads() > 0:
MuonManagerKey = ['MuonDetectorManager'] if (DetFlags.Muon_on() and not DetFlags.writeRDOPool.Muon_on()) else []
TRT_DetEltKey = ["TRT_DetElementContainer"] if DetFlags.TRT_on() else []
SCTAlignStore = ["SCTAlignmentStore"] if DetFlags.SCT_on() else []
PixelAlignStore = ["PixelAlignmentStore"] if DetFlags.pixel_on() else []
modifyCondAlg('SCT_DetectorElementCondAlg', MuonManagerKey = MuonManagerKey,
TRT_DetEltContKey = TRT_DetEltKey,
PixelAlignmentStore = PixelAlignStore)
modifyCondAlg('PixelDetectorElementCondAlg', MuonManagerKey = MuonManagerKey,
modifyCondAlg('PixelDetectorElementCondAlg', MuonManagerKey = MuonManagerKey,
TRT_DetEltContKey = TRT_DetEltKey,
SCTAlignmentStore = SCTAlignStore)
......
......@@ -82,9 +82,9 @@ def _getInDetTrackingGeometryBuilder(name, flags,result, envelopeDefinitionSvc,
# is identical to the IOV of the tracking geoemtry cond alg
from PixelConditionsAlgorithms.PixelConditionsConfig import PixelDetectorElementCondAlgCfg
result.merge(PixelDetectorElementCondAlgCfg(flags,
MuonManagerKey = ["MuonDetectorManager"] if flags.Muon.enableAlignment else [],
TRT_DetEltContKey = ["TRT_DetElementContainer"] if flags.Detector.GeometryTRT else [],
SCTAlignmentStore = ["SCTAlignmentStore"] if flags.Detector.GeometrySCT else []))
MuonManagerKey = ["MuonDetectorManager"] if flags.Muon.enableAlignment and flags.Concurrency.NumThreads > 0 else [],
TRT_DetEltContKey = ["TRT_DetElementContainer"] if flags.Detector.GeometryTRT and flags.Concurrency.NumThreads > 0 else [],
SCTAlignmentStore = ["SCTAlignmentStore"] if flags.Detector.GeometrySCT and flags.Concurrency.NumThreads > 0 else []))
if flags.Detector.GeometrySCT:
# for SCT DetectorElement conditions data :
......@@ -120,13 +120,13 @@ def _getInDetTrackingGeometryBuilder(name, flags,result, envelopeDefinitionSvc,
layerbuilders += [ SCT_LayerBuilder ]
binnings += [ SCT_LayerBinning ]
colors += [ 4 ]
if flags.Concurrency.NumThreads <= 0:
#ordering of algs is missing for single threaded athena
from SCT_GeoModel.SCT_GeoModelConfig import SCT_DetectorElementCondAlgCfg
result.merge(SCT_DetectorElementCondAlgCfg(flags,
MuonManagerKey = ["MuonDetectorManager"] if flags.Muon.enableAlignment else [],
TRT_DetEltContKey = ["TRT_DetElementContainer"] if flags.Detector.GeometryTRT else [],
PixelAlignmentStore = ["PixelAlignmentStore"] if flags.Detector.GeometryPixel else []))
MuonManagerKey = ["MuonDetectorManager"] if flags.Muon.enableAlignment and flags.Concurrency.NumThreads > 0 else [],
TRT_DetEltContKey = ["TRT_DetElementContainer"] if flags.Detector.GeometryTRT and flags.Concurrency.NumThreads > 0 else [],
PixelAlignmentStore = ["PixelAlignmentStore"] if flags.Detector.GeometryPixel and flags.Concurrency.NumThreads > 0 else []))
if flags.Detector.GeometryTRT:
# for TRT DetectorElement conditions data :
......
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