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

Moved PFClusterProducer from beginLuminosityBlock to beginRun #40717

Merged
merged 2 commits into from
Feb 8, 2023
Merged

Moved PFClusterProducer from beginLuminosityBlock to beginRun #40717

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
ed3768d
moved PFClusterProducer from beginLuminosityBlock to beginRun
jsamudio Feb 1, 2023
896fff0
code check patch
jsamudio Feb 7, 2023
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
2 changes: 1 addition & 1 deletion RecoParticleFlow/PFClusterProducer/interface/PFECALHashNavigator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class PFECALHashNavigator : public PFRecHitNavigatorBase {
: PFRecHitNavigatorBase(iConfig, cc),
neighbourmapcalculated_(false),
crossBarrelEndcapBorder_(iConfig.getParameter<bool>("crossBarrelEndcapBorder")),
geomToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {}
geomToken_(cc.esConsumes<edm::Transition::BeginRun>()) {}

void init(const edm::EventSetup& iSetup) override {
edm::ESHandle<CaloGeometry> geoHandle = iSetup.getHandle(geomToken_);
Expand Down
2 changes: 1 addition & 1 deletion RecoParticleFlow/PFClusterProducer/interface/PFEcalBarrelRecHitCreator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class PFEcalBarrelRecHitCreator : public PFRecHitCreatorBase {
recHitToken_(cc.consumes<EcalRecHitCollection>(iConfig.getParameter<edm::InputTag>("src"))),
triggerTowerMap_(nullptr),
geomToken_(cc.esConsumes()),
towerToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {
towerToken_(cc.esConsumes<edm::Transition::BeginRun>()) {
auto srF = iConfig.getParameter<edm::InputTag>("srFlags");
if (not srF.label().empty())
srFlagToken_ = cc.consumes<EBSrFlagCollection>(srF);
Expand Down
2 changes: 1 addition & 1 deletion RecoParticleFlow/PFClusterProducer/interface/PFEcalEndcapRecHitCreator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class PFEcalEndcapRecHitCreator : public PFRecHitCreatorBase {
recHitToken_(cc.consumes<EcalRecHitCollection>(iConfig.getParameter<edm::InputTag>("src"))),
elecMap_(nullptr),
geomToken_(cc.esConsumes()),
mappingToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {
mappingToken_(cc.esConsumes<edm::Transition::BeginRun>()) {
auto srF = iConfig.getParameter<edm::InputTag>("srFlags");
if (not srF.label().empty())
srFlagToken_ = cc.consumes<EESrFlagCollection>(srF);
Expand Down
4 changes: 2 additions & 2 deletions RecoParticleFlow/PFClusterProducer/interface/PFHCALDenseIdNavigator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class PFHCALDenseIdNavigator : public PFRecHitNavigatorBase {

PFHCALDenseIdNavigator(const edm::ParameterSet& iConfig, edm::ConsumesCollector& cc)
: vhcalEnum_(iConfig.getParameter<std::vector<int>>("hcalEnums")),
hcalToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()),
geomToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {}
hcalToken_(cc.esConsumes<edm::Transition::BeginRun>()),
geomToken_(cc.esConsumes<edm::Transition::BeginRun>()) {}

void init(const edm::EventSetup& iSetup) override {
bool check = theRecNumberWatcher_.check(iSetup);
Expand Down
2 changes: 1 addition & 1 deletion RecoParticleFlow/PFClusterProducer/plugins/ECAL2DPositionCalcWithDepthCorr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ECAL2DPositionCalcWithDepthCorr : public PFCPositionCalculatorBase {
_esGeom(nullptr),
_esPlus(false),
_esMinus(false),
_geomToken(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {
_geomToken(cc.esConsumes<edm::Transition::BeginRun>()) {
_timeResolutionCalc.reset(nullptr);
if (conf.exists("timeResolutionCalc")) {
const edm::ParameterSet& timeResConf = conf.getParameterSet("timeResolutionCalc");
Expand Down
2 changes: 1 addition & 1 deletion RecoParticleFlow/PFClusterProducer/plugins/ECALPFSeedCleaner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ECALPFSeedCleaner : public RecHitTopologicalCleanerBase {
DEFINE_EDM_PLUGIN(RecHitTopologicalCleanerFactory, ECALPFSeedCleaner, "ECALPFSeedCleaner");

ECALPFSeedCleaner::ECALPFSeedCleaner(const edm::ParameterSet& conf, edm::ConsumesCollector& cc)
: RecHitTopologicalCleanerBase(conf, cc), thsToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {}
: RecHitTopologicalCleanerBase(conf, cc), thsToken_(cc.esConsumes<edm::Transition::BeginRun>()) {}

void ECALPFSeedCleaner::update(const edm::EventSetup& iSetup) { ths_ = iSetup.getHandle(thsToken_); }

Expand Down
17 changes: 7 additions & 10 deletions RecoParticleFlow/PFClusterProducer/plugins/Navigators.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
class PFRecHitEcalBarrelNavigatorWithTime : public PFRecHitCaloNavigatorWithTime<EBDetId, EcalBarrelTopology> {
public:
PFRecHitEcalBarrelNavigatorWithTime(const edm::ParameterSet& iConfig, edm::ConsumesCollector& cc)
: PFRecHitCaloNavigatorWithTime(iConfig, cc),
geomToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {}
: PFRecHitCaloNavigatorWithTime(iConfig, cc), geomToken_(cc.esConsumes<edm::Transition::BeginRun>()) {}

void init(const edm::EventSetup& iSetup) override {
edm::ESHandle<CaloGeometry> geoHandle = iSetup.getHandle(geomToken_);
Expand All @@ -29,8 +28,7 @@ class PFRecHitEcalBarrelNavigatorWithTime : public PFRecHitCaloNavigatorWithTime
class PFRecHitEcalEndcapNavigatorWithTime : public PFRecHitCaloNavigatorWithTime<EEDetId, EcalEndcapTopology> {
public:
PFRecHitEcalEndcapNavigatorWithTime(const edm::ParameterSet& iConfig, edm::ConsumesCollector& cc)
: PFRecHitCaloNavigatorWithTime(iConfig, cc),
geomToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {}
: PFRecHitCaloNavigatorWithTime(iConfig, cc), geomToken_(cc.esConsumes<edm::Transition::BeginRun>()) {}

void init(const edm::EventSetup& iSetup) override {
edm::ESHandle<CaloGeometry> geoHandle = iSetup.getHandle(geomToken_);
Expand All @@ -44,7 +42,7 @@ class PFRecHitEcalEndcapNavigatorWithTime : public PFRecHitCaloNavigatorWithTime
class PFRecHitEcalBarrelNavigator final : public PFRecHitCaloNavigator<EBDetId, EcalBarrelTopology> {
public:
PFRecHitEcalBarrelNavigator(const edm::ParameterSet& iConfig, edm::ConsumesCollector& cc)
: geomToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {}
: geomToken_(cc.esConsumes<edm::Transition::BeginRun>()) {}

void init(const edm::EventSetup& iSetup) override {
edm::ESHandle<CaloGeometry> geoHandle = iSetup.getHandle(geomToken_);
Expand All @@ -58,7 +56,7 @@ class PFRecHitEcalBarrelNavigator final : public PFRecHitCaloNavigator<EBDetId,
class PFRecHitEcalEndcapNavigator final : public PFRecHitCaloNavigator<EEDetId, EcalEndcapTopology> {
public:
PFRecHitEcalEndcapNavigator(const edm::ParameterSet& iConfig, edm::ConsumesCollector& cc)
: geomToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {}
: geomToken_(cc.esConsumes<edm::Transition::BeginRun>()) {}

void init(const edm::EventSetup& iSetup) override {
edm::ESHandle<CaloGeometry> geoHandle = iSetup.getHandle(geomToken_);
Expand All @@ -85,7 +83,7 @@ class PFRecHitHCALDenseIdNavigator final : public PFHCALDenseIdNavigator<HcalDet
class PFRecHitHCALNavigator : public PFRecHitCaloNavigator<HcalDetId, HcalTopology, false> {
public:
PFRecHitHCALNavigator(const edm::ParameterSet& iConfig, edm::ConsumesCollector& cc)
: hcalToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {}
: hcalToken_(cc.esConsumes<edm::Transition::BeginRun>()) {}

void init(const edm::EventSetup& iSetup) override {
edm::ESHandle<HcalTopology> hcalTopology = iSetup.getHandle(hcalToken_);
Expand All @@ -100,8 +98,7 @@ class PFRecHitHCALNavigator : public PFRecHitCaloNavigator<HcalDetId, HcalTopolo
class PFRecHitHCALNavigatorWithTime : public PFRecHitCaloNavigatorWithTime<HcalDetId, HcalTopology, false> {
public:
PFRecHitHCALNavigatorWithTime(const edm::ParameterSet& iConfig, edm::ConsumesCollector& cc)
: PFRecHitCaloNavigatorWithTime(iConfig, cc),
hcalToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {}
: PFRecHitCaloNavigatorWithTime(iConfig, cc), hcalToken_(cc.esConsumes<edm::Transition::BeginRun>()) {}

void init(const edm::EventSetup& iSetup) override {
edm::ESHandle<HcalTopology> hcalTopology = iSetup.getHandle(hcalToken_);
Expand All @@ -116,7 +113,7 @@ class PFRecHitHCALNavigatorWithTime : public PFRecHitCaloNavigatorWithTime<HcalD
class PFRecHitCaloTowerNavigator : public PFRecHitCaloNavigator<CaloTowerDetId, CaloTowerTopology> {
public:
PFRecHitCaloTowerNavigator(const edm::ParameterSet& iConfig, edm::ConsumesCollector& cc)
: caloToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {}
: caloToken_(cc.esConsumes<edm::Transition::BeginRun>()) {}

void init(const edm::EventSetup& iSetup) override {
edm::ESHandle<CaloTowerTopology> caloTowerTopology = iSetup.getHandle(caloToken_);
Expand Down
4 changes: 2 additions & 2 deletions RecoParticleFlow/PFClusterProducer/plugins/PFClusterProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class PFClusterProducer : public edm::stream::EDProducer<> {
PFClusterProducer(const edm::ParameterSet&);
~PFClusterProducer() override = default;

void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
void beginRun(const edm::Run&, const edm::EventSetup&) override;
void produce(edm::Event&, const edm::EventSetup&) override;

private:
Expand Down Expand Up @@ -106,7 +106,7 @@ PFClusterProducer::PFClusterProducer(const edm::ParameterSet& conf)
produces<reco::PFClusterCollection>();
}

void PFClusterProducer::beginLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& es) {
void PFClusterProducer::beginRun(const edm::Run& run, const edm::EventSetup& es) {
_initialClustering->update(es);
if (_pfClusterBuilder)
_pfClusterBuilder->update(es);
Expand Down
4 changes: 2 additions & 2 deletions RecoParticleFlow/PFClusterProducer/plugins/PFMultiDepthClusterProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class PFMultiDepthClusterProducer : public edm::stream::EDProducer<> {
PFMultiDepthClusterProducer(const edm::ParameterSet&);
~PFMultiDepthClusterProducer() override = default;

void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
void beginRun(const edm::Run&, const edm::EventSetup&) override;
void produce(edm::Event&, const edm::EventSetup&) override;

private:
Expand Down Expand Up @@ -66,7 +66,7 @@ PFMultiDepthClusterProducer::PFMultiDepthClusterProducer(const edm::ParameterSet
produces<reco::PFClusterCollection>();
}

void PFMultiDepthClusterProducer::beginLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& es) {
void PFMultiDepthClusterProducer::beginRun(const edm::Run& run, const edm::EventSetup& es) {
_pfClusterBuilder->update(es);
}

Expand Down
7 changes: 2 additions & 5 deletions RecoParticleFlow/PFClusterProducer/plugins/PFRecHitProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ class PFRecHitProducer final : public edm::stream::EDProducer<> {

private:
void produce(edm::Event&, const edm::EventSetup&) override;
void beginLuminosityBlock(edm::LuminosityBlock const&, const edm::EventSetup&) override;
void endLuminosityBlock(edm::LuminosityBlock const&, const edm::EventSetup&) override;
void beginRun(edm::Run const&, const edm::EventSetup&) override;
std::vector<std::unique_ptr<PFRecHitCreatorBase> > creators_;
std::unique_ptr<PFRecHitNavigatorBase> navigator_;
bool init_;
Expand Down Expand Up @@ -61,15 +60,13 @@ PFRecHitProducer::~PFRecHitProducer() = default;
// member functions
//

void PFRecHitProducer::beginLuminosityBlock(edm::LuminosityBlock const& iLumi, const edm::EventSetup& iSetup) {
void PFRecHitProducer::beginRun(edm::Run const& iRun, const edm::EventSetup& iSetup) {
for (const auto& creator : creators_) {
creator->init(iSetup);
}
navigator_->init(iSetup);
}

void PFRecHitProducer::endLuminosityBlock(edm::LuminosityBlock const& iLumi, const edm::EventSetup&) {}

// ------------ method called to produce the data ------------
void PFRecHitProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
using namespace edm;
Expand Down
2 changes: 1 addition & 1 deletion RecoParticleFlow/PFClusterProducer/plugins/SimMappers/RealisticSimClusterMapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class RealisticSimClusterMapper : public InitialClusteringStepBase {
hadronCalib_(conf.getParameter<std::vector<double> >("hadronCalib")),
egammaCalib_(conf.getParameter<std::vector<double> >("egammaCalib")),
simClusterToken_(cc.consumes<SimClusterCollection>(conf.getParameter<edm::InputTag>("simClusterSrc"))),
geomToken_(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()) {}
geomToken_(cc.esConsumes<edm::Transition::BeginRun>()) {}

~RealisticSimClusterMapper() override {}
RealisticSimClusterMapper(const RealisticSimClusterMapper&) = delete;
Expand Down