diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py index f0ebc6b652a01142121312a5e7e0d7a01164bcef..c11cb6e0e0cf9568c50f5bb7c04857fcf0b09694 100644 --- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py +++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py @@ -125,8 +125,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/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py index acf529239d1a7028455153bbf02dd5a6397b771f..b3151045d17eb1b8dd0944353f300adc13ac4c2c 100644 --- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py +++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py @@ -113,8 +113,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/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py index 54c3b25854d8dd0a293bec34304be82b7a29e0e9..75fe998cb29a316f3fd670cefbfe144a0ef9b3e8 100644 --- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py +++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py @@ -105,8 +105,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/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py index 40622f6a7e96f1d9932e6dc5fbd7ae8168de6e4c..4c8667b36c623cad2aa3c8569281a21d00e1b069 100644 --- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py +++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py @@ -103,8 +103,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/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py index c9d33be0789a5c1c90abbf371a1dcf8bd3706715..0834ff148d46fee92d0a5a9a80e3ceb2792dd71f 100644 --- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py +++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py @@ -101,8 +101,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/InDetRawAlgs/InDetOverlay/python/SCTOverlayConfig.py b/InnerDetector/InDetRawAlgs/InDetOverlay/python/SCTOverlayConfig.py index 02ee90618e4f56f9a4f8e25f8be23cd68ae9f583..575cdcd38aa4bd9b8d8eaacc86fb0a1b21739157 100644 --- a/InnerDetector/InDetRawAlgs/InDetOverlay/python/SCTOverlayConfig.py +++ b/InnerDetector/InDetRawAlgs/InDetOverlay/python/SCTOverlayConfig.py @@ -16,7 +16,7 @@ def SCT_ConfigurationConditionsCfg(flags, **kwargs): SCT_ConfigurationConditionsTool = CompFactory.SCT_ConfigurationConditionsTool acc.addPublicTool(SCT_ConfigurationConditionsTool()) - channelFolder = "/SCT/DAQ/Config/Chip" + channelFolder = "/SCT/DAQ/Config/ChipSlim" moduleFolder = "/SCT/DAQ/Config/Module" murFolder = "/SCT/DAQ/Config/MUR" from IOVDbSvc.IOVDbSvcConfig import addFolders diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py index 41ec801614e7b4ed89903810149abef4fcfcf479..f9a8e1cf22bd40c11e3b57fe737eedea8a1e9307 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py @@ -372,7 +372,7 @@ class forceConditions(_modifier): # All time-based folders (from IOVDbSvc DEBUG message, see athena!38274) timebased = ['/TDAQ/OLC/CALIBRATIONS', '/TDAQ/Resources/ATLAS/SCT/Robins', - '/SCT/DAQ/Config/Chip', + '/SCT/DAQ/Config/ChipSlim', '/SCT/DAQ/Config/Geog', '/SCT/DAQ/Config/MUR', '/SCT/DAQ/Config/Module',