Skip to content
Snippets Groups Projects
Commit d7b55498 authored by Marija Vranjes Milosavljevic's avatar Marija Vranjes Milosavljevic Committed by Jiri Masik
Browse files

Merge branch 'sct-dcs-hack-overlay' into '21.1-dev'

Sct dcs hack overlay

See merge request atlas/athena!10435

(cherry picked from commit 52c7c2ef [formerly 190451e0196235c4f213e9764d5c80fdba9f3a4a])

de12de42 workaround to prevent using the online SCT DCS folders in overlay jobs ATLHI-188
1d73e7bc Merge branch '21.1-dev' of ssh://gitlab.cern.ch:7999/atlas/athena into sct-dcs-hack-overlay

Former-commit-id: e3954941273d36f13910ec3151ff74317d45b657
parent a141f302
No related branches found
No related tags found
No related merge requests found
......@@ -371,7 +371,8 @@ class SCT_ConditionsServicesSetup:
"Init DCS conditions service"
dcs_folder="/SCT/DCS"
db_loc = "DCS_OFL"
if (not self.isMC):
from AthenaCommon.GlobalFlags import globalflags
if not (self.isMC or globalflags.isOverlay()):
dcs_folder="/SCT/HLT/DCS"
db_loc = "SCT"
......@@ -380,7 +381,7 @@ class SCT_ConditionsServicesSetup:
else:
from SCT_ConditionsServices.SCT_ConditionsServicesConf import SCT_DCSConditionsSvc
dcsSvc = SCT_DCSConditionsSvc(name = instanceName)
if (not self.isMC):
if not (self.isMC or globalflags.isOverlay()):
dcsSvc.FolderLocation="/SCT/HLT/DCS"
dcsSvc.ReadAllDBFolders=False
dcsSvc.ReturnHVTemp=True
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment