Merge branch 'master-ATLASDQ-805-v2' into 'master'

Another possible fix of ATLASDQ-805

See merge request atlas/athena!34925

InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTLorentzAngleToolSetup.py

@@ -14,7 +14,7 @@ class SCTLorentzAngleToolSetup:
             from SCT_ConditionsTools.SCT_DCSConditionsToolSetup import SCT_DCSConditionsToolSetup
             sct_DCSConditionsToolSetup = SCT_DCSConditionsToolSetup()
 
-            # For HLT
+            # For HLT and online monitoring
             from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
             if athenaCommonFlags.isOnline():
                 sct_DCSConditionsToolSetup.setReadAllDBFolders(False)

InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py

@@ -326,6 +326,17 @@ if DetFlags.haveRIO.SCT_on():
     if InDetFlags.useSctDCS():
         from SCT_ConditionsTools.SCT_DCSConditionsToolSetup import SCT_DCSConditionsToolSetup
         sct_DCSConditionsToolSetup = SCT_DCSConditionsToolSetup()
+
+        # For HLT and online monitoring
+        if athenaCommonFlags.isOnline():
+            sct_DCSConditionsToolSetup.setReadAllDBFolders(False)
+            if globalflags.DataSource() == "data":
+                sct_DCSConditionsToolSetup.setDbInstance("SCT")
+                dcs_folder="/SCT/HLT/DCS"
+                sct_DCSConditionsToolSetup.setStateFolder(dcs_folder+"/CHANSTAT")
+                sct_DCSConditionsToolSetup.setHVFolder(dcs_folder+"/HV")
+                sct_DCSConditionsToolSetup.setTempFolder(dcs_folder+"/MODTEMP")
+
         sct_DCSConditionsToolSetup.setup()
         InDetSCT_DCSConditionsTool = sct_DCSConditionsToolSetup.getTool()
         if InDetFlags.useHVForSctDCS():

InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTErrMonAlg_jobOptions.py

@@ -15,12 +15,14 @@ myMonAlg.TriggerChain = ""
 
 # Use SCT conditions tools defined in InDetRecConditionsAccess.py
 # SCT_ByteStreamErrorsTool
-myMonAlg.SCT_ByteStreamErrorsTool = sct_ByteStreamErrorsToolSetup.getTool()
+myMonAlg.SCT_ByteStreamErrorsTool = SCT_ByteStreamErrorsTool
 # InDetSCT_ConfigurationConditionsTool
 myMonAlg.conditionsTool = InDetSCT_ConfigurationConditionsTool
 # SCT_DCSConditionsTool
 if InDetFlags.useDCS():
     myMonAlg.SCT_DCSConditionsTool = InDetSCT_DCSConditionsTool
+else:
+    myMonAlg.UseDCS = False
 # InDetSCT_ConditionsSummaryTool
 myMonAlg.SCT_ConditionsSummaryTool = InDetSCT_ConditionsSummaryTool