Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class EgammaHLTHcalVarProducerFromRecHit : public edm::global::EDProducer<> {
explicit EgammaHLTHcalVarProducerFromRecHit(const edm::ParameterSet &);

public:
void beginRun(edm::Run const &, edm::EventSetup const &);
void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const final;
static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);

Expand Down Expand Up @@ -75,7 +74,6 @@ class EgammaHLTHcalVarProducerFromRecHit : public edm::global::EDProducer<> {
//Get HCAL thresholds from GT
edm::ESGetToken<HcalPFCuts, HcalPFCutsRcd> hcalCutsToken_;
bool cutsFromDB;
HcalPFCuts const *hcalCuts = nullptr;
};

EgammaHLTHcalVarProducerFromRecHit::EgammaHLTHcalVarProducerFromRecHit(const edm::ParameterSet &config)
Expand Down Expand Up @@ -124,7 +122,7 @@ EgammaHLTHcalVarProducerFromRecHit::EgammaHLTHcalVarProducerFromRecHit(const edm
}

if (cutsFromDB) {
hcalCutsToken_ = esConsumes<HcalPFCuts, HcalPFCutsRcd, edm::Transition::BeginRun>(edm::ESInputTag("", "withTopo"));
hcalCutsToken_ = esConsumes<HcalPFCuts, HcalPFCutsRcd>(edm::ESInputTag("", "withTopo"));
}
}

Expand Down Expand Up @@ -155,12 +153,6 @@ void EgammaHLTHcalVarProducerFromRecHit::fillDescriptions(edm::ConfigurationDesc
descriptions.add("hltEgammaHLTHcalVarProducerFromRecHit", desc);
}

void EgammaHLTHcalVarProducerFromRecHit::beginRun(edm::Run const &run, edm::EventSetup const &iSetup) {
if (cutsFromDB) {
hcalCuts = &iSetup.getData(hcalCutsToken_);
}
}

void EgammaHLTHcalVarProducerFromRecHit::produce(edm::StreamID,
edm::Event &iEvent,
const edm::EventSetup &iSetup) const {
Expand Down Expand Up @@ -214,6 +206,10 @@ void EgammaHLTHcalVarProducerFromRecHit::produce(edm::StreamID,
iSetup.getData(hcalChannelQualityToken_),
iSetup.getData(hcalSevLvlComputerToken_),
iSetup.getData(caloTowerConstituentsMapToken_));
const HcalPFCuts *hcalCuts{nullptr};
if (cutsFromDB) {
hcalCuts = &iSetup.getData(hcalCutsToken_);
}

if (useSingleTower_) {
if (doEtSum_) { //this is cone-based HCAL isolation with single tower based footprint removal
Expand Down