Skip to content

Commit 8a12a98

Browse files
ktfktf
committed
Merge pull request cms-sw#2037 from deguio/fixingAtanasPulls
DQM fixes -- Consumes migration for several packages
2 parents 477f5e7 + a9fe95e commit 8a12a98

11 files changed

+116
-100
lines changed

‎DQM/SiStripCommon/test/plugins/Test_SiStrip_HistId.cc

+9-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,20 @@ class Test_SiStrip_HistId : public edm::EDAnalyzer {
2727

2828
virtual void analyze(const edm::Event&, const edm::EventSetup&);
2929
private:
30+
31+
#ifdef THIS_IS_AN_EVENTSETUP_EXAMPLE
32+
EDGetTokenT<ExampleData> example_;
33+
#endif
34+
3035
// ----------member data ---------------------------
3136
};
3237

3338
Test_SiStrip_HistId::Test_SiStrip_HistId(const edm::ParameterSet& iConfig)
3439
{
3540
//now do what ever initialization is needed
36-
41+
#ifdef THIS_IS_AN_EVENTSETUP_EXAMPLE
42+
example_ = consumes<ExampleData>(edm::InputTag("data"));
43+
#endif
3744
}
3845

3946

@@ -46,7 +53,7 @@ void Test_SiStrip_HistId::analyze(const edm::Event& iEvent, const edm::EventSetu
4653
{
4754
#ifdef THIS_IS_AN_EVENT_EXAMPLE
4855
edm::Handle<ExampleData> pIn;
49-
iEvent.getByLabel("example",pIn);
56+
iEvent.getByToken(example_,pIn);
5057
#endif
5158

5259
#ifdef THIS_IS_AN_EVENTSETUP_EXAMPLE

‎DQMOffline/Alignment/interface/MuonAlignment.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,12 @@ class MuonAlignment : public edm::EDAnalyzer {
122122
RecHitVector doMatching(const reco::Track &, edm::Handle<DTRecSegment4DCollection> &, edm::Handle<CSCSegmentCollection> &, intDVector *, intDVector *, edm::ESHandle<GlobalTrackingGeometry> &);
123123

124124
// Muon Track Label
125-
edm::InputTag theMuonCollectionLabel;
125+
edm::EDGetTokenT<reco::TrackCollection> theMuonCollectionLabel;
126+
127+
edm::EDGetTokenT<DTRecSegment4DCollection> theRecHits4DTagDT;
128+
129+
edm::EDGetTokenT<CSCSegmentCollection> theRecHits4DTagCSC;
126130

127-
edm::InputTag theRecHits4DTagDT;
128-
edm::InputTag theRecHits4DTagCSC;
129131
std::string trackRefitterType;
130132

131133
// residual histos residual range

‎DQMOffline/Alignment/interface/TkAlCaRecoMonitor.h

+7-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ Monitoring special quantities related to Tracker Alignment AlCaReco Production.
2222
#include "FWCore/ServiceRegistry/interface/Service.h"
2323
#include "DQMServices/Core/interface/MonitorElement.h"
2424

25+
//DataFormats
26+
#include <DataFormats/JetReco/interface/CaloJet.h>
27+
28+
2529
class TrackerGeometry;
2630
class DQMStore;
2731

@@ -65,8 +69,9 @@ class TkAlCaRecoMonitor : public edm::EDAnalyzer {
6569
bool runsOnReco_;
6670
bool useSignedR_;
6771

68-
edm::InputTag trackProducer_;
69-
edm::InputTag referenceTrackProducer_;
72+
edm::EDGetTokenT<reco::TrackCollection> trackProducer_;
73+
edm::EDGetTokenT<reco::TrackCollection> referenceTrackProducer_;
74+
edm::EDGetTokenT<reco::CaloJetCollection> jetCollection_;
7075
double daughterMass_;
7176
std::map<int,int> binByRawId_;
7277
};

‎DQMOffline/Alignment/src/MuonAlignment.cc

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ MuonAlignment::MuonAlignment(const edm::ParameterSet& pSet) {
1616

1717
parameters = pSet;
1818

19-
theMuonCollectionLabel = parameters.getParameter<edm::InputTag>("MuonCollection");
19+
theMuonCollectionLabel = consumes<reco::TrackCollection>(parameters.getParameter<edm::InputTag>("MuonCollection"));
2020

21-
theRecHits4DTagDT = parameters.getParameter<edm::InputTag>("RecHits4DDTCollectionTag");
22-
theRecHits4DTagCSC = parameters.getParameter<edm::InputTag>("RecHits4DCSCCollectionTag");
21+
theRecHits4DTagDT = consumes<DTRecSegment4DCollection>(parameters.getParameter<edm::InputTag>("RecHits4DDTCollectionTag"));
22+
theRecHits4DTagCSC = consumes<CSCSegmentCollection>(parameters.getParameter<edm::InputTag>("RecHits4DCSCCollectionTag"));
2323

2424
resLocalXRangeStation1 = parameters.getUntrackedParameter<double>("resLocalXRangeStation1");
2525
resLocalXRangeStation2 = parameters.getUntrackedParameter<double>("resLocalXRangeStation2");
@@ -238,16 +238,16 @@ void MuonAlignment::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe
238238

239239
// Get the RecoMuons collection from the event
240240
edm::Handle<reco::TrackCollection> muons;
241-
iEvent.getByLabel(theMuonCollectionLabel, muons);
241+
iEvent.getByToken(theMuonCollectionLabel, muons);
242242

243243
// Get the 4D DTSegments
244244
edm::Handle<DTRecSegment4DCollection> all4DSegmentsDT;
245-
iEvent.getByLabel(theRecHits4DTagDT, all4DSegmentsDT);
245+
iEvent.getByToken(theRecHits4DTagDT, all4DSegmentsDT);
246246
DTRecSegment4DCollection::const_iterator segmentDT;
247247

248248
// Get the 4D CSCSegments
249249
edm::Handle<CSCSegmentCollection> all4DSegmentsCSC;
250-
iEvent.getByLabel(theRecHits4DTagCSC, all4DSegmentsCSC);
250+
iEvent.getByToken(theRecHits4DTagCSC, all4DSegmentsCSC);
251251
CSCSegmentCollection::const_iterator segmentCSC;
252252

253253
//Vectors used to perform the matching between Segments and hits from Track

‎DQMOffline/Alignment/src/TkAlCaRecoMonitor.cc

+12-10
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@
1818
#include "DQMServices/Core/interface/DQMStore.h"
1919
#include "DQMOffline/Alignment/interface/TkAlCaRecoMonitor.h"
2020

21-
#include <DataFormats/JetReco/interface/CaloJet.h>
2221
#include <DataFormats/Math/interface/deltaR.h>
2322

2423
#include <string>
2524
//#include <sstream>
2625
#include "TLorentzVector.h"
2726

2827
TkAlCaRecoMonitor::TkAlCaRecoMonitor(const edm::ParameterSet& iConfig) {
29-
dqmStore_ = edm::Service<DQMStore>().operator->();
3028
conf_ = iConfig;
29+
trackProducer_ = consumes<reco::TrackCollection>(conf_.getParameter<edm::InputTag>("TrackProducer"));
30+
referenceTrackProducer_ = consumes<reco::TrackCollection>(conf_.getParameter<edm::InputTag>("ReferenceTrackProducer"));
31+
jetCollection_ = mayConsume<reco::CaloJetCollection>(conf_.getParameter<edm::InputTag>("CaloJetCollection"));
32+
33+
dqmStore_ = edm::Service<DQMStore>().operator->();
3134
}
3235

3336
TkAlCaRecoMonitor::~TkAlCaRecoMonitor() { }
@@ -36,9 +39,6 @@ void TkAlCaRecoMonitor::beginJob() {
3639

3740
std::string histname; //for naming the histograms according to algorithm used
3841

39-
trackProducer_ = conf_.getParameter<edm::InputTag>("TrackProducer");
40-
referenceTrackProducer_ = conf_.getParameter<edm::InputTag>("ReferenceTrackProducer");
41-
4242
std::string AlgoName = conf_.getParameter<std::string>("AlgoName");
4343
std::string MEFolderName = conf_.getParameter<std::string>("FolderName");
4444

@@ -142,7 +142,10 @@ void TkAlCaRecoMonitor::beginJob() {
142142

143143
histname = "AlCaRecoTrackEfficiency_";
144144
AlCaRecoTrackEfficiency_ = dqmStore_->book1D(histname+AlgoName, histname+AlgoName, TrackEfficiencyBin, TrackEfficiencyMin, TrackEfficiencyMax);
145-
AlCaRecoTrackEfficiency_->setAxisTitle("n("+trackProducer_.label()+") / n("+referenceTrackProducer_.label()+")");
145+
Labels l_tp, l_rtp;
146+
labelsForToken(referenceTrackProducer_, l_rtp);
147+
labelsForToken(trackProducer_, l_tp);
148+
AlCaRecoTrackEfficiency_->setAxisTitle("n("+std::string(l_tp.module)+") / n("+std::string(l_rtp.module)+")");
146149

147150
int zBin = conf_.getParameter<unsigned int>("HitMapsZBin"); //300
148151
double zMax = conf_.getParameter<double>("HitMapZMax"); //300.0; //cm
@@ -184,14 +187,14 @@ void TkAlCaRecoMonitor::beginJob() {
184187
void TkAlCaRecoMonitor::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
185188

186189
edm::Handle<reco::TrackCollection> trackCollection;
187-
iEvent.getByLabel(trackProducer_, trackCollection);
190+
iEvent.getByToken(trackProducer_, trackCollection);
188191
if (!trackCollection.isValid()){
189192
edm::LogError("Alignment")<<"invalid trackcollection encountered!";
190193
return;
191194
}
192195

193196
edm::Handle<reco::TrackCollection> referenceTrackCollection;
194-
iEvent.getByLabel(referenceTrackProducer_, referenceTrackCollection);
197+
iEvent.getByToken(referenceTrackProducer_, referenceTrackCollection);
195198
if (!trackCollection.isValid()){
196199
edm::LogError("Alignment")<<"invalid reference track-collection encountered!";
197200
return;
@@ -212,8 +215,7 @@ void TkAlCaRecoMonitor::analyze(const edm::Event& iEvent, const edm::EventSetup&
212215

213216
edm::Handle<reco::CaloJetCollection> jets;
214217
if(runsOnReco_){
215-
edm::InputTag jetCollection = conf_.getParameter<edm::InputTag>("CaloJetCollection");
216-
iEvent.getByLabel(jetCollection, jets);
218+
iEvent.getByToken(jetCollection_, jets);
217219
if(! jets.isValid()){
218220
edm::LogError("Alignment")<<"no jet collection found in event!";
219221
}

‎DQMOffline/EGamma/plugins/ElectronAnalyzer.cc

+18-29
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
66
#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
77
#include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
8-
#include "DataFormats/VertexReco/interface/VertexFwd.h"
9-
#include "DataFormats/VertexReco/interface/Vertex.h"
108
#include "DataFormats/Common/interface/Handle.h"
119
#include "DataFormats/BeamSpot/interface/BeamSpot.h"
1210
#include "DataFormats/Common/interface/TriggerResults.h"
@@ -32,12 +30,12 @@ ElectronAnalyzer::ElectronAnalyzer( const edm::ParameterSet & conf )
3230
{
3331
// general, collections
3432
Selection_ = conf.getParameter<int>("Selection");
35-
electronCollection_ = conf.getParameter<edm::InputTag>("ElectronCollection");
36-
matchingObjectCollection_ = conf.getParameter<edm::InputTag>("MatchingObjectCollection");
37-
trackCollection_ = conf.getParameter<edm::InputTag>("TrackCollection");
38-
vertexCollection_ = conf.getParameter<edm::InputTag>("VertexCollection");
39-
gsftrackCollection_ = conf.getParameter<edm::InputTag>("GsfTrackCollection");
40-
beamSpotTag_ = conf.getParameter<edm::InputTag>("BeamSpot");
33+
electronCollection_ = consumes<GsfElectronCollection>(conf.getParameter<edm::InputTag>("ElectronCollection"));
34+
matchingObjectCollection_ = consumes<SuperClusterCollection>(conf.getParameter<edm::InputTag>("MatchingObjectCollection"));
35+
trackCollection_ = consumes<TrackCollection>(conf.getParameter<edm::InputTag>("TrackCollection"));
36+
vertexCollection_ = consumes<VertexCollection>(conf.getParameter<edm::InputTag>("VertexCollection"));
37+
gsftrackCollection_ = consumes<GsfTrackCollection>(conf.getParameter<edm::InputTag>("GsfTrackCollection"));
38+
beamSpotTag_ = consumes<BeamSpot>(conf.getParameter<edm::InputTag>("BeamSpot"));
4139
readAOD_ = conf.getParameter<bool>("ReadAOD");
4240

4341
// matching
@@ -282,10 +280,12 @@ void ElectronAnalyzer::book()
282280

283281
// matching object
284282
std::string matchingObjectType ;
285-
if (std::string::npos!=matchingObjectCollection_.label().find("SuperCluster",0))
286-
{ matchingObjectType = "SC" ; }
283+
Labels l;
284+
labelsForToken(matchingObjectCollection_,l);
285+
if (std::string::npos != std::string(l.module).find("SuperCluster",0))
286+
{ matchingObjectType = "SC" ; }
287287
if (matchingObjectType=="")
288-
{ edm::LogError("ElectronMcFakeValidator::beginJob")<<"Unknown matching object type !" ; }
288+
{ edm::LogError("ElectronMcFakeValidator::beginJob")<<"Unknown matching object type !" ; }
289289
else
290290
{ edm::LogInfo("ElectronMcFakeValidator::beginJob")<<"Matching object type: "<<matchingObjectType ; }
291291
// std::string htitle = "# "+matchingObjectType+"s", xtitle = "N_{"+matchingObjectType+"}" ;
@@ -317,30 +317,19 @@ void ElectronAnalyzer::book()
317317
void ElectronAnalyzer::analyze( const edm::Event& iEvent, const edm::EventSetup & iSetup )
318318
{
319319
nEvents_++ ;
320-
// if (!trigger(iEvent)) return ;
321-
// nAfterTrigger_++ ;
322-
323-
// edm::Handle<SuperClusterCollection> barrelSCs ;
324-
// iEvent.getByLabel("correctedHybridSuperClusters",barrelSCs) ;
325-
// edm::Handle<SuperClusterCollection> endcapsSCs ;
326-
// iEvent.getByLabel("correctedMulti5x5SuperClustersWithPreshower",endcapsSCs) ;
327-
// std::cout<<"[ElectronMcSignalValidator::analyze]"
328-
// <<"Event "<<iEvent.id()
329-
// <<" has "<<barrelSCs.product()->size()<<" barrel superclusters"
330-
// <<" and "<<endcapsSCs.product()->size()<<" endcaps superclusters" ;
331-
//
320+
332321
edm::Handle<GsfElectronCollection> gsfElectrons ;
333-
iEvent.getByLabel(electronCollection_,gsfElectrons) ;
322+
iEvent.getByToken(electronCollection_,gsfElectrons) ;
334323
edm::Handle<reco::SuperClusterCollection> recoClusters ;
335-
iEvent.getByLabel(matchingObjectCollection_,recoClusters) ;
324+
iEvent.getByToken(matchingObjectCollection_,recoClusters) ;
336325
edm::Handle<reco::TrackCollection> tracks;
337-
iEvent.getByLabel(trackCollection_,tracks);
326+
iEvent.getByToken(trackCollection_,tracks);
338327
edm::Handle<reco::GsfTrackCollection> gsfTracks;
339-
iEvent.getByLabel(gsftrackCollection_,gsfTracks);
328+
iEvent.getByToken(gsftrackCollection_,gsfTracks);
340329
edm::Handle<reco::VertexCollection> vertices;
341-
iEvent.getByLabel(vertexCollection_,vertices);
330+
iEvent.getByToken(vertexCollection_,vertices);
342331
edm::Handle<reco::BeamSpot> recoBeamSpotHandle ;
343-
iEvent.getByLabel(beamSpotTag_,recoBeamSpotHandle) ;
332+
iEvent.getByToken(beamSpotTag_,recoBeamSpotHandle) ;
344333
const BeamSpot bs = *recoBeamSpotHandle ;
345334

346335
int ievt = iEvent.id().event();

‎DQMOffline/EGamma/plugins/ElectronAnalyzer.h

+10-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
1111
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
1212

13+
#include "DataFormats/VertexReco/interface/VertexFwd.h"
14+
#include "DataFormats/VertexReco/interface/Vertex.h"
15+
16+
1317
class MagneticField ;
1418

1519
#include "FWCore/Framework/interface/Event.h"
@@ -34,12 +38,12 @@ class ElectronAnalyzer : public ElectronDqmAnalyzerBase
3438

3539
// general, collections
3640
int Selection_;
37-
edm::InputTag electronCollection_;
38-
edm::InputTag matchingObjectCollection_;
39-
edm::InputTag gsftrackCollection_;
40-
edm::InputTag trackCollection_;
41-
edm::InputTag vertexCollection_;
42-
edm::InputTag beamSpotTag_;
41+
edm::EDGetTokenT<reco::GsfElectronCollection> electronCollection_;
42+
edm::EDGetTokenT<reco::SuperClusterCollection> matchingObjectCollection_;
43+
edm::EDGetTokenT<reco::GsfTrackCollection> gsftrackCollection_;
44+
edm::EDGetTokenT<reco::TrackCollection> trackCollection_;
45+
edm::EDGetTokenT<reco::VertexCollection> vertexCollection_;
46+
edm::EDGetTokenT<reco::BeamSpot> beamSpotTag_;
4347
bool readAOD_; //NEW
4448

4549
// matching

‎DQMOffline/EGamma/plugins/ElectronGeneralAnalyzer.cc

+14-16
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
77
#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
88
#include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
9-
#include "DataFormats/VertexReco/interface/VertexFwd.h"
10-
#include "DataFormats/VertexReco/interface/Vertex.h"
119
#include "DataFormats/Common/interface/Handle.h"
1210
#include "DataFormats/BeamSpot/interface/BeamSpot.h"
1311
#include "DataFormats/Common/interface/TriggerResults.h"
@@ -30,13 +28,13 @@ ElectronGeneralAnalyzer::ElectronGeneralAnalyzer( const edm::ParameterSet & conf
3028
: ElectronDqmAnalyzerBase(conf)
3129
{
3230
// collection input tags
33-
electronCollection_ = conf.getParameter<edm::InputTag>("ElectronCollection");
34-
matchingObjectCollection_ = conf.getParameter<edm::InputTag>("MatchingObjectCollection");
35-
trackCollection_ = conf.getParameter<edm::InputTag>("TrackCollection");
36-
vertexCollection_ = conf.getParameter<edm::InputTag>("VertexCollection");
37-
gsftrackCollection_ = conf.getParameter<edm::InputTag>("GsfTrackCollection");
38-
beamSpotTag_ = conf.getParameter<edm::InputTag>("BeamSpot");
39-
triggerResults_ = conf.getParameter<edm::InputTag>("TriggerResults");
31+
electronCollection_ = consumes<GsfElectronCollection>(conf.getParameter<edm::InputTag>("ElectronCollection"));
32+
matchingObjectCollection_ = consumes<reco::SuperClusterCollection>(conf.getParameter<edm::InputTag>("MatchingObjectCollection"));
33+
trackCollection_ = consumes<reco::TrackCollection>(conf.getParameter<edm::InputTag>("TrackCollection"));
34+
vertexCollection_ = consumes<reco::VertexCollection>(conf.getParameter<edm::InputTag>("VertexCollection"));
35+
gsftrackCollection_ = consumes<reco::GsfTrackCollection>(conf.getParameter<edm::InputTag>("GsfTrackCollection"));
36+
beamSpotTag_ = consumes<reco::BeamSpot>(conf.getParameter<edm::InputTag>("BeamSpot"));
37+
triggerResults_ = consumes<edm::TriggerResults>(conf.getParameter<edm::InputTag>("TriggerResults"));
4038

4139
// // for trigger
4240
// HLTPathsByName_= conf.getParameter<std::vector<std::string > >("HltPaths");
@@ -60,17 +58,17 @@ void ElectronGeneralAnalyzer::book()
6058
void ElectronGeneralAnalyzer::analyze( const edm::Event& iEvent, const edm::EventSetup & iSetup )
6159
{
6260
edm::Handle<GsfElectronCollection> gsfElectrons ;
63-
iEvent.getByLabel(electronCollection_,gsfElectrons) ;
61+
iEvent.getByToken(electronCollection_,gsfElectrons) ;
6462
edm::Handle<reco::SuperClusterCollection> recoClusters ;
65-
iEvent.getByLabel(matchingObjectCollection_,recoClusters) ;
63+
iEvent.getByToken(matchingObjectCollection_,recoClusters) ;
6664
edm::Handle<reco::TrackCollection> tracks;
67-
iEvent.getByLabel(trackCollection_,tracks);
65+
iEvent.getByToken(trackCollection_,tracks);
6866
edm::Handle<reco::GsfTrackCollection> gsfTracks;
69-
iEvent.getByLabel(gsftrackCollection_,gsfTracks);
67+
iEvent.getByToken(gsftrackCollection_,gsfTracks);
7068
edm::Handle<reco::VertexCollection> vertices;
71-
iEvent.getByLabel(vertexCollection_,vertices);
69+
iEvent.getByToken(vertexCollection_,vertices);
7270
edm::Handle<reco::BeamSpot> recoBeamSpotHandle ;
73-
iEvent.getByLabel(beamSpotTag_,recoBeamSpotHandle) ;
71+
iEvent.getByToken(beamSpotTag_,recoBeamSpotHandle) ;
7472
const BeamSpot bs = *recoBeamSpotHandle ;
7573

7674
int ievt = iEvent.id().event();
@@ -90,7 +88,7 @@ void ElectronGeneralAnalyzer::analyze( const edm::Event& iEvent, const edm::Even
9088

9189
// trigger
9290
edm::Handle<edm::TriggerResults> triggerResults ;
93-
iEvent.getByLabel(triggerResults_,triggerResults) ;
91+
iEvent.getByToken(triggerResults_,triggerResults) ;
9492
if (triggerResults.isValid())
9593
{
9694
unsigned int i, n = triggerResults->size() ;

‎DQMOffline/EGamma/plugins/ElectronGeneralAnalyzer.h

+11-7
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ class MagneticField ;
1616
#include "FWCore/Framework/interface/ESHandle.h"
1717
#include "FWCore/Framework/interface/EventSetup.h"
1818

19+
#include "DataFormats/VertexReco/interface/VertexFwd.h"
20+
#include "DataFormats/VertexReco/interface/Vertex.h"
21+
22+
1923
class ElectronGeneralAnalyzer : public ElectronDqmAnalyzerBase
2024
{
2125
public:
@@ -33,15 +37,15 @@ class ElectronGeneralAnalyzer : public ElectronDqmAnalyzerBase
3337
//=========================================
3438

3539
// collection input tags
36-
edm::InputTag electronCollection_;
37-
edm::InputTag matchingObjectCollection_;
38-
edm::InputTag gsftrackCollection_;
39-
edm::InputTag trackCollection_;
40-
edm::InputTag vertexCollection_;
41-
edm::InputTag beamSpotTag_;
40+
edm::EDGetTokenT<reco::GsfElectronCollection> electronCollection_;
41+
edm::EDGetTokenT<reco::SuperClusterCollection> matchingObjectCollection_;
42+
edm::EDGetTokenT<reco::GsfTrackCollection> gsftrackCollection_;
43+
edm::EDGetTokenT<reco::TrackCollection> trackCollection_;
44+
edm::EDGetTokenT<reco::VertexCollection> vertexCollection_;
45+
edm::EDGetTokenT<reco::BeamSpot> beamSpotTag_;
4246

4347
// for trigger
44-
edm::InputTag triggerResults_;
48+
edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
4549
//std::vector<std::string > HLTPathsByName_;
4650
//
4751
// //=========================================

0 commit comments

Comments
 (0)