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

Run3-gex142A Use tokenss rather than labels in accessing collections in Alignment/CommonAlignmentMonitor #39831

Merged
merged 1 commit into from Oct 26, 2022
Merged

Run3-gex142A Use tokenss rather than labels in accessing collections in Alignment/CommonAlignmentMonitor #39831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 3 deletions Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc
View file
Open in desktop
Expand Up @@ -102,6 +102,7 @@ class AlignmentMonitorAsAnalyzer : public edm::one::EDAnalyzer<> {
const edm::ESGetToken<AlignmentErrorsExtended, CSCAlignmentErrorExtendedRcd> esTokenCSCAPE_;
const edm::ESGetToken<Alignments, GEMAlignmentRcd> esTokenGEMAl_;
const edm::ESGetToken<AlignmentErrorsExtended, GEMAlignmentErrorExtendedRcd> esTokenGEMAPE_;
const edm::EDGetTokenT<TrajTrackAssociationCollection> trajTrackToken_;
bool m_firstEvent;
};

Expand Down Expand Up @@ -134,7 +135,8 @@ AlignmentMonitorAsAnalyzer::AlignmentMonitorAsAnalyzer(const edm::ParameterSet&
esTokenCSCAl_(esConsumes()),
esTokenCSCAPE_(esConsumes()),
esTokenGEMAl_(esConsumes()),
esTokenGEMAPE_(esConsumes()) {
esTokenGEMAPE_(esConsumes()),
trajTrackToken_(consumes<TrajTrackAssociationCollection>(m_tjTag)) {
edm::ConsumesCollector consumeCollector = consumesCollector();
std::vector<std::string> monitors = iConfig.getUntrackedParameter<std::vector<std::string>>("monitors");

Expand Down Expand Up @@ -213,8 +215,7 @@ void AlignmentMonitorAsAnalyzer::analyze(const edm::Event& iEvent, const edm::Ev
}

// Retrieve trajectories and tracks from the event
edm::Handle<TrajTrackAssociationCollection> trajTracksMap;
iEvent.getByLabel(m_tjTag, trajTracksMap);
const edm::Handle<TrajTrackAssociationCollection>& trajTracksMap = iEvent.getHandle(trajTrackToken_);

// Form pairs of trajectories and tracks
ConstTrajTrackPairCollection trajTracks;
Expand Down
48 changes: 25 additions & 23 deletions Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@
class AlignmentMonitorMuonSystemMap1D : public AlignmentMonitorBase {
public:
AlignmentMonitorMuonSystemMap1D(const edm::ParameterSet &cfg, edm::ConsumesCollector iC);
~AlignmentMonitorMuonSystemMap1D() override {}
~AlignmentMonitorMuonSystemMap1D() override = default;

void book() override;

Expand All @@ -54,23 +54,25 @@ class AlignmentMonitorMuonSystemMap1D : public AlignmentMonitorBase {
const MuonResidualsFromTrack::BuilderToken m_esTokenBuilder;

// parameters
edm::InputTag m_muonCollectionTag;
double m_minTrackPt;
double m_maxTrackPt;
double m_minTrackP;
double m_maxTrackP;
double m_maxDxy;
int m_minTrackerHits;
double m_maxTrackerRedChi2;
bool m_allowTIDTEC;
int m_minNCrossedChambers;
int m_minDT13Hits;
int m_minDT2Hits;
int m_minCSCHits;
bool m_doDT;
bool m_doCSC;
bool m_useStubPosition;
bool m_createNtuple;
const edm::InputTag m_muonCollectionTag;
const double m_minTrackPt;
const double m_maxTrackPt;
const double m_minTrackP;
const double m_maxTrackP;
const double m_maxDxy;
const int m_minTrackerHits;
const double m_maxTrackerRedChi2;
const bool m_allowTIDTEC;
const int m_minNCrossedChambers;
const int m_minDT13Hits;
const int m_minDT2Hits;
const int m_minCSCHits;
const bool m_doDT;
const bool m_doCSC;
const bool m_useStubPosition;
const bool m_createNtuple;
const edm::EDGetTokenT<reco::BeamSpot> bsToken_;
const edm::EDGetTokenT<reco::MuonCollection> muonToken_;

// counter
long m_counter_event;
Expand Down Expand Up @@ -173,7 +175,9 @@ AlignmentMonitorMuonSystemMap1D::AlignmentMonitorMuonSystemMap1D(const edm::Para
m_doDT(cfg.getParameter<bool>("doDT")),
m_doCSC(cfg.getParameter<bool>("doCSC")),
m_useStubPosition(cfg.getParameter<bool>("useStubPosition")),
m_createNtuple(cfg.getParameter<bool>("createNtuple")) {
m_createNtuple(cfg.getParameter<bool>("createNtuple")),
bsToken_(iC.consumes<reco::BeamSpot>(m_beamSpotTag)),
muonToken_(iC.consumes<reco::MuonCollection>(m_muonCollectionTag)) {
if (m_createNtuple) {
edm::Service<TFileService> fs;
m_cscnt = fs->make<TTree>("mualNtuple", "mualNtuple");
Expand Down Expand Up @@ -266,8 +270,7 @@ void AlignmentMonitorMuonSystemMap1D::event(const edm::Event &iEvent,
const ConstTrajTrackPairCollection &trajtracks) {
m_counter_event++;

edm::Handle<reco::BeamSpot> beamSpot;
iEvent.getByLabel(m_beamSpotTag, beamSpot);
const edm::Handle<reco::BeamSpot> &beamSpot = iEvent.getHandle(bsToken_);

const GlobalTrackingGeometry *globalGeometry = &iSetup.getData(m_esTokenGBTGeom);
const DetIdAssociator *muonDetIdAssociator_ = &iSetup.getData(m_esTokenDetId);
Expand Down Expand Up @@ -296,8 +299,7 @@ void AlignmentMonitorMuonSystemMap1D::event(const edm::Event &iEvent,
} // end if track has acceptable momentum
} // end loop over tracks
} else {
edm::Handle<reco::MuonCollection> muons;
iEvent.getByLabel(m_muonCollectionTag, muons);
const edm::Handle<reco::MuonCollection> &muons = iEvent.getHandle(muonToken_);

for (reco::MuonCollection::const_iterator muon = muons->begin(); muon != muons->end(); ++muon) {
if (!(muon->isTrackerMuon() && muon->innerTrack().isNonnull()))
Expand Down
43 changes: 23 additions & 20 deletions Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc
View file
Open in desktop
Expand Up @@ -52,21 +52,24 @@ class AlignmentMonitorMuonVsCurvature : public AlignmentMonitorBase {
const MuonResidualsFromTrack::BuilderToken m_esTokenBuilder;

// parameters
edm::InputTag m_muonCollectionTag;
double m_minTrackPt;
double m_minTrackP;
int m_minTrackerHits;
double m_maxTrackerRedChi2;
bool m_allowTIDTEC;
bool m_minNCrossedChambers;
double m_maxDxy;
int m_minDT13Hits;
int m_minDT2Hits;
int m_minCSCHits;
int m_layer;
std::string m_propagator;
bool m_doDT;
bool m_doCSC;
const edm::InputTag m_muonCollectionTag;
const double m_minTrackPt;
const double m_minTrackP;
const int m_minTrackerHits;
const double m_maxTrackerRedChi2;
const bool m_allowTIDTEC;
const bool m_minNCrossedChambers;
const double m_maxDxy;
const int m_minDT13Hits;
const int m_minDT2Hits;
const int m_minCSCHits;
const int m_layer;
const std::string m_propagator;
const bool m_doDT;
const bool m_doCSC;

const edm::EDGetTokenT<reco::BeamSpot> bsToken_;
const edm::EDGetTokenT<reco::MuonCollection> muonToken_;

enum { kDeltaX = 0, kDeltaDxDz, kNumComponents };

Expand Down Expand Up @@ -104,7 +107,9 @@ AlignmentMonitorMuonVsCurvature::AlignmentMonitorMuonVsCurvature(const edm::Para
m_layer(cfg.getParameter<int>("layer")),
m_propagator(cfg.getParameter<std::string>("propagator")),
m_doDT(cfg.getParameter<bool>("doDT")),
m_doCSC(cfg.getParameter<bool>("doCSC")) {}
m_doCSC(cfg.getParameter<bool>("doCSC")),
bsToken_(iC.consumes<reco::BeamSpot>(m_beamSpotTag)),
muonToken_(iC.consumes<reco::MuonCollection>(m_muonCollectionTag)) {}

void AlignmentMonitorMuonVsCurvature::book() {
// DT
Expand Down Expand Up @@ -196,8 +201,7 @@ void AlignmentMonitorMuonVsCurvature::book() {
void AlignmentMonitorMuonVsCurvature::event(const edm::Event &iEvent,
const edm::EventSetup &iSetup,
const ConstTrajTrackPairCollection &trajtracks) {
edm::Handle<reco::BeamSpot> beamSpot;
iEvent.getByLabel(m_beamSpotTag, beamSpot);
const edm::Handle<reco::BeamSpot> &beamSpot = iEvent.getHandle(bsToken_);

const GlobalTrackingGeometry *globalGeometry = &iSetup.getData(m_esTokenGBTGeom);
const DetIdAssociator *muonDetIdAssociator_ = &iSetup.getData(m_esTokenDetId);
Expand All @@ -219,8 +223,7 @@ void AlignmentMonitorMuonVsCurvature::event(const edm::Event &iEvent,
} // end if track pT is within range
} // end loop over tracks
} else {
edm::Handle<reco::MuonCollection> muons;
iEvent.getByLabel(m_muonCollectionTag, muons);
const edm::Handle<reco::MuonCollection> &muons = iEvent.getHandle(muonToken_);

for (reco::MuonCollection::const_iterator muon = muons->begin(); muon != muons->end(); ++muon) {
if (!(muon->isTrackerMuon() && muon->innerTrack().isNonnull()))
Expand Down
39 changes: 21 additions & 18 deletions Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc
View file
Open in desktop
Expand Up @@ -52,19 +52,22 @@ class AlignmentMonitorSegmentDifferences : public AlignmentMonitorBase {
const MuonResidualsFromTrack::BuilderToken m_esTokenBuilder;

// parameters
edm::InputTag m_muonCollectionTag;
double m_minTrackPt;
double m_minTrackP;
double m_maxDxy;
int m_minTrackerHits;
double m_maxTrackerRedChi2;
bool m_allowTIDTEC;
bool m_minNCrossedChambers;
int m_minDT13Hits;
int m_minDT2Hits;
int m_minCSCHits;
bool m_doDT;
bool m_doCSC;
const edm::InputTag m_muonCollectionTag;
const double m_minTrackPt;
const double m_minTrackP;
const double m_maxDxy;
const int m_minTrackerHits;
const double m_maxTrackerRedChi2;
const bool m_allowTIDTEC;
const bool m_minNCrossedChambers;
const int m_minDT13Hits;
const int m_minDT2Hits;
const int m_minCSCHits;
const bool m_doDT;
const bool m_doCSC;

const edm::EDGetTokenT<reco::BeamSpot> bsToken_;
const edm::EDGetTokenT<reco::MuonCollection> muonToken_;

// wheel, sector, stationdiff
TProfile *m_dt13_resid[5][12][3];
Expand Down Expand Up @@ -135,7 +138,9 @@ AlignmentMonitorSegmentDifferences::AlignmentMonitorSegmentDifferences(const edm
m_minDT2Hits(cfg.getParameter<int>("minDT2Hits")),
m_minCSCHits(cfg.getParameter<int>("minCSCHits")),
m_doDT(cfg.getParameter<bool>("doDT")),
m_doCSC(cfg.getParameter<bool>("doCSC")) {}
m_doCSC(cfg.getParameter<bool>("doCSC")),
bsToken_(iC.consumes<reco::BeamSpot>(m_beamSpotTag)),
muonToken_(iC.consumes<reco::MuonCollection>(m_muonCollectionTag)) {}

void AlignmentMonitorSegmentDifferences::book() {
char name[225], pos[228], neg[228];
Expand Down Expand Up @@ -371,8 +376,7 @@ void AlignmentMonitorSegmentDifferences::book() {
void AlignmentMonitorSegmentDifferences::event(const edm::Event &iEvent,
const edm::EventSetup &iSetup,
const ConstTrajTrackPairCollection &trajtracks) {
edm::Handle<reco::BeamSpot> beamSpot;
iEvent.getByLabel(m_beamSpotTag, beamSpot);
const edm::Handle<reco::BeamSpot> &beamSpot = iEvent.getHandle(bsToken_);

const GlobalTrackingGeometry *globalGeometry = &iSetup.getData(m_esTokenGBTGeom);
const DetIdAssociator *muonDetIdAssociator_ = &iSetup.getData(m_esTokenDetId);
Expand All @@ -394,8 +398,7 @@ void AlignmentMonitorSegmentDifferences::event(const edm::Event &iEvent,
}
} // end loop over tracks
} else {
edm::Handle<reco::MuonCollection> muons;
iEvent.getByLabel(m_muonCollectionTag, muons);
const edm::Handle<reco::MuonCollection> &muons = iEvent.getHandle(muonToken_);

for (reco::MuonCollection::const_iterator muon = muons->begin(); muon != muons->end(); ++muon) {
if (!(muon->isTrackerMuon() && muon->innerTrack().isNonnull()))
Expand Down
11 changes: 6 additions & 5 deletions Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTracksFromTrajectories.cc
View file
Open in desktop
Expand Up @@ -44,8 +44,9 @@ class AlignmentMonitorTracksFromTrajectories : public AlignmentMonitorBase {
private:
MuonServiceProxy *theMuonServiceProxy;
MuonUpdatorAtVertex *theMuonUpdatorAtVertex;
bool m_vertexConstraint;
edm::InputTag m_beamSpot;
const bool m_vertexConstraint;
const edm::InputTag m_beamSpot;
const edm::EDGetTokenT<reco::BeamSpot> bsToken_;

TH1F *m_diMuon_Z;
TH1F *m_diMuon_Zforward;
Expand Down Expand Up @@ -100,7 +101,8 @@ AlignmentMonitorTracksFromTrajectories::AlignmentMonitorTracksFromTrajectories(c
edm::ConsumesCollector iC)
: AlignmentMonitorBase(cfg, iC, "AlignmentMonitorTracksFromTrajectories"),
m_vertexConstraint(cfg.getParameter<bool>("vertexConstraint")),
m_beamSpot(cfg.getParameter<edm::InputTag>("beamSpot")) {
m_beamSpot(cfg.getParameter<edm::InputTag>("beamSpot")),
bsToken_(iC.consumes<reco::BeamSpot>(m_beamSpot)) {
theMuonServiceProxy = new MuonServiceProxy(cfg.getParameter<edm::ParameterSet>("ServiceParameters"));
theMuonUpdatorAtVertex = new MuonUpdatorAtVertex(cfg.getParameter<edm::ParameterSet>("MuonUpdatorAtVertexParameters"),
theMuonServiceProxy);
Expand Down Expand Up @@ -152,8 +154,7 @@ void AlignmentMonitorTracksFromTrajectories::event(const edm::Event &iEvent,
const ConstTrajTrackPairCollection &tracks) {
theMuonServiceProxy->update(iSetup);

edm::Handle<reco::BeamSpot> beamSpot;
iEvent.getByLabel(m_beamSpot, beamSpot);
const edm::Handle<reco::BeamSpot> &beamSpot = iEvent.getHandle(bsToken_);

GlobalVector p1, p2;
double e1 = 0.;
Expand Down
11 changes: 5 additions & 6 deletions Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc
View file
Open in desktop
Expand Up @@ -15,7 +15,6 @@
#include "RecoTracker/TransientTrackingRecHit/interface/TSiPixelRecHit.h"

#include "DataFormats/Alignment/interface/AlignmentClusterFlag.h"
#include "DataFormats/Alignment/interface/AliClusterValueMap.h"

#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
#include "DataFormats/TrackReco/interface/Track.h"
Expand All @@ -34,7 +33,9 @@ AlignmentStats::AlignmentStats(const edm::ParameterSet &iConfig)
keepHitPopulation_(iConfig.getParameter<bool>("keepHitStats")),
statsTreeName_(iConfig.getParameter<string>("TrkStatsFileName")),
hitsTreeName_(iConfig.getParameter<string>("HitStatsFileName")),
prescale_(iConfig.getParameter<uint32_t>("TrkStatsPrescale")) {
prescale_(iConfig.getParameter<uint32_t>("TrkStatsPrescale")),
trackToken_(consumes<reco::TrackCollection>(src_)),
mapToken_(consumes<AliClusterValueMap>(overlapAM_)) {
//sanity checks

//init
Expand Down Expand Up @@ -87,12 +88,10 @@ void AlignmentStats::analyze(const edm::Event &iEvent, const edm::EventSetup &iS

//take trajectories and tracks to loop on
// edm::Handle<TrajTrackAssociationCollection> TrackAssoMap;
edm::Handle<reco::TrackCollection> Tracks;
iEvent.getByLabel(src_, Tracks);
const edm::Handle<reco::TrackCollection> &Tracks = iEvent.getHandle(trackToken_);

//take overlap HitAssomap
edm::Handle<AliClusterValueMap> hMap;
iEvent.getByLabel(overlapAM_, hMap);
const edm::Handle<AliClusterValueMap> &hMap = iEvent.getHandle(mapToken_);
const AliClusterValueMap &OverlapMap = *hMap;

// Initialise
Expand Down
20 changes: 13 additions & 7 deletions Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.h
View file
Open in desktop
Expand Up @@ -11,6 +11,8 @@
#include "FWCore/Utilities/interface/InputTag.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/Alignment/interface/AliClusterValueMap.h"

// #include <Riostream.h>
#include <fstream>
Expand Down Expand Up @@ -39,13 +41,17 @@ class AlignmentStats : public edm::one::EDAnalyzer<> {
const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> esTokenTkGeo_;

//////inputs from config file
edm::InputTag src_;
edm::InputTag overlapAM_;
bool keepTrackStats_;
bool keepHitPopulation_;
std::string statsTreeName_;
std::string hitsTreeName_;
uint32_t prescale_;
const edm::InputTag src_;
const edm::InputTag overlapAM_;
const bool keepTrackStats_;
const bool keepHitPopulation_;
const std::string statsTreeName_;
const std::string hitsTreeName_;
const uint32_t prescale_;

const edm::EDGetTokenT<reco::TrackCollection> trackToken_;
const edm::EDGetTokenT<AliClusterValueMap> mapToken_;

//////
uint32_t tmpPresc_;

Expand Down