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

Migrate rest of RecoLocalTracker to esConsumes #33123

Merged
merged 2 commits into from Mar 13, 2021
Merged

Migrate rest of RecoLocalTracker to esConsumes #33123

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
0754a5d
migrate Phase2TrackerRecHits to esConsumes
mmusich Mar 9, 2021
0a8736c
migrate RecoLocalTracker/SubCollectionProducers to esConsumes
mmusich Mar 9, 2021
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
16 changes: 8 additions & 8 deletions RecoLocalTracker/Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc
View file
Open in desktop
Expand Up @@ -34,13 +34,16 @@ class Phase2TrackerRecHits : public edm::global::EDProducer<> {
void produce(edm::StreamID sid, edm::Event& event, const edm::EventSetup& eventSetup) const final;

private:
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> const tTrackerGeom_;
edm::ESGetToken<ClusterParameterEstimator<Phase2TrackerCluster1D>, TkPhase2OTCPERecord> const tCPE_;

edm::EDGetTokenT<Phase2TrackerCluster1DCollectionNew> token_;
edm::ESInputTag cpeTag_;
};

Phase2TrackerRecHits::Phase2TrackerRecHits(edm::ParameterSet const& conf)
: token_(consumes<Phase2TrackerCluster1DCollectionNew>(conf.getParameter<edm::InputTag>("src"))),
cpeTag_(conf.getParameter<edm::ESInputTag>("Phase2StripCPE")) {
: tTrackerGeom_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
tCPE_(esConsumes(conf.getParameter<edm::ESInputTag>("Phase2StripCPE"))),
token_(consumes<Phase2TrackerCluster1DCollectionNew>(conf.getParameter<edm::InputTag>("src"))) {
produces<Phase2TrackerRecHit1DCollectionNew>();
}

Expand All @@ -50,13 +53,10 @@ void Phase2TrackerRecHits::produce(edm::StreamID sid, edm::Event& event, const e
event.getByToken(token_, clusters);

// load the cpe via the eventsetup
edm::ESHandle<ClusterParameterEstimator<Phase2TrackerCluster1D> > cpe;
eventSetup.get<TkPhase2OTCPERecord>().get(cpeTag_, cpe);
const auto& cpe = &eventSetup.getData(tCPE_);

// Get the geometry
edm::ESHandle<TrackerGeometry> geomHandle;
eventSetup.get<TrackerDigiGeometryRecord>().get(geomHandle);
const TrackerGeometry* tkGeom(&(*geomHandle));
const TrackerGeometry* tkGeom = &eventSetup.getData(tTrackerGeom_);

// Global container for the RecHits of each module
auto outputRecHits = std::make_unique<Phase2TrackerRecHit1DCollectionNew>();
Expand Down
6 changes: 3 additions & 3 deletions RecoLocalTracker/SubCollectionProducers/interface/PixelClusterSelectorTopBottom.h
View file
Open in desktop
Expand Up @@ -13,8 +13,6 @@
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "DataFormats/Common/interface/Handle.h"
#include "FWCore/Framework/interface/ESHandle.h"

#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
Expand All @@ -28,14 +26,16 @@
class PixelClusterSelectorTopBottom : public edm::global::EDProducer<> {
public:
explicit PixelClusterSelectorTopBottom(const edm::ParameterSet& cfg)
: token_(consumes<SiPixelClusterCollectionNew>(cfg.getParameter<edm::InputTag>("label"))),
: tTrackerGeom_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
token_(consumes<SiPixelClusterCollectionNew>(cfg.getParameter<edm::InputTag>("label"))),
y_(cfg.getParameter<double>("y")) {
produces<SiPixelClusterCollectionNew>();
}

void produce(edm::StreamID, edm::Event& event, const edm::EventSetup& setup) const override;

private:
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> const tTrackerGeom_;
edm::EDGetTokenT<SiPixelClusterCollectionNew> token_;
double y_;
};
Expand Down
5 changes: 3 additions & 2 deletions RecoLocalTracker/SubCollectionProducers/interface/StripClusterSelectorTopBottom.h
View file
Open in desktop
Expand Up @@ -13,7 +13,6 @@
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "DataFormats/Common/interface/Handle.h"
#include "FWCore/Framework/interface/ESHandle.h"

#include "FWCore/ParameterSet/interface/ParameterSet.h"

Expand All @@ -29,14 +28,16 @@
class StripClusterSelectorTopBottom : public edm::global::EDProducer<> {
public:
explicit StripClusterSelectorTopBottom(const edm::ParameterSet& cfg)
: token_(consumes<edmNew::DetSetVector<SiStripCluster>>(cfg.getParameter<edm::InputTag>("label"))),
: tTrackerGeom_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
token_(consumes<edmNew::DetSetVector<SiStripCluster>>(cfg.getParameter<edm::InputTag>("label"))),
y_(cfg.getParameter<double>("y")) {
produces<edmNew::DetSetVector<SiStripCluster>>();
}

void produce(edm::StreamID, edm::Event& event, const edm::EventSetup& setup) const override;

private:
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> const tTrackerGeom_;
edm::EDGetTokenT<edmNew::DetSetVector<SiStripCluster>> token_;
double y_;
};
Expand Down
10 changes: 5 additions & 5 deletions RecoLocalTracker/SubCollectionProducers/src/HITrackClusterRemover.cc
View file
Open in desktop
@@ -1,7 +1,6 @@
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/InputTag.h"

Expand Down Expand Up @@ -46,6 +45,7 @@ class HITrackClusterRemover : public edm::stream::EDProducer<> {
void produce(edm::Event &iEvent, const edm::EventSetup &iSetup) override;

private:
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> const tTrackerGeom_;
struct ParamBlock {
ParamBlock() : isSet_(false), usesCharge_(false) {}
ParamBlock(const edm::ParameterSet &iConfig)
Expand Down Expand Up @@ -143,7 +143,8 @@ void HITrackClusterRemover::readPSet(
}

HITrackClusterRemover::HITrackClusterRemover(const ParameterSet &iConfig)
: doTracks_(iConfig.exists("trajectories")),
: tTrackerGeom_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
doTracks_(iConfig.exists("trajectories")),
doStrip_(iConfig.existsAs<bool>("doStrip") ? iConfig.getParameter<bool>("doStrip") : true),
doPixel_(iConfig.existsAs<bool>("doPixel") ? iConfig.getParameter<bool>("doPixel") : true),
mergeOld_(iConfig.exists("oldClusterRemovalInfo")),
Expand Down Expand Up @@ -410,8 +411,7 @@ void HITrackClusterRemover::process(const TrackingRecHit *hit, unsigned char chi
void HITrackClusterRemover::produce(Event &iEvent, const EventSetup &iSetup) {
ProductID pixelOldProdID, stripOldProdID;

edm::ESHandle<TrackerGeometry> tgh;
iSetup.get<TrackerDigiGeometryRecord>().get(tgh);
const auto &tgh = &iSetup.getData(tTrackerGeom_);

Handle<edmNew::DetSetVector<SiPixelCluster> > pixelClusters;
if (doPixel_) {
Expand Down Expand Up @@ -525,7 +525,7 @@ void HITrackClusterRemover::produce(Event &iEvent, const EventSetup &iSetup) {
auto hit = *(hb + h);
if (!hit->isValid())
continue;
process(hit, chi2sX5[h], tgh.product());
process(hit, chi2sX5[h], tgh);
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions RecoLocalTracker/SubCollectionProducers/src/HLTTrackClusterRemoverNew.cc
View file
Open in desktop
@@ -1,7 +1,6 @@
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/InputTag.h"

Expand Down Expand Up @@ -43,6 +42,7 @@ class HLTTrackClusterRemoverNew final : public edm::stream::EDProducer<> {
void produce(edm::Event &iEvent, const edm::EventSetup &iSetup) override;

private:
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> const tTrackerGeom_;
struct ParamBlock {
ParamBlock() : isSet_(false), usesCharge_(false) {}
ParamBlock(const edm::ParameterSet &iConfig)
Expand Down Expand Up @@ -132,7 +132,8 @@ void HLTTrackClusterRemoverNew::readPSet(
}

HLTTrackClusterRemoverNew::HLTTrackClusterRemoverNew(const ParameterSet &iConfig)
: doTracks_(iConfig.exists("trajectories")),
: tTrackerGeom_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
doTracks_(iConfig.exists("trajectories")),
doStrip_(iConfig.existsAs<bool>("doStrip") ? iConfig.getParameter<bool>("doStrip") : true),
doPixel_(iConfig.existsAs<bool>("doPixel") ? iConfig.getParameter<bool>("doPixel") : true),
mergeOld_(false),
Expand Down Expand Up @@ -364,8 +365,7 @@ void HLTTrackClusterRemoverNew::process(const TrackingRecHit *hit, float chi2, c
void HLTTrackClusterRemoverNew::produce(Event &iEvent, const EventSetup &iSetup) {
ProductID pixelOldProdID, stripOldProdID;

edm::ESHandle<TrackerGeometry> tgh;
iSetup.get<TrackerDigiGeometryRecord>().get(tgh);
const auto &tgh = &iSetup.getData(tTrackerGeom_);

edm::Handle<edmNew::DetSetVector<SiPixelCluster> > pixelClusters;
if (doPixel_) {
Expand Down Expand Up @@ -411,7 +411,7 @@ void HLTTrackClusterRemoverNew::produce(Event &iEvent, const EventSetup &iSetup)
if (!hit->isValid())
continue;
// std::cout<<"process hit"<<std::endl;
process(hit, itm->estimate(), tgh.product());
process(hit, itm->estimate(), tgh);
}
}

Expand Down
19 changes: 9 additions & 10 deletions RecoLocalTracker/SubCollectionProducers/src/JetCoreClusterSplitter.cc
View file
Open in desktop
Expand Up @@ -46,8 +46,11 @@ class JetCoreClusterSplitter : public edm::stream::EDProducer<> {
std::multimap<float, int> secondDistDiffScore(const std::vector<std::vector<float>>& distanceMap);
std::multimap<float, int> secondDistScore(const std::vector<std::vector<float>>& distanceMap);
std::multimap<float, int> distScore(const std::vector<std::vector<float>>& distanceMap);

edm::ESGetToken<GlobalTrackingGeometry, GlobalTrackingGeometryRecord> const tTrackingGeom_;
edm::ESGetToken<PixelClusterParameterEstimator, TkPixelCPERecord> const tCPE_;

bool verbose;
std::string pixelCPE_;
double ptMin_;
double deltaR_;
double chargeFracMin_;
Expand All @@ -62,8 +65,9 @@ class JetCoreClusterSplitter : public edm::stream::EDProducer<> {
};

JetCoreClusterSplitter::JetCoreClusterSplitter(const edm::ParameterSet& iConfig)
: verbose(iConfig.getParameter<bool>("verbose")),
pixelCPE_(iConfig.getParameter<std::string>("pixelCPE")),
: tTrackingGeom_(esConsumes()),
tCPE_(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("pixelCPE")))),
verbose(iConfig.getParameter<bool>("verbose")),
ptMin_(iConfig.getParameter<double>("ptMin")),
deltaR_(iConfig.getParameter<double>("deltaRmax")),
chargeFracMin_(iConfig.getParameter<double>("chargeFractionMin")),
Expand All @@ -87,8 +91,7 @@ bool SortPixels(const SiPixelCluster::Pixel& i, const SiPixelCluster::Pixel& j)

void JetCoreClusterSplitter::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
using namespace edm;
edm::ESHandle<GlobalTrackingGeometry> geometry;
iSetup.get<GlobalTrackingGeometryRecord>().get(geometry);
const auto& geometry = &iSetup.getData(tTrackingGeom_);

Handle<edmNew::DetSetVector<SiPixelCluster>> inputPixelClusters;
iEvent.getByToken(pixelClusters_, inputPixelClusters);
Expand All @@ -100,11 +103,7 @@ void JetCoreClusterSplitter::produce(edm::Event& iEvent, const edm::EventSetup&
Handle<edm::View<reco::Candidate>> cores;
iEvent.getByToken(cores_, cores);

edm::ESHandle<PixelClusterParameterEstimator> pe;
const PixelClusterParameterEstimator* pp;
iSetup.get<TkPixelCPERecord>().get(pixelCPE_, pe);
pp = pe.product();

const PixelClusterParameterEstimator* pp = &iSetup.getData(tCPE_);
auto output = std::make_unique<edmNew::DetSetVector<SiPixelCluster>>();

edmNew::DetSetVector<SiPixelCluster>::const_iterator detIt = inputPixelClusters->begin();
Expand Down
4 changes: 1 addition & 3 deletions RecoLocalTracker/SubCollectionProducers/src/PixelClusterSelectorTopBottom.cc
View file
Open in desktop
Expand Up @@ -5,9 +5,7 @@ void PixelClusterSelectorTopBottom::produce(edm::StreamID, edm::Event& event, co
edm::Handle<SiPixelClusterCollectionNew> input;
event.getByToken(token_, input);

edm::ESHandle<TrackerGeometry> geom;
setup.get<TrackerDigiGeometryRecord>().get(geom);
const TrackerGeometry& theTracker(*geom);
const TrackerGeometry& theTracker = setup.getData(tTrackerGeom_);

auto output = std::make_unique<SiPixelClusterCollectionNew>();

Expand Down
10 changes: 5 additions & 5 deletions RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc
View file
Open in desktop
@@ -1,7 +1,6 @@
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/InputTag.h"

Expand Down Expand Up @@ -39,6 +38,7 @@ class SeedClusterRemover : public edm::stream::EDProducer<> {
void produce(edm::Event &iEvent, const edm::EventSetup &iSetup) override;

private:
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> const tTrackerGeom_;
struct ParamBlock {
ParamBlock() : isSet_(false), usesCharge_(false) {}
ParamBlock(const edm::ParameterSet &iConfig)
Expand Down Expand Up @@ -111,7 +111,8 @@ void SeedClusterRemover::readPSet(
}

SeedClusterRemover::SeedClusterRemover(const ParameterSet &iConfig)
: doStrip_(iConfig.existsAs<bool>("doStrip") ? iConfig.getParameter<bool>("doStrip") : true),
: tTrackerGeom_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
doStrip_(iConfig.existsAs<bool>("doStrip") ? iConfig.getParameter<bool>("doStrip") : true),
doPixel_(iConfig.existsAs<bool>("doPixel") ? iConfig.getParameter<bool>("doPixel") : true),
mergeOld_(iConfig.exists("oldClusterRemovalInfo")) {
fill(pblocks_, pblocks_ + NumberOfParamBlocks, ParamBlock());
Expand Down Expand Up @@ -235,8 +236,7 @@ void SeedClusterRemover::process(const TrackingRecHit *hit, float chi2, const Tr
}

void SeedClusterRemover::produce(Event &iEvent, const EventSetup &iSetup) {
edm::ESHandle<TrackerGeometry> tgh;
iSetup.get<TrackerDigiGeometryRecord>().get("", tgh); //is it correct to use "" ?
const auto &tgh = &iSetup.getData(tTrackerGeom_);

Handle<edmNew::DetSetVector<SiPixelCluster> > pixelClusters;
if (doPixel_) {
Expand Down Expand Up @@ -283,7 +283,7 @@ void SeedClusterRemover::produce(Event &iEvent, const EventSetup &iSetup) {
for (auto const &hit : seed.recHits()) {
if (!hit.isValid())
continue;
process(&hit, 0., tgh.product());
process(&hit, 0., tgh);
}
}

Expand Down
10 changes: 5 additions & 5 deletions RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemoverPhase2.cc
View file
Open in desktop
@@ -1,7 +1,6 @@
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/InputTag.h"

Expand Down Expand Up @@ -38,6 +37,7 @@ class SeedClusterRemoverPhase2 : public edm::stream::EDProducer<> {
void produce(edm::Event &iEvent, const edm::EventSetup &iSetup) override;

private:
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> const tTrackerGeom_;
bool doOuterTracker_, doPixel_;
bool mergeOld_;
typedef edm::ContainerMask<edmNew::DetSetVector<SiPixelCluster> > PixelMaskContainer;
Expand All @@ -61,7 +61,8 @@ using namespace std;
using namespace edm;

SeedClusterRemoverPhase2::SeedClusterRemoverPhase2(const ParameterSet &iConfig)
: doOuterTracker_(iConfig.existsAs<bool>("doOuterTracker") ? iConfig.getParameter<bool>("doOuterTracker") : true),
: tTrackerGeom_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
doOuterTracker_(iConfig.existsAs<bool>("doOuterTracker") ? iConfig.getParameter<bool>("doOuterTracker") : true),
doPixel_(iConfig.existsAs<bool>("doPixel") ? iConfig.getParameter<bool>("doPixel") : true),
mergeOld_(iConfig.exists("oldClusterRemovalInfo")) {
produces<edm::ContainerMask<edmNew::DetSetVector<SiPixelCluster> > >();
Expand Down Expand Up @@ -163,8 +164,7 @@ void SeedClusterRemoverPhase2::process(const TrackingRecHit *hit, float chi2, co
void SeedClusterRemoverPhase2::produce(Event &iEvent, const EventSetup &iSetup) {
ProductID pixelOldProdID, stripOldProdID;

edm::ESHandle<TrackerGeometry> tgh;
iSetup.get<TrackerDigiGeometryRecord>().get("", tgh); //is it correct to use "" ?
const auto &tgh = &iSetup.getData(tTrackerGeom_);

Handle<edmNew::DetSetVector<SiPixelCluster> > pixelClusters;
if (doPixel_) {
Expand Down Expand Up @@ -211,7 +211,7 @@ void SeedClusterRemoverPhase2::produce(Event &iEvent, const EventSetup &iSetup)
for (auto const &hit : seed.recHits()) {
if (!hit.isValid())
continue;
process(&hit, 0., tgh.product());
process(&hit, 0., tgh);
}
}

Expand Down
4 changes: 1 addition & 3 deletions RecoLocalTracker/SubCollectionProducers/src/StripClusterSelectorTopBottom.cc
View file
Open in desktop
Expand Up @@ -5,9 +5,7 @@ void StripClusterSelectorTopBottom::produce(edm::StreamID, edm::Event& event, co
edm::Handle<edmNew::DetSetVector<SiStripCluster>> input;
event.getByToken(token_, input);

edm::ESHandle<TrackerGeometry> geom;
setup.get<TrackerDigiGeometryRecord>().get(geom);
const TrackerGeometry& theTracker(*geom);
const TrackerGeometry& theTracker = setup.getData(tTrackerGeom_);

auto output = std::make_unique<edmNew::DetSetVector<SiStripCluster>>();

Expand Down