Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added esConsumes to modules in L1Trigger/L1THGCal #30314

Merged
merged 2 commits into from
Jun 26, 2020
Merged

added esConsumes to modules in L1Trigger/L1THGCal #30314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31f893e
added esConsumes to modules in L1Trigger/L1THGCal
JamminJones Jun 19, 2020
3985391
added esConsumes to more modules in L1Trigger/ L1THGCal
JamminJones Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions L1Trigger/L1THGCal/plugins/HGCalBackendLayer1Producer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Utilities/interface/ESGetToken.h"

#include "DataFormats/L1THGCal/interface/HGCalTriggerCell.h"
#include "DataFormats/L1THGCal/interface/HGCalTriggerSums.h"
Expand All @@ -28,14 +29,16 @@ class HGCalBackendLayer1Producer : public edm::stream::EDProducer<> {
// inputs
edm::EDGetToken input_cell_, input_sums_;
edm::ESHandle<HGCalTriggerGeometryBase> triggerGeometry_;
edm::ESGetToken<HGCalTriggerGeometryBase, CaloGeometryRecord> triggerGeomToken_;

std::unique_ptr<HGCalBackendLayer1ProcessorBase> backendProcess_;
};

DEFINE_FWK_MODULE(HGCalBackendLayer1Producer);

HGCalBackendLayer1Producer::HGCalBackendLayer1Producer(const edm::ParameterSet& conf)
: input_cell_(consumes<l1t::HGCalTriggerCellBxCollection>(conf.getParameter<edm::InputTag>("InputTriggerCells"))) {
: input_cell_(consumes<l1t::HGCalTriggerCellBxCollection>(conf.getParameter<edm::InputTag>("InputTriggerCells"))),
triggerGeomToken_(esConsumes<HGCalTriggerGeometryBase, CaloGeometryRecord, edm::Transition::BeginRun>()) {
//setup Backend parameters
const edm::ParameterSet& beParamConfig = conf.getParameterSet("ProcessorParameters");
const std::string& beProcessorName = beParamConfig.getParameter<std::string>("ProcessorName");
Expand All @@ -46,7 +49,7 @@ HGCalBackendLayer1Producer::HGCalBackendLayer1Producer(const edm::ParameterSet&
}

void HGCalBackendLayer1Producer::beginRun(const edm::Run& /*run*/, const edm::EventSetup& es) {
es.get<CaloGeometryRecord>().get("", triggerGeometry_);
triggerGeometry_ = es.getHandle(triggerGeomToken_);
backendProcess_->setGeometry(triggerGeometry_.product());
}

Expand Down
7 changes: 5 additions & 2 deletions L1Trigger/L1THGCal/plugins/HGCalBackendLayer2Producer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Utilities/interface/ESGetToken.h"

#include "DataFormats/L1THGCal/interface/HGCalTriggerCell.h"
#include "DataFormats/L1THGCal/interface/HGCalTriggerSums.h"
Expand All @@ -28,14 +29,16 @@ class HGCalBackendLayer2Producer : public edm::stream::EDProducer<> {
// inputs
edm::EDGetToken input_clusters_;
edm::ESHandle<HGCalTriggerGeometryBase> triggerGeometry_;
edm::ESGetToken<HGCalTriggerGeometryBase, CaloGeometryRecord> triggerGeomToken_;

std::unique_ptr<HGCalBackendLayer2ProcessorBase> backendProcess_;
};

DEFINE_FWK_MODULE(HGCalBackendLayer2Producer);

HGCalBackendLayer2Producer::HGCalBackendLayer2Producer(const edm::ParameterSet& conf)
: input_clusters_(consumes<l1t::HGCalClusterBxCollection>(conf.getParameter<edm::InputTag>("InputCluster"))) {
: input_clusters_(consumes<l1t::HGCalClusterBxCollection>(conf.getParameter<edm::InputTag>("InputCluster"))),
triggerGeomToken_(esConsumes<HGCalTriggerGeometryBase, CaloGeometryRecord, edm::Transition::BeginRun>()) {
//setup Backend parameters
const edm::ParameterSet& beParamConfig = conf.getParameterSet("ProcessorParameters");
const std::string& beProcessorName = beParamConfig.getParameter<std::string>("ProcessorName");
Expand All @@ -46,7 +49,7 @@ HGCalBackendLayer2Producer::HGCalBackendLayer2Producer(const edm::ParameterSet&
}

void HGCalBackendLayer2Producer::beginRun(const edm::Run& /*run*/, const edm::EventSetup& es) {
es.get<CaloGeometryRecord>().get("", triggerGeometry_);
triggerGeometry_ = es.getHandle(triggerGeomToken_);
backendProcess_->setGeometry(triggerGeometry_.product());
}

Expand Down
8 changes: 5 additions & 3 deletions L1Trigger/L1THGCal/plugins/HGCalConcentratorProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/Utilities/interface/ESGetToken.h"
#include "DataFormats/L1THGCal/interface/HGCalTriggerCell.h"
#include "DataFormats/L1THGCal/interface/HGCalTriggerSums.h"
#include "DataFormats/HGCDigi/interface/HGCDigiCollections.h"
Expand All @@ -27,6 +27,7 @@ class HGCalConcentratorProducer : public edm::stream::EDProducer<> {
// inputs
edm::EDGetToken input_cell_, input_sums_;
edm::ESHandle<HGCalTriggerGeometryBase> triggerGeometry_;
edm::ESGetToken<HGCalTriggerGeometryBase, CaloGeometryRecord> triggerGeomToken_;

std::unique_ptr<HGCalConcentratorProcessorBase> concentratorProcess_;
};
Expand All @@ -35,7 +36,8 @@ DEFINE_FWK_MODULE(HGCalConcentratorProducer);

HGCalConcentratorProducer::HGCalConcentratorProducer(const edm::ParameterSet& conf)
: input_cell_(consumes<l1t::HGCalTriggerCellBxCollection>(conf.getParameter<edm::InputTag>("InputTriggerCells"))),
input_sums_(consumes<l1t::HGCalTriggerSumsBxCollection>(conf.getParameter<edm::InputTag>("InputTriggerSums"))) {
input_sums_(consumes<l1t::HGCalTriggerSumsBxCollection>(conf.getParameter<edm::InputTag>("InputTriggerSums"))),
triggerGeomToken_(esConsumes<HGCalTriggerGeometryBase, CaloGeometryRecord, edm::Transition::BeginRun>()) {
//setup Concentrator parameters
const edm::ParameterSet& concParamConfig = conf.getParameterSet("ProcessorParameters");
const std::string& concProcessorName = concParamConfig.getParameter<std::string>("ProcessorName");
Expand All @@ -47,7 +49,7 @@ HGCalConcentratorProducer::HGCalConcentratorProducer(const edm::ParameterSet& co
}

void HGCalConcentratorProducer::beginRun(const edm::Run& /*run*/, const edm::EventSetup& es) {
es.get<CaloGeometryRecord>().get(triggerGeometry_);
triggerGeometry_ = es.getHandle(triggerGeomToken_);

concentratorProcess_->setGeometry(triggerGeometry_.product());
}
Expand Down
9 changes: 5 additions & 4 deletions L1Trigger/L1THGCal/plugins/HGCalTowerMapProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/Utilities/interface/ESGetToken.h"
#include "DataFormats/L1THGCal/interface/HGCalTriggerCell.h"
#include "DataFormats/L1THGCal/interface/HGCalTriggerSums.h"
#include "DataFormats/L1THGCal/interface/HGCalTower.h"
Expand All @@ -27,14 +27,15 @@ class HGCalTowerMapProducer : public edm::stream::EDProducer<> {
// inputs
edm::EDGetToken input_cell_;
edm::ESHandle<HGCalTriggerGeometryBase> triggerGeometry_;

edm::ESGetToken<HGCalTriggerGeometryBase, CaloGeometryRecord> triggerGeomToken_;
std::unique_ptr<HGCalTowerMapProcessorBase> towersMapProcess_;
};

DEFINE_FWK_MODULE(HGCalTowerMapProducer);

HGCalTowerMapProducer::HGCalTowerMapProducer(const edm::ParameterSet& conf)
: input_cell_(consumes<l1t::HGCalTriggerCellBxCollection>(conf.getParameter<edm::InputTag>("InputTriggerCells"))) {
: input_cell_(consumes<l1t::HGCalTriggerCellBxCollection>(conf.getParameter<edm::InputTag>("InputTriggerCells"))),
triggerGeomToken_(esConsumes<HGCalTriggerGeometryBase, CaloGeometryRecord, edm::Transition::BeginRun>()) {
//setup TowerMap parameters
const edm::ParameterSet& towerMapParamConfig = conf.getParameterSet("ProcessorParameters");
const std::string& towerMapProcessorName = towerMapParamConfig.getParameter<std::string>("ProcessorName");
Expand All @@ -45,7 +46,7 @@ HGCalTowerMapProducer::HGCalTowerMapProducer(const edm::ParameterSet& conf)
}

void HGCalTowerMapProducer::beginRun(const edm::Run& /*run*/, const edm::EventSetup& es) {
es.get<CaloGeometryRecord>().get("", triggerGeometry_);
triggerGeometry_ = es.getHandle(triggerGeomToken_);
towersMapProcess_->setGeometry(triggerGeometry_.product());
}

Expand Down
9 changes: 5 additions & 4 deletions L1Trigger/L1THGCal/plugins/HGCalTowerProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/Utilities/interface/ESGetToken.h"
#include "DataFormats/L1THGCal/interface/HGCalTriggerCell.h"
#include "DataFormats/L1THGCal/interface/HGCalTriggerSums.h"
#include "DataFormats/L1THGCal/interface/HGCalTower.h"
Expand All @@ -27,14 +27,15 @@ class HGCalTowerProducer : public edm::stream::EDProducer<> {
// inputs
edm::EDGetToken input_towers_map_;
edm::ESHandle<HGCalTriggerGeometryBase> triggerGeometry_;

edm::ESGetToken<HGCalTriggerGeometryBase, CaloGeometryRecord> triggerGeomToken_;
std::unique_ptr<HGCalTowerProcessorBase> towersProcess_;
};

DEFINE_FWK_MODULE(HGCalTowerProducer);

HGCalTowerProducer::HGCalTowerProducer(const edm::ParameterSet& conf)
: input_towers_map_(consumes<l1t::HGCalTowerMapBxCollection>(conf.getParameter<edm::InputTag>("InputTowerMaps"))) {
: input_towers_map_(consumes<l1t::HGCalTowerMapBxCollection>(conf.getParameter<edm::InputTag>("InputTowerMaps"))),
triggerGeomToken_(esConsumes<HGCalTriggerGeometryBase, CaloGeometryRecord, edm::Transition::BeginRun>()) {
//setup TowerMap parameters
const edm::ParameterSet& towerParamConfig = conf.getParameterSet("ProcessorParameters");
const std::string& towerProcessorName = towerParamConfig.getParameter<std::string>("ProcessorName");
Expand All @@ -44,7 +45,7 @@ HGCalTowerProducer::HGCalTowerProducer(const edm::ParameterSet& conf)
}

void HGCalTowerProducer::beginRun(const edm::Run& /*run*/, const edm::EventSetup& es) {
es.get<CaloGeometryRecord>().get("", triggerGeometry_);
triggerGeometry_ = es.getHandle(triggerGeomToken_);
towersProcess_->setGeometry(triggerGeometry_.product());
}

Expand Down
9 changes: 5 additions & 4 deletions L1Trigger/L1THGCal/plugins/HGCalVFEProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"

#include "FWCore/Utilities/interface/ESGetToken.h"
#include "DataFormats/HGCDigi/interface/HGCDigiCollections.h"
#include "DataFormats/L1THGCal/interface/HGCalTriggerCell.h"
#include "DataFormats/L1THGCal/interface/HGCalTriggerSums.h"
Expand All @@ -28,7 +28,7 @@ class HGCalVFEProducer : public edm::stream::EDProducer<> {
// inputs
edm::EDGetToken inputee_, inputfh_, inputbh_;
edm::ESHandle<HGCalTriggerGeometryBase> triggerGeometry_;

edm::ESGetToken<HGCalTriggerGeometryBase, CaloGeometryRecord> triggerGeomToken_;
std::unique_ptr<HGCalVFEProcessorBase> vfeProcess_;
};

Expand All @@ -37,7 +37,8 @@ DEFINE_FWK_MODULE(HGCalVFEProducer);
HGCalVFEProducer::HGCalVFEProducer(const edm::ParameterSet& conf)
: inputee_(consumes<HGCalDigiCollection>(conf.getParameter<edm::InputTag>("eeDigis"))),
inputfh_(consumes<HGCalDigiCollection>(conf.getParameter<edm::InputTag>("fhDigis"))),
inputbh_(consumes<HGCalDigiCollection>(conf.getParameter<edm::InputTag>("bhDigis"))) {
inputbh_(consumes<HGCalDigiCollection>(conf.getParameter<edm::InputTag>("bhDigis"))),
triggerGeomToken_(esConsumes<HGCalTriggerGeometryBase, CaloGeometryRecord, edm::Transition::BeginRun>()) {
// setup VFE parameters
const edm::ParameterSet& vfeParamConfig = conf.getParameterSet("ProcessorParameters");
const std::string& vfeProcessorName = vfeParamConfig.getParameter<std::string>("ProcessorName");
Expand All @@ -49,7 +50,7 @@ HGCalVFEProducer::HGCalVFEProducer(const edm::ParameterSet& conf)
}

void HGCalVFEProducer::beginRun(const edm::Run& /*run*/, const edm::EventSetup& es) {
es.get<CaloGeometryRecord>().get(triggerGeometry_);
triggerGeometry_ = es.getHandle(triggerGeomToken_);
vfeProcess_->setGeometry(triggerGeometry_.product());
}

Expand Down