diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
index 07c9cfb66d52e1017a575ab17cc85758b1216730..da704d780ddeb3e7d40cad2acc7c372b8bfa09b8 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
@@ -122,8 +122,8 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/MDT/ENDCAP/SIDEC","MuonAlign
conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndCapAAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
-conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
+conddb.blockFolder("/SCT/DAQ/Config/ChipSlim")
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/ChipSlim","/SCT/DAQ/Config/ChipSlim",force=True,className="CondAttrListVec")
conddb.blockFolder("/SCT/DAQ/Config/Module")
conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibChipRead.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibChipRead.py
index d60353751e1606da2398ca929c4d57a35d9806b5..afd8fea2afabca27b89305d294bf3d1e19ed466a 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibChipRead.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibChipRead.py
@@ -90,6 +90,9 @@ DetFlags.readRIOBS.all_setOff()
DetFlags.readRIOPool.all_setOff()
DetFlags.writeRIOPool.all_setOff()
+if conddb.dbdata=="COMP200":
+ from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
+ InDetGeometryFlags.useDynamicAlignFolders = False
import AtlasGeoModel.SetGeometryVersion
import AtlasGeoModel.GeoModelInit
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testConfig.py
index 51a43800a51e766e14db34f4ba574ca6b5445ab4..f8219b1159d33e9de18bcf5eaa4a488cced233cc 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testConfig.py
@@ -184,6 +184,9 @@ if useSlim:
# conddb.addFolderWithTag("SCT_OFL","/SCT/DAQ/Config/Chip","SctDaqConfigChip-MC-14",force=True,forceMC=True,className="CondAttrListVec");
# conddb.blockFolder("/SCT/DAQ/Config/ChipSlim")
conddb.addFolderWithTag("SCT_OFL","/SCT/DAQ/Config/ChipSlim","SctDaqConfigChipSlim-MC-14",force=True,forceMC=True,className="CondAttrListVec");
+ elif (test=='run2Data'):
+ sct_ConfigurationConditionsToolSetup.setChannelFolder("/SCT/DAQ/Config/ChipSlim")
+ conddb.addFolder("SCT","/SCT/DAQ/Config/ChipSlim",force=True,forceData=True,className="CondAttrListVec");
sct_ConfigurationConditionsToolSetup.setup()
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testParameters.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testParameters.py
index 9cf72f8b7c335a38ddf4d101f787efac9541dcc8..4ed2db84a38f3a462d24a2ce9ba46a1f3d73a25a 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testParameters.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testParameters.py
@@ -50,6 +50,20 @@ msg.info(globalflags)
from RecExConfig.RecFlags import rec
rec.projectName.set_Value_and_Lock("data12_8TeV")
+#--------------------------------------------------------------
+# Load IOVDbSvc
+#--------------------------------------------------------------
+IOVDbSvc = Service("IOVDbSvc")
+from IOVDbSvc.CondDB import conddb
+conddb.dbdata="COMP200"
+
+if conddb.dbdata=="COMP200":
+ from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
+ InDetGeometryFlags.useDynamicAlignFolders = False
+
+IOVDbSvc.GlobalTag=globalflags.ConditionsTag()
+IOVDbSvc.OutputLevel = 3
+
#--------------------------------------------------------------
# Set Detector setup
#--------------------------------------------------------------
@@ -99,19 +113,6 @@ theApp.EvtMax = 20
#--------------------------------------------------------------
ServiceMgr.MessageSvc.OutputLevel = 3
-#--------------------------------------------------------------
-# Load IOVDbSvc
-#--------------------------------------------------------------
-IOVDbSvc = Service("IOVDbSvc")
-from IOVDbSvc.CondDB import conddb
-conddb.dbdata="COMP200"
-IOVDbSvc.GlobalTag=globalflags.ConditionsTag()
-IOVDbSvc.OutputLevel = 3
-conddb.addFolder("SCT","/SCT/DAQ/Configuration/ROD")
-conddb.addFolder("SCT","/SCT/DAQ/Configuration/Geog")
-conddb.addFolder("SCT","/SCT/DAQ/Configuration/RODMUR")
-conddb.addFolder("SCT","/SCT/DAQ/Configuration/MUR")
-
#--------------------------------------------------------------
# Load DCSConditions Alg and Service
#--------------------------------------------------------------
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSensors.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSensors.py
index 36b339b19feb44c60245162169cd4a2878e9473b..ce1596c708f32709f242c4e70740151ff4362164 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSensors.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSensors.py
@@ -75,7 +75,9 @@ DetFlags.readRIOBS.all_setOff()
DetFlags.readRIOPool.all_setOff()
DetFlags.writeRIOPool.all_setOff()
-
+if conddb.dbdata=="COMP200":
+ from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
+ InDetGeometryFlags.useDynamicAlignFolders = False
import AtlasGeoModel.SetGeometryVersion
import AtlasGeoModel.GeoModelInit
diff --git a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
index a537f729218c776e047668e1dd08dd466fb713b8..640aec7d2fce85b6b07cde857167ec07bc76cb53 100644
--- a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
+++ b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
@@ -287,7 +287,7 @@ def SCT_ConfigurationConditionsToolCfg(flags, name="SCT_ConfigurationConditionsT
SCTConfigurationFolderPath=''
cond_kwargs = {}
- cond_kwargs["ChannelFolder"] = SCTConfigurationFolderPath+("ChipSlim" if flags.Input.isMC else "Chip")
+ cond_kwargs["ChannelFolder"] = SCTConfigurationFolderPath+("Chip" if flags.IOVDb.DatabaseInstance=="COMP200" else "ChipSlim")
cond_kwargs["ModuleFolder"] = SCTConfigurationFolderPath+"Module"
cond_kwargs["MurFolder"] = SCTConfigurationFolderPath+"MUR"
cond_kwargs["dbInstance"] = "SCT"
@@ -348,7 +348,7 @@ def getSCTDAQConfigFolder(flags) :
def SCT_ConfigurationCondAlgCfg(flags, name="SCT_ConfigurationCondAlg", **kwargs):
result = ComponentAccumulator()
config_folder_prefix = getSCTDAQConfigFolder(flags)
- channelFolder = config_folder_prefix+("ChipSlim" if flags.Input.isMC else "Chip")
+ channelFolder = config_folder_prefix+("Chip" if flags.IOVDb.DatabaseInstance=="COMP200" else "ChipSlim")
kwargs.setdefault("ReadKeyChannel", channelFolder)
kwargs.setdefault("ReadKeyModule", config_folder_prefix+"Module")
kwargs.setdefault("ReadKeyMur", config_folder_prefix+"MUR")
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index 5ddaf73a445376482cee256f995d69efe750b40e..3d006cdeeedf88d04767cab7044400884f7a76c8 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -274,10 +274,10 @@ if DetFlags.haveRIO.SCT_on():
pass
from SCT_ConditionsTools.SCT_ConfigurationConditionsToolSetup import SCT_ConfigurationConditionsToolSetup
sct_ConfigurationConditionsToolSetup = SCT_ConfigurationConditionsToolSetup()
- if globalflags.DataSource() == "data":
- sct_ConfigurationConditionsToolSetup.setChannelFolder(SCTConfigurationFolderPath+"Chip")
+ if SCTConfigurationFolderPath=='/SCT/DAQ/Configuration/':
+ sct_ConfigurationConditionsToolSetup.setChannelFolder(SCTConfigurationFolderPath+"Chip") # Run 1 data (COMP200)
else:
- sct_ConfigurationConditionsToolSetup.setChannelFolder(SCTConfigurationFolderPath+"ChipSlim") # For MC (OFLP200)
+ sct_ConfigurationConditionsToolSetup.setChannelFolder(SCTConfigurationFolderPath+"ChipSlim") # For MC (OFLP200) and Run 2, 3 data (CONDBR2)
sct_ConfigurationConditionsToolSetup.setModuleFolder(SCTConfigurationFolderPath+"Module")
sct_ConfigurationConditionsToolSetup.setMurFolder(SCTConfigurationFolderPath+"MUR")
sct_ConfigurationConditionsToolSetup.setup()
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
index b6b92a9c868b8d298a33da7a7cbac67bc994624c..763f8eb940341eb7262faeb9790d383ad92094fc 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
@@ -435,10 +435,10 @@ class SCT_ConditionsToolsSetup:
from SCT_ConditionsTools.SCT_ConfigurationConditionsToolSetup import SCT_ConfigurationConditionsToolSetup
sct_ConfigurationConditionsToolSetup = SCT_ConfigurationConditionsToolSetup()
from AthenaCommon.GlobalFlags import globalflags
- if (globalflags.DataSource() == 'data'):
- sct_ConfigurationConditionsToolSetup.setChannelFolder(sctdaqpath+"/Chip")
+ if (sctdaqpath=='/SCT/DAQ/Configuration'):
+ sct_ConfigurationConditionsToolSetup.setChannelFolder(sctdaqpath+"/Chip") # For Run 1 data (COMP200)
else:
- sct_ConfigurationConditionsToolSetup.setChannelFolder(sctdaqpath+"/ChipSlim") # For MC (OFLP200)
+ sct_ConfigurationConditionsToolSetup.setChannelFolder(sctdaqpath+"/ChipSlim") # For MC (OFLP200) and Run 2, 3 data (CONDBR2)
sct_ConfigurationConditionsToolSetup.setModuleFolder(sctdaqpath+"/Module")
sct_ConfigurationConditionsToolSetup.setMurFolder(sctdaqpath+"/MUR")
sct_ConfigurationConditionsToolSetup.setToolName(instanceName)
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
index ab0d0a6b87f006d7f393bba45cf300147fe7e04c..33b3bf2e4905fd687af528f145a4d1ab40aaf059 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
@@ -213,8 +213,9 @@ def makeInDetAlgs( config = None, rois = 'EMViewRoIs', doFTF = True, viewVerifie
from SCT_ConditionsTools.SCT_ConfigurationConditionsToolSetup import SCT_ConfigurationConditionsToolSetup
sct_ConfigurationConditionsToolSetup = SCT_ConfigurationConditionsToolSetup()
sct_ConfigurationConditionsToolSetup.setToolName("InDetSCT_ConfigurationConditionsTool_" + signature)
- if globalflags.DataSource() == 'geant4':
- sct_ConfigurationConditionsToolSetup.setChannelFolder("/SCT/DAQ/Config/ChipSlim") # For MC (OFLP200)
+ from IOVDbSvc.CondDB import conddb
+ if (globalflags.DataSource() == "geant4") or (conddb.dbdata == "CONDBR2"):
+ sct_ConfigurationConditionsToolSetup.setChannelFolder("/SCT/DAQ/Config/ChipSlim") # For MC (OFLP200) or Run 2, 3 data (CONDBR2)
sct_ConfigurationConditionsToolSetup.setup()
InDetSCT_ConditionsSummaryToolWithoutFlagged.ConditionsTools.append(sct_ConfigurationConditionsToolSetup.getTool().getFullName())
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
index 51d8b9090763ace63a9d5d95fd00a48863c7dc9c..87adfc9736db148779beb9b4264acb60d3fa8a5c 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
@@ -291,7 +291,7 @@ def sctCondCfg(flags):
acc.merge(SCT_CablingCondAlgCfg(flags))
SCT_ConfigurationConditionsTool=CompFactory.SCT_ConfigurationConditionsTool
acc.addPublicTool(SCT_ConfigurationConditionsTool())
- channelFolder = "/SCT/DAQ/Config/ChipSlim" if flags.Input.isMC else "/SCT/DAQ/Config/Chip"
+ channelFolder = "/SCT/DAQ/Config/ChipSlim"
moduleFolder = "/SCT/DAQ/Config/Module"
murFolder = "/SCT/DAQ/Config/MUR"
SCT_ConfigurationCondAlg=CompFactory.SCT_ConfigurationCondAlg