Changing configs so HLT job works wiht isOnline setting

InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py

@@ -9,7 +9,7 @@ from IOVDbSvc.IOVDbSvcConfig import addFolders,addFoldersSplitOnline
 def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
     """Return a ComponentAccumulator with configured PixelConfigCondAlg"""
     acc = ComponentAccumulator()
-    acc.merge(addFolders(flags, "/PIXEL/PixMapOverlay", "PIXEL_OFL", className="CondAttrListCollection"))
+#    acc.merge(addFolders(flags, "/PIXEL/PixMapOverlay", "PIXEL_OFL", className="CondAttrListCollection"))
     acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/PixMapOverlay",
                                         "/PIXEL/PixMapOverlay", "CondAttrListCollection"))
     runNum = flags.Input.RunNumber[0]
@@ -343,7 +343,7 @@ def PixelChargeCalibCondAlgCfg(flags, name="PixelChargeCalibCondAlg", **kwargs):
     """Return a ComponentAccumulator with configured PixelChargeCalibCondAlg"""
     acc = ComponentAccumulator()
     acc.merge(PixelConfigCondAlgCfg(flags))
-    acc.merge(addFolders(flags, "/PIXEL/PixCalib", "PIXEL_OFL", className="CondAttrListCollection"))
+    acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/PixCalib", "/PIXEL/PixCalib", className="CondAttrListCollection"))
     kwargs.setdefault("PixelDetEleCollKey", "PixelDetectorElementCollection")
     kwargs.setdefault("PixelModuleData", "PixelModuleData")
     kwargs.setdefault("ReadKey", "/PIXEL/PixCalib")
@@ -355,7 +355,7 @@ def PixelChargeLUTCalibCondAlgCfg(flags, name="PixelChargeLUTCalibCondAlg", **kw
     """Return a ComponentAccumulator with configured PixelChargeLUTCalibCondAlg"""
     acc = ComponentAccumulator()
     acc.merge(PixelConfigCondAlgCfg(flags))
-    acc.merge(addFolders(flags, "/PIXEL/PixCalib", "PIXEL_OFL", className="CondAttrListCollection"))
+    acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/PixCalib", "/PIXEL/PixCalib", className="CondAttrListCollection"))
     kwargs.setdefault("PixelDetEleCollKey", "PixelDetectorElementCollection")
     kwargs.setdefault("PixelModuleData", "PixelModuleData")
     kwargs.setdefault("ReadKey", "/PIXEL/ChargeCalibration")
@@ -368,9 +368,12 @@ def PixelDCSCondHVAlgCfg(flags, name="PixelDCSCondHVAlg", **kwargs):
     acc = ComponentAccumulator()
     acc.merge(PixelConfigCondAlgCfg(flags))
     if flags.Common.isOnline:
-        acc.merge(addFolders(flags, "/PIXEL/HLT/DCS/HV", "PIXEL_ONL", className="CondAttrListCollection"))
+        kwargs.update( ReadKey="/PIXEL/HLT/DCS/HV")
+        acc.merge(addFolders(flags, kwargs["ReadKey"], "PIXEL_ONL", className="CondAttrListCollection"))
     else:
-        acc.merge(addFolders(flags, "/PIXEL/DCS/HV", "DCS_OFL", className="CondAttrListCollection"))
+        kwargs.update( ReadKey="/PIXEL/HLT/DCS/HV")
+        acc.merge(addFolders(flags, kwargs["ReadKey"], "DCS_OFL", className="CondAttrListCollection"))
+
     kwargs.setdefault("WriteKey", "PixelDCSHVCondData")
     acc.addCondAlgo(CompFactory.PixelDCSCondHVAlg(name, **kwargs))
     return acc
@@ -404,11 +407,12 @@ def PixelDCSCondTempAlgCfg(flags, name="PixelDCSCondTempAlg", **kwargs):
     acc = ComponentAccumulator()
     acc.merge(PixelConfigCondAlgCfg(flags))
     if flags.Common.isOnline:
-        acc.merge(addFolders(flags, "/PIXEL/HLT/DCS/TEMPERATURE", "PIXEL_ONL", className="CondAttrListCollection"))
+        kwargs.setdefault("ReadKey", "/PIXEL/HLT/DCS/TEMPERATURE")
+        acc.merge(addFolders(flags, kwargs["ReadKey"], "PIXEL_ONL", className="CondAttrListCollection"))
     else:
-        acc.merge(addFolders(flags, "/PIXEL/DCS/TEMPERATURE", "DCS_OFL", className="CondAttrListCollection"))
+        kwargs.setdefault("ReadKey", "/PIXEL/DCS/TEMPERATURE")
+        acc.merge(addFolders(flags, kwargs["ReadKey"], "DCS_OFL", className="CondAttrListCollection"))
     kwargs.setdefault("PixelModuleData", "PixelModuleData")
-    kwargs.setdefault("ReadKey", "/PIXEL/DCS/TEMPERATURE")
     kwargs.setdefault("WriteKey", "PixelDCSTempCondData")
     acc.addCondAlgo(CompFactory.PixelDCSCondTempAlg(name, **kwargs))
     return acc
@@ -463,8 +467,9 @@ def PixelHitDiscCnfgAlgCfg(flags, name="PixelHitDiscCnfgAlg", **kwargs):
 def PixelOfflineCalibCondAlgCfg(flags, name="PixelOfflineCalibCondAlg", **kwargs):
     """Return a ComponentAccumulator with configured PixelOfflineCalibCondAlg"""
     acc = ComponentAccumulator()
-    acc.merge(addFolders(flags, "/PIXEL/PixReco", "PIXEL_OFL", className="DetCondCFloat"))
-    kwargs.setdefault("InputSource",2)
+#    acc.merge(addFolders(flags, "/PIXEL/PixReco", "PIXEL_OFL", className="DetCondCFloat"))
+    acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/PixReco", "/PIXEL/PixReco", className="DetCondCFloat"))
+    kwargs.setdefault("InputSource", 1 if flags.Common.isOnline else 2)
     kwargs.setdefault("PixelClusterErrorDataFile", "PixelClusterErrorData.txt")
     kwargs.setdefault("PixelClusterOnTrackErrorDataFile", "PixelClusterOnTrackErrorData.txt")
     kwargs.setdefault("PixelChargeInterpolationDataFile", "PixelChargeInterpolationData.txt")

InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_DCSConditionsConfig.py

@@ -26,9 +26,9 @@ def SCT_DCSConditionsCfg(flags, name="InDetSCT_DCSConditions", **kwargs):
     stateFolder = kwargs.get("stateFolder", dcsFolder + "/CHANSTAT")
     ReadAllDBFolders = kwargs.get("ReadAllDBFolders", True)
     ReturnHVTemp = kwargs.get("ReturnHVTemp", True)
-
+    
     # Condition algorithms
-    if ReadAllDBFolders == ReturnHVTemp:
+    if ReadAllDBFolders == ReturnHVTemp and not flags.Common.isOnline:
         acc.merge(addFolders(flags, stateFolder, dbInstance, className="CondAttrListCollection"))
         # algo
         statArgs = {

InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_SiliconConditionsConfig.py

@@ -24,7 +24,7 @@ def SCT_SiliconConditionsCfg(flags, name="SCT_Silicon", **kwargs):
         algkwargs["UseState"] = DCSConditionsTool.ReadAllDBFolders
         algkwargs["DCSConditionsTool"] = DCSConditionsTool
     else:
-        algkwargs["UseState"] = True
+        algkwargs["UseState"] = not flags.Common.isOnline
         algkwargs["DCSConditionsTool"] = acc.popToolsAndMerge(SCT_DCSConditionsCfg(flags))
     # For SCT_ID used in SCT_SiliconHVCondAlg,
     # SCT_SiliconTempCondAlg and SCT_SiliconConditionsTool

MagneticField/MagFieldServices/python/MagFieldServicesConfig.py

@@ -25,18 +25,20 @@ def MagneticFieldSvcCfg(flags, **kwargs):
       "name": "AtlasFieldMapCondAlg",
     }
     if flags.Common.isOnline:
-      # online has the map loaded at start
+      # online has the map loaded at start and does not use DCS
       afmArgs.update( LoadMapOnStart = True )
-
-    # UseMapsFromCOOL is default for standard running
-    afmArgs.update( UseMapsFromCOOL = True )
-    # However, for tests, this must be turned off. It is detected
-    # when UseDCS is set to False - UseDCS is directly an option for the field cache alg 
-    if 'UseDCS' in kwargs and not kwargs['UseDCS']:
-      afmArgs['UseMapsFromCOOL'] = False
-    mag_field_map_cond_alg = CompFactory.MagField.AtlasFieldMapCondAlg(**afmArgs) 
-    result.addCondAlgo(mag_field_map_cond_alg)
-    
+      afmArgs.update( UseMapsFromCOOL = False )
+    else:
+      # UseMapsFromCOOL is default for standard running
+      afmArgs.update( UseMapsFromCOOL =  True)
+      # However, for tests, this must be turned off. It is detected
+      # when UseDCS is set to False - UseDCS is directly an option for the field cache alg 
+      if 'UseDCS' in kwargs and not kwargs['UseDCS']:
+        afmArgs['UseMapsFromCOOL'] = False
+    magFieldMapCondAlg = CompFactory.MagField.AtlasFieldMapCondAlg(**afmArgs) 
+    result.addCondAlgo(magFieldMapCondAlg)
+    # import code
+    # code.interact(local=locals())
     # AtlasFieldCacheCondAlg - for reading in current
     afcArgs = {
       "name": "AtlasFieldCacheCondAlg",
@@ -51,8 +53,8 @@ def MagneticFieldSvcCfg(flags, **kwargs):
     # For test, UseDCS is set to False
     if 'UseDCS' in kwargs:
       afcArgs['UseDCS'] = kwargs['UseDCS']
-    mag_field_cache_cond_alg = CompFactory.MagField.AtlasFieldCacheCondAlg(**afcArgs) 
-    result.addCondAlgo(mag_field_cache_cond_alg)
+    magFieldCacheCondAlg = CompFactory.MagField.AtlasFieldCacheCondAlg(**afcArgs) 
+    result.addCondAlgo(magFieldCacheCondAlg)
     
     return result 
     

MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py

@@ -107,8 +107,8 @@ def MdtCalibDbAlgCfg(flags,name="MdtCalibDbAlg",**kwargs):
     result.merge(acc)
 
     # set some default proper ties
-    from IOVDbSvc.CondDB import conddb
-    if conddb.isOnline and not conddb.isMC:
+    # from IOVDbSvc.CondDB import conddb
+    if flags.Common.isOnline and not flags.Input.isMC:
        kwargs.setdefault("TubeFolder", "/MDT/T0")
        kwargs.setdefault("RtFolder",  "/MDT/RT")
     else:

MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py

@@ -15,7 +15,7 @@ def MuonEDMPrinterTool(flags, name="MuonEDMPrinterTool", **kwargs):
 def MuonTrackToSegmentToolCfg(flags,name="MuonTrackToSegmentTool", **kwargs):
     Muon__MuonTrackToSegmentTool=CompFactory.Muon.MuonTrackToSegmentTool
     #MDT conditions information not available online
-    if(flags.Common.isOnline):
+    if flags.Common.isOnline:
         kwargs.setdefault("MdtCondKey","")
     
     result = MuonStationIntersectSvcCfg(flags)

MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py

@@ -242,7 +242,9 @@ def DCMathSegmentMakerCfg(flags, **kwargs):
     result.merge(acc)
     
     kwargs.setdefault('TgcPrepDataContainer', 'TGC_MeasurementsAllBCs' if not flags.Muon.useTGCPriorNextBC and not flags.Muon.useTGCPriorNextBC else 'TGC_Measurements')
-    
+    if flags.Common.isOnline:
+        kwargs.setdefault('MdtCondKey', '')
+
     dc_segment_maker = Muon__DCMathSegmentMaker(**kwargs)
     result.setPrivateTools(dc_segment_maker)
     return result
@@ -634,7 +636,7 @@ def MooSegmentFinderAlgCfg(flags, name = "MuonSegmentMaker",  **kwargs):
     kwargs.setdefault('TgcPrepDataContainer', 'TGC_MeasurementsAllBCs' if not flags.Muon.useTGCPriorNextBC and not flags.Muon.useTGCPriorNextBC else 'TGC_Measurements')
         
     kwargs.setdefault('MuonSegmentOutputLocation', "ThirdChainSegments" if flags.Muon.segmentOrigin=="TruthTracking" else "MuonSegments")
-    
+
     moo_segment_finder_alg = MooSegmentFinderAlg( name=name, **kwargs )
     moo_segment_finder_alg.Cardinality=10
     result.addEventAlgo( moo_segment_finder_alg )

MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py

@@ -332,7 +332,9 @@ def MuonSegmentRegionRecoveryToolCfg(flags, name="MuonSegmentRegionRecoveryTool"
     acc = MuonTrackSummaryToolCfg(flags)
     kwargs.setdefault("TrackSummaryTool", acc.getPrimary())
     result.merge(acc)
-
+    if flags.Common.isOnline:
+        kwargs.setdefault("MdtCondKey", "")
+        
     segment_region_recovery_tool = Muon__MuonSegmentRegionRecoveryTool(name, **kwargs)
     result.setPrivateTools(segment_region_recovery_tool)
     return result
@@ -380,7 +382,9 @@ def MuonChamberHoleRecoveryToolCfg(flags, name="MuonChamberHoleRecoveryTool", **
         kwargs.setdefault("MMPrepDataContainer","")
     
     kwargs.setdefault('TgcPrepDataContainer', 'TGC_MeasurementsAllBCs' if not flags.Muon.useTGCPriorNextBC and not flags.Muon.useTGCPriorNextBC else 'TGC_Measurements')    
-    
+    if flags.Common.isOnline:
+        kwargs.setdefault("MdtCondKey","")
+
     hole_rec_tool = Muon__MuonChamberHoleRecoveryTool(name, **kwargs)
     result.setPrivateTools(hole_rec_tool)
     return result

Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py

@@ -52,6 +52,7 @@ flags.needFlagsCategory('Trigger')
 setupMenuModule.setupMenu(flags)
 flags.Exec.MaxEvents=50
 flags.Input.isMC = False
+flags.Common.isOnline=True
 
 
 flags.Concurrency.NumThreads=1