Skip to content

Commit 7c01a7a

Browse files
mmusichmmusich
committed
get rid of deprecation warnings in Validation/*Track
1 parent ed67ffc commit 7c01a7a

File tree

11 files changed

+45
-83
lines changed

11 files changed

+45
-83
lines changed

‎Validation/RecoPixelVertexing/test/PixelTrackVal.cc‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "DataFormats/Common/interface/Handle.h"
2-
#include "FWCore/Framework/interface/EDAnalyzer.h"
2+
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
33
#include "FWCore/Framework/interface/ESHandle.h"
44
#include "FWCore/Framework/interface/Event.h"
55
#include "FWCore/Framework/interface/EventSetup.h"
@@ -33,7 +33,7 @@ T sqr(T t) {
3333
return t * t;
3434
}
3535

36-
class PixelTrackVal : public edm::EDAnalyzer {
36+
class PixelTrackVal : public edm::one::EDAnalyzer<> {
3737
public:
3838
explicit PixelTrackVal(const edm::ParameterSet &conf);
3939
~PixelTrackVal() override;
@@ -76,7 +76,7 @@ void PixelTrackVal::beginJob() {
7676
}
7777

7878
void PixelTrackVal::analyze(const edm::Event &ev, const edm::EventSetup &es) {
79-
std::cout << "*** PixelTrackVal, analyze event: " << ev.id() << std::endl;
79+
LogTrace("PixelTrackVal") << "*** PixelTrackVal, analyze event: " << ev.id() << std::endl;
8080

8181
//------------------------ simulated tracks
8282
edm::Handle<reco::TrackCollection> trackCollection;
@@ -87,7 +87,7 @@ void PixelTrackVal::analyze(const edm::Event &ev, const edm::EventSetup &es) {
8787

8888
if (verbose_ > 0) {
8989
// std::cout << *(trackCollection.provenance()) << std::endl;
90-
std::cout << "Reconstructed " << tracks.size() << " tracks" << std::endl;
90+
edm::LogInfo("PixelTrackVal") << "Reconstructed " << tracks.size() << " tracks" << std::endl;
9191
}
9292

9393
for (unsigned int idx = 0; idx < tracks.size(); idx++) {
@@ -113,14 +113,15 @@ void PixelTrackVal::analyze(const edm::Event &ev, const edm::EventSetup &es) {
113113
}
114114
}
115115
if (problem)
116-
std::cout << " *** PROBLEM **" << std::endl;
116+
edm::LogInfo("PixelTrackVal") << " *** PROBLEM **" << std::endl;
117117

118118
if (verbose_ > 0) {
119-
std::cout << "\tmomentum: " << tracks[idx].momentum() << "\tPT: " << tracks[idx].pt() << std::endl;
120-
std::cout << "\tvertex: " << tracks[idx].vertex() << "\tTIP: " << tracks[idx].d0() << " +- "
121-
<< tracks[idx].d0Error() << "\tZ0: " << tracks[idx].dz() << " +- " << tracks[idx].dzError()
122-
<< std::endl;
123-
std::cout << "\tcharge: " << tracks[idx].charge() << std::endl;
119+
edm::LogInfo("PixelTrackVal") << "\tmomentum: " << tracks[idx].momentum() << "\tPT: " << tracks[idx].pt()
120+
<< std::endl;
121+
edm::LogInfo("PixelTrackVal") << "\tvertex: " << tracks[idx].vertex() << "\tTIP: " << tracks[idx].d0() << " +- "
122+
<< tracks[idx].d0Error() << "\tZ0: " << tracks[idx].dz() << " +- "
123+
<< tracks[idx].dzError() << std::endl;
124+
edm::LogInfo("PixelTrackVal") << "\tcharge: " << tracks[idx].charge() << std::endl;
124125
}
125126
}
126127

@@ -129,17 +130,17 @@ void PixelTrackVal::analyze(const edm::Event &ev, const edm::EventSetup &es) {
129130
edm::Handle<edm::SimVertexContainer> simVtcs;
130131
ev.getByToken(simVertexContainerToken_, simVtcs);
131132

132-
// std::cout << "SimVertex " << simVtcs->size() << std::endl;
133+
// edm::LogInfo("PixelTrackVal") << "SimVertex " << simVtcs->size() << std::endl;
133134
// for(edm::SimVertexContainer::const_iterator v=simVtcs->begin();
134135
// v!=simVtcs->end(); ++v){
135-
// std::cout << "simvtx " << std::setw(10) << std::setprecision(3)
136+
// edm::LogInfo("PixelTrackVal") << "simvtx " << std::setw(10) << std::setprecision(3)
136137
// << v->position().x() << " " << v->position().y() << " " <<
137138
// v->position().z() << " "
138139
// << v->parentIndex() << " " << v->noParent() << " " << std::endl; }
139140

140141
edm::Handle<edm::SimTrackContainer> simTrks;
141142
ev.getByToken(simTrackContainerToken_, simTrks);
142-
std::cout << "simtrks " << simTrks->size() << std::endl;
143+
edm::LogInfo("PixelTrackVal") << "simtrks " << simTrks->size() << std::endl;
143144

144145
//-------------- association
145146
// matching cuts from Marcin

‎Validation/RecoTrack/interface/SiStripTrackingRecHitsValid.h‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,40 @@
22
#define Validation_RecoTrack_SiStripTrackingRecHitsValid_h
33

44
//DQM services for histogram
5+
#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
56
#include "DQMServices/Core/interface/DQMStore.h"
6-
#include "FWCore/ServiceRegistry/interface/Service.h"
7-
#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
8-
#include "FWCore/Framework/interface/EDAnalyzer.h"
9-
#include "FWCore/Framework/interface/Event.h"
10-
117
#include "DataFormats/Common/interface/Handle.h"
12-
#include "FWCore/Utilities/interface/EDGetToken.h"
13-
14-
#include "FWCore/Framework/interface/EventSetup.h"
15-
16-
#include "FWCore/ParameterSet/interface/ParameterSet.h"
17-
8+
#include "DataFormats/GeometryVector/interface/GlobalVector.h"
9+
#include "DataFormats/GeometryVector/interface/LocalVector.h"
10+
#include "DataFormats/TrackReco/interface/Track.h"
11+
#include "DataFormats/TrackReco/interface/TrackExtra.h"
1812
#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
1913
#include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h"
2014
#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
21-
#include "DataFormats/TrackReco/interface/Track.h"
22-
#include "DataFormats/TrackReco/interface/TrackExtra.h"
23-
#include "DataFormats/GeometryVector/interface/GlobalVector.h"
24-
#include "DataFormats/GeometryVector/interface/LocalVector.h"
25-
26-
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
15+
#include "FWCore/Framework/interface/Event.h"
16+
#include "FWCore/Framework/interface/EventSetup.h"
17+
#include "FWCore/MessageLogger/interface/MessageLogger.h"
18+
#include "FWCore/ParameterSet/interface/ParameterSet.h"
19+
#include "FWCore/ServiceRegistry/interface/Service.h"
20+
#include "FWCore/Utilities/interface/EDGetToken.h"
2721
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
2822
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
29-
#include "TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h"
30-
#include "TrackingTools/KalmanUpdators/interface/KFUpdator.h"
23+
#include "RecoLocalTracker/Records/interface/TkStripCPERecord.h"
24+
#include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h"
3125
#include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h"
26+
#include "TrackingTools/KalmanUpdators/interface/KFUpdator.h"
27+
#include "TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h"
3228
#include "TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h"
3329
#include "TrackingTools/TrackFitters/interface/KFTrajectorySmoother.h"
34-
#include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h"
35-
#include "RecoLocalTracker/Records/interface/TkStripCPERecord.h"
30+
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
3631
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
37-
#include "FWCore/MessageLogger/interface/MessageLogger.h"
3832

3933
#include <TROOT.h>
4034
#include <TTree.h>
4135
#include <TFile.h>
4236
#include <TH1F.h>
4337
#include <TProfile.h>
38+
#include <string>
4439

4540
#include "FWCore/Framework/interface/Frameworkfwd.h"
4641
#include "FWCore/Framework/interface/EventSetup.h"
@@ -63,13 +58,9 @@
6358
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
6459
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
6560
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h"
66-
6761
#include "DataFormats/GeometrySurface/interface/ReferenceCounted.h"
68-
6962
#include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h"
7063

71-
#include <string>
72-
7364
class SiStripDetCabling;
7465
class SiStripDCSStatus;
7566

‎Validation/SiOuterTrackerV/plugins/OuterTrackerMonitorTrackingParticles.cc‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ OuterTrackerMonitorTrackingParticles::OuterTrackerMonitorTrackingParticles(const
5858
TP_maxVtxZ = conf_.getParameter<double>("TP_maxVtxZ"); // max vertZ (or z0) to consider matching
5959
}
6060

61-
OuterTrackerMonitorTrackingParticles::~OuterTrackerMonitorTrackingParticles() {
62-
// do anything here that needs to be done at desctruction time
63-
// (e.g. close files, deallocate resources etc.)
64-
}
61+
OuterTrackerMonitorTrackingParticles::~OuterTrackerMonitorTrackingParticles() = default;
6562

6663
// member functions
6764

‎Validation/SiOuterTrackerV/plugins/OuterTrackerMonitorTrackingParticles.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "DataFormats/Common/interface/DetSetVector.h"
77
#include "DataFormats/Common/interface/DetSetVectorNew.h"
88
#include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
9-
#include "FWCore/Framework/interface/EDAnalyzer.h"
109
#include "FWCore/Framework/interface/ESHandle.h"
1110
#include "FWCore/Framework/interface/Event.h"
1211
#include "FWCore/Framework/interface/Frameworkfwd.h"

‎Validation/TrackerHits/interface/TrackerHitAnalyzer.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*
99
*/
1010
// framework & common header files
11-
#include "FWCore/Framework/interface/EDAnalyzer.h"
1211
#include "FWCore/Framework/interface/Frameworkfwd.h"
1312
#include "FWCore/ParameterSet/interface/ParameterSet.h"
1413
#include "DQMServices/Core/interface/DQMEDAnalyzer.h"

‎Validation/TrackerRecHits/interface/SiPixelRecHitsValid.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#include "FWCore/Framework/interface/Frameworkfwd.h"
1313
#include "FWCore/ParameterSet/interface/ParameterSet.h"
14-
#include "FWCore/Framework/interface/EDAnalyzer.h"
1514
#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
1615
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
1716
#include "DQMServices/Core/interface/DQMStore.h"

‎Validation/TrackerRecHits/interface/SiStripRecHitsValid.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define SiStripRecHitsValid_h
33

44
#include "FWCore/Framework/interface/Frameworkfwd.h"
5-
#include "FWCore/Framework/interface/EDAnalyzer.h"
65
#include "FWCore/Framework/interface/Event.h"
76
#include "FWCore/Framework/interface/EventSetup.h"
87
#include "FWCore/Framework/interface/ESHandle.h"

‎Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ SiPixelRecHitsValid::SiPixelRecHitsValid(const edm::ParameterSet& ps)
4949
trackerHitAssociatorConfig_(ps, consumesCollector()),
5050
siPixelRecHitCollectionToken_(consumes<SiPixelRecHitCollection>(ps.getParameter<edm::InputTag>("src"))) {}
5151

52-
SiPixelRecHitsValid::~SiPixelRecHitsValid() {}
52+
SiPixelRecHitsValid::~SiPixelRecHitsValid() = default;
5353

5454
void SiPixelRecHitsValid::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run& run, const edm::EventSetup& es) {
5555
ibooker.setCurrentFolder("TrackerRecHitsV/TrackerRecHits/Pixel/clustBPIX");

‎Validation/TrackerRecHits/test/StripClusterMCanalysis.cc‎

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@
3232

3333
// user include files
3434
#include "FWCore/Framework/interface/Frameworkfwd.h"
35-
#include "FWCore/Framework/interface/EDAnalyzer.h"
3635
#include "FWCore/Framework/interface/Event.h"
36+
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
3737
#include "FWCore/Framework/interface/MakerMacros.h"
3838
#include "FWCore/Utilities/interface/EDGetToken.h"
3939
#include "FWCore/ParameterSet/interface/ParameterSet.h"
4040
#include "FWCore/ServiceRegistry/interface/Service.h"
41-
#include "FWCore/Framework/interface/ESHandle.h"
4241

4342
#include "TH1F.h"
4443
#include "TH2F.h"
@@ -64,7 +63,6 @@
6463
#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
6564
#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
6665
#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
67-
6866
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
6967
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
7068
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
@@ -80,16 +78,14 @@
8078
// class declaration
8179
//
8280

83-
class StripClusterMCanalysis : public edm::EDAnalyzer {
81+
class StripClusterMCanalysis : public edm::one::EDAnalyzer<edm::one::SharedResources> {
8482
public:
8583
explicit StripClusterMCanalysis(const edm::ParameterSet&);
86-
8784
~StripClusterMCanalysis() override;
8885

8986
private:
9087
void beginJob() override;
9188
void analyze(const edm::Event&, const edm::EventSetup&) override;
92-
void endJob() override;
9389

9490
typedef std::pair<unsigned int, unsigned int> simHitCollectionID;
9591
typedef std::pair<simHitCollectionID, unsigned int> simhitAddr;
@@ -101,13 +97,14 @@ class StripClusterMCanalysis : public edm::EDAnalyzer {
10197
// ----------member data ---------------------------
10298

10399
private:
100+
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topoToken_;
101+
const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
104102
edm::ParameterSet conf_;
105103
edm::InputTag beamSpotLabel_;
106104
edm::InputTag primaryVertexLabel_;
107105
edm::InputTag stripClusterSourceLabel_;
108106
edm::InputTag stripSimLinkLabel_;
109107
int printOut_;
110-
111108
edm::EDGetTokenT<reco::BeamSpot> beamSpotToken_;
112109
edm::EDGetTokenT<reco::VertexCollection> primaryVertexToken_;
113110
edm::EDGetTokenT<edmNew::DetSetVector<SiStripCluster> > clusterToken_;
@@ -180,25 +177,21 @@ class StripClusterMCanalysis : public edm::EDAnalyzer {
180177
TH1F* hZvSec;
181178
};
182179

183-
//
184-
// constants, enums and typedefs
185-
//
186-
187-
//
188-
// static data member definitions
189-
//
190-
191180
//
192181
// constructors and destructor
193182
//
194183
StripClusterMCanalysis::StripClusterMCanalysis(const edm::ParameterSet& iConfig)
195-
: conf_(iConfig),
184+
: topoToken_(esConsumes()),
185+
tkGeomToken_(esConsumes()),
186+
conf_(iConfig),
196187
beamSpotLabel_(iConfig.getParameter<edm::InputTag>("beamSpot")),
197188
primaryVertexLabel_(iConfig.getParameter<edm::InputTag>("primaryVertex")),
198189
stripClusterSourceLabel_(iConfig.getParameter<edm::InputTag>("stripClusters")),
199190
stripSimLinkLabel_(iConfig.getParameter<edm::InputTag>("stripSimLinks")),
200191
printOut_(iConfig.getUntrackedParameter<int>("printOut")) {
201192
//now do whatever initialization is needed
193+
usesResource(TFileService::kSharedResource);
194+
202195
beamSpotToken_ = consumes<reco::BeamSpot>(beamSpotLabel_);
203196
primaryVertexToken_ = consumes<reco::VertexCollection>(primaryVertexLabel_);
204197
clusterToken_ = consumes<edmNew::DetSetVector<SiStripCluster> >(stripClusterSourceLabel_);
@@ -213,10 +206,7 @@ StripClusterMCanalysis::StripClusterMCanalysis(const edm::ParameterSet& iConfig)
213206
}
214207
}
215208

216-
StripClusterMCanalysis::~StripClusterMCanalysis() {
217-
// do anything here that needs to be done at destruction time
218-
// (e.g. close files, deallocate resources etc.)
219-
}
209+
StripClusterMCanalysis::~StripClusterMCanalysis() = default;
220210

221211
//
222212
// member functions
@@ -233,9 +223,7 @@ void StripClusterMCanalysis::analyze(const edm::Event& iEvent, const edm::EventS
233223
evCnt_++;
234224

235225
// Retrieve tracker topology from geometry
236-
edm::ESHandle<TrackerTopology> tTopoHandle;
237-
iSetup.get<TrackerTopologyRcd>().get(tTopoHandle); // PR#7802
238-
const TrackerTopology* const tTopo = tTopoHandle.product();
226+
const TrackerTopology* const tTopo = &iSetup.getData(topoToken_);
239227

240228
// Get the beam spot
241229
edm::Handle<reco::BeamSpot> recoBeamSpotHandle;
@@ -299,9 +287,7 @@ void StripClusterMCanalysis::analyze(const edm::Event& iEvent, const edm::EventS
299287
iEvent.getByToken(clusterToken_, dsv_SiStripCluster);
300288

301289
iEvent.getByToken(stripSimlinkToken_, stripdigisimlink);
302-
303-
edm::ESHandle<TrackerGeometry> tkgeom;
304-
iSetup.get<TrackerDigiGeometryRecord>().get(tkgeom);
290+
edm::ESHandle<TrackerGeometry> tkgeom = iSetup.getHandle(tkGeomToken_);
305291
if (!tkgeom.isValid()) {
306292
std::cout << "Unable to find TrackerDigiGeometryRecord in event!";
307293
return;
@@ -582,9 +568,6 @@ void StripClusterMCanalysis::beginJob() {
582568
evCnt_ = 0;
583569
}
584570

585-
// ------------ method called once each job just after ending the event loop ------------
586-
void StripClusterMCanalysis::endJob() {}
587-
588571
void StripClusterMCanalysis::makeMap(const edm::Event& theEvent) {
589572
// The simHit collections are specified in trackerContainers, and can
590573
// be either crossing frames (e.g., mix/g4SimHitsTrackerHitsTIBLowTof)

‎Validation/TrackingMCTruth/interface/TrackingTruthValid.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define TrackingTruthValid_h
33

44
#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
5-
#include "FWCore/Framework/interface/EDAnalyzer.h"
65
#include "FWCore/Framework/interface/Frameworkfwd.h"
76
#include "FWCore/ParameterSet/interface/ParameterSet.h"
87
#include "DQMServices/Core/interface/DQMStore.h"

0 commit comments

Comments
 (0)