InDetAlignFolders.py: Add dependency of SCT_DetectorElementCondAlg and...

InDetAlignFolders.py: Add dependency of SCT_DetectorElementCondAlg and PixelDetectorElementCondAlg on MuonDetectorManager if (DetFlags.Muon_on() and not DetFlags.writeRDOPool.Muon_on())

InnerDetector/InDetConditions/InDetCondFolders/python/InDetAlignFolders.py

@@ -94,9 +94,12 @@ 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 ("WL, InDetFolderAlign:",DetFlags.Muon_on(),overlayFlags.isDataOverlay(), DetFlags.writeRDOPool.Muon_on())
                 from AthenaCommon.ConcurrencyFlags import jobproperties as jp
                 if jp.ConcurrencyFlags.NumThreads() > 0:
-                    if (DetFlags.Muon_on() and not conddb.isMC and not overlayFlags.isDataOverlay()):
+                    #if (DetFlags.Muon_on() and (overlayFlags.isDataOverlay() or not DetFlags.writeRDOPool.Muon_on())):
+                    if (DetFlags.Muon_on() and not DetFlags.writeRDOPool.Muon_on()):
+                        #MuonDetectorManager not part of the HIT2RDO configuration
                         MuonMgrKey = "MuonDetectorManager"
                     if DetFlags.TRT_on():
                         TRT_DetEltKey = "TRT_DetElementContainer"
@@ -124,7 +127,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
                 from AthenaCommon.ConcurrencyFlags import jobproperties as jp
                 if jp.ConcurrencyFlags.NumThreads() > 0:
-                    if (DetFlags.Muon_on() and not conddb.isMC and not overlayFlags.isDataOverlay()):
+                    if (DetFlags.Muon_on() and not DetFlags.writeRDOPool.Muon_on()):
                         MuonMgrKey = "MuonDetectorManager"
                     if DetFlags.TRT_on():
                         TRT_DetEltKey = "TRT_DetElementContainer"