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
new file mode 100644
index 0000000000000000000000000000000000000000..b9f1148f73915aeb1f73bc1ab2d08d30717c5dc1
--- /dev/null
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py
@@ -0,0 +1,246 @@
+from IOVDbSvc.CondDB import conddb
+from AthenaCommon.DetFlags import DetFlags
+from RecExConfig.RecAlgsFlags import recAlgs
+########################################
+
+#use MC MDT RT functions
+#conddb.blockFolder("/MDT/RT")
+#conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
+conddb.blockFolder("/MDT/RTBLOB")
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+
+#from Guillaume
+conddb.blockFolder("/LAR/LArCellPositionShift");
+conddb.addFolderWithTag("LAR_OFL","/LAR/LArCellPositionShift","LArCellPositionShift-ideal",force=True,forceMC=True);
+conddb.addOverride("/LAR/ElecCalibOfl/Shape/RTM/4samples1phase","LARElecCalibOflShapeRTM4samples1phase-RUN2-UPD4-00")
+conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecCalibOflOFCPhysWaveRTM4samples1phase-RUN2-UPD4-00")
+svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
+
+conddb.blockFolder("/PIXEL/ReadoutSpeed")
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+
+conddb.blockFolder("/TRT/Cond/DigVers")
+conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True)
+
+
+###################################################
+print "RT OVERRIDE, for OFLCOND-MC16-SDR-23 "
+#See https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=OFLCOND-MC16-SDR-23
+# https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=CONDBR2-BLKPA-2017-14
+
+conddb.blockFolder("/LAR/BadChannels/BadChannels");
+conddb.blockFolder("/LAR/BadChannelsOfl/BadChannels");
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True);
+conddb.blockFolder("/LAR/BadChannels/MissingFEBs");
+conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
+
+if not "EOJT_alignMC" in globals():
+ print "EOJT_alignMC not found in globals(), so aligning ID to data conditions"
+ #conddb.blockFolder("/TRT/Align")
+ #conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-RUN2-BLK-UPD4-10",force=True,forceData=True)
+ #conddb.blockFolder("/LAR/Align")
+ #conddb.addFolderWithTag("LAR_ONL","/LAR/Align","LARAlign-RUN2-UPD4-02",force=True,forceData=True)
+ #conddb.blockFolder("/Indet/Align")
+ #conddb.addFolderWithTag("INDET_OFL","/Indet/Align","InDetAlign-RUN2-BLK-UPD4-13",force=True,forceData=True)
+else:
+ print "EOJT_alignMC found in globals(), so aligning ID to MC conditions"
+ conddb.blockFolder("/TRT/Align")
+ conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-RUN2-BLK-UPD4-13",force=True,forceMC=True)
+ conddb.blockFolder("/LAR/Align")
+ conddb.addFolderWithTag("LAR_OFL","/LAR/Align","LARAlign-RUN2-UPD4-03",force=True,forceMC=True)
+ conddb.blockFolder("/Indet/Align")
+ conddb.addFolderWithTag("INDET_OFL","/Indet/Align","InDetAlign-RUN2-BLK-UPD4-16",force=True,forceMC=True) #InDetAlign_IOVDEP-03
+
+#to set beam spot from MC
+#conddb.blockFolder("/Indet/Beampos")
+#conddb.addFolderWithTag("INDET_OFL","/Indet/Beampos","IndetBeampos-RunDep-MC15-BestKnowledge-002",force=True,forceMC=True)
+
+#to run overlay chain with trigger
+if (hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE") or (hasattr(recAlgs,'doTrigger') and recAlgs.doTrigger() and DetFlags.LVL1_on()):
+ print "running with trigger "
+ conddb.addOverride("/GLOBAL/Onl/BTagCalib/RUN12","BTagCalibRUN12Onl-08-40")
+else:
+ print "running with no trigger "
+
+if DetFlags.writeRDOPool.pixel_on():
+ conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
+
+conddb.blockFolder("/PIXEL/PixdEdx")
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
+mcIDoverlay=False
+if mcIDoverlay:
+ print "ACH777: Using MC overlay Lorentz DB settings"
+ conddb.blockFolder("/PIXEL/DCS/HV")
+ conddb.addFolderWithTag("DCS_OFL","/PIXEL/DCS/HV","PixDCSHV-SIM-MC16a-000-04",force=True,forceMC=True)
+ conddb.blockFolder("/PIXEL/DCS/TEMPERATURE")
+ conddb.addFolderWithTag("DCS_OFL","/PIXEL/DCS/TEMPERATURE","PixDCSTemp-SIM-MC16a-000-06",force=True,forceMC=True)
+ conddb.blockFolder("/SCT/DCS/HV")
+ conddb.addFolderWithTag("DCS_OFL","/SCT/DCS/HV","SctDcsHv-MC16",force=True,forceMC=True)
+ conddb.blockFolder("/SCT/DCS/MODTEMP")
+ conddb.addFolderWithTag("DCS_OFL","/SCT/DCS/MODTEMP","SctDcsModtemp-MC16",force=True,forceMC=True)
+mcIDoverlay2=False
+if mcIDoverlay2:
+ print "ACH777: Using more MC overlay ID DB settings"
+ conddb.blockFolder("/Indet/PixelDist")
+ conddb.addFolderWithTag("INDET_OFL","/Indet/PixelDist","InDetPixelDist-nominal",force=True,forceMC=True)
+ conddb.blockFolder("/PIXEL/PixelClustering/PixelClusNNCalib")
+ conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixelClustering/PixelClusNNCalib","PixelClusNNCalib-SIM-RUN12-000-06",force=True,forceMC=True)
+ conddb.blockFolder("/PIXEL/LorentzAngleScale")
+ conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/LorentzAngleScale","PixLorentzAngleScale-SIM-RUN124-000-00",force=True,forceMC=True)
+
+conddb.blockFolder("/MUONALIGN/MDT/BARREL")
+conddb.blockFolder("/MUONALIGN/MDT/ENDCAP/SIDEA")
+conddb.blockFolder("/MUONALIGN/MDT/ENDCAP/SIDEC")
+conddb.blockFolder("/MUONALIGN/TGC/SIDEA")
+conddb.blockFolder("/MUONALIGN/TGC/SIDEC")
+
+#use updated muon alignments
+conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/MDT/BARREL","MuonAlignMDTBarrelAlign-RUN2-BA_ROLLING_09-BLKP-UPD4-00",force=True,forceData=True)
+conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/MDT/ENDCAP/SIDEA","MuonAlignMDTEndCapAAlign-RUN2-ECA_ROLLING_2015_02_01-UPD4-02",force=True,forceData=True)
+conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/MDT/ENDCAP/SIDEC","MuonAlignMDTEndCapCAlign-RUN2-ECC_ROLLING_2015_02_01-UPD4-02",force=True,forceData=True)
+#conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/MDT/BARREL","MuonAlignMDTBarrelAlign-BA_ROLLING_2010_03-BLKP-UPD4-00",force=True,forceData=True)
+#conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/MDT/ENDCAP/SIDEA","MuonAlignMDTEndCapAAlign-ECA_ROLLING_2011_02_02-UPD4-01",force=True,forceData=True)
+#conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/MDT/ENDCAP/SIDEC","MuonAlignMDTEndCapCAlign-ECC_ROLLING_2011_02_02-UPD4-01",force=True,forceData=True)
+
+#the TGC alignments had overlap issues... caused G4 crash
+#conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndCapAAlign-TGCA_ROLLING_2011_01-ES1-UPD1-00",force=True,forceData=True)
+#conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-TGCC_ROLLING_2011_01-ES1-UPD1-00",force=True,forceData=True)
+#G4 overlap crash is still here:
+#conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndCapAAlign-RUN2-TGCA_ROLLING_2011_01-ES1-UPD1-03",force=True,forceData=True)
+#conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-RUN2-TGCC_ROLLING_2011_01-ES1-UPD1-03",force=True,forceData=True)
+conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndCapAAlign-0001-DEFAULT",force=True,forceMC=True)
+conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True)
+
+conddb.blockFolder("/SCT/DAQ/Config/Chip")
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.blockFolder("/SCT/DAQ/Config/Module")
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+
+dofolderoverrides = True
+if dofolderoverrides:
+ print "ACH - overriding folder access patterns"
+ conddb.dumpFolderTags('myconddb.txt',True)
+
+overlaylongfolders = []
+def adjustlongfolder(name):
+ if conddb.folderRequested(name):
+ print "setting "+name+" to 100000000s cache"
+ conddb.addMarkup(name,"<cache>100000000</cache>")
+ global overlaylongfolders
+ overlaylongfolders += [name]
+
+if dofolderoverrides:
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/calhits")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/clcon")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/deadOTXback")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/deadOTXps")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/etamod")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/etaoff")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/gap")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/larupdate")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/lwc")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/phimod")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/phioff")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/rfac")
+ adjustlongfolder("/CALO/CaloSwClusterCorrections/trcorr")
+ adjustlongfolder("/CALO/H1Weights/H1WeightsCone4Topo")
+ adjustlongfolder("/CALO/Identifier/CaloTTOnAttrIdMapAtlas")
+ adjustlongfolder("/CALO/Identifier/CaloTTOnOffIdMapAtlas")
+ adjustlongfolder("/CALO/Identifier/CaloTTPpmRxIdMapAtlas")
+ adjustlongfolder("/CALO/JetCalib/EtaMassEnergyCorr")
+ adjustlongfolder("/CALO/JetCalib/JetPropertyInvertResponseTool")
+ adjustlongfolder("/CALO/JetCalib/MCNumInversionResponse")
+ adjustlongfolder("/CALO/JetCalib/OffsetCorrection")
+ adjustlongfolder("/CALO/JetCalib/TrackAngularCorrection")
+ adjustlongfolder("/CALO/JetCalib/TrackBasedResponseCorrection")
+ adjustlongfolder("/CALO/Ofl/Pedestal/CellPedestal")
+ adjustlongfolder("/CALO/Pedestal/CellPedestal")
+ adjustlongfolder("/CSC/PSLOPE")
+ adjustlongfolder("/CSC/RMS")
+ adjustlongfolder("/CSC/T0BASE")
+ adjustlongfolder("/CSC/T0PHASE")
+ adjustlongfolder("/GLOBAL/DETSTATUS/DEFECTLOGIC")
+ adjustlongfolder("/Indet/TrkErrorScaling")
+ adjustlongfolder("/LAR/CellCorrOfl/deadOTX")
+ adjustlongfolder("/LAR/ElecCalibOfl/LArPileupShape")
+ adjustlongfolder("/MDT/CABLING/MAP_SCHEMA")
+ adjustlongfolder("/MDT/CABLING/MEZZANINE_SCHEMA")
+ adjustlongfolder("/MUONALIGN/MDT/ASBUILTPARAMS")
+ adjustlongfolder("/MUONALIGN/TGC/SIDEA")
+ adjustlongfolder("/MUONALIGN/TGC/SIDEC")
+ adjustlongfolder("/PIXEL/LorentzAngleScale")
+ adjustlongfolder("/PIXEL/NoiseMapLong")
+ adjustlongfolder("/PIXEL/PixMapLong")
+ adjustlongfolder("/PIXEL/PixMapShort")
+ adjustlongfolder("/PIXEL/PixdEdx")
+ adjustlongfolder("/PIXEL/PixelClustering/PixelClusNNCalib")
+ adjustlongfolder("/PIXEL/PixelClustering/PixelCovCorr")
+ adjustlongfolder("/RPC/CABLING/MAP_SCHEMA")
+ adjustlongfolder("/RPC/CABLING/MAP_SCHEMA_CORR")
+ adjustlongfolder("/RPC/DQMF/ELEMENT_STATUS")
+ adjustlongfolder("/TGC/CABLING/MAP_SCHEMA")
+ adjustlongfolder("/TILE/OFL02/CALIB/CIS/NLN")
+ adjustlongfolder("/TILE/OFL02/CALIB/EMS")
+ adjustlongfolder("/TILE/OFL02/CALIB/LAS/FIBER")
+ adjustlongfolder("/TILE/OFL02/CALIB/LAS/NLN")
+ adjustlongfolder("/TILE/OFL02/NOISE/AUTOCR")
+ adjustlongfolder("/TILE/OFL02/PULSESHAPE/CIS/LEAK100")
+ adjustlongfolder("/TILE/OFL02/PULSESHAPE/CIS/LEAK5P2")
+ adjustlongfolder("/TILE/OFL02/PULSESHAPE/CIS/PULSE100")
+ adjustlongfolder("/TILE/OFL02/PULSESHAPE/CIS/PULSE5P2")
+ adjustlongfolder("/TILE/OFL02/PULSESHAPE/LAS")
+ adjustlongfolder("/TILE/OFL02/PULSESHAPE/PHY")
+ adjustlongfolder("/TILE/OFL02/TIME/CHANNELOFFSET/CIS")
+ adjustlongfolder("/TRT/Calib/DX")
+ adjustlongfolder("/TRT/Calib/HTCalib")
+ adjustlongfolder("/TRT/Calib/PID")
+ adjustlongfolder("/TRT/Calib/PID_RToT")
+ adjustlongfolder("/TRT/Calib/PID_RToTver_New")
+ adjustlongfolder("/TRT/Calib/PID_vector")
+ adjustlongfolder("/TRT/Calib/PIDver_New")
+ adjustlongfolder("/TRT/Calib/ToT/ToTValue")
+ adjustlongfolder("/TRT/Calib/ToT/ToTVectors")
+ adjustlongfolder("/TRT/Calib/ToTCalib")
+ adjustlongfolder("/TRT/Calib/errors")
+ adjustlongfolder("/TRT/Calib/errors2d")
+ adjustlongfolder("/TRT/Calib/slopes")
+ adjustlongfolder("/CSC/FTHOLD")
+ adjustlongfolder("/CSC/NOISE")
+ adjustlongfolder("/CSC/PED")
+ adjustlongfolder("/GLOBAL/BTagCalib/Onl/RUN12")
+ adjustlongfolder("/Indet/PixelDist")
+ adjustlongfolder("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples3bins17phases")
+ adjustlongfolder("/LAR/ElecCalibOfl/Shape/RTM/4samples3bins17phases")
+ adjustlongfolder("/PIXEL/CablingMap")
+ adjustlongfolder("/PIXEL/NoiseMapShort")
+ adjustlongfolder("/PIXEL/PixReco")
+ adjustlongfolder("/Indet/AlignL3")
+ adjustlongfolder("/MUONALIGN/ERRS")
+ adjustlongfolder("/RPC/TRIGGER/CM_THR_ETA")
+ adjustlongfolder("/RPC/TRIGGER/CM_THR_PHI")
+ adjustlongfolder("/TRT/AlignL2")
+
+print "overlaylongfolders: ", overlaylongfolders
+
+def adjustshortfolder(name):
+ global overlaylongfolders
+ if name in overlaylongfolders:
+ print "already made "+name+" long"
+ else:
+ if conddb.folderRequested(name):
+ print "setting "+name+" to 10s cache"
+ conddb.addMarkup(name,"<cache>10</cache>")
+ else:
+ print "folder "+name+" was not requested?!"
+
+if dofolderoverrides:
+ with open("myconddb.txt") as f:
+ for l in f:
+ ls=l.split(" ")
+ if ls[0].startswith("--folder"):
+ ls1=ls[1].rstrip('\r\n')
+ ls11=ls1.rstrip('\n')
+ adjustshortfolder(ls11)
+
+
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_ESDtoAOD.py b/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_ESDtoAOD.py
new file mode 100644
index 0000000000000000000000000000000000000000..603a01e9284d86a3fb69b062343bdfe85ee01e8d
--- /dev/null
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_ESDtoAOD.py
@@ -0,0 +1,12 @@
+from IOVDbSvc.CondDB import conddb;
+conddb.blockFolder("/Indet/PixelDist");
+conddb.blockFolder("/Indet/TrkErrorScaling");
+conddb.blockFolder("/LAR/ElecCalibFlat/HVScaleCorr");
+conddb.blockFolder("/LAR/Identifier/CalibIdMap");
+conddb.blockFolder("/LAR/Identifier/FebRodMap");
+conddb.blockFolder("/LAR/Identifier/OnOffIdMap");
+conddb.blockFolder("/MUONALIGN/ERRS");
+conddb.blockFolder("/TRT/Cond/Status");
+conddb.blockFolder("/TRT/Cond/StatusHT");
+conddb.blockFolder("/TRT/Cond/StatusPermanent");
+conddb.blockFolder("/LAR/Identifier/LArTTCellMapAtlas");
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_EVNTtoHITS.py b/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_EVNTtoHITS.py
new file mode 100644
index 0000000000000000000000000000000000000000..35877785518cf29c031de20f09fb1726f5affdc1
--- /dev/null
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_EVNTtoHITS.py
@@ -0,0 +1,15 @@
+from IOVDbSvc.CondDB import conddb;
+conddb.blockFolder("/Indet/Beampos");
+conddb.blockFolder("/Indet/PixelDist");
+conddb.blockFolder("/LAR/ElecCalibFlat/DAC2uA");
+conddb.blockFolder("/LAR/ElecCalibFlat/HVScaleCorr");
+conddb.blockFolder("/LAR/ElecCalibFlat/MphysOverMcal");
+conddb.blockFolder("/LAR/ElecCalibFlat/OFC");
+conddb.blockFolder("/LAR/ElecCalibFlat/Pedestal");
+conddb.blockFolder("/LAR/ElecCalibFlat/Ramp");
+conddb.blockFolder("/LAR/ElecCalibFlat/Shape");
+conddb.blockFolder("/LAR/ElecCalibFlat/uA2MeV");
+conddb.blockFolder("/LAR/Identifier/CalibIdMap");
+conddb.blockFolder("/LAR/Identifier/FebRodMap");
+conddb.blockFolder("/LAR/Identifier/OnOffIdMap");
+conddb.blockFolder("/LAR/Identifier/LArTTCellMapAtlas");
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_OverlayBS.py b/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_OverlayBS.py
new file mode 100644
index 0000000000000000000000000000000000000000..1743eec25d709a75ba56866f3226f12c76fb4b22
--- /dev/null
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_OverlayBS.py
@@ -0,0 +1,16 @@
+from IOVDbSvc.CondDB import conddb;
+conddb.blockFolder("/LAR/BadChannelsOfl/KnownBADFEBs");
+conddb.blockFolder("/LAR/BadChannelsOfl/KnownMNBFEBs");
+conddb.blockFolder("/SCT/DAQ/Calibration/NPtGainDefects");
+conddb.blockFolder("/SCT/DAQ/Calibration/NoiseOccupancyDefects");
+conddb.blockFolder("/TRT/Calib/PID");
+conddb.blockFolder("/TRT/Calib/PID_RToT");
+conddb.blockFolder("/TRT/Calib/PID_RToTver_New");
+conddb.blockFolder("/TRT/Calib/PID_vector");
+conddb.blockFolder("/TRT/Calib/PIDver_New");
+conddb.blockFolder("/TRT/Calib/ToT/ToTValue");
+conddb.blockFolder("/TRT/Calib/ToT/ToTVectors");
+conddb.blockFolder("/TRT/DCS/HV/BARREL");
+conddb.blockFolder("/TRT/DCS/HV/ENDCAPA");
+conddb.blockFolder("/TRT/DCS/HV/ENDCAPC");
+conddb.blockFolder("/LAR/Identifier/LArTTCellMapAtlas");
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_RAWtoESD.py b/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_RAWtoESD.py
new file mode 100644
index 0000000000000000000000000000000000000000..0e1e53d064874486d8b07bf8be592e7c5999c900
--- /dev/null
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/blockFoldersHI_RAWtoESD.py
@@ -0,0 +1,35 @@
+from IOVDbSvc.CondDB import conddb;
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMBA1");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMBA2");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMBA3");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMBA4");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMBC1");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMBC2");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMBC3");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMBC4");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMECA1");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMECA2");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMECA3");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMECC1");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMECC2");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/EMECC3");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/FCALA");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/FCALC");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/HECA");
+conddb.blockFolder("/LAR/Configuration/FEBConfig/Physics/HECC");
+conddb.blockFolder("/LAR/ElecCalibFlat/DAC2uA");
+conddb.blockFolder("/LAR/ElecCalibFlat/HVScaleCorr");
+conddb.blockFolder("/LAR/ElecCalibFlat/MphysOverMcal");
+conddb.blockFolder("/LAR/ElecCalibFlat/OFC");
+conddb.blockFolder("/LAR/ElecCalibFlat/Pedestal");
+conddb.blockFolder("/LAR/ElecCalibFlat/Ramp");
+conddb.blockFolder("/LAR/ElecCalibFlat/Shape");
+conddb.blockFolder("/LAR/ElecCalibFlat/uA2MeV");
+conddb.blockFolder("/TILE/DCS/HV");
+conddb.blockFolder("/TILE/DCS/STATES");
+conddb.blockFolder("/TRT/Calib/PID");
+conddb.blockFolder("/TRT/Calib/PID_RToT");
+conddb.blockFolder("/CALO/Identifier/CaloTTOnAttrIdMapAtlas");
+conddb.blockFolder("/CALO/Identifier/CaloTTOnOffIdMapAtlas");
+conddb.blockFolder("/CALO/Identifier/CaloTTPpmRxIdMapAtlas");
+conddb.blockFolder("/LAR/Identifier/LArTTCellMapAtlas");
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI_reco.py b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI_reco.py
index 9f73d2b43f70f27dabc0ec56b26ae4430dc8bfdb..9e737701ed2316b432750bdc14e3d6c69db846e5 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI_reco.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI_reco.py
@@ -41,11 +41,11 @@ MuonDetectorTool.EnableFineClashFixing = 0 #this should be on for g4?
#conddb.blockFolder("/TRT/Calib/MCT0")
#conddb.addFolder("","<dbConnection>sqlite://;schema=mycool.db;dbname=OFLP200</dbConnection>/TRT/Calib/MCT0" + "<tag> TrtCalibMCT0-13TeV_ArgonScenario1_00-00</tag>" , force=True)
conddb.blockFolder("/TRT/Calib/MC/RT")
-conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/MC/RT","TrtCalibRt-R2-MC-run2-scenario1_03-00",force=True,forceData=True)
-conddb.addMarkup("/TRT/Calib/MC/RT","<forceRunNumber>295000</forceRunNumber>")
+conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/MC/RT","TrtCalibRt-R2-MC-run2-scenario1_04-02",force=True,forceData=True)
+conddb.addMarkup("/TRT/Calib/MC/RT","<forceRunNumber>309000</forceRunNumber>")
conddb.blockFolder("/TRT/Calib/MC/T0")
-conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/MC/T0","TrtCalibT0-R2-MC-run2-scenario1_03-00",force=True,forceData=True)
-conddb.addMarkup("/TRT/Calib/MC/T0","<forceRunNumber>295000</forceRunNumber>")
+conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/MC/T0","TrtCalibT0-R2-MC-run2-scenario1_04-02",force=True,forceData=True)
+conddb.addMarkup("/TRT/Calib/MC/T0","<forceRunNumber>309000</forceRunNumber>")
#conddb.blockFolder("/TRT/Calib/MCerrors2d")
#conddb.addFolder("","<dbConnection>sqlite://;schema=mycool.db;dbname=OFLP200</dbConnection> /TRT/Calib/MCerrors2d" + "<tag> TrtCalibMCErrors2d-IOVdep-2Dfit-00-00 </tag>" , force=True)
#conddb.blockFolder("/TRT/Calib/MCslopes")