PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CaloCellD3PDObject.py

@@ -61,6 +61,11 @@ def hookForCaloCellFilterAlg(c, flags, acc, prefix, *args, **kw) :
         
     return
 
+def hookForCaloNoiseCondAlg(c, flags, acc, prefix, *args, **kw):
+    from CaloTools.CaloNoiseCondAlgConfig import CaloNoiseCondAlgCfg
+    acc.merge (CaloNoiseCondAlgCfg (flags, noisetype='totalNoise'))
+    return
+
 def makeCaloCellD3PDObject (maker, prefix, object_name) :
 
     cellD3PDObject = D3PDObject (makeCellD3PDObject, prefix, object_name)
@@ -97,9 +102,8 @@ def makeCaloCellD3PDObject (maker, prefix, object_name) :
                                 SavePositionInfo=True,
                                 )
 
+    cellD3PDObject.defineHook  ( hookForCaloNoiseCondAlg )
     noiseType = "totalNoise"
-    from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
-    CaloNoiseCondAlg(noisetype=noiseType)
 
     cellD3PDObject.defineBlock (3, 'Detail3',
                                 D3PD.CaloCellDetailsFillerTool,
@@ -155,9 +159,8 @@ def makeCaloCellSlimmedD3PDObject (maker, prefix, object_name) :
                                 WriteE  = True,  WriteM = False, WritePt = False)
 
 
+    cellD3PDObject.defineHook  ( hookForCaloNoiseCondAlg )
     noiseType = "totalNoise"
-    from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
-    CaloNoiseCondAlg(noisetype=noiseType)
 
     cellD3PDObject.defineBlock (1, 'Detail1',
                                 D3PD.CaloCellDetailsFillerTool,

PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommonConfig.py

@@ -251,6 +251,14 @@ def EGammaCommonCfg(ConfigFlags):
     )
     acc.addPublicTool(PhotonIsEMSelectorLoose)
 
+    # Medium 
+    PhotonIsEMSelectorMedium = acc.popToolsAndMerge(
+        AsgPhotonIsEMSelectorCfg(
+            ConfigFlags, name="PhotonIsEMSelectorMedium", quality=egammaPID.PhotonIDMedium
+        )
+    )
+    acc.addPublicTool(PhotonIsEMSelectorMedium)
+
     # Tight (default == pt-dependent)
     PhotonIsEMSelectorTight = acc.popToolsAndMerge(
         AsgPhotonIsEMSelectorCfg(
@@ -524,6 +532,21 @@ def EGammaCommonCfg(ConfigFlags):
         )
     )
 
+    # decorate photons with the output of IsEM medium 
+    # on MC, fudge the shower shapes before computing the ID (but the
+    # original shower shapes are not overridden)
+    PhotonPassIsEMMedium = acc.getPrimaryAndMerge(
+        EGSelectionToolWrapperCfg(
+            ConfigFlags,
+            name="PhotonPassIsEMMedium",
+            EGammaSelectionTool=PhotonIsEMSelectorMedium,
+            EGammaFudgeMCTool=(PhotonVariableCorrectionTool if isFullSim else None),
+            CutType="",
+            StoreGateEntryName="DFCommonPhotonsIsEMMedium",
+            ContainerName="Photons",
+        )
+    )
+
     # decorate photons with the output of IsEM tight
     # on full-sim MC, fudge the shower shapes before computing the ID
     # (but the original shower shapes are not overridden)
@@ -614,6 +637,7 @@ def EGammaCommonCfg(ConfigFlags):
         ElectronPassDNNMedium,
         ElectronPassDNNTight,
         PhotonPassIsEMLoose,
+        PhotonPassIsEMMedium,
         PhotonPassIsEMTight,
         PhotonPassIsEMTightPtIncl,
         PhotonPassCleaning,

PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/PhotonsCPContent.py

@@ -6,7 +6,7 @@ PhotonsCPContent = [
 "GSFTrackParticles",
 "GSFTrackParticlesAux.phi.theta.qOverP.numberOfPixelHits.numberOfSCTHits.vertexLink.truthParticleLink.originalTrackParticle.numberOfInnermostPixelLayerHits.expectInnermostPixelLayerHit.numberOfNextToInnermostPixelLayerHits.expectNextToInnermostPixelLayerHit",
 "Photons",
-"PhotonsAux.pt.eta.phi.m.author.OQ.DFCommonPhotonsIsEMLoose.DFCommonPhotonsIsEMTight.DFCommonPhotonsIsEMTightIsEMValue.DFCommonPhotonsCleaning.DFCommonPhotonsCleaningNoTime.DFCommonCrackVetoCleaning.ptcone20.neflowisol20.topoetcone20.topoetcone30.topoetcone40.topoetcone20ptCorrection.topoetcone30ptCorrection.topoetcone40ptCorrection.core57cellsEnergyCorrection.topoetconecoreConeEnergyCorrection.caloClusterLinks.vertexLinks.ambiguityLink.ambiguityType.truthParticleLink.truthOrigin.truthType.topoetcone20_CloseByCorr.topoetcone40_CloseByCorr.ptcone20_CloseByCorr.Eadded_Lr2.Eadded_Lr3",
+"PhotonsAux.pt.eta.phi.m.author.OQ.DFCommonPhotonsIsEMLoose.DFCommonPhotonsIsEMMedium.DFCommonPhotonsIsEMTight.DFCommonPhotonsIsEMTightIsEMValue.DFCommonPhotonsCleaning.DFCommonPhotonsCleaningNoTime.DFCommonCrackVetoCleaning.ptcone20.neflowisol20.topoetcone20.topoetcone30.topoetcone40.topoetcone20ptCorrection.topoetcone30ptCorrection.topoetcone40ptCorrection.core57cellsEnergyCorrection.topoetconecoreConeEnergyCorrection.caloClusterLinks.vertexLinks.ambiguityLink.ambiguityType.truthParticleLink.truthOrigin.truthType.topoetcone20_CloseByCorr.topoetcone40_CloseByCorr.ptcone20_CloseByCorr.Eadded_Lr2.Eadded_Lr3",
 "egammaClusters",
 "egammaClustersAux.calE.calEta.calPhi.e_sampl.eta_sampl.ETACALOFRAME.PHICALOFRAME.clusterSize.altE.calM.constituentClusterLinks",
 "Electrons",

PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py

@@ -414,7 +414,7 @@ def PHYSLITECfg(flags):
     PHYSLITESlimmingHelper.ExtraVariables += [ 
         'AnalysisElectrons.trackParticleLinks.f1.pt.eta.phi.m.charge.author.DFCommonElectronsLHVeryLoose.DFCommonElectronsLHLoose.DFCommonElectronsLHLooseBL.DFCommonElectronsLHMedium.DFCommonElectronsLHTight.DFCommonElectronsLHVeryLooseIsEMValue.DFCommonElectronsLHLooseIsEMValue.DFCommonElectronsLHLooseBLIsEMValue.DFCommonElectronsLHMediumIsEMValue.DFCommonElectronsLHTightIsEMValue.DFCommonElectronsECIDS.DFCommonElectronsECIDSResult.topoetcone20.topoetcone20ptCorrection.neflowisol20.ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500.ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000.ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500.ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000.topoetcone20_CloseByCorr.ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000_CloseByCorr.ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000_CloseByCorr.caloClusterLinks.ambiguityLink.TruthLink.truthParticleLink.truthOrigin.truthType.truthPdgId.firstEgMotherTruthType.firstEgMotherTruthOrigin.firstEgMotherTruthParticleLink.firstEgMotherPdgId.ambiguityType.OQ',
         'AnalysisSiHitElectrons.pt.eta.phi.m.charge.author.topoetcone20_CloseByCorr.DFCommonElectronsLHVeryLoose.ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000_CloseByCorr.OQ.truthOrigin.truthType.firstEgMotherTruthType.firstEgMotherTruthOrigin.z0stheta.d0Normalized.nInnerExpPix.clEta.clPhi',
-        'AnalysisPhotons.f1.pt.eta.phi.m.author.OQ.DFCommonPhotonsIsEMLoose.DFCommonPhotonsIsEMTight.DFCommonPhotonsIsEMTightIsEMValue.DFCommonPhotonsCleaning.DFCommonPhotonsCleaningNoTime.ptcone20.topoetcone20.topoetcone40.topoetcone20ptCorrection.topoetcone40ptCorrection.topoetcone20_CloseByCorr.topoetcone40_CloseByCorr.ptcone20_CloseByCorr.caloClusterLinks.vertexLinks.ambiguityLink.TruthLink.truthParticleLink.truthOrigin.truthType',
+        'AnalysisPhotons.f1.pt.eta.phi.m.author.OQ.DFCommonPhotonsIsEMLoose.DFCommonPhotonsIsEMMedium.DFCommonPhotonsIsEMTight.DFCommonPhotonsIsEMTightIsEMValue.DFCommonPhotonsCleaning.DFCommonPhotonsCleaningNoTime.ptcone20.topoetcone20.topoetcone40.topoetcone20ptCorrection.topoetcone40ptCorrection.topoetcone20_CloseByCorr.topoetcone40_CloseByCorr.ptcone20_CloseByCorr.caloClusterLinks.vertexLinks.ambiguityLink.TruthLink.truthParticleLink.truthOrigin.truthType',
         'GSFTrackParticles.chiSquared.phi.d0.theta.qOverP.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag.z0.vz.charge.vertexLink.numberOfPixelHits.numberOfSCTHits.expectInnermostPixelLayerHit.expectNextToInnermostPixelLayerHit.numberOfInnermostPixelLayerHits.numberOfNextToInnermostPixelLayerHits.originalTrackParticle',
         'GSFConversionVertices.trackParticleLinks.x.y.z.px.py.pz.pt1.pt2.neutralParticleLinks.minRfirstHit',
         'egammaClusters.calE.calEta.calPhi.calM.e_sampl.eta_sampl.ETACALOFRAME.PHICALOFRAME.ETA2CALOFRAME.PHI2CALOFRAME.constituentClusterLinks',

PhysicsAnalysis/DerivationFramework/DerivationFrameworkTileCal/python/TCAL1.py

@@ -142,7 +142,7 @@ def TCAL1Cfg(flags):
     from xAODMetaDataCnv.InfileMetaDataConfig import SetupMetaDataForStreamCfg
     from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
     TCAL1SlimmingHelper = SlimmingHelper("TCAL1SlimmingHelper", NamesAndTypes = flags.Input.TypedCollections, flags = flags)
-    TCAL1SlimmingHelper.SmartCollections = ['EventInfo', 'Muons', 'AntiKt4EMTopoJets', 'AntiKt4EMPFlowJets', 'MET_Baseline_AntiKt4EMTopo', 'MET_Baseline_AntiKt4EMPFlow', 'PrimaryVertices']
+    TCAL1SlimmingHelper.SmartCollections = ['EventInfo', 'Muons', 'AntiKt4EMTopoJets', 'AntiKt4EMPFlowJets', 'MET_Baseline_AntiKt4EMTopo', 'MET_Baseline_AntiKt4EMPFlow', 'PrimaryVertices', 'BTagging_AntiKt4EMPFlow']
 
     TCAL1ExtraVariables = f'Muons.{TCAL1Prefix}etrkcone40'
 

PhysicsAnalysis/ElectronPhotonID/EGammaVariableCorrection/python/EGammaVariableCorrectionConfig.py

@@ -16,8 +16,8 @@ def PhotonVariableCorrectionToolCfg(
         flags, name="PhotonVariableCorrectionTool", **kwargs):
     """Configure the e/gamma variable correction tool"""
     acc = ComponentAccumulator()
-    # Keep using TUNE 23 for now for photons
-    kwargs.setdefault("ConfigFile", "EGammaVariableCorrection/TUNE23/ElPhVariableNominalCorrection.conf")
+    # Use TUNE 25 for now for photons
+    kwargs.setdefault("ConfigFile", "EGammaVariableCorrection/TUNE25/ElPhVariableNominalCorrection.conf")
     acc.setPrivateTools(
         CompFactory.ElectronPhotonVariableCorrectionTool(name, **kwargs))
     return acc

PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/EGSelectorConfigurationMapping.h

@@ -77,11 +77,11 @@ const std::map<std::string, std::string> PhotonCutPointToConfFile = {
     "ElectronPhotonSelectorTools/offline/mc15_20150712/"
     "PhotonIsEMLooseSelectorCutDefs.conf" },
   { "MediumPhoton",
-    "ElectronPhotonSelectorTools/offline/mc15_20160512/"
-    "PhotonIsEMMediumSelectorCutDefs.conf" },
+    "ElectronPhotonSelectorTools/offline/mc20_20240510/"
+    "PhotonIsEMMediumSelectorCutDefs_pTdep_smooth.conf" },
   { "TightPhoton",
-    "ElectronPhotonSelectorTools/offline/20180825/"
-    "PhotonIsEMTightSelectorCutDefs.conf" },
+    "ElectronPhotonSelectorTools/offline/mc20_20240510/"
+    "PhotonIsEMTightSelectorCutDefs_pTdep_mc20_smooth.conf" },
   { "TightPhotonWithMu",
     "ElectronPhotonSelectorTools/offline/mc16_20220621/"
     "PhotonIsEMTightSelectorCutDefs.conf" },

PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/PhotonIsEMMenuDefs.py

@@ -20,10 +20,10 @@ def PhotonIsEMMediumSelectorConfig(theTool):
     These are the photon isEM definitions from *DC14*
     '''
 
-    # MEDIUM (20/11/2013 -- Ludovica@cern.ch)
+    # MEDIUM (10/05/24 - see ATLASG-2708)
     #  Coming from Fer
     #
-    theTool.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20150712/PhotonIsEMMediumSelectorCutDefs.conf"
+    theTool.ConfigFile = "ElectronPhotonSelectorTools/offline/mc20_20240510/PhotonIsEMMediumSelectorCutDefs_pTdep_smooth.conf"
 
 
 # Current cut-based tight menu. When updating tight, simply change the config-file below
@@ -37,9 +37,9 @@ def PhotonIsEMTightSelectorConfig(theTool):
     '''
 
     #
-    # Pt-dependent tight cuts, derived in August 2018 ("v11")
+    # Tight (10/05/24 - see ATLASG-2708)
     #
-    theTool.ConfigFile = "ElectronPhotonSelectorTools/offline/20180825/PhotonIsEMTightSelectorCutDefs.conf"
+    theTool.ConfigFile = "ElectronPhotonSelectorTools/offline/mc20_20240510/PhotonIsEMTightSelectorCutDefs_pTdep_mc20_smooth.conf"
 
 #
 # Pt-inclusive tight ID menu, derived in January 2018.

PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx

@@ -179,7 +179,7 @@ int main( int argc, char* argv[] ) {
      //Tight cut based photon
      
      asg::StandaloneToolHandle<IAsgPhotonIsEMSelector> photonTightIsEMSelector ("AsgPhotonIsEMSelector/photonTightIsEMSelector");
-     ANA_CHECK(photonTightIsEMSelector.setProperty("WorkingPoint", "TightPhotonWithMu"));
+     ANA_CHECK(photonTightIsEMSelector.setProperty("WorkingPoint", "MediumPhoton"));
      ANA_CHECK(photonTightIsEMSelector.setProperty("OutputLevel", mylevel));
      ANA_CHECK(photonTightIsEMSelector.initialize());
      // Loop over the events:

PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYObjDef_xAOD.cxx

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 // Local include(s):
@@ -215,6 +215,7 @@ SUSYObjDef_xAOD::SUSYObjDef_xAOD( const std::string& name )
     m_elez0(-99.),
     m_elebaselined0sig(-99.),
     m_elebaselinez0(-99),
+    m_eleAllowRun3TrigSFFallback(false),
     //
     m_muBaselinePt(-99.),
     m_muBaselineEta(-99.),
@@ -252,15 +253,16 @@ SUSYObjDef_xAOD::SUSYObjDef_xAOD( const std::string& name )
     m_jetJvt(-99.),
     m_JvtWP(""),
     m_JvtPtMax(-99.),
-    m_JvtConfig(""),
+    m_JvtConfigRun2(""),
+    m_JvtConfigRun3(""),
     m_trkJetPt(-99.),
     m_trkJetEta(-99.),
     m_doFwdJVT(false),
     m_fJvtWP(""),
     m_fJvtPtMax(-99.),
     m_fJvtEtaMin(-99.),
-    m_fJvtConfig(""),
-    m_fJvtRecalculate(false),
+    m_fJvtConfigRun2(""),
+    m_fJvtConfigRun3(""),
     m_JMScalib(false),
     //
     m_orDoTau(false),
@@ -551,6 +553,7 @@ SUSYObjDef_xAOD::SUSYObjDef_xAOD( const std::string& name )
   declareProperty( "EleCrackVeto", m_eleCrackVeto);
   declareProperty( "EleForceNoId", m_force_noElId );
   declareProperty( "EleEffMapFilePath", m_eleEffMapFilePath);
+  declareProperty( "EleAllowRun3TrigSFFallback", m_eleAllowRun3TrigSFFallback);
 
   //MUONS
   declareProperty( "MuonBaselinePt", m_muBaselinePt);
@@ -1333,6 +1336,7 @@ StatusCode SUSYObjDef_xAOD::readConfig()
   m_conf_to_prop["Ele.CrackVeto"] = "EleCrackVeto";
   m_conf_to_prop["EleBaseline.CrackVeto"] = "EleBaselineCrackVeto";
   m_conf_to_prop["Ele.ForceNoId"] = "EleForceNoId";
+  m_conf_to_prop["Ele.AllowRun3TrigSFFallback"] = "EleAllowRun3TrigSFFallback";
   m_conf_to_prop["Muon.ForceNoId"] = "MuonForceNoId";
   m_conf_to_prop["Muon.TTVASF"] = "MuonTTVASF";
   m_conf_to_prop["Muon.passedHighPt"] = "MuonRequireHighPtCuts";
@@ -1397,6 +1401,7 @@ StatusCode SUSYObjDef_xAOD::readConfig()
   configFromFile(m_eleConfigBaseline, "EleBaseline.Config", rEnv, "None");
   configFromFile(m_eleBaselineCrackVeto, "EleBaseline.CrackVeto", rEnv, false);
   configFromFile(m_force_noElId, "Ele.ForceNoId", rEnv, false);
+  
   //
   configFromFile(m_elePt, "Ele.Et", rEnv, 25000.);
   configFromFile(m_eleEta, "Ele.Eta", rEnv, 2.47);
@@ -1420,6 +1425,8 @@ StatusCode SUSYObjDef_xAOD::readConfig()
   configFromFile(m_EG_corrFNList, "Ele.EffCorrFNList", rEnv, "None");
   configFromFile(m_electronTriggerSFStringSingle, "Ele.TriggerSFStringSingle", rEnv, "SINGLE_E_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_2018_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0");
   configFromFile(m_eleEffMapFilePath, "Ele.EffMapFilePath", rEnv, "ElectronEfficiencyCorrection/2015_2025/rel22.2/2022_Summer_Prerecom_v1/map4.txt");
+  configFromFile(m_eleAllowRun3TrigSFFallback, "Ele.AllowRun3TrigSFFallback", rEnv, false);
+  
   configFromFile(m_trig2015combination_singleLep, "Trig.Singlelep2015", rEnv, "e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose || mu20_iloose_L1MU15_OR_mu50");
   configFromFile(m_trig2016combination_singleLep, "Trig.Singlelep2016", rEnv, "e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 || mu26_ivarmedium_OR_mu50");
   configFromFile(m_trig2017combination_singleLep, "Trig.Singlelep2017", rEnv, "e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 || mu26_ivarmedium_OR_mu50");
@@ -1503,7 +1510,8 @@ StatusCode SUSYObjDef_xAOD::readConfig()
   configFromFile(m_jetEta, "Jet.Eta", rEnv, 2.8);
   configFromFile(m_JvtWP, "Jet.JvtWP", rEnv, "FixedEffPt"); // https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/PileupJetRecommendations
   configFromFile(m_JvtPtMax, "Jet.JvtPtMax", rEnv, 60.0e3);
-  configFromFile(m_JvtConfig, "Jet.JvtConfig", rEnv, "", true); // empty string means dummy SF
+  configFromFile(m_JvtConfigRun2, "Jet.JvtConfigRun2", rEnv, "JetJvtEfficiency/May2024/NNJvtSFFile_Run2_EMPFlow.root", true); // empty string means dummy SF
+  configFromFile(m_JvtConfigRun3, "Jet.JvtConfigRun3", rEnv, "JetJvtEfficiency/May2024/NNJvtSFFile_Run3_EMPFlow.root", true); // empty string means dummy SF
   configFromFile(m_jetUncertaintiesConfig, "Jet.UncertConfig", rEnv, "rel22/Summer2023_PreRec/R4_CategoryReduction_FullJER.config"); // https://twiki.cern.ch/twiki/bin/view/AtlasProtected/JetUncertaintiesRel22/
   configFromFile(m_jetUncertaintiesAnalysisFile, "Jet.AnalysisFile", rEnv, "default"); // https://twiki.cern.ch/twiki/bin/view/AtlasProtected/JetUncertaintiesRel21Summer2018SmallR
   configFromFile(m_jetUncertaintiesCalibArea, "Jet.UncertCalibArea", rEnv, "default"); // Defaults to default area set by tool
@@ -1535,10 +1543,10 @@ StatusCode SUSYObjDef_xAOD::readConfig()
   //
   configFromFile(m_doFwdJVT, "FwdJet.doJVT", rEnv, false); // https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/PileupJetRecommendations
   configFromFile(m_fJvtWP, "FwdJet.JvtWP", rEnv, "Loose");
-  configFromFile(m_fJvtPtMax, "FwdJet.JvtPtMax", rEnv, 120e3);
+  configFromFile(m_fJvtPtMax, "FwdJet.JvtPtMax", rEnv, 60e3);
   configFromFile(m_fJvtEtaMin, "FwdJet.JvtEtaMin", rEnv, 2.5);
-  configFromFile(m_fJvtConfig, "FwdJet.JvtConfig", rEnv, "", true); // empty string means dummy SF
-  configFromFile(m_fJvtRecalculate, "FwdJet.JvtRecalculate", rEnv, false);
+  configFromFile(m_fJvtConfigRun2, "FwdJet.JvtConfigRun2", rEnv, "JetJvtEfficiency/May2024/fJvtSFFile_Run2_EMPFlow.root", true); // empty string means dummy SF
+  configFromFile(m_fJvtConfigRun3, "FwdJet.JvtConfigRun3", rEnv, "JetJvtEfficiency/May2024/fJvtSFFile_Run2_EMPFlow.root", true); // empty string means dummy SF
   configFromFile(m_JMScalib, "Jet.JMSCalib", rEnv, false);
   //
   configFromFile(m_useBtagging, "Btag.enable", rEnv, true);

PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYToolsInit.cxx

@@ -312,6 +312,7 @@ StatusCode SUSYObjDef_xAOD::SUSYToolsInit()
       ATH_CHECK( m_jetTruthLabelingTool.setProperty("TruthParticleContainerName", "TruthParticles") );
       ATH_CHECK( m_jetTruthLabelingTool.setProperty("TruthBosonContainerName", "TruthBoson") );  // Set this if you are using a TRUTH3 style truth boson container
       ATH_CHECK( m_jetTruthLabelingTool.setProperty("TruthTopQuarkContainerName", "TruthTop") ); // Set this if you are using a TRUTH3 style truth top quark container
+      ATH_CHECK( m_jetTruthLabelingTool.setProperty("OutputLevel", this->msg().level()) );
       ATH_CHECK( m_jetTruthLabelingTool.retrieve() );
     } else if (m_jetTruthLabelingTool.isUserConfigured()) ATH_CHECK(m_jetTruthLabelingTool.retrieve());
 
@@ -537,7 +538,7 @@ StatusCode SUSYObjDef_xAOD::SUSYToolsInit()
       ATH_CHECK( m_jetNNJvtEfficiencyTool.setProperty("JetContainer", m_defaultJets) );  
       ATH_CHECK( m_jetNNJvtEfficiencyTool.setProperty("WorkingPoint", m_JvtWP) );
       ATH_CHECK( m_jetNNJvtEfficiencyTool.setProperty("MaxPtForJvt", m_JvtPtMax) );
-      ATH_CHECK( m_jetNNJvtEfficiencyTool.setProperty("SFFile", m_JvtConfig) );
+      ATH_CHECK( m_jetNNJvtEfficiencyTool.setProperty("SFFile", m_isRun3 ? m_JvtConfigRun3 : m_JvtConfigRun2) );
       ATH_CHECK( m_jetNNJvtEfficiencyTool.setProperty("OutputLevel", this->msg().level()) );
       ATH_CHECK( m_jetNNJvtEfficiencyTool.retrieve() );
     } else if (m_jetNNJvtEfficiencyTool.isUserConfigured()) ATH_CHECK( m_jetNNJvtEfficiencyTool.retrieve() );
@@ -565,7 +566,7 @@ StatusCode SUSYObjDef_xAOD::SUSYToolsInit()
       ATH_CHECK( m_jetfJvtEfficiencyTool.setProperty("JetContainer", m_defaultJets) );  
       ATH_CHECK( m_jetfJvtEfficiencyTool.setProperty("WorkingPoint", m_fJvtWP) );
       ATH_CHECK( m_jetfJvtEfficiencyTool.setProperty("MaxPtForJvt", m_fJvtPtMax) );
-      ATH_CHECK( m_jetfJvtEfficiencyTool.setProperty("SFFile", m_fJvtConfig) );
+      ATH_CHECK( m_jetfJvtEfficiencyTool.setProperty("SFFile", m_isRun3 ? m_fJvtConfigRun3 : m_fJvtConfigRun2) );
       ATH_CHECK( m_jetfJvtEfficiencyTool.setProperty("OutputLevel", this->msg().level()) );
       ATH_CHECK( m_jetfJvtEfficiencyTool.retrieve() );
     } else  ATH_CHECK( m_jetfJvtEfficiencyTool.retrieve() );
@@ -695,6 +696,7 @@ StatusCode SUSYObjDef_xAOD::SUSYToolsInit()
         m_muonLRTORTool.setTypeAndName("CP::MuonLRTOverlapRemovalTool/"+toolName);
         ATH_CHECK( m_muonLRTORTool.setProperty("overlapStrategy", CP::IMuonLRTOverlapRemovalTool::defaultStrategy) );
         if (m_isRun3) ATH_CHECK( m_muonLRTORTool.setProperty("UseRun3WP", true ));
+        ATH_CHECK( m_muonLRTORTool.setProperty("OutputLevel", this->msg().level()) );
         ATH_CHECK( m_muonLRTORTool.retrieve() );
     } else ATH_CHECK( m_muonLRTORTool.retrieve() );
 
@@ -1086,17 +1088,39 @@ StatusCode SUSYObjDef_xAOD::SUSYToolsInit()
   
       //single lepton
       
+      if(m_isRun3 && eleId.find("LooseBLayer") != std::string::npos) ATH_MSG_WARNING("Replacing 'LooseBLayer' with 'Loose' for Electron ID while configuring single-ele trigger SF using: " << m_eleEffMapFilePath);
       std::string triggerEleID = m_isRun3? TString(eleId).ReplaceAll("LooseBLayer", "Loose").Data() : eleId;
+      std::string triggerEleIso= m_eleIso_WP;
+      
+      // This is an hack to work with ElectronEfficiencyCorrection/2015_2025/rel22.2/2022_Summer_Prerecom_v1/map4.txt to allow 
+
+      if(m_isRun3 && m_eleAllowRun3TrigSFFallback){
+        bool pass_isRun3TrigSFFallback = true;
+        if (triggerEleID.find("Medium") != std::string::npos && triggerEleIso.find("Loose") != std::string::npos)                {triggerEleID = "Loose";}
+        else if (triggerEleID.find("Medium") != std::string::npos && triggerEleIso.find("Tight") != std::string::npos)           {triggerEleID = "Tight"; triggerEleIso = "Tight_VarRad";}
+        else if (triggerEleID.find("Medium") != std::string::npos && triggerEleIso.find("HighPtCaloOnly") != std::string::npos)  {triggerEleID = "Tight"; triggerEleIso = "Tight_VarRad";}
+        else if (triggerEleID.find("Tight")  != std::string::npos && triggerEleIso.find("Loose") != std::string::npos)           {triggerEleID = "Loose";}
+        else if (triggerEleID.find("Tight")  != std::string::npos && triggerEleIso.find("Tight") != std::string::npos)           {triggerEleIso= "Tight_VarRad";}
+        else if (triggerEleID.find("Tight")  != std::string::npos && triggerEleIso.find("HighPtCaloOnly") != std::string::npos)  {triggerEleID = "Tight"; triggerEleIso = "Tight_VarRad";}
+        else if (triggerEleID.find("Loose")  != std::string::npos && triggerEleIso.find("Tight") != std::string::npos)           {triggerEleID = "Loose"; triggerEleIso = "Loose_VarRad";}
+        else if (triggerEleID.find("Loose")  != std::string::npos && triggerEleIso.find("HighPtCaloOnly") != std::string::npos)  {triggerEleID = "Loose"; triggerEleIso = "Loose_VarRad";}
+        else {pass_isRun3TrigSFFallback=false;}
+        if(pass_isRun3TrigSFFallback){
+          ATH_MSG_INFO(" ************** This is only for testing/studying purpose! ************** ");
+          ATH_MSG_INFO(" ************** For official recommendation, please get in contact with the SUSY Bkg Forum ************** ");
+          ATH_MSG_INFO("In the current map ("<<m_eleEffMapFilePath<<"), the only supported Electron ID working-points supported for Electron Trigger Scale Factor are 'Loose_Loose_VarRad' and 'Tight_Tight_VarRad' ");
+          ATH_MSG_INFO("Only for single-lepton trigger scale factor, fall back to Electron ID:  -> "<< triggerEleID << " with Isolation: " << triggerEleIso);
+        }
+      }
       
-      if(m_isRun3 && eleId.find("LooseBLayer") != std::string::npos) ATH_MSG_WARNING("Replacing 'LooseBLayer' with 'Loose' for Electron ID while configuring single-ele trigger SF using: " << m_eleEffMapFilePath);
       
-      ATH_MSG_INFO("eSF_keys: " << m_electronTriggerSFStringSingle<< "_"<<triggerEleID<<"_"<<m_eleIso_WP);
-      std::string triggerEleIso("");
-      if (std::find(eSF_keys.begin(), eSF_keys.end(), m_electronTriggerSFStringSingle+"_"+triggerEleID+"_"+m_eleIso_WP) != eSF_keys.end()){
+      ATH_MSG_INFO("eSF_keys: " << m_electronTriggerSFStringSingle<< "_"<<triggerEleID<<"_"<<triggerEleIso);
+
+      if (std::find(eSF_keys.begin(), eSF_keys.end(), m_electronTriggerSFStringSingle+"_"+triggerEleID+"_"+triggerEleIso) != eSF_keys.end()){
         triggerEleIso   = m_eleIso_WP;
-      } else if (std::find(eSF_keys.begin(), eSF_keys.end(), m_electronTriggerSFStringSingle+"_"+triggerEleID+"_"+m_el_iso_fallback[m_eleIso_WP]) != eSF_keys.end()){
+      } else if (std::find(eSF_keys.begin(), eSF_keys.end(), m_electronTriggerSFStringSingle+"_"+triggerEleID+"_"+m_el_iso_fallback[triggerEleIso]) != eSF_keys.end()){
         //--- Check to see if the only issue is an unknown isolation working point
-        triggerEleIso = m_el_iso_fallback[m_eleIso_WP];
+        triggerEleIso = m_el_iso_fallback[triggerEleIso];
         ATH_MSG_WARNING("(AsgElectronEfficiencyCorrectionTool_trig_singleLep_*) Your selected electron Iso WP ("
           << m_eleIso_WP
           << ") does not have trigger SFs defined. Falling back to "

PhysicsAnalysis/SUSYPhys/SUSYTools/SUSYTools/SUSYObjDef_xAOD.h

@@ -678,6 +678,8 @@ namespace ST {
     double m_elebaselinez0;
     std::string m_eleEffMapFilePath;
     std::string m_eleEffMapFilePathRun2;
+    bool   m_eleAllowRun3TrigSFFallback;
+
 
     double m_muBaselinePt;
     double m_muBaselineEta;
@@ -716,8 +718,8 @@ namespace ST {
     double m_jetJvt;
     std::string m_JvtWP;
     double m_JvtPtMax;
-    std::string m_JvtConfig;
-    std::string m_JvtConfig_SFFile;
+    std::string m_JvtConfigRun2;
+    std::string m_JvtConfigRun3;
 
     double m_trkJetPt;
     double m_trkJetEta;
@@ -726,10 +728,8 @@ namespace ST {
     std::string m_fJvtWP;
     double m_fJvtPtMax;
     double m_fJvtEtaMin;
-    std::string m_fJvtConfig;
-    std::string m_fJvtConfig_SFFile;
-    bool m_fJvtRecalculate;
-    bool m_fJvt_useTightOP;
+    std::string m_fJvtConfigRun2;
+    std::string m_fJvtConfigRun3;
 
     bool m_JMScalib;
 

PhysicsAnalysis/SUSYPhys/SUSYTools/data/SUSYTools_Default.conf

@@ -82,7 +82,7 @@ Jet.UncertPDsmearing: false # set this to true for pseudo-data smearing for Full
 #
 FwdJet.doJVT: false
 FwdJet.JvtEtaMin: 2.5
-FwdJet.JvtWP: Loose #  R22 prerec
+FwdJet.JvtWP: Loose
 FwdJet.JvtPtMax: 60.0e3
 #
 Jet.LargeRuncConfig: #rec are missing for UFO jets

PhysicsAnalysis/SUSYPhys/SUSYTools/data/SUSYTools_Default_LITE.conf

@@ -82,7 +82,7 @@ Jet.UncertPDsmearing: false # set this to true for pseudo-data smearing for Full
 #
 FwdJet.doJVT: false
 FwdJet.JvtEtaMin: 2.5 
-FwdJet.JvtWP: Loose #  R22 prerec
+FwdJet.JvtWP: Loose
 FwdJet.JvtPtMax: 60.0e3
 #
 Jet.LargeRuncConfig: #rec are missing for UFO jets

PhysicsAnalysis/SUSYPhys/SUSYTools/data/SUSYTools_Default_Run3.conf

@@ -83,7 +83,7 @@ Jet.UncertPDsmearing: false # set this to true for pseudo-data smearing for Full
 #
 FwdJet.doJVT: false
 FwdJet.JvtEtaMin: 2.5 
-FwdJet.JvtWP: Loose #  R22 prerec
+FwdJet.JvtWP: Loose
 FwdJet.JvtPtMax: 60.0e3
 #
 Jet.LargeRuncConfig: #rec are missing for UFO jets

PhysicsAnalysis/SUSYPhys/SUSYTools/data/SUSYTools_Default_Run3_LITE.conf

@@ -83,7 +83,7 @@ Jet.UncertPDsmearing: false # set this to true for pseudo-data smearing for Full
 #
 FwdJet.doJVT: false
 FwdJet.JvtEtaMin: 2.5 
-FwdJet.JvtWP: Loose #  R22 prerec
+FwdJet.JvtWP: Loose
 FwdJet.JvtPtMax: 60.0e3
 #
 Jet.LargeRuncConfig: #rec are missing for UFO jets

PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx

@@ -1164,7 +1164,10 @@ StatusCode SUSYToolsAlg::execute() {
         }
 
         if(isNominal){ //JVT
-          jets_weight_nominal = jet_weight = m_SUSYTools->JVT_SF(jets);
+          jet_weight = m_SUSYTools->JVT_SF(jets);
+          jet_weight *= m_SUSYTools->FJVT_SF(jets);
+          jets_weight_nominal = jet_weight;
+          jets_weight_nominal *= m_SUSYTools->FJVT_SF(jets);
           weight_jets->SetBinContent(1, weight_jets->GetBinContent(1)+jet_weight);
         }
         else if (!syst_affectsJets || (syst_affectsJets && !sysInfo.affectsWeights)){
@@ -1172,6 +1175,7 @@ StatusCode SUSYToolsAlg::execute() {
         }
         else if ( syst_affectsJets && sysInfo.affectsWeights ){
           jet_weight = m_SUSYTools->JVT_SF(jets);
+          jet_weight *= m_SUSYTools->FJVT_SF(jets);
           size_t iwbin = find(m_syst_weights["Jet"].begin(), m_syst_weights["Jet"].end(), sys.name()) - m_syst_weights["Jet"].begin();
           if(iwbin < m_syst_weights["Jet"].size()) {  weight_jets->SetBinContent(iwbin+1, weight_jets->GetBinContent(iwbin+1)+jet_weight); }
         }

Reconstruction/Jet/JetJvtEfficiency/JetJvtEfficiency/FJvtSelectionTool.h

@@ -27,11 +27,11 @@ namespace CP {
                 "The working point to use. Set to 'Custom' to manually set the values"};
         Gaudi::Property<float> m_jvtCut{this, "JvtCut", 999, "The JVT selection to make"};
         SG::ReadDecorHandleKey<xAOD::JetContainer> m_jvtMoment{
-                this, "JvtMomentName", "FJvt", "The name of the Jvt moment to use"};
+                this, "JvtMomentName", "DFCommonJets_fJvt", "The name of the Jvt moment to use"};
         SG::ReadDecorHandleKey<xAOD::JetContainer> m_timingMoment{
                 this, "TimingMomentName", "Timing", "The name of the timing moment to use"};
         Gaudi::Property<float> m_timingCut{
-                this, "TimingCut", 10, "Only accept jets with time less than this"};
+                this, "TimingCut", -1, "Only accept jets with time less than this; negative values deactivate timing requirement"};
 
         virtual bool select(const xAOD::IParticle *jet) const override;
 

Reconstruction/Jet/JetJvtEfficiency/JetJvtEfficiency/JvtEfficiencyToolBase.h

@@ -51,7 +51,7 @@ namespace CP {
                 this, "DummySFError", 0.1, "The amount by which to vary the dummy SF"};
         // NB: Use a string not a read handle key as this is not written with a write handle key
         Gaudi::Property<std::string> m_jetEtaName{
-                this, "JetEtaName", "DetectorEta", "The name of the jet eta to use."};
+                this, "JetEtaName", "eta", "The name of the jet eta to use."};
         std::unique_ptr<TH2> m_jvtHist;
         std::unique_ptr<TH2> m_effHist;
         bool m_useDummySFs{false};

Reconstruction/Jet/JetJvtEfficiency/JetJvtEfficiency/JvtSelectionToolBase.h

@@ -34,7 +34,7 @@ namespace CP {
                 this, "MaxEtaForJvt", 2.5, "Accept all jets with |eta| above this"};
         // NB: Use a string not a read handle key as this is not written with a write handle key
         Gaudi::Property<std::string> m_jetEtaName{
-                this, "JetEtaName", "DetectorEta", "The name of the jet eta to use."};
+                this, "JetEtaName", "eta", "The name of the jet eta to use."};
 
         // The template AcceptInfo object
         asg::AcceptInfo m_info;