Commit e42fe7df authored by Walter Lampl's avatar Walter Lampl
Browse files

InDetAlignFolders: Set dependency on MuonDetectorManger CDO only if not isMC...

InDetAlignFolders: Set dependency on MuonDetectorManger CDO only if not isMC and not overlayFlags.isDataOverlay
parent 4cf5129e
...@@ -4,6 +4,7 @@ from IOVDbSvc.CondDB import conddb ...@@ -4,6 +4,7 @@ from IOVDbSvc.CondDB import conddb
from AthenaCommon.DetFlags import DetFlags from AthenaCommon.DetFlags import DetFlags
from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
from OverlayCommonAlgs.OverlayFlags import overlayFlags
# Top sequence # Top sequence
from AthenaCommon.AlgSequence import AlgSequence from AthenaCommon.AlgSequence import AlgSequence
...@@ -95,7 +96,7 @@ if DetFlags.SCT_on() and ((not DetFlags.simulate.SCT_on()) or DetFlags.overlay.S ...@@ -95,7 +96,7 @@ if DetFlags.SCT_on() and ((not DetFlags.simulate.SCT_on()) or DetFlags.overlay.S
# To avoid setting up conditions algorithms in the right order, only set up for athena MT # To avoid setting up conditions algorithms in the right order, only set up for athena MT
from AthenaCommon.ConcurrencyFlags import jobproperties as jp from AthenaCommon.ConcurrencyFlags import jobproperties as jp
if jp.ConcurrencyFlags.NumThreads() > 0: if jp.ConcurrencyFlags.NumThreads() > 0:
if DetFlags.Muon_on(): if (DetFlags.Muon_on() and not conddb.isMC and not overlayFlags.isDataOverlay()):
MuonMgrKey = "MuonDetectorManager" MuonMgrKey = "MuonDetectorManager"
if DetFlags.TRT_on(): if DetFlags.TRT_on():
TRT_DetEltKey = "TRT_DetElementContainer" TRT_DetEltKey = "TRT_DetElementContainer"
...@@ -123,7 +124,7 @@ if DetFlags.pixel_on() and ((not DetFlags.simulate.pixel_on()) or DetFlags.overl ...@@ -123,7 +124,7 @@ if DetFlags.pixel_on() and ((not DetFlags.simulate.pixel_on()) or DetFlags.overl
# To avoid setting up conditions algorithms in the right order, only set up for athena MT # To avoid setting up conditions algorithms in the right order, only set up for athena MT
from AthenaCommon.ConcurrencyFlags import jobproperties as jp from AthenaCommon.ConcurrencyFlags import jobproperties as jp
if jp.ConcurrencyFlags.NumThreads() > 0: if jp.ConcurrencyFlags.NumThreads() > 0:
if DetFlags.Muon_on(): if (DetFlags.Muon_on() and not conddb.isMC and not overlayFlags.isDataOverlay()):
MuonMgrKey = "MuonDetectorManager" MuonMgrKey = "MuonDetectorManager"
if DetFlags.TRT_on(): if DetFlags.TRT_on():
TRT_DetEltKey = "TRT_DetElementContainer" TRT_DetEltKey = "TRT_DetElementContainer"
...@@ -134,4 +135,4 @@ if DetFlags.pixel_on() and ((not DetFlags.simulate.pixel_on()) or DetFlags.overl ...@@ -134,4 +135,4 @@ if DetFlags.pixel_on() and ((not DetFlags.simulate.pixel_on()) or DetFlags.overl
condSeq += PixelDetectorElementCondAlg(name = "PixelDetectorElementCondAlg", condSeq += PixelDetectorElementCondAlg(name = "PixelDetectorElementCondAlg",
MuonManagerKey = MuonMgrKey, MuonManagerKey = MuonMgrKey,
TRT_DetEltContKey = TRT_DetEltKey, TRT_DetEltContKey = TRT_DetEltKey,
SCTAlignmentStore = SCTAlignStore) SCTAlignmentStore = SCTAlignStore)
\ No newline at end of file
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