From b82670fb3a9ef75660c2138d98f191592640f232 Mon Sep 17 00:00:00 2001 From: Slava Krutelyov Date: Mon, 30 Nov 2015 02:40:53 +0100 Subject: [PATCH] use TrackCollection instead of a view of tracks (the view in the end was never really used) --- .../plugins/PixelTrackExtractor.cc | 4 +- .../plugins/PixelTrackExtractor.h | 2 +- .../MuonIsolation/plugins/TrackExtractor.cc | 4 +- .../MuonIsolation/plugins/TrackExtractor.h | 2 +- .../MuonIsolation/plugins/TrackSelector.cc | 40 +++++++++---------- .../MuonIsolation/plugins/TrackSelector.h | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/RecoMuon/MuonIsolation/plugins/PixelTrackExtractor.cc b/RecoMuon/MuonIsolation/plugins/PixelTrackExtractor.cc index 5dd6b7aba4a63..57305f58f03de 100644 --- a/RecoMuon/MuonIsolation/plugins/PixelTrackExtractor.cc +++ b/RecoMuon/MuonIsolation/plugins/PixelTrackExtractor.cc @@ -20,7 +20,7 @@ using namespace muonisolation; using reco::isodeposit::Direction; PixelTrackExtractor::PixelTrackExtractor( const ParameterSet& par, edm::ConsumesCollector && iC ) : - theTrackCollectionToken(iC.consumes >(par.getParameter("inputTrackCollection"))), + theTrackCollectionToken(iC.consumes(par.getParameter("inputTrackCollection"))), theDepositLabel(par.getUntrackedParameter("DepositLabel")), theDiff_r(par.getParameter("Diff_r")), theDiff_z(par.getParameter("Diff_z")), @@ -86,7 +86,7 @@ IsoDeposit PixelTrackExtractor::deposit(const Event & event, const EventSetup & deposit.addCandEnergy(muon.pt()); - Handle > tracksH; + Handle tracksH; event.getByToken(theTrackCollectionToken, tracksH); // const TrackCollection tracks = *(tracksH.product()); LogTrace(metname)<<"***** TRACK COLLECTION SIZE: "<size(); diff --git a/RecoMuon/MuonIsolation/plugins/PixelTrackExtractor.h b/RecoMuon/MuonIsolation/plugins/PixelTrackExtractor.h index 331871d70f0d6..ca84e55820e88 100644 --- a/RecoMuon/MuonIsolation/plugins/PixelTrackExtractor.h +++ b/RecoMuon/MuonIsolation/plugins/PixelTrackExtractor.h @@ -39,7 +39,7 @@ class PixelTrackExtractor : public reco::isodeposit::IsoDepositExtractor { reco::isodeposit::Direction directionAtPresetRadius(const reco::Track& tk, double bz) const; private: // Parameter set - edm::EDGetTokenT > theTrackCollectionToken; //! Track Collection Token + edm::EDGetTokenT theTrackCollectionToken; //! Track Collection Token std::string theDepositLabel; //! name for deposit double theDiff_r; //! transverse distance to vertex double theDiff_z; //! z distance to vertex diff --git a/RecoMuon/MuonIsolation/plugins/TrackExtractor.cc b/RecoMuon/MuonIsolation/plugins/TrackExtractor.cc index 48e0858b02e0e..942e22ab92d29 100644 --- a/RecoMuon/MuonIsolation/plugins/TrackExtractor.cc +++ b/RecoMuon/MuonIsolation/plugins/TrackExtractor.cc @@ -13,7 +13,7 @@ using namespace muonisolation; using reco::isodeposit::Direction; TrackExtractor::TrackExtractor( const ParameterSet& par, edm::ConsumesCollector && iC ) : - theTrackCollectionToken(iC.consumes >(par.getParameter("inputTrackCollection"))), + theTrackCollectionToken(iC.consumes(par.getParameter("inputTrackCollection"))), theDepositLabel(par.getUntrackedParameter("DepositLabel")), theDiff_r(par.getParameter("Diff_r")), theDiff_z(par.getParameter("Diff_z")), @@ -52,7 +52,7 @@ IsoDeposit TrackExtractor::deposit(const Event & event, const EventSetup & event deposit.setVeto( veto(muonDir) ); deposit.addCandEnergy(muon.pt()); - Handle > tracksH; + Handle tracksH; event.getByToken(theTrackCollectionToken, tracksH); // const TrackCollection tracks = *(tracksH.product()); LogTrace(metname)<<"***** TRACK COLLECTION SIZE: "<size(); diff --git a/RecoMuon/MuonIsolation/plugins/TrackExtractor.h b/RecoMuon/MuonIsolation/plugins/TrackExtractor.h index 511c401e1e803..168bd59a5addf 100644 --- a/RecoMuon/MuonIsolation/plugins/TrackExtractor.h +++ b/RecoMuon/MuonIsolation/plugins/TrackExtractor.h @@ -37,7 +37,7 @@ class TrackExtractor : public reco::isodeposit::IsoDepositExtractor { reco::IsoDeposit::Veto veto( const reco::IsoDeposit::Direction & dir) const; private: // Parameter set - edm::EDGetTokenT > theTrackCollectionToken; //! Track Collection Label + edm::EDGetTokenT theTrackCollectionToken; //! Track Collection Label std::string theDepositLabel; //! name for deposit double theDiff_r; //! transverse distance to vertex double theDiff_z; //! z distance to vertex diff --git a/RecoMuon/MuonIsolation/plugins/TrackSelector.cc b/RecoMuon/MuonIsolation/plugins/TrackSelector.cc index f160e74696c5a..1d4e655144ab6 100644 --- a/RecoMuon/MuonIsolation/plugins/TrackSelector.cc +++ b/RecoMuon/MuonIsolation/plugins/TrackSelector.cc @@ -9,17 +9,17 @@ TrackSelector::result_type TrackSelector::operator()(const TrackSelector::input_ { static const std::string metname = "MuonIsolation|TrackSelector"; result_type result; - for (input_type::const_iterator it = tracks.begin(); it != tracks.end(); it++) { + for (auto const& tk: tracks) { -// float tZ = it->vz(); -// float tD0 = fabs(it->d0()); -// float tD0Cor = fabs(it->dxy(thePars.beamPoint)); -// float tEta = it->eta(); -// float tPhi = it->phi(); -// unsigned int tHits = it->numberOfValidHits(); -// float tChi2Ndof = it->normalizedChi2(); -// float tChi2Prob = ChiSquaredProbability(it->chi2(), it->ndof()); -// float tPt = it->pt(); +// float tZ = tk.vz(); +// float tD0 = fabs(tk.d0()); +// float tD0Cor = fabs(tk.dxy(thePars.beamPoint)); +// float tEta = tk.eta(); +// float tPhi = tk.phi(); +// unsigned int tHits = tk.numberOfValidHits(); +// float tChi2Ndof = tk.normalizedChi2(); +// float tChi2Prob = ChiSquaredProbability(tk.chi2(), tk.ndof()); +// float tPt = tk.pt(); // LogTrace(metname)<<"Tk vz: "<vz(); - float tPt = it->pt(); - float tD0 = fabs(it->d0()); - float tD0Cor = fabs(it->dxy(thePars.beamPoint)); - float tEta = it->eta(); - float tPhi = it->phi(); - float tChi2Ndof = it->normalizedChi2(); + float tZ = tk.vz(); + float tPt = tk.pt(); + float tD0 = fabs(tk.d0()); + float tD0Cor = fabs(tk.dxy(thePars.beamPoint)); + float tEta = tk.eta(); + float tPhi = tk.phi(); + float tChi2Ndof = tk.normalizedChi2(); LogTrace(metname)<<"Tk vz: "< 0 ){ - unsigned int tHits = it->numberOfValidHits(); + unsigned int tHits = tk.numberOfValidHits(); LogTrace(metname)<<", nHits: "< 0){ - float tChi2Prob = ChiSquaredProbability(it->chi2(), it->ndof()); + float tChi2Prob = ChiSquaredProbability(tk.chi2(), tk.ndof()); LogTrace(metname)<<", chi2Prob: "< Range; typedef std::list result_type; - typedef edm::View input_type; + typedef reco::TrackCollection input_type; typedef reco::TrackBase::Point BeamPoint; //!config parameters