From d3c29f20b09e718d7d215481d1f426e50b834cb6 Mon Sep 17 00:00:00 2001
From: Ruben Lopez Ruiz <24.lopezr@gmail.com>
Date: Tue, 30 Jul 2024 12:14:31 +0200
Subject: [PATCH 1/4] Ecal rechit iso with GT thresholds, calotow Hcal/H0 iso

---
 .../python/displacedMuons_cfi.py              |   4 +-
 .../python/isolation_cff.py                   |   2 +-
 .../MuonIdentification/python/muons_cfi.py    |   4 +-
 RecoMuon/MuonIsolation/plugins/BuildFile.xml  |   6 +
 .../plugins/CaloExtractorByAssociator.cc      | 151 ++++++++++++------
 .../plugins/CaloExtractorByAssociator.h       |  33 +++-
 .../caloExtractorByAssociatorBlocks_cff.py    |  57 ++++++-
 .../muIsoDepositCalByAssociatorMixed_cfi.py   |  16 ++
 ...muIsoDeposits_cff.py.1muIsoDeposits_cff.py |  86 ++++++++++
 .../python/muIsoResultM2C_cfi.py              |   2 +-
 .../python/muIsoResultM2T_cfi.py              |   2 +-
 .../python/trackAssociatorBlocks_cff.py       |  15 ++
 12 files changed, 317 insertions(+), 61 deletions(-)
 create mode 100644 RecoMuon/MuonIsolationProducers/python/muIsoDepositCalByAssociatorMixed_cfi.py
 create mode 100644 RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py.1muIsoDeposits_cff.py

diff --git a/RecoMuon/MuonIdentification/python/displacedMuons_cfi.py b/RecoMuon/MuonIdentification/python/displacedMuons_cfi.py
index 9c782574757e3..8f2cac0ebeba0 100644
--- a/RecoMuon/MuonIdentification/python/displacedMuons_cfi.py
+++ b/RecoMuon/MuonIdentification/python/displacedMuons_cfi.py
@@ -11,8 +11,8 @@
                        
                        FillDetectorBasedIsolation = cms.bool(True),
                        EcalIsoDeposits  = cms.InputTag("muIsoDepositCalByAssociatorHitsDisplaced","ecal"),
-                       HcalIsoDeposits  = cms.InputTag("muIsoDepositCalByAssociatorHitsDisplaced","hcal"),
-                       HoIsoDeposits    = cms.InputTag("muIsoDepositCalByAssociatorHitsDisplaced","ho"),
+                       HcalIsoDeposits  = cms.InputTag("muIsoDepositCalByAssociatorTowersDisplaced","hcal"),
+                       HoIsoDeposits    = cms.InputTag("muIsoDepositCalByAssociatorTowersDisplaced","ho"),
                        TrackIsoDeposits = cms.InputTag("muIsoDepositTkDisplaced"),
                        JetIsoDeposits   = cms.InputTag("muIsoDepositJetsDisplaced"),
 
diff --git a/RecoMuon/MuonIdentification/python/isolation_cff.py b/RecoMuon/MuonIdentification/python/isolation_cff.py
index 657699536b24e..3c03ff1091612 100644
--- a/RecoMuon/MuonIdentification/python/isolation_cff.py
+++ b/RecoMuon/MuonIdentification/python/isolation_cff.py
@@ -5,7 +5,7 @@
 from RecoMuon.MuonIsolationProducers.jetExtractorBlock_cff import *
 MIdIsoExtractorPSetBlock = cms.PSet(
     CaloExtractorPSet = cms.PSet(
-        MIsoCaloExtractorByAssociatorHitsBlock
+        MIsoCaloExtractorByAssociatorMixedBlock
     ),
     TrackExtractorPSet = cms.PSet(
         MIsoTrackExtractorBlock
diff --git a/RecoMuon/MuonIdentification/python/muons_cfi.py b/RecoMuon/MuonIdentification/python/muons_cfi.py
index 793d41db40f7f..ba6460f64c793 100644
--- a/RecoMuon/MuonIdentification/python/muons_cfi.py
+++ b/RecoMuon/MuonIdentification/python/muons_cfi.py
@@ -14,8 +14,8 @@
                        
                        FillDetectorBasedIsolation = cms.bool(True),
                        EcalIsoDeposits  = cms.InputTag("muIsoDepositCalByAssociatorHits","ecal"),
-                       HcalIsoDeposits  = cms.InputTag("muIsoDepositCalByAssociatorHits","hcal"),
-                       HoIsoDeposits    = cms.InputTag("muIsoDepositCalByAssociatorHits","ho"),
+                       HcalIsoDeposits  = cms.InputTag("muIsoDepositCalByAssociatorTowers","hcal"),
+                       HoIsoDeposits    = cms.InputTag("muIsoDepositCalByAssociatorTowers","ho"),
                        TrackIsoDeposits = cms.InputTag("muIsoDepositTk"),
                        JetIsoDeposits   = cms.InputTag("muIsoDepositJets"),
 
diff --git a/RecoMuon/MuonIsolation/plugins/BuildFile.xml b/RecoMuon/MuonIsolation/plugins/BuildFile.xml
index 6f675a84554af..3af4f12cc38d6 100644
--- a/RecoMuon/MuonIsolation/plugins/BuildFile.xml
+++ b/RecoMuon/MuonIsolation/plugins/BuildFile.xml
@@ -15,6 +15,7 @@
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/PluginManager"/>
   <use name="Geometry/CaloGeometry"/>
+  <use name="Geometry/CaloTopology"/>
   <use name="Geometry/Records"/>
   <use name="MagneticField/Engine"/>
   <use name="MagneticField/Records"/>
@@ -24,5 +25,10 @@
   <use name="TrackingTools/TrackAssociator"/>
   <use name="TrackingTools/TransientTrack"/>
   <use name="DataFormats/PatCandidates"/>
+  <use name="CondFormats/EcalObjects"/>
+  <use name="CondFormats/HcalObjects"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondTools/Hcal"/>
+  <use name="RecoLocalCalo/HcalRecAlgos"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoMuon/MuonIsolation/plugins/CaloExtractorByAssociator.cc b/RecoMuon/MuonIsolation/plugins/CaloExtractorByAssociator.cc
index 8fbf37a61b254..9ede80672dfd1 100644
--- a/RecoMuon/MuonIsolation/plugins/CaloExtractorByAssociator.cc
+++ b/RecoMuon/MuonIsolation/plugins/CaloExtractorByAssociator.cc
@@ -18,6 +18,15 @@
 
 #include "DataFormats/Math/interface/deltaR.h"
 
+#include "CondFormats/EcalObjects/interface/EcalPFRecHitThresholds.h"
+#include "CondFormats/DataRecord/interface/EcalPFRecHitThresholdsRcd.h"
+#include "CondFormats/DataRecord/interface/HcalPFCutsRcd.h"
+#include "CondTools/Hcal/interface/HcalPFCutsHandler.h"
+#include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
+#include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"
+#include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
+#include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h"
+
 using namespace edm;
 using namespace std;
 using namespace reco;
@@ -29,13 +38,17 @@ namespace {
 }
 
 CaloExtractorByAssociator::CaloExtractorByAssociator(const ParameterSet& par, edm::ConsumesCollector&& iC)
-    : theUseRecHitsFlag(par.getParameter<bool>("UseRecHitsFlag")),
+    : theUseEcalRecHitsFlag(par.getParameter<bool>("UseEcalRecHitsFlag")),
+      theUseHcalRecHitsFlag(par.getParameter<bool>("UseHcalRecHitsFlag")),
+      theUseHORecHitsFlag(par.getParameter<bool>("UseHORecHitsFlag")),
       theDepositLabel(par.getUntrackedParameter<string>("DepositLabel")),
       theDepositInstanceLabels(par.getParameter<std::vector<std::string> >("DepositInstanceLabels")),
       thePropagatorName(par.getParameter<std::string>("PropagatorName")),
       theThreshold_E(par.getParameter<double>("Threshold_E")),
       theThreshold_H(par.getParameter<double>("Threshold_H")),
       theThreshold_HO(par.getParameter<double>("Threshold_HO")),
+      theMaxSeverityHB(par.getParameter<int>("MaxSeverityHB")),
+      theMaxSeverityHE(par.getParameter<int>("MaxSeverityHE")),
       theDR_Veto_E(par.getParameter<double>("DR_Veto_E")),
       theDR_Veto_H(par.getParameter<double>("DR_Veto_H")),
       theDR_Veto_HO(par.getParameter<double>("DR_Veto_HO")),
@@ -60,9 +73,15 @@ CaloExtractorByAssociator::CaloExtractorByAssociator(const ParameterSet& par, ed
   theAssociatorParameters->loadParameters(par.getParameter<edm::ParameterSet>("TrackAssociatorParameters"), iC);
   theAssociator = new TrackDetectorAssociator();
 
-  if (theUseRecHitsFlag) {
-    caloGeomToken_ = iC.esConsumes();
-  }
+  ecalRecHitThresh_ = par.getParameter<bool>("EcalRecHitThresh");
+  hcalCutsFromDB_ = par.getParameter<bool>("HcalCutsFromDB");
+
+  caloGeomToken_ = iC.esConsumes();
+  ecalPFRechitThresholdsToken_ = iC.esConsumes();
+  hcalCutsToken_ = iC.esConsumes();
+  hcalTopologyToken_ = iC.esConsumes();
+  hcalChannelQualityToken_ = iC.esConsumes(edm::ESInputTag("", "withTopo"));
+  hcalSevLvlComputerToken_ = iC.esConsumes();
 }
 
 CaloExtractorByAssociator::~CaloExtractorByAssociator() {
@@ -102,6 +121,12 @@ std::vector<IsoDeposit> CaloExtractorByAssociator::deposits(const Event& event,
   theService->update(eventSetup);
   theAssociator->setPropagator(&*(theService->propagator(thePropagatorName)));
 
+  const EcalPFRecHitThresholds* ecalThresholds = &eventSetup.getData(ecalPFRechitThresholdsToken_);
+  const HcalPFCuts* hcalCuts = &eventSetup.getData(hcalCutsToken_);
+  const HcalTopology* hcalTopology_ = &eventSetup.getData(hcalTopologyToken_);
+  const HcalChannelQuality* hcalChStatus_ = &eventSetup.getData(hcalChannelQualityToken_);
+  const HcalSeverityLevelComputer* hcalSevLvlComputer_ = &eventSetup.getData(hcalSevLvlComputerToken_);
+
   //! check configuration consistency
   //! could've been made at construction stage (fix later?)
   if (theDepositInstanceLabels.size() != 3) {
@@ -155,29 +180,33 @@ std::vector<IsoDeposit> CaloExtractorByAssociator::deposits(const Event& event,
     depHOcal.setVeto(Veto(dirTmp, dRtmp));
   }
 
-  if (theUseRecHitsFlag) {
-    //! do things based on rec-hits here
-    //! too much copy-pasting now (refactor later?)
-    auto const& caloGeom = eventSetup.getData(caloGeomToken_);
-
+  if (theUseEcalRecHitsFlag) {
     //Ecal
+    auto const& caloGeom = eventSetup.getData(caloGeomToken_);
     std::vector<const EcalRecHit*>::const_iterator eHitCI = mInfo.ecalRecHits.begin();
     for (; eHitCI != mInfo.ecalRecHits.end(); ++eHitCI) {
       const EcalRecHit* eHitCPtr = *eHitCI;
       GlobalPoint eHitPos = caloGeom.getPosition(eHitCPtr->detid());
-      double deltar0 = reco::deltaR(muon, eHitPos);
+      double deltaR2 = reco::deltaR2(muon, eHitPos);
       double cosTheta = 1. / cosh(eHitPos.eta());
       double energy = eHitCPtr->energy();
       double et = energy * cosTheta;
-      if (deltar0 > std::max(dRMax_CandDep, theDR_Max) ||
-          !(et > theThreshold_E && energy > 3 * noiseRecHit(eHitCPtr->detid())))
+      if (deltaR2 > std::max(dRMax_CandDep * dRMax_CandDep, theDR_Max * theDR_Max))
         continue;
 
+      if (ecalThresholds != nullptr) {  // use thresholds from rechit
+        float rhThres = (ecalThresholds != nullptr) ? (*ecalThresholds)[eHitCPtr->detid()] : 0.f;
+        if (energy <= rhThres)
+          continue;
+      } else {  // use thresholds from config
+        if (et <= theThreshold_E || energy <= 3 * noiseRecHit(eHitCPtr->detid()))
+          continue;
+      }
+
       bool vetoHit = false;
-      double deltar = reco::deltaR(mInfo.trkGlobPosAtEcal, eHitPos);
       //! first check if the hit is inside the veto cone by dR-alone
-      if (deltar < theDR_Veto_E) {
-        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto ECAL hit: Calo deltaR= " << deltar;
+      if (deltaR2 < std::pow(theDR_Veto_E, 2)) {
+        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto ECAL hit: Calo deltaR2= " << deltaR2;
         LogDebug("RecoMuon|CaloExtractorByAssociator")
             << " >>> Calo eta phi ethcal: " << eHitPos.eta() << " " << eHitPos.phi() << " " << et;
         vetoHit = true;
@@ -191,7 +220,7 @@ std::vector<IsoDeposit> CaloExtractorByAssociator::deposits(const Event& event,
       }
 
       //check theDR_Max only here to keep vetoHits being added to the veto energy
-      if (deltar0 > theDR_Max && !vetoHit)
+      if (deltaR2 > std::pow(theDR_Max, 2) && !vetoHit)
         continue;
 
       if (vetoHit) {
@@ -200,25 +229,48 @@ std::vector<IsoDeposit> CaloExtractorByAssociator::deposits(const Event& event,
         depEcal.addDeposit(reco::isodeposit::Direction(eHitPos.eta(), eHitPos.phi()), et);
       }
     }
+  }
 
+  if (theUseHcalRecHitsFlag) {
     //Hcal
+    auto const& caloGeom = eventSetup.getData(caloGeomToken_);
     std::vector<const HBHERecHit*>::const_iterator hHitCI = mInfo.hcalRecHits.begin();
     for (; hHitCI != mInfo.hcalRecHits.end(); ++hHitCI) {
       const HBHERecHit* hHitCPtr = *hHitCI;
       GlobalPoint hHitPos = caloGeom.getPosition(hHitCPtr->detid());
-      double deltar0 = reco::deltaR(muon, hHitPos);
+      double deltaR2 = reco::deltaR2(muon, hHitPos);
       double cosTheta = 1. / cosh(hHitPos.eta());
       double energy = hHitCPtr->energy();
       double et = energy * cosTheta;
-      if (deltar0 > std::max(dRMax_CandDep, theDR_Max) ||
-          !(et > theThreshold_H && energy > 3 * noiseRecHit(hHitCPtr->detid())))
+      if (deltaR2 > std::max(dRMax_CandDep * dRMax_CandDep, theDR_Max * theDR_Max))
+        continue;
+
+      // check Hcal Cuts from DB
+      if (hcalCuts != nullptr) {
+        const HcalPFCut* item = hcalCuts->getValues(hHitCPtr->id().rawId());
+        if (energy <= item->noiseThreshold())
+          continue;
+      } else {
+        if (et <= theThreshold_H || energy <= 3 * noiseRecHit(hHitCPtr->detid()))
+          continue;
+      }
+
+      const HcalDetId hid(hHitCPtr->detid());
+      DetId did = hcalTopology_->idFront(hid);
+      const uint32_t flag = hHitCPtr->flags();
+      const uint32_t dbflag = hcalChStatus_->getValues(did)->getValue();
+      bool recovered = hcalSevLvlComputer_->recoveredRecHit(did, flag);
+      int severity = hcalSevLvlComputer_->getSeverityLevel(did, flag, dbflag);
+
+      const bool goodHB = hid.subdet() == HcalBarrel and (severity <= theMaxSeverityHB or recovered);
+      const bool goodHE = hid.subdet() == HcalEndcap and (severity <= theMaxSeverityHE or recovered);
+      if (!goodHB and !goodHE)
         continue;
 
       bool vetoHit = false;
-      double deltar = reco::deltaR(mInfo.trkGlobPosAtHcal, hHitPos);
       //! first check if the hit is inside the veto cone by dR-alone
-      if (deltar < theDR_Veto_H) {
-        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto HBHE hit: Calo deltaR= " << deltar;
+      if (deltaR2 < std::pow(theDR_Veto_H, 2)) {
+        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto HBHE hit: Calo deltaR2= " << deltaR2;
         LogDebug("RecoMuon|CaloExtractorByAssociator")
             << " >>> Calo eta phi ethcal: " << hHitPos.eta() << " " << hHitPos.phi() << " " << et;
         vetoHit = true;
@@ -232,7 +284,7 @@ std::vector<IsoDeposit> CaloExtractorByAssociator::deposits(const Event& event,
       }
 
       //check theDR_Max only here to keep vetoHits being added to the veto energy
-      if (deltar0 > theDR_Max && !vetoHit)
+      if (deltaR2 > std::pow(theDR_Max, 2) && !vetoHit)
         continue;
 
       if (vetoHit) {
@@ -241,25 +293,27 @@ std::vector<IsoDeposit> CaloExtractorByAssociator::deposits(const Event& event,
         depHcal.addDeposit(reco::isodeposit::Direction(hHitPos.eta(), hHitPos.phi()), et);
       }
     }
+  }
 
+  if (theUseHORecHitsFlag) {
     //HOcal
+    auto const& caloGeom = eventSetup.getData(caloGeomToken_);
     std::vector<const HORecHit*>::const_iterator hoHitCI = mInfo.hoRecHits.begin();
     for (; hoHitCI != mInfo.hoRecHits.end(); ++hoHitCI) {
       const HORecHit* hoHitCPtr = *hoHitCI;
       GlobalPoint hoHitPos = caloGeom.getPosition(hoHitCPtr->detid());
-      double deltar0 = reco::deltaR(muon, hoHitPos);
+      double deltaR2 = reco::deltaR2(muon, hoHitPos);
       double cosTheta = 1. / cosh(hoHitPos.eta());
       double energy = hoHitCPtr->energy();
       double et = energy * cosTheta;
-      if (deltar0 > std::max(dRMax_CandDep, theDR_Max) ||
+      if (deltaR2 > std::max(dRMax_CandDep * dRMax_CandDep, theDR_Max * theDR_Max) ||
           !(et > theThreshold_HO && energy > 3 * noiseRecHit(hoHitCPtr->detid())))
         continue;
 
       bool vetoHit = false;
-      double deltar = reco::deltaR(mInfo.trkGlobPosAtHO, hoHitPos);
       //! first check if the hit is inside the veto cone by dR-alone
-      if (deltar < theDR_Veto_HO) {
-        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto HO hit: Calo deltaR= " << deltar;
+      if (deltaR2 < std::pow(theDR_Veto_HO, 2)) {
+        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto HO hit: Calo deltaR2= " << deltaR2;
         LogDebug("RecoMuon|CaloExtractorByAssociator")
             << " >>> Calo eta phi ethcal: " << hoHitPos.eta() << " " << hoHitPos.phi() << " " << et;
         vetoHit = true;
@@ -273,7 +327,7 @@ std::vector<IsoDeposit> CaloExtractorByAssociator::deposits(const Event& event,
       }
 
       //check theDR_Max only here to keep vetoHits being added to the veto energy
-      if (deltar0 > theDR_Max && !vetoHit)
+      if (deltaR2 > std::pow(theDR_Max, 2) && !vetoHit)
         continue;
 
       if (vetoHit) {
@@ -282,14 +336,15 @@ std::vector<IsoDeposit> CaloExtractorByAssociator::deposits(const Event& event,
         depHOcal.addDeposit(reco::isodeposit::Direction(hoHitPos.eta(), hoHitPos.phi()), et);
       }
     }
+  }
 
-  } else {
+  if (!theUseEcalRecHitsFlag or !theUseHcalRecHitsFlag or !theUseHORecHitsFlag) {
     //! use calo towers
     std::vector<const CaloTower*>::const_iterator calCI = mInfo.towers.begin();
     for (; calCI != mInfo.towers.end(); ++calCI) {
       const CaloTower* calCPtr = *calCI;
-      double deltar0 = reco::deltaR(muon, *calCPtr);
-      if (deltar0 > std::max(dRMax_CandDep, theDR_Max))
+      double deltaR2 = reco::deltaR2(muon, *calCPtr);
+      if (deltaR2 > std::max(dRMax_CandDep * dRMax_CandDep, theDR_Max * theDR_Max))
         continue;
 
       //even more copy-pasting .. need to refactor
@@ -306,28 +361,28 @@ std::vector<IsoDeposit> CaloExtractorByAssociator::deposits(const Event& event,
         continue;
 
       bool vetoTowerEcal = false;
-      double deltarEcal = reco::deltaR(mInfo.trkGlobPosAtEcal, *calCPtr);
+      double deltar2Ecal = reco::deltaR2(mInfo.trkGlobPosAtEcal, *calCPtr);
       //! first check if the tower is inside the veto cone by dR-alone
-      if (deltarEcal < theDR_Veto_E) {
-        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto ecal tower: Calo deltaR= " << deltarEcal;
+      if (deltar2Ecal < std::pow(theDR_Veto_E, 2)) {
+        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto ecal tower: Calo deltaR= " << deltar2Ecal;
         LogDebug("RecoMuon|CaloExtractorByAssociator")
             << " >>> Calo eta phi ethcal: " << calCPtr->eta() << " " << calCPtr->phi() << " " << ethcal;
         vetoTowerEcal = true;
       }
       bool vetoTowerHcal = false;
-      double deltarHcal = reco::deltaR(mInfo.trkGlobPosAtHcal, *calCPtr);
+      double deltar2Hcal = reco::deltaR2(mInfo.trkGlobPosAtHcal, *calCPtr);
       //! first check if the tower is inside the veto cone by dR-alone
-      if (deltarHcal < theDR_Veto_H) {
-        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto hcal tower: Calo deltaR= " << deltarHcal;
+      if (deltar2Hcal < std::pow(theDR_Veto_H, 2)) {
+        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto hcal tower: Calo deltaR= " << deltar2Hcal;
         LogDebug("RecoMuon|CaloExtractorByAssociator")
             << " >>> Calo eta phi ethcal: " << calCPtr->eta() << " " << calCPtr->phi() << " " << ethcal;
         vetoTowerHcal = true;
       }
       bool vetoTowerHOCal = false;
-      double deltarHOcal = reco::deltaR(mInfo.trkGlobPosAtHO, *calCPtr);
+      double deltar2HOcal = reco::deltaR2(mInfo.trkGlobPosAtHO, *calCPtr);
       //! first check if the tower is inside the veto cone by dR-alone
-      if (deltarHOcal < theDR_Veto_HO) {
-        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto HO tower: Calo deltaR= " << deltarHOcal;
+      if (deltar2HOcal < std::pow(theDR_Veto_HO, 2)) {
+        LogDebug("RecoMuon|CaloExtractorByAssociator") << " >>> Veto HO tower: Calo deltaR= " << deltar2HOcal;
         LogDebug("RecoMuon|CaloExtractorByAssociator")
             << " >>> Calo eta phi ethcal: " << calCPtr->eta() << " " << calCPtr->phi() << " " << ethcal;
         vetoTowerHOCal = true;
@@ -345,27 +400,27 @@ std::vector<IsoDeposit> CaloExtractorByAssociator::deposits(const Event& event,
         }
       }
 
-      if (deltar0 > theDR_Max && !(vetoTowerEcal || vetoTowerHcal || vetoTowerHOCal))
+      if (deltaR2 > std::pow(theDR_Max, 2) && !(vetoTowerEcal || vetoTowerHcal || vetoTowerHOCal))
         continue;
 
       reco::isodeposit::Direction towerDir(calCPtr->eta(), calCPtr->phi());
       //! add the Et of the tower to deposits if it's not a vetoed; put into muonEnergy otherwise
-      if (doEcal) {
+      if (doEcal and !theUseEcalRecHitsFlag) {
         if (vetoTowerEcal)
           depEcal.addCandEnergy(etecal);
-        else if (deltar0 <= theDR_Max)
+        else if (deltaR2 <= std::pow(theDR_Max, 2))
           depEcal.addDeposit(towerDir, etecal);
       }
-      if (doHcal) {
+      if (doHcal and !theUseHcalRecHitsFlag) {
         if (vetoTowerHcal)
           depHcal.addCandEnergy(ethcal);
-        else if (deltar0 <= theDR_Max)
+        else if (deltaR2 <= std::pow(theDR_Max, 2))
           depHcal.addDeposit(towerDir, ethcal);
       }
-      if (doHOcal) {
+      if (doHOcal and !theUseHORecHitsFlag) {
         if (vetoTowerHOCal)
           depHOcal.addCandEnergy(ethocal);
-        else if (deltar0 <= theDR_Max)
+        else if (deltaR2 <= std::pow(theDR_Max, 2))
           depHOcal.addDeposit(towerDir, ethocal);
       }
     }
diff --git a/RecoMuon/MuonIsolation/plugins/CaloExtractorByAssociator.h b/RecoMuon/MuonIsolation/plugins/CaloExtractorByAssociator.h
index bffbddd717d7e..dba8d08091316 100644
--- a/RecoMuon/MuonIsolation/plugins/CaloExtractorByAssociator.h
+++ b/RecoMuon/MuonIsolation/plugins/CaloExtractorByAssociator.h
@@ -25,10 +25,20 @@
 
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 
+#include "CondFormats/EcalObjects/interface/EcalPFRecHitThresholds.h"
+#include "CondFormats/DataRecord/interface/EcalPFRecHitThresholdsRcd.h"
+#include "CondFormats/DataRecord/interface/HcalPFCutsRcd.h"
+#include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
+#include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h"
+#include "CondTools/Hcal/interface/HcalPFCutsHandler.h"
+
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/CaloTopology/interface/HcalTopology.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
+#include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"
 
 class TrackAssociatorParameters;
 class TrackDetectorAssociator;
@@ -58,7 +68,9 @@ namespace muonisolation {
 
   private:
     //! use towers or rec hits
-    bool theUseRecHitsFlag;
+    bool theUseEcalRecHitsFlag;
+    bool theUseHcalRecHitsFlag;
+    bool theUseHORecHitsFlag;
 
     //! Label of deposit -- suggest to set to "" (all info is in collection name anyways)
     std::string theDepositLabel;
@@ -74,6 +86,8 @@ namespace muonisolation {
     double theThreshold_E;
     double theThreshold_H;
     double theThreshold_HO;
+    int theMaxSeverityHB;
+    int theMaxSeverityHE;
 
     //! cone sizes inside which the Et (towers) are not counted
     double theDR_Veto_E;
@@ -108,6 +122,23 @@ namespace muonisolation {
     edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> bFieldToken_;
     edm::ESGetToken<CaloGeometry, CaloGeometryRecord> caloGeomToken_;
 
+    // Ecal noise thresholds
+    edm::ESGetToken<EcalPFRecHitThresholds, EcalPFRecHitThresholdsRcd> ecalPFRechitThresholdsToken_;
+    bool ecalRecHitThresh_;
+    EcalPFRecHitThresholds* ecalThresholds = nullptr;
+
+    // following are needed to grab HCal thresholds from GT
+    edm::ESGetToken<HcalPFCuts, HcalPFCutsRcd> hcalCutsToken_;
+    bool hcalCutsFromDB_;
+    HcalPFCuts* hcalCuts = nullptr;
+
+    edm::ESGetToken<HcalTopology, HcalRecNumberingRecord> hcalTopologyToken_;
+    edm::ESGetToken<HcalChannelQuality, HcalChannelQualityRcd> hcalChannelQualityToken_;
+    edm::ESGetToken<HcalSeverityLevelComputer, HcalSeverityLevelComputerRcd> hcalSevLvlComputerToken_;
+    HcalTopology* hcalTopology_;
+    HcalChannelQuality* hcalChStatus_;
+    HcalSeverityLevelComputer* hcalSevLvlComputer_;
+
     //! flag to turn on/off printing of a time report
     bool thePrintTimeReport;
 
diff --git a/RecoMuon/MuonIsolationProducers/python/caloExtractorByAssociatorBlocks_cff.py b/RecoMuon/MuonIsolationProducers/python/caloExtractorByAssociatorBlocks_cff.py
index c02b213ef4c46..2d6ada5279dff 100644
--- a/RecoMuon/MuonIsolationProducers/python/caloExtractorByAssociatorBlocks_cff.py
+++ b/RecoMuon/MuonIsolationProducers/python/caloExtractorByAssociatorBlocks_cff.py
@@ -7,7 +7,11 @@
     Noise_HE = cms.double(0.2),
     DR_Veto_H = cms.double(0.1),
     Noise_EE = cms.double(0.1),
-    UseRecHitsFlag = cms.bool(False),
+    UseEcalRecHitsFlag = cms.bool(False),
+    UseHcalRecHitsFlag = cms.bool(False),
+    UseHORecHitsFlag = cms.bool(False),
+    EcalRecHitThresh = cms.bool(False),
+    HcalCutsFromDB = cms.bool(False),
     NoiseTow_EE = cms.double(0.15),
     Threshold_HO = cms.double(0.5),
     Noise_EB = cms.double(0.025),
@@ -25,6 +29,8 @@
     PrintTimeReport = cms.untracked.bool(False),
     NoiseTow_EB = cms.double(0.04),
     Threshold_H = cms.double(0.5),
+    MaxSeverityHB = cms.int32(9),
+    MaxSeverityHE = cms.int32(9),
     DR_Veto_E = cms.double(0.07),
     DepositLabel = cms.untracked.string('Cal'),
     ComponentName = cms.string('CaloExtractorByAssociator'),
@@ -38,9 +44,13 @@
     Noise_HE = cms.double(0.2),
     DR_Veto_H = cms.double(0.1),
     Noise_EE = cms.double(0.1),
-    UseRecHitsFlag = cms.bool(True),
+    UseEcalRecHitsFlag = cms.bool(True),
+    UseHcalRecHitsFlag = cms.bool(True),
+    UseHORecHitsFlag = cms.bool(True),
+    EcalRecHitThresh = cms.bool(True),
+    HcalCutsFromDB = cms.bool(True),
     NoiseTow_EE = cms.double(0.15),
-    Threshold_HO = cms.double(0.1),
+    Threshold_HO = cms.double(0.5),
     Noise_EB = cms.double(0.025),
     Noise_HO = cms.double(0.2),
     CenterConeOnCalIntersection = cms.bool(False),
@@ -56,6 +66,45 @@
     NoiseTow_EB = cms.double(0.04),
     PrintTimeReport = cms.untracked.bool(False),
     Threshold_H = cms.double(0.1),
+    MaxSeverityHB = cms.int32(9),
+    MaxSeverityHE = cms.int32(9),
+    DR_Veto_E = cms.double(0.07),
+    DepositLabel = cms.untracked.string('Cal'),
+    ComponentName = cms.string('CaloExtractorByAssociator'),
+    DR_Veto_HO = cms.double(0.1),
+    DepositInstanceLabels = cms.vstring('ecal', 
+        'hcal', 
+        'ho')
+)
+MIsoCaloExtractorByAssociatorMixedBlock = cms.PSet(
+    MIsoTrackAssociatorMixed,
+    Noise_HE = cms.double(0.2),
+    DR_Veto_H = cms.double(0.1),
+    Noise_EE = cms.double(0.1),
+    UseEcalRecHitsFlag = cms.bool(True),
+    UseHcalRecHitsFlag = cms.bool(False),
+    UseHORecHitsFlag = cms.bool(False),
+    EcalRecHitThresh = cms.bool(True),
+    HcalCutsFromDB = cms.bool(False),
+    NoiseTow_EE = cms.double(0.15),
+    Threshold_HO = cms.double(0.5),
+    Noise_EB = cms.double(0.025),
+    Noise_HO = cms.double(0.2),
+    CenterConeOnCalIntersection = cms.bool(False),
+    DR_Max = cms.double(0.5),
+    PropagatorName = cms.string('SteppingHelixPropagatorAny'),
+    ServiceParameters = cms.PSet(
+        Propagators = cms.untracked.vstring( 'SteppingHelixPropagatorAny' ),
+        RPCLayers = cms.bool( False ),
+        UseMuonNavigation = cms.untracked.bool( False )
+    ),
+    Threshold_E = cms.double(0.025),
+    Noise_HB = cms.double(0.2),
+    PrintTimeReport = cms.untracked.bool(False),
+    NoiseTow_EB = cms.double(0.04),
+    Threshold_H = cms.double(0.5),
+    MaxSeverityHB = cms.int32(9),
+    MaxSeverityHE = cms.int32(9),
     DR_Veto_E = cms.double(0.07),
     DepositLabel = cms.untracked.string('Cal'),
     ComponentName = cms.string('CaloExtractorByAssociator'),
@@ -64,5 +113,3 @@
         'hcal', 
         'ho')
 )
-
-
diff --git a/RecoMuon/MuonIsolationProducers/python/muIsoDepositCalByAssociatorMixed_cfi.py b/RecoMuon/MuonIsolationProducers/python/muIsoDepositCalByAssociatorMixed_cfi.py
new file mode 100644
index 0000000000000..5767c8b1c39e0
--- /dev/null
+++ b/RecoMuon/MuonIsolationProducers/python/muIsoDepositCalByAssociatorMixed_cfi.py
@@ -0,0 +1,16 @@
+import FWCore.ParameterSet.Config as cms
+
+# -*-TCL-*-
+from RecoMuon.MuonIsolationProducers.isoDepositProducerIOBlocks_cff import *
+from RecoMuon.MuonIsolationProducers.caloExtractorByAssociatorBlocks_cff import *
+muIsoDepositCalByAssociatorMixed = cms.EDProducer("MuIsoDepositProducer",
+    IOPSet = cms.PSet(
+        MIsoDepositViewMultiIOBlock
+    ),
+    ExtractorPSet = cms.PSet(
+        MIsoCaloExtractorByAssociatorMixedBlock
+    )
+)
+
+
+
diff --git a/RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py.1muIsoDeposits_cff.py b/RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py.1muIsoDeposits_cff.py
new file mode 100644
index 0000000000000..e3e5ad6e540dd
--- /dev/null
+++ b/RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py.1muIsoDeposits_cff.py
@@ -0,0 +1,86 @@
+# The following comments couldn't be translated into the new config version:
+
+#the same but for FastSim muons
+
+#for bw compat (kill later)
+
+import FWCore.ParameterSet.Config as cms
+
+# -*-TCL-*-
+#the default set of includes
+from RecoMuon.MuonIsolationProducers.muIsoDeposits_setup_cff import *
+#the default set of modules first
+from RecoMuon.MuonIsolationProducers.muIsoDepositCopies_cfi import *
+import RecoMuon.MuonIsolationProducers.muIsoDepositTk_cfi
+import RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorTowers_cfi
+import RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorHits_cfi
+import RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorMixed_cfi
+import RecoMuon.MuonIsolationProducers.muIsoDepositJets_cfi
+import RecoMuon.MuonIsolationProducers.muIsoDepositCal_cfi
+
+muParamGlobalIsoDepositCtfTk   = RecoMuon.MuonIsolationProducers.muIsoDepositTk_cfi.muIsoDepositTk.clone()
+muParamGlobalIsoDepositJets    = RecoMuon.MuonIsolationProducers.muIsoDepositJets_cfi.muIsoDepositJets.clone()
+muParamGlobalIsoDepositGsTk    = RecoMuon.MuonIsolationProducers.muIsoDepositTk_cfi.muIsoDepositTk.clone()
+muParamGlobalIsoDepositTk      = RecoMuon.MuonIsolationProducers.muIsoDepositTk_cfi.muIsoDepositTk.clone()
+muParamGlobalIsoDepositCalEcal = RecoMuon.MuonIsolationProducers.muIsoDepositCal_cfi.muIsoDepositCal.clone()
+muParamGlobalIsoDepositCalHcal = RecoMuon.MuonIsolationProducers.muIsoDepositCal_cfi.muIsoDepositCal.clone()
+muParamGlobalIsoDepositCalByAssociatorTowers = RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorTowers_cfi.muIsoDepositCalByAssociatorTowers.clone()
+muParamGlobalIsoDepositCalByAssociatorHits   = RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorHits_cfi.muIsoDepositCalByAssociatorHits.clone()
+muParamGlobalIsoDepositCalByAssociatorMixed   = RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorMixed_cfi.muIsoDepositCalByAssociatorMixed.clone()
+#
+# and now sequences of the above
+#
+#------------------------------
+# "standard sequences"
+muIsoDeposits_muonsTask = cms.Task(muIsoDepositTk,muIsoDepositCalByAssociatorHits,muIsoDepositCalByAssociatorTowers,muIsoDepositJets)
+muIsoDeposits_muons = cms.Sequence(muIsoDeposits_muonsTask)
+# "displaced sequences"
+muIsoDeposits_displacedMuonsTask = cms.Task(muIsoDepositTkDisplaced,muIsoDepositCalByAssociatorHitsDisplaced,muIsoDepositCalByAssociatorTowersDisplaced,muIsoDepositJetsDisplaced)
+muIsoDeposits_displacedMuons = cms.Sequence(muIsoDeposits_displacedMuonsTask)
+#old one, using a reduced config set
+muIsoDeposits_ParamGlobalMuonsOldTask = cms.Task(muParamGlobalIsoDepositGsTk,muParamGlobalIsoDepositCalEcal,muParamGlobalIsoDepositCalHcal)
+muIsoDeposits_ParamGlobalMuonsOld = cms.Sequence(muIsoDeposits_ParamGlobalMuonsOldTask)
+muIsoDeposits_ParamGlobalMuonsTask = cms.Task(muParamGlobalIsoDepositTk,muParamGlobalIsoDepositCalByAssociatorMixed,muParamGlobalIsoDepositJets)
+muIsoDeposits_ParamGlobalMuons = cms.Sequence(muIsoDeposits_ParamGlobalMuonsTask)
+muParamGlobalIsoDepositCtfTk.IOPSet = cms.PSet(
+    MIsoDepositParamGlobalViewIOBlock
+)
+muParamGlobalIsoDepositCtfTk.ExtractorPSet = cms.PSet(
+    MIsoTrackExtractorGsBlock
+)
+muParamGlobalIsoDepositCalByAssociatorTowers.IOPSet = cms.PSet(
+    MIsoDepositParamGlobalViewMultiIOBlock
+)
+muParamGlobalIsoDepositCalByAssociatorHits.IOPSet = cms.PSet(
+    MIsoDepositParamGlobalViewMultiIOBlock
+)
+muParamGlobalIsoDepositCalByAssociatorMixed.IOPSet = cms.PSet(
+    MIsoDepositParamGlobalViewMultiIOBlock
+)
+muParamGlobalIsoDepositJets.IOPSet = cms.PSet(
+    MIsoDepositParamGlobalViewIOBlock
+)
+muParamGlobalIsoDepositGsTk.IOPSet = cms.PSet(
+    MIsoDepositParamGlobalIOBlock
+)
+muParamGlobalIsoDepositGsTk.ExtractorPSet = cms.PSet(
+    MIsoTrackExtractorGsBlock
+)
+muParamGlobalIsoDepositTk.IOPSet = cms.PSet(
+    MIsoDepositParamGlobalIOBlock
+)
+muParamGlobalIsoDepositTk.ExtractorPSet = cms.PSet(
+    MIsoTrackExtractorBlock
+)
+muParamGlobalIsoDepositCalEcal.IOPSet = cms.PSet(
+    MIsoDepositParamGlobalIOBlock
+)
+muParamGlobalIsoDepositCalEcal.ExtractorPSet = cms.PSet(
+    MIsoCaloExtractorEcalBlock
+)
+muParamGlobalIsoDepositCalHcal.IOPSet = cms.PSet(
+    MIsoDepositParamGlobalIOBlock
+)
+muParamGlobalIsoDepositCalHcal.ExtractorPSet = cms.PSet(
+    MIsoCaloExtractorHcalBlock
+)
diff --git a/RecoMuon/MuonIsolationProducers/python/muIsoResultM2C_cfi.py b/RecoMuon/MuonIsolationProducers/python/muIsoResultM2C_cfi.py
index 5faf28f335826..266cd037137a5 100644
--- a/RecoMuon/MuonIsolationProducers/python/muIsoResultM2C_cfi.py
+++ b/RecoMuon/MuonIsolationProducers/python/muIsoResultM2C_cfi.py
@@ -17,7 +17,7 @@
             UnweightedInputHitEcalDeps
         ), 
         cms.PSet(
-            UnweightedInputHitHcalDeps
+            UnweightedInputTowHcalDeps
         )),
     BeamlineOption = cms.string('BeamSpotFromEvent')
 )
diff --git a/RecoMuon/MuonIsolationProducers/python/muIsoResultM2T_cfi.py b/RecoMuon/MuonIsolationProducers/python/muIsoResultM2T_cfi.py
index 50c585c118fca..54b1f5ddaf58e 100644
--- a/RecoMuon/MuonIsolationProducers/python/muIsoResultM2T_cfi.py
+++ b/RecoMuon/MuonIsolationProducers/python/muIsoResultM2T_cfi.py
@@ -16,7 +16,7 @@
             UnweightedInputHitEcalDeps
         ), 
         cms.PSet(
-            UnweightedInputHitHcalDeps
+            UnweightedInputTowHcalDeps
         ))
 )
 
diff --git a/RecoMuon/MuonIsolationProducers/python/trackAssociatorBlocks_cff.py b/RecoMuon/MuonIsolationProducers/python/trackAssociatorBlocks_cff.py
index 82c72109d1a97..2f7a1f3b524d1 100644
--- a/RecoMuon/MuonIsolationProducers/python/trackAssociatorBlocks_cff.py
+++ b/RecoMuon/MuonIsolationProducers/python/trackAssociatorBlocks_cff.py
@@ -15,6 +15,10 @@
     TrackAssociatorParameterBlock
 )
 
+MIsoTrackAssociatorMixed = cms.PSet(
+    TrackAssociatorParameterBlock
+)
+
 MIsoTrackAssociatorJets = cms.PSet(
     TrackAssociatorParameterBlock
 )
@@ -52,6 +56,17 @@
 MIsoTrackAssociatorHits.TrackAssociatorParameters.dREcal = 1.0
 MIsoTrackAssociatorHits.TrackAssociatorParameters.dRHcal = 1.0
 
+MIsoTrackAssociatorMixed.TrackAssociatorParameters.useEcal = True ## RecoHits
+MIsoTrackAssociatorMixed.TrackAssociatorParameters.useHcal = False ## RecoHits
+MIsoTrackAssociatorMixed.TrackAssociatorParameters.useHO = False ## RecoHits
+MIsoTrackAssociatorMixed.TrackAssociatorParameters.useCalo = True ## CaloTowers
+MIsoTrackAssociatorMixed.TrackAssociatorParameters.useMuon = False ## RecoHits
+MIsoTrackAssociatorMixed.TrackAssociatorParameters.usePreshower = False
+MIsoTrackAssociatorMixed.TrackAssociatorParameters.dREcalPreselection = 1.0
+MIsoTrackAssociatorMixed.TrackAssociatorParameters.dRHcalPreselection = 1.0
+MIsoTrackAssociatorMixed.TrackAssociatorParameters.dREcal = 1.0
+MIsoTrackAssociatorMixed.TrackAssociatorParameters.dRHcal = 1.0
+
 MIsoTrackAssociatorJets.TrackAssociatorParameters.useEcal = False ## RecoHits
 MIsoTrackAssociatorJets.TrackAssociatorParameters.useHcal = False ## RecoHits
 MIsoTrackAssociatorJets.TrackAssociatorParameters.useHO = False ## RecoHits

From e84ccc00ac8d3aa087bf0acdb40a7e23fd1f69cf Mon Sep 17 00:00:00 2001
From: Ruben Lopez Ruiz <24.lopezr@gmail.com>
Date: Tue, 30 Jul 2024 12:24:55 +0200
Subject: [PATCH 2/4] hltmuons config files

---
 .../Configuration/python/HLT_2024v14_cff.py   | 109 +++++++++++++--
 .../modules/hltPhase2L3MuonsNoID_cfi.py       |   9 +-
 .../Configuration/python/HLT_FULL_cff.py      | 126 ++++++++++++++++--
 .../Configuration/python/HLT_GRun_cff.py      | 108 +++++++++++++--
 .../Configuration/python/HLT_HIon_cff.py      |  18 ++-
 .../Configuration/python/HLT_PRef_cff.py      |  18 ++-
 .../Configuration/python/HLT_Special_cff.py   |   9 +-
 7 files changed, 353 insertions(+), 44 deletions(-)

diff --git a/HLTrigger/Configuration/python/HLT_2024v14_cff.py b/HLTrigger/Configuration/python/HLT_2024v14_cff.py
index b8c54bbabdcb5..2f722166f1823 100644
--- a/HLTrigger/Configuration/python/HLT_2024v14_cff.py
+++ b/HLTrigger/Configuration/python/HLT_2024v14_cff.py
@@ -9334,7 +9334,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -9970,7 +9977,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -12720,7 +12734,15 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      seRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -13356,7 +13378,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -15531,7 +15560,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -22401,7 +22437,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -24591,7 +24634,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -26247,7 +26297,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -34942,7 +34999,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -55915,7 +55979,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -71285,7 +71356,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -72532,7 +72610,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsNoID_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsNoID_cfi.py
index a045ef1e0bdac..c1039baf79a55 100644
--- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsNoID_cfi.py
+++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsNoID_cfi.py
@@ -61,7 +61,14 @@
             useMuon = cms.bool(False),
             usePreshower = cms.bool(False)
         ),
-        UseRecHitsFlag = cms.bool(False)
+        #UseRecHitsFlag = cms.bool(False)
+        EcalRecHitThresh = cms.bool(False),
+        HcalCutsFromDB = cms.bool(False),
+        UseEcalRecHitsFlag = cms.bool(False),
+        UseHcalRecHitsFlag = cms.bool(False),
+        UseHORecHitsFlag = cms.bool(False),
+        MaxSeverityHB = cms.int32(9),
+        MaxSeverityHE = cms.int32(9)
     ),
     JetExtractorPSet = cms.PSet(
         ComponentName = cms.string('JetExtractor'),
diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py
index efbefc2a22a6c..c28c27d10dacb 100644
--- a/HLTrigger/Configuration/python/HLT_FULL_cff.py
+++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py
@@ -15096,7 +15096,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -15732,7 +15739,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -18482,7 +18496,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -19118,7 +19139,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -21661,7 +21689,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -28539,7 +28574,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -30729,7 +30771,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -32385,7 +32434,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -41080,7 +41136,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -62053,7 +62116,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -77423,7 +77493,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -78670,7 +78747,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -90917,7 +91001,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -92481,7 +92572,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py
index a383fb1f4ef2a..a840a6c84b90d 100644
--- a/HLTrigger/Configuration/python/HLT_GRun_cff.py
+++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py
@@ -9334,7 +9334,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -9970,7 +9977,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -12720,7 +12734,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -13356,7 +13377,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -15531,7 +15559,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -22401,7 +22436,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -24591,7 +24633,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -26247,7 +26296,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -34942,7 +34998,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -55915,7 +55978,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -71285,7 +71355,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -72532,7 +72609,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py
index 442cac936a6d1..2c306b7de6372 100644
--- a/HLTrigger/Configuration/python/HLT_HIon_cff.py
+++ b/HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -11997,7 +11997,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -13561,7 +13568,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py
index c656b9a8e6eae..2eeea61347200 100644
--- a/HLTrigger/Configuration/python/HLT_PRef_cff.py
+++ b/HLTrigger/Configuration/python/HLT_PRef_cff.py
@@ -7568,7 +7568,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -9377,7 +9384,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
diff --git a/HLTrigger/Configuration/python/HLT_Special_cff.py b/HLTrigger/Configuration/python/HLT_Special_cff.py
index 65380cf468f86..d19c314c8a0d1 100644
--- a/HLTrigger/Configuration/python/HLT_Special_cff.py
+++ b/HLTrigger/Configuration/python/HLT_Special_cff.py
@@ -7724,7 +7724,14 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      UseRecHitsFlag = cms.bool( False ),
+      #UseRecHitsFlag = cms.bool( False ),
+      EcalRecHitThresh = cms.bool(False),
+      HcalCutsFromDB = cms.bool(False),
+      UseEcalRecHitsFlag = cms.bool(False),
+      UseHcalRecHitsFlag = cms.bool(False),
+      UseHORecHitsFlag = cms.bool(False),
+      MaxSeverityHB = cms.int32(9),
+      MaxSeverityHE = cms.int32(9),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),

From cad29204fcea969039e24b4d239e0e9cc704d33f Mon Sep 17 00:00:00 2001
From: Ruben Lopez Ruiz <24.lopezr@gmail.com>
Date: Wed, 31 Jul 2024 10:18:12 +0200
Subject: [PATCH 3/4] Correct file name

---
 .../python/muIsoDeposits_cff.py               | 11 ++-
 ...muIsoDeposits_cff.py.1muIsoDeposits_cff.py | 86 -------------------
 2 files changed, 8 insertions(+), 89 deletions(-)
 delete mode 100644 RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py.1muIsoDeposits_cff.py

diff --git a/RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py b/RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py
index 5e8628c1a2b3c..e3e5ad6e540dd 100644
--- a/RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py
+++ b/RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py
@@ -14,6 +14,7 @@
 import RecoMuon.MuonIsolationProducers.muIsoDepositTk_cfi
 import RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorTowers_cfi
 import RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorHits_cfi
+import RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorMixed_cfi
 import RecoMuon.MuonIsolationProducers.muIsoDepositJets_cfi
 import RecoMuon.MuonIsolationProducers.muIsoDepositCal_cfi
 
@@ -25,20 +26,21 @@
 muParamGlobalIsoDepositCalHcal = RecoMuon.MuonIsolationProducers.muIsoDepositCal_cfi.muIsoDepositCal.clone()
 muParamGlobalIsoDepositCalByAssociatorTowers = RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorTowers_cfi.muIsoDepositCalByAssociatorTowers.clone()
 muParamGlobalIsoDepositCalByAssociatorHits   = RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorHits_cfi.muIsoDepositCalByAssociatorHits.clone()
+muParamGlobalIsoDepositCalByAssociatorMixed   = RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorMixed_cfi.muIsoDepositCalByAssociatorMixed.clone()
 #
 # and now sequences of the above
 #
 #------------------------------
 # "standard sequences"
-muIsoDeposits_muonsTask = cms.Task(muIsoDepositTk,muIsoDepositCalByAssociatorHits,muIsoDepositJets)
+muIsoDeposits_muonsTask = cms.Task(muIsoDepositTk,muIsoDepositCalByAssociatorHits,muIsoDepositCalByAssociatorTowers,muIsoDepositJets)
 muIsoDeposits_muons = cms.Sequence(muIsoDeposits_muonsTask)
 # "displaced sequences"
-muIsoDeposits_displacedMuonsTask = cms.Task(muIsoDepositTkDisplaced,muIsoDepositCalByAssociatorHitsDisplaced,muIsoDepositJetsDisplaced)
+muIsoDeposits_displacedMuonsTask = cms.Task(muIsoDepositTkDisplaced,muIsoDepositCalByAssociatorHitsDisplaced,muIsoDepositCalByAssociatorTowersDisplaced,muIsoDepositJetsDisplaced)
 muIsoDeposits_displacedMuons = cms.Sequence(muIsoDeposits_displacedMuonsTask)
 #old one, using a reduced config set
 muIsoDeposits_ParamGlobalMuonsOldTask = cms.Task(muParamGlobalIsoDepositGsTk,muParamGlobalIsoDepositCalEcal,muParamGlobalIsoDepositCalHcal)
 muIsoDeposits_ParamGlobalMuonsOld = cms.Sequence(muIsoDeposits_ParamGlobalMuonsOldTask)
-muIsoDeposits_ParamGlobalMuonsTask = cms.Task(muParamGlobalIsoDepositTk,muParamGlobalIsoDepositCalByAssociatorHits,muParamGlobalIsoDepositJets)
+muIsoDeposits_ParamGlobalMuonsTask = cms.Task(muParamGlobalIsoDepositTk,muParamGlobalIsoDepositCalByAssociatorMixed,muParamGlobalIsoDepositJets)
 muIsoDeposits_ParamGlobalMuons = cms.Sequence(muIsoDeposits_ParamGlobalMuonsTask)
 muParamGlobalIsoDepositCtfTk.IOPSet = cms.PSet(
     MIsoDepositParamGlobalViewIOBlock
@@ -52,6 +54,9 @@
 muParamGlobalIsoDepositCalByAssociatorHits.IOPSet = cms.PSet(
     MIsoDepositParamGlobalViewMultiIOBlock
 )
+muParamGlobalIsoDepositCalByAssociatorMixed.IOPSet = cms.PSet(
+    MIsoDepositParamGlobalViewMultiIOBlock
+)
 muParamGlobalIsoDepositJets.IOPSet = cms.PSet(
     MIsoDepositParamGlobalViewIOBlock
 )
diff --git a/RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py.1muIsoDeposits_cff.py b/RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py.1muIsoDeposits_cff.py
deleted file mode 100644
index e3e5ad6e540dd..0000000000000
--- a/RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py.1muIsoDeposits_cff.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# The following comments couldn't be translated into the new config version:
-
-#the same but for FastSim muons
-
-#for bw compat (kill later)
-
-import FWCore.ParameterSet.Config as cms
-
-# -*-TCL-*-
-#the default set of includes
-from RecoMuon.MuonIsolationProducers.muIsoDeposits_setup_cff import *
-#the default set of modules first
-from RecoMuon.MuonIsolationProducers.muIsoDepositCopies_cfi import *
-import RecoMuon.MuonIsolationProducers.muIsoDepositTk_cfi
-import RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorTowers_cfi
-import RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorHits_cfi
-import RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorMixed_cfi
-import RecoMuon.MuonIsolationProducers.muIsoDepositJets_cfi
-import RecoMuon.MuonIsolationProducers.muIsoDepositCal_cfi
-
-muParamGlobalIsoDepositCtfTk   = RecoMuon.MuonIsolationProducers.muIsoDepositTk_cfi.muIsoDepositTk.clone()
-muParamGlobalIsoDepositJets    = RecoMuon.MuonIsolationProducers.muIsoDepositJets_cfi.muIsoDepositJets.clone()
-muParamGlobalIsoDepositGsTk    = RecoMuon.MuonIsolationProducers.muIsoDepositTk_cfi.muIsoDepositTk.clone()
-muParamGlobalIsoDepositTk      = RecoMuon.MuonIsolationProducers.muIsoDepositTk_cfi.muIsoDepositTk.clone()
-muParamGlobalIsoDepositCalEcal = RecoMuon.MuonIsolationProducers.muIsoDepositCal_cfi.muIsoDepositCal.clone()
-muParamGlobalIsoDepositCalHcal = RecoMuon.MuonIsolationProducers.muIsoDepositCal_cfi.muIsoDepositCal.clone()
-muParamGlobalIsoDepositCalByAssociatorTowers = RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorTowers_cfi.muIsoDepositCalByAssociatorTowers.clone()
-muParamGlobalIsoDepositCalByAssociatorHits   = RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorHits_cfi.muIsoDepositCalByAssociatorHits.clone()
-muParamGlobalIsoDepositCalByAssociatorMixed   = RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorMixed_cfi.muIsoDepositCalByAssociatorMixed.clone()
-#
-# and now sequences of the above
-#
-#------------------------------
-# "standard sequences"
-muIsoDeposits_muonsTask = cms.Task(muIsoDepositTk,muIsoDepositCalByAssociatorHits,muIsoDepositCalByAssociatorTowers,muIsoDepositJets)
-muIsoDeposits_muons = cms.Sequence(muIsoDeposits_muonsTask)
-# "displaced sequences"
-muIsoDeposits_displacedMuonsTask = cms.Task(muIsoDepositTkDisplaced,muIsoDepositCalByAssociatorHitsDisplaced,muIsoDepositCalByAssociatorTowersDisplaced,muIsoDepositJetsDisplaced)
-muIsoDeposits_displacedMuons = cms.Sequence(muIsoDeposits_displacedMuonsTask)
-#old one, using a reduced config set
-muIsoDeposits_ParamGlobalMuonsOldTask = cms.Task(muParamGlobalIsoDepositGsTk,muParamGlobalIsoDepositCalEcal,muParamGlobalIsoDepositCalHcal)
-muIsoDeposits_ParamGlobalMuonsOld = cms.Sequence(muIsoDeposits_ParamGlobalMuonsOldTask)
-muIsoDeposits_ParamGlobalMuonsTask = cms.Task(muParamGlobalIsoDepositTk,muParamGlobalIsoDepositCalByAssociatorMixed,muParamGlobalIsoDepositJets)
-muIsoDeposits_ParamGlobalMuons = cms.Sequence(muIsoDeposits_ParamGlobalMuonsTask)
-muParamGlobalIsoDepositCtfTk.IOPSet = cms.PSet(
-    MIsoDepositParamGlobalViewIOBlock
-)
-muParamGlobalIsoDepositCtfTk.ExtractorPSet = cms.PSet(
-    MIsoTrackExtractorGsBlock
-)
-muParamGlobalIsoDepositCalByAssociatorTowers.IOPSet = cms.PSet(
-    MIsoDepositParamGlobalViewMultiIOBlock
-)
-muParamGlobalIsoDepositCalByAssociatorHits.IOPSet = cms.PSet(
-    MIsoDepositParamGlobalViewMultiIOBlock
-)
-muParamGlobalIsoDepositCalByAssociatorMixed.IOPSet = cms.PSet(
-    MIsoDepositParamGlobalViewMultiIOBlock
-)
-muParamGlobalIsoDepositJets.IOPSet = cms.PSet(
-    MIsoDepositParamGlobalViewIOBlock
-)
-muParamGlobalIsoDepositGsTk.IOPSet = cms.PSet(
-    MIsoDepositParamGlobalIOBlock
-)
-muParamGlobalIsoDepositGsTk.ExtractorPSet = cms.PSet(
-    MIsoTrackExtractorGsBlock
-)
-muParamGlobalIsoDepositTk.IOPSet = cms.PSet(
-    MIsoDepositParamGlobalIOBlock
-)
-muParamGlobalIsoDepositTk.ExtractorPSet = cms.PSet(
-    MIsoTrackExtractorBlock
-)
-muParamGlobalIsoDepositCalEcal.IOPSet = cms.PSet(
-    MIsoDepositParamGlobalIOBlock
-)
-muParamGlobalIsoDepositCalEcal.ExtractorPSet = cms.PSet(
-    MIsoCaloExtractorEcalBlock
-)
-muParamGlobalIsoDepositCalHcal.IOPSet = cms.PSet(
-    MIsoDepositParamGlobalIOBlock
-)
-muParamGlobalIsoDepositCalHcal.ExtractorPSet = cms.PSet(
-    MIsoCaloExtractorHcalBlock
-)

From 46ae6f2f1d0798ebb279bad7468777aafda45380 Mon Sep 17 00:00:00 2001
From: Ruben Lopez Ruiz <24.lopezr@gmail.com>
Date: Thu, 1 Aug 2024 17:09:57 +0200
Subject: [PATCH 4/4] Revert HLT cfg files + default params in producer

---
 .../Configuration/python/HLT_2024v14_cff.py   | 109 ++-------------
 .../modules/hltPhase2L3MuonsNoID_cfi.py       |   9 +-
 .../Configuration/python/HLT_FULL_cff.py      | 126 ++----------------
 .../Configuration/python/HLT_GRun_cff.py      | 108 ++-------------
 .../Configuration/python/HLT_HIon_cff.py      |  18 +--
 .../Configuration/python/HLT_PRef_cff.py      |  18 +--
 .../Configuration/python/HLT_Special_cff.py   |   9 +-
 .../plugins/MuonIdProducer.cc                 |   7 +
 8 files changed, 51 insertions(+), 353 deletions(-)

diff --git a/HLTrigger/Configuration/python/HLT_2024v14_cff.py b/HLTrigger/Configuration/python/HLT_2024v14_cff.py
index 2f722166f1823..b8c54bbabdcb5 100644
--- a/HLTrigger/Configuration/python/HLT_2024v14_cff.py
+++ b/HLTrigger/Configuration/python/HLT_2024v14_cff.py
@@ -9334,14 +9334,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -9977,14 +9970,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -12734,15 +12720,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      seRecHitsFlag = cms.bool( False ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -13378,14 +13356,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -15560,14 +15531,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -22437,14 +22401,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -24634,14 +24591,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -26297,14 +26247,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -34999,14 +34942,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -55979,14 +55915,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -71356,14 +71285,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -72610,14 +72532,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsNoID_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsNoID_cfi.py
index c1039baf79a55..a045ef1e0bdac 100644
--- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsNoID_cfi.py
+++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonsNoID_cfi.py
@@ -61,14 +61,7 @@
             useMuon = cms.bool(False),
             usePreshower = cms.bool(False)
         ),
-        #UseRecHitsFlag = cms.bool(False)
-        EcalRecHitThresh = cms.bool(False),
-        HcalCutsFromDB = cms.bool(False),
-        UseEcalRecHitsFlag = cms.bool(False),
-        UseHcalRecHitsFlag = cms.bool(False),
-        UseHORecHitsFlag = cms.bool(False),
-        MaxSeverityHB = cms.int32(9),
-        MaxSeverityHE = cms.int32(9)
+        UseRecHitsFlag = cms.bool(False)
     ),
     JetExtractorPSet = cms.PSet(
         ComponentName = cms.string('JetExtractor'),
diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py
index c28c27d10dacb..efbefc2a22a6c 100644
--- a/HLTrigger/Configuration/python/HLT_FULL_cff.py
+++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py
@@ -15096,14 +15096,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -15739,14 +15732,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -18496,14 +18482,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -19139,14 +19118,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -21689,14 +21661,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -28574,14 +28539,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -30771,14 +30729,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -32434,14 +32385,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -41136,14 +41080,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -62116,14 +62053,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -77493,14 +77423,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -78747,14 +78670,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -91001,14 +90917,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -92572,14 +92481,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py
index a840a6c84b90d..a383fb1f4ef2a 100644
--- a/HLTrigger/Configuration/python/HLT_GRun_cff.py
+++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py
@@ -9334,14 +9334,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -9977,14 +9970,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -12734,14 +12720,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -13377,14 +13356,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -15559,14 +15531,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -22436,14 +22401,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -24633,14 +24591,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -26296,14 +26247,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -34998,14 +34942,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -55978,14 +55915,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -71355,14 +71285,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -72609,14 +72532,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py
index 2c306b7de6372..442cac936a6d1 100644
--- a/HLTrigger/Configuration/python/HLT_HIon_cff.py
+++ b/HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -11997,14 +11997,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -13568,14 +13561,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py
index 2eeea61347200..c656b9a8e6eae 100644
--- a/HLTrigger/Configuration/python/HLT_PRef_cff.py
+++ b/HLTrigger/Configuration/python/HLT_PRef_cff.py
@@ -7568,14 +7568,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
@@ -9384,14 +9377,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
diff --git a/HLTrigger/Configuration/python/HLT_Special_cff.py b/HLTrigger/Configuration/python/HLT_Special_cff.py
index d19c314c8a0d1..65380cf468f86 100644
--- a/HLTrigger/Configuration/python/HLT_Special_cff.py
+++ b/HLTrigger/Configuration/python/HLT_Special_cff.py
@@ -7724,14 +7724,7 @@
       DR_Veto_E = cms.double( 0.07 ),
       NoiseTow_EB = cms.double( 0.04 ),
       Noise_EE = cms.double( 0.1 ),
-      #UseRecHitsFlag = cms.bool( False ),
-      EcalRecHitThresh = cms.bool(False),
-      HcalCutsFromDB = cms.bool(False),
-      UseEcalRecHitsFlag = cms.bool(False),
-      UseHcalRecHitsFlag = cms.bool(False),
-      UseHORecHitsFlag = cms.bool(False),
-      MaxSeverityHB = cms.int32(9),
-      MaxSeverityHE = cms.int32(9),
+      UseRecHitsFlag = cms.bool( False ),
       DR_Max = cms.double( 1.0 ),
       DepositLabel = cms.untracked.string( "Cal" ),
       Noise_HO = cms.double( 0.2 ),
diff --git a/RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc b/RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc
index 4a462888aac66..a1d2ab0d0cace 100644
--- a/RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc
+++ b/RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc
@@ -1532,6 +1532,13 @@ void MuonIdProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptio
   edm::ParameterSetDescription descCalo;
   descCalo.setAllowAnything();
   descCalo.add<edm::ParameterSetDescription>("TrackAssociatorParameters", descTrkAsoPar);
+  descCalo.add<bool>("UseEcalRecHitsFlag", false);
+  descCalo.add<bool>("UseHcalRecHitsFlag", false);
+  descCalo.add<bool>("UseHORecHitsFlag", false);
+  descCalo.add<bool>("EcalRecHitThresh", false);
+  descCalo.add<bool>("HcalCutsFromDB", false);
+  descCalo.add<int>("MaxSeverityHB", 9);
+  descCalo.add<int>("MaxSeverityHE", 9);
   desc.add<edm::ParameterSetDescription>("CaloExtractorPSet", descCalo);
 
   descriptions.addDefault(desc);