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

Consumes migration for JetAssociationProducers #1620

Merged
merged 2 commits into from
Nov 29, 2013
Merged

Consumes migration for JetAssociationProducers #1620

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
ecfc873
Consumes migration
thspeer Nov 28, 2013
cba8221
Consumes migration
thspeer Nov 28, 2013
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 RecoJets/JetAssociationProducers/interface/TrackExtrapolator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class TrackExtrapolator : public edm::EDProducer {

// ----------member data ---------------------------

edm::InputTag tracksSrc_; /// Input tracks
edm::EDGetTokenT<reco::TrackCollection> tracksSrc_; /// Input tracks
reco::TrackBase::TrackQuality trackQuality_; /// track quality of the tracks we care about


Expand Down
13 changes: 7 additions & 6 deletions RecoJets/JetAssociationProducers/src/JetExtender.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@

#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "DataFormats/Common/interface/View.h"
#include "DataFormats/JetReco/interface/Jet.h"
#include "DataFormats/JetReco/interface/JetExtendedAssociation.h"
#include "DataFormats/JetReco/interface/JetTracksAssociation.h"

#include "JetExtender.h"

Expand All @@ -20,6 +17,10 @@ JetExtender::JetExtender(const edm::ParameterSet& fConfig)
mJet2TracksAtVX (fConfig.getParameter<edm::InputTag> ("jet2TracksAtVX")),
mJet2TracksAtCALO (fConfig.getParameter<edm::InputTag> ("jet2TracksAtCALO"))
{
token_mJets = consumes<edm::View <reco::Jet> >(mJets);
if (!(mJet2TracksAtVX.label().empty())) token_mJet2TracksAtVX = consumes<reco::JetTracksAssociation::Container> (mJet2TracksAtVX);
if (!(mJet2TracksAtCALO.label().empty())) token_mJet2TracksAtCALO = consumes<reco::JetTracksAssociation::Container> (mJet2TracksAtCALO);

produces<reco::JetExtendedAssociation::Container> ();
}

Expand All @@ -28,11 +29,11 @@ JetExtender::~JetExtender() {}
void JetExtender::produce(edm::Event& fEvent, const edm::EventSetup& fSetup) {
// get stuff from Event
edm::Handle <edm::View <reco::Jet> > jets_h;
fEvent.getByLabel (mJets, jets_h);
fEvent.getByToken (token_mJets, jets_h);
edm::Handle <reco::JetTracksAssociation::Container> j2tVX_h;
if (!(mJet2TracksAtVX.label().empty())) fEvent.getByLabel (mJet2TracksAtVX, j2tVX_h);
if (!(mJet2TracksAtVX.label().empty())) fEvent.getByToken (token_mJet2TracksAtVX, j2tVX_h);
edm::Handle <reco::JetTracksAssociation::Container> j2tCALO_h;
if (!(mJet2TracksAtCALO.label().empty())) fEvent.getByLabel (mJet2TracksAtCALO, j2tCALO_h);
if (!(mJet2TracksAtCALO.label().empty())) fEvent.getByToken (token_mJet2TracksAtCALO, j2tCALO_h);

std::auto_ptr<reco::JetExtendedAssociation::Container>
jetExtender (new reco::JetExtendedAssociation::Container (reco::JetRefBaseProd(jets_h)));
Expand Down
6 changes: 6 additions & 0 deletions RecoJets/JetAssociationProducers/src/JetExtender.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
#include "DataFormats/Common/interface/EDProductfwd.h"
#include "FWCore/Utilities/interface/InputTag.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "DataFormats/Common/interface/View.h"
#include "DataFormats/JetReco/interface/Jet.h"
#include "DataFormats/JetReco/interface/JetTracksAssociation.h"

class JetExtender : public edm::EDProducer {
public:
Expand All @@ -21,6 +24,9 @@ class JetExtender : public edm::EDProducer {
virtual void produce(edm::Event&, const edm::EventSetup&);

private:
edm::EDGetTokenT<edm::View <reco::Jet>> token_mJets;
edm::EDGetTokenT<reco::JetTracksAssociation::Container > token_mJet2TracksAtVX;
edm::EDGetTokenT<reco::JetTracksAssociation::Container > token_mJet2TracksAtCALO;
edm::InputTag mJets;
edm::InputTag mJet2TracksAtVX;
edm::InputTag mJet2TracksAtCALO;
Expand Down
10 changes: 5 additions & 5 deletions RecoJets/JetAssociationProducers/src/JetSignalVertexCompatibility.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ using namespace reco;
JetSignalVertexCompatibility::JetSignalVertexCompatibility(
const edm::ParameterSet &params) :
algo(params.getParameter<double>("cut"),
params.getParameter<double>("temperature")),
jetTracksAssocLabel(params.getParameter<edm::InputTag>("jetTracksAssoc")),
primaryVerticesLabel(params.getParameter<edm::InputTag>("primaryVertices"))
params.getParameter<double>("temperature"))
{
jetTracksAssocToken = consumes<JetTracksAssociationCollection>(params.getParameter<edm::InputTag>("jetTracksAssoc"));
primaryVerticesToken = consumes<VertexCollection>(params.getParameter<edm::InputTag>("primaryVertices"));
produces<JetFloatAssociation::Container>();
}

Expand All @@ -46,10 +46,10 @@ void JetSignalVertexCompatibility::produce(edm::Event &event,
algo.resetEvent(trackBuilder.product());

edm::Handle<JetTracksAssociationCollection> jetTracksAssoc;
event.getByLabel(jetTracksAssocLabel, jetTracksAssoc);
event.getByToken(jetTracksAssocToken, jetTracksAssoc);

edm::Handle<VertexCollection> primaryVertices;
event.getByLabel(primaryVerticesLabel, primaryVertices);
event.getByToken(primaryVerticesToken, primaryVertices);

std::auto_ptr<JetFloatAssociation::Container> result(
new JetFloatAssociation::Container(jetTracksAssoc->keyProduct()));
Expand Down
6 changes: 4 additions & 2 deletions RecoJets/JetAssociationProducers/src/JetSignalVertexCompatibility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "FWCore/Utilities/interface/InputTag.h"

#include "RecoJets/JetAssociationAlgorithms/interface/JetSignalVertexCompatibilityAlgo.h"
#include "DataFormats/VertexReco/interface/VertexFwd.h"

class JetSignalVertexCompatibility : public edm::EDProducer {
public:
Expand All @@ -19,8 +20,9 @@ class JetSignalVertexCompatibility : public edm::EDProducer {
private:
reco::JetSignalVertexCompatibilityAlgo algo;

const edm::InputTag jetTracksAssocLabel;
const edm::InputTag primaryVerticesLabel;
edm::EDGetTokenT<reco::JetTracksAssociationCollection> jetTracksAssocToken;
edm::EDGetTokenT<reco::VertexCollection> primaryVerticesToken;

};

#endif // JetSignalVertexCompatibility_h
13 changes: 6 additions & 7 deletions RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtCaloFace.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,21 @@
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
#include "FWCore/Framework/interface/Event.h"
#include "DataFormats/Common/interface/View.h"
#include "DataFormats/JetReco/interface/Jet.h"
#include "DataFormats/JetReco/interface/CaloJet.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/JetReco/interface/JetTracksAssociation.h"



#include "JetTracksAssociatorAtCaloFace.h"

JetTracksAssociatorAtCaloFace::JetTracksAssociatorAtCaloFace(const edm::ParameterSet& fConfig)
: mJets (fConfig.getParameter<edm::InputTag> ("jets")),
mExtrapolations (fConfig.getParameter<edm::InputTag> ("extrapolations")),
firstRun(true),
: firstRun(true),
dR_(fConfig.getParameter<double>("coneSize"))
{
mJets = consumes<edm::View <reco::Jet> >(fConfig.getParameter<edm::InputTag> ("jets"));
mExtrapolations = consumes<std::vector<reco::TrackExtrapolation> >(fConfig.getParameter<edm::InputTag> ("extrapolations")),

produces<reco::JetTracksAssociation::Container> ();
}

Expand All @@ -44,9 +43,9 @@ void JetTracksAssociatorAtCaloFace::produce(edm::Event& fEvent, const edm::Event

// get stuff from Event
edm::Handle <edm::View <reco::Jet> > jets_h;
fEvent.getByLabel (mJets, jets_h);
fEvent.getByToken (mJets, jets_h);
edm::Handle <std::vector<reco::TrackExtrapolation> > extrapolations_h;
fEvent.getByLabel (mExtrapolations, extrapolations_h);
fEvent.getByToken (mExtrapolations, extrapolations_h);

// Check to make sure we have inputs
if ( jets_h->size() == 0 ) return;
Expand Down
6 changes: 4 additions & 2 deletions RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtCaloFace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

#include "FWCore/Framework/interface/ESHandle.h"
#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
#include "DataFormats/Common/interface/View.h"
#include "DataFormats/JetReco/interface/JetTracksAssociation.h"

class JetTracksAssociatorAtCaloFace : public edm::EDProducer {
public:
Expand All @@ -27,8 +29,8 @@ class JetTracksAssociatorAtCaloFace : public edm::EDProducer {

JetTracksAssociatorAtCaloFace(){}

edm::InputTag mJets;
edm::InputTag mExtrapolations;
edm::EDGetTokenT<edm::View <reco::Jet>> mJets;
edm::EDGetTokenT<std::vector<reco::TrackExtrapolation> > mExtrapolations;
JetTracksAssociationXtrpCalo mAssociator;
edm::ESHandle<CaloGeometry> pGeo;
bool firstRun;
Expand Down
15 changes: 7 additions & 8 deletions RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtVertex.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,15 @@
#include "JetTracksAssociatorAtVertex.h"

JetTracksAssociatorAtVertex::JetTracksAssociatorAtVertex(const edm::ParameterSet& fConfig)
: mJets (fConfig.getParameter<edm::InputTag> ("jets")),
mTracks (fConfig.getParameter<edm::InputTag> ("tracks")),
mAssociator (fConfig.getParameter<double> ("coneSize")),
: mAssociator (fConfig.getParameter<double> ("coneSize")),
mAssociatorAssigned (fConfig.getParameter<double> ("coneSize")),
useAssigned(false), pvSrc()
{

mJets = consumes<edm::View <reco::Jet> >(fConfig.getParameter<edm::InputTag> ("jets"));
mTracks = consumes<reco::TrackCollection>(fConfig.getParameter<edm::InputTag>("tracks"));
if ( fConfig.exists("useAssigned") ) {
useAssigned = fConfig.getParameter<bool> ("useAssigned");
pvSrc = fConfig.getParameter<edm::InputTag> ("pvSrc");
pvSrc = consumes<reco::VertexCollection>(fConfig.getParameter<edm::InputTag> ("pvSrc"));
}

produces<reco::JetTracksAssociation::Container> ();
Expand All @@ -35,9 +34,9 @@ JetTracksAssociatorAtVertex::~JetTracksAssociatorAtVertex() {}

void JetTracksAssociatorAtVertex::produce(edm::Event& fEvent, const edm::EventSetup& fSetup) {
edm::Handle <edm::View <reco::Jet> > jets_h;
fEvent.getByLabel (mJets, jets_h);
fEvent.getByToken (mJets, jets_h);
edm::Handle <reco::TrackCollection> tracks_h;
fEvent.getByLabel (mTracks, tracks_h);
fEvent.getByToken (mTracks, tracks_h);

std::auto_ptr<reco::JetTracksAssociation::Container> jetTracks (new reco::JetTracksAssociation::Container (reco::JetRefBaseProd(jets_h)));

Expand All @@ -55,7 +54,7 @@ void JetTracksAssociatorAtVertex::produce(edm::Event& fEvent, const edm::EventSe
mAssociator.produce (&*jetTracks, allJets, allTracks);
} else {
edm::Handle<reco::VertexCollection> pvHandle;
fEvent.getByLabel(pvSrc,pvHandle);
fEvent.getByToken(pvSrc,pvHandle);
const reco::VertexCollection & vertices = *pvHandle.product();
mAssociatorAssigned.produce (&*jetTracks, allJets, allTracks,vertices);
}
Expand Down
7 changes: 4 additions & 3 deletions RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtVertex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ class JetTracksAssociatorAtVertex : public edm::EDProducer {
virtual void produce(edm::Event&, const edm::EventSetup&);

private:
edm::InputTag mJets;
edm::InputTag mTracks;
edm::EDGetTokenT<edm::View <reco::Jet>> mJets;
edm::EDGetTokenT<reco::TrackCollection> mTracks;

int mTrackQuality;
JetTracksAssociationDRVertex mAssociator;
JetTracksAssociationDRVertexAssigned mAssociatorAssigned;
bool useAssigned; /// if true, use the track/jet association with vertex assignment to tracks
edm::InputTag pvSrc; /// if useAssigned, will read this PV collection.
edm::EDGetTokenT<reco::VertexCollection> pvSrc; /// if useAssigned, will read this PV collection.
};

#endif
10 changes: 5 additions & 5 deletions RecoJets/JetAssociationProducers/src/JetTracksAssociatorExplicit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#include "JetTracksAssociatorExplicit.h"

JetTracksAssociatorExplicit::JetTracksAssociatorExplicit(const edm::ParameterSet& fConfig)
: mJets (fConfig.getParameter<edm::InputTag> ("jets")),
mTracks (fConfig.getParameter<edm::InputTag> ("tracks")),
mAssociatorExplicit ()
: mAssociatorExplicit ()
{
mJets = consumes<edm::View <reco::Jet> >(fConfig.getParameter<edm::InputTag> ("jets"));
mTracks = consumes<reco::TrackCollection>(fConfig.getParameter<edm::InputTag>("tracks"));

produces<reco::JetTracksAssociation::Container> ();
}
Expand All @@ -28,9 +28,9 @@ JetTracksAssociatorExplicit::~JetTracksAssociatorExplicit() {}

void JetTracksAssociatorExplicit::produce(edm::Event& fEvent, const edm::EventSetup& fSetup) {
edm::Handle <edm::View <reco::Jet> > jets_h;
fEvent.getByLabel (mJets, jets_h);
fEvent.getByToken (mJets, jets_h);
edm::Handle <reco::TrackCollection> tracks_h;
fEvent.getByLabel (mTracks, tracks_h);
fEvent.getByToken (mTracks, tracks_h);

std::auto_ptr<reco::JetTracksAssociation::Container> jetTracks (new reco::JetTracksAssociation::Container (reco::JetRefBaseProd(jets_h)));

Expand Down
4 changes: 2 additions & 2 deletions RecoJets/JetAssociationProducers/src/JetTracksAssociatorExplicit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ class JetTracksAssociatorExplicit : public edm::EDProducer {
virtual void produce(edm::Event&, const edm::EventSetup&);

private:
edm::InputTag mJets;
edm::InputTag mTracks;
edm::EDGetTokenT<edm::View <reco::Jet>> mJets;
edm::EDGetTokenT<reco::TrackCollection> mTracks;
JetTracksAssociationExplicit mAssociatorExplicit;
};

Expand Down
6 changes: 3 additions & 3 deletions RecoJets/JetAssociationProducers/src/TrackExtrapolator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
//
// constructors and destructor
//
TrackExtrapolator::TrackExtrapolator(const edm::ParameterSet& iConfig) :
tracksSrc_(iConfig.getParameter<edm::InputTag> ("trackSrc"))
TrackExtrapolator::TrackExtrapolator(const edm::ParameterSet& iConfig)
{
tracksSrc_ = consumes<reco::TrackCollection>(iConfig.getParameter<edm::InputTag>("trackSrc"));
trackQuality_ =
reco::TrackBase::qualityByName (iConfig.getParameter<std::string> ("trackQuality"));
if (trackQuality_ == reco::TrackBase::undefQuality) { // we have a problem
Expand Down Expand Up @@ -48,7 +48,7 @@ TrackExtrapolator::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)

// get stuff from Event
edm::Handle <reco::TrackCollection> tracks_h;
iEvent.getByLabel (tracksSrc_, tracks_h);
iEvent.getByToken (tracksSrc_, tracks_h);

std::auto_ptr< std::vector<reco::TrackExtrapolation> > extrapolations( new std::vector<reco::TrackExtrapolation>() );

Expand Down
21 changes: 13 additions & 8 deletions RecoJets/JetAssociationProducers/test/PileupJetAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ class PileupJetAnalyzer : public edm::EDAnalyzer {
private:
TNtuple *ntuple;

const edm::InputTag jetTracksAssocLabel;
const edm::InputTag jetTagLabel;
edm::EDGetTokenT<JetTracksAssociationCollection> jetTracksAssocToken;
edm::EDGetTokenT<JetFloatAssociation::Container> jetTagToken;
edm::EDGetTokenT<edm::SimTrackContainer> tokenSimTrack;
edm::EDGetTokenT<edm::SimVertexContainer> tokenSimVertex;
const double signalFraction;
const double jetMinE;
const double jetMinEt;
Expand All @@ -54,14 +56,17 @@ class PileupJetAnalyzer : public edm::EDAnalyzer {
};

PileupJetAnalyzer::PileupJetAnalyzer(const edm::ParameterSet &params) :
jetTracksAssocLabel(params.getParameter<edm::InputTag>("jetTracksAssoc")),
jetTagLabel(params.getParameter<edm::InputTag>("jetTagLabel")),
signalFraction(params.getParameter<double>("signalFraction")),
jetMinE(params.getParameter<double>("jetMinE")),
jetMinEt(params.getParameter<double>("jetMinEt")),
jetMaxEta(params.getParameter<double>("jetMaxEta")),
trackPtLimit(params.getParameter<double>("trackPtLimit"))
{
jetTracksAssocToken = consumes<JetTracksAssociationCollection>(params.getParameter<edm::InputTag>("jetTracksAssoc"));
jetTagToken = consumes<JetFloatAssociation::Container>(params.getParameter<edm::InputTag>("jetTagLabel"));
tokenSimTrack = consumes<edm::SimTrackContainer>(edm::InputTag("famosSimHits"));
tokenSimVertex = consumes<edm::SimVertexContainer>(edm::InputTag("famosSimHits"));

edm::Service<TFileService> fs;
ntuple = fs->make<TNtuple>("jets", "", "mc:tag:et:eta");
}
Expand All @@ -74,16 +79,16 @@ void PileupJetAnalyzer::analyze(const edm::Event &event,
const edm::EventSetup &es)
{
edm::Handle<JetTracksAssociationCollection> jetTracksAssoc;
event.getByLabel(jetTracksAssocLabel, jetTracksAssoc);
event.getByToken(jetTracksAssocToken, jetTracksAssoc);

edm::Handle<JetFloatAssociation::Container> jetTags;
event.getByLabel(jetTagLabel, jetTags);
event.getByToken(jetTagToken, jetTags);

edm::Handle<edm::SimTrackContainer> simTracks;
event.getByLabel("famosSimHits", simTracks);
event.getByToken(tokenSimTrack, simTracks);

edm::Handle<edm::SimVertexContainer> simVertices;
event.getByLabel("famosSimHits", simVertices);
event.getByToken(tokenSimVertex, simVertices);

// find vertices in all jets
for(JetTracksAssociationCollection::const_iterator iter =
Expand Down