remove debug output, add muonDetectorCondAlg to Run3DQTestingDriver.py

Control/AthenaConfiguration/python/OldFlags2NewFlags.py

@@ -20,6 +20,12 @@ def getNewConfigFlags():
     ConfigFlags.GeoModel.AtlasVersion = jobproperties.Global.DetDescrVersion()
     ConfigFlags.GeoModel.Align.Dynamic = InDetGeometryFlags.useDynamicAlignFolders()
 
+    # Concurrency
+    from AthenaCommon.ConcurrencyFlags import jobproperties as jp
+    ConfigFlags.Concurrency.NumProcs = jp.ConcurrencyFlags.NumProcs()
+    ConfigFlags.Concurrency.NumThreads = jp.ConcurrencyFlags.NumThreads()
+
+
     # Let's build a map whose key is new flagname, and whose value is old flagname.
     geom_flag_map = {}
     # Geometry - InnerDetector

Control/AthenaMonitoring/share/Run3DQTestingDriver.py

@@ -132,6 +132,9 @@ if __name__=='__main__':
             beginseq = cfg.getSequence("AthBeginSeq")
             beginseq.Members.append(CompFactory.ForceIDConditionsAlg("ForceIDConditionsAlg"))
         if len([_ for _ in cfg._conditionsAlgs if _.name=="MuonAlignmentCondAlg"]) > 0:
+            # create MuonDetectorCondAlg as pixel and SCT depend on it
+            from MuonConfig.MuonGeometryConfig import MuonDetectorCondAlgCf
+            cfg.merge(MuonDetectorCondAlgCfg(flags))
             beginseq = cfg.getSequence("AthBeginSeq")
             beginseq.Members.append(CompFactory.ForceMSConditionsAlg("ForceMSConditionsAlg"))
     

InnerDetector/InDetConditions/InDetCondFolders/python/InDetAlignFolders.py

@@ -93,17 +93,13 @@ 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
@@ -125,22 +121,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
                 condSeq += PixelDetectorElementCondAlg(name = "PixelDetectorElementCondAlg",
                                                     MuonManagerKey = MuonMgrKey,
                                                     TRT_DetEltContKey = TRT_DetEltKey,
-                                                    SCTAlignmentStore = SCTAlignStore)
-
+                                                    SCTAlignmentStore = SCTAlignStore)
\ No newline at end of file

InnerDetector/InDetConditions/InDetCondFolders/python/InDetAlignFolders_FATRAS.py

@@ -73,18 +73,14 @@ 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
@@ -99,7 +95,6 @@ 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 = ""
@@ -109,12 +104,9 @@ 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

InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py

@@ -450,17 +450,12 @@ 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.Concurrency.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)

InnerDetector/InDetDetDescr/PixelGeoModel/python/PixelGeoModelConfig.py

@@ -36,7 +36,6 @@ 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

InnerDetector/InDetDetDescr/SCT_GeoModel/python/SCT_GeoModelConfig.py

@@ -43,17 +43,12 @@ def SCT_DetectorElementCondAlgCfg(flags, name = "SCT_DetectorElementCondAlg", **
     TRT_DetEltKey = ""
     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.Concurrency.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)

Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/python/TrackCaloClusterConfig.py

@@ -50,7 +50,6 @@ 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
@@ -59,7 +58,6 @@ 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

Reconstruction/eflowRec/python/PFRun3Config.py

@@ -61,7 +61,6 @@ 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
@@ -69,7 +68,6 @@ 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