Skip to content

Commit 02c7664

Browse files
mmusichmmusich
committed
get rid of CMSDEPRECATED_X warnings in SLHCUpgradeSimulations/Geometry
1 parent 05eadd4 commit 02c7664

File tree

3 files changed

+123
-171
lines changed

3 files changed

+123
-171
lines changed

‎SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc

+3-7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
// user include files
2020
#include "FWCore/Framework/interface/Frameworkfwd.h"
21-
#include "FWCore/Framework/interface/EDAnalyzer.h"
21+
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
2222

2323
#include "FWCore/Framework/interface/Event.h"
2424
#include "FWCore/Framework/interface/EventSetup.h"
@@ -66,7 +66,7 @@
6666
// class decleration
6767
//
6868

69-
class ModuleInfo_Phase2 : public edm::EDAnalyzer {
69+
class ModuleInfo_Phase2 : public edm::one::EDAnalyzer<> {
7070
public:
7171
explicit ModuleInfo_Phase2(const edm::ParameterSet&);
7272
~ModuleInfo_Phase2();
@@ -95,11 +95,7 @@ ModuleInfo_Phase2::ModuleInfo_Phase2(const edm::ParameterSet& ps) {
9595
//now do what ever initialization is needed
9696
}
9797

98-
ModuleInfo_Phase2::~ModuleInfo_Phase2() {
99-
// do anything here that needs to be done at desctruction time
100-
// (e.g. close files, deallocate resources etc.)
101-
}
102-
98+
ModuleInfo_Phase2::~ModuleInfo_Phase2() = default;
10399
//
104100
// member functions
105101
//

‎SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc

+120-42
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,7 @@
1-
// File: StdHitNtuplizer.cc
2-
// Description: see StdHitNtuplizer.h
3-
// Authors: H. Cheung
4-
//--------------------------------------------------------------
5-
6-
#include "SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h"
7-
8-
#include "FWCore/PluginManager/interface/ModuleDef.h"
9-
#include "FWCore/Framework/interface/MakerMacros.h"
10-
#include "FWCore/Framework/interface/EventSetup.h"
11-
#include "FWCore/MessageLogger/interface/MessageLogger.h"
12-
13-
// DataFormats
14-
#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
15-
#include "DataFormats/Common/interface/Handle.h"
16-
#include "DataFormats/Common/interface/OwnVector.h"
17-
#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
18-
#include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
19-
#include "DataFormats/TrackReco/interface/Track.h"
20-
21-
#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
22-
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
23-
#include "SimDataFormats/Track/interface/SimTrack.h"
24-
#include "SimDataFormats/Track/interface/SimTrackContainer.h"
25-
#include "SimDataFormats/Vertex/interface/SimVertex.h"
26-
#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
27-
28-
#include "DataFormats/DetId/interface/DetId.h"
29-
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
30-
#include "DataFormats/Common/interface/DetSetVector.h"
31-
#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
32-
#include "DataFormats/Common/interface/Ref.h"
33-
34-
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
35-
36-
// Geometry
37-
#include "MagneticField/Engine/interface/MagneticField.h"
38-
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
39-
#include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h"
40-
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
41-
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
1+
/** \class StdHitNtuplizer
2+
* File: StdHitNtuplizer.cc
3+
* Authors: H. Cheung
4+
************************************************************/
425

436
// For ROOT
447
#include <TROOT.h>
@@ -53,6 +16,121 @@
5316
#include <string>
5417
#include <iostream>
5518

19+
// USER INCLUDES
20+
#include "DataFormats/Common/interface/DetSetVector.h"
21+
#include "DataFormats/Common/interface/Handle.h"
22+
#include "DataFormats/Common/interface/OwnVector.h"
23+
#include "DataFormats/Common/interface/Ref.h"
24+
#include "DataFormats/DetId/interface/DetId.h"
25+
#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
26+
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
27+
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
28+
#include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
29+
#include "DataFormats/TrackReco/interface/Track.h"
30+
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
31+
#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
32+
#include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h"
33+
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h"
34+
#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
35+
#include "FWCore/Framework/interface/Event.h"
36+
#include "FWCore/Framework/interface/EventSetup.h"
37+
#include "FWCore/Framework/interface/MakerMacros.h"
38+
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
39+
#include "FWCore/MessageLogger/interface/MessageLogger.h"
40+
#include "FWCore/ParameterSet/interface/ParameterSet.h"
41+
#include "FWCore/PluginManager/interface/ModuleDef.h"
42+
#include "FWCore/Utilities/interface/InputTag.h"
43+
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
44+
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
45+
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
46+
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
47+
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
48+
#include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h"
49+
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
50+
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
51+
#include "MagneticField/Engine/interface/MagneticField.h"
52+
#include "SimDataFormats/Track/interface/SimTrack.h"
53+
#include "SimDataFormats/Track/interface/SimTrackContainer.h"
54+
#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
55+
#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
56+
#include "SimDataFormats/Vertex/interface/SimVertex.h"
57+
#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
58+
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
59+
60+
class StdHitNtuplizer : public edm::one::EDAnalyzer<> {
61+
public:
62+
explicit StdHitNtuplizer(const edm::ParameterSet& conf);
63+
virtual ~StdHitNtuplizer();
64+
virtual void beginJob();
65+
virtual void endJob();
66+
virtual void analyze(const edm::Event& e, const edm::EventSetup& es);
67+
68+
protected:
69+
void fillEvt(const edm::Event&);
70+
void fillSRecHit(const int subid,
71+
SiStripRecHit2DCollection::DetSet::const_iterator pixeliter,
72+
const GeomDet* theGeom);
73+
void fillSRecHit(const int subid,
74+
SiStripMatchedRecHit2DCollection::DetSet::const_iterator pixeliter,
75+
const GeomDet* theGeom);
76+
void fillSRecHit(const int subid, const FastTrackerRecHit& hit, const GeomDet* theGeom);
77+
//void fillPRecHit(const int subid, SiPixelRecHitCollection::const_iterator pixeliter,
78+
// const GeomDet* PixGeom);
79+
void fillPRecHit(const int subid,
80+
const int layer_num,
81+
SiPixelRecHitCollection::DetSet::const_iterator pixeliter,
82+
const int num_simhit,
83+
std::vector<PSimHit>::const_iterator closest_simhit,
84+
const GeomDet* PixGeom);
85+
void fillPRecHit(const int subid, trackingRecHit_iterator pixeliter, const GeomDet* PixGeom);
86+
87+
private:
88+
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geom_esToken;
89+
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topo_esToken;
90+
edm::ParameterSet conf_;
91+
TrackerHitAssociator::Config trackerHitAssociatorConfig_;
92+
edm::InputTag src_;
93+
edm::InputTag rphiRecHits_;
94+
edm::InputTag stereoRecHits_;
95+
edm::InputTag matchedRecHits_;
96+
97+
void init();
98+
99+
//--- Structures for ntupling:
100+
struct evt {
101+
int run;
102+
int evtnum;
103+
104+
void init();
105+
} evt_, stripevt_;
106+
107+
struct RecHit {
108+
float x;
109+
float y;
110+
float xx;
111+
float xy;
112+
float yy;
113+
float row;
114+
float col;
115+
float gx;
116+
float gy;
117+
float gz;
118+
int subid;
119+
int layer;
120+
int nsimhit;
121+
float hx, hy;
122+
float tx, ty;
123+
float theta, phi;
124+
125+
void init();
126+
} recHit_, striprecHit_;
127+
128+
TFile* tfile_;
129+
TTree* pixeltree_;
130+
TTree* striptree_;
131+
TTree* pixeltree2_;
132+
};
133+
56134
using namespace std;
57135
using namespace edm;
58136
using namespace reco;
@@ -71,7 +149,7 @@ StdHitNtuplizer::StdHitNtuplizer(edm::ParameterSet const& conf)
71149
striptree_(0),
72150
pixeltree2_(0) {}
73151

74-
StdHitNtuplizer::~StdHitNtuplizer() {}
152+
StdHitNtuplizer::~StdHitNtuplizer() = default;
75153

76154
void StdHitNtuplizer::endJob() {
77155
std::cout << " StdHitNtuplizer::endJob" << std::endl;

‎SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h

-122
Original file line numberDiff line numberDiff line change
@@ -1,122 +0,0 @@
1-
#ifndef StdHitNtuplizer_h
2-
#define StdHitNtuplizer_h
3-
4-
/** \class StdHitNtuplizer
5-
*
6-
*
7-
************************************************************/
8-
9-
#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
10-
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h"
11-
#include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h"
12-
13-
#include "FWCore/Framework/interface/EDAnalyzer.h"
14-
#include "FWCore/Framework/interface/Event.h"
15-
#include "DataFormats/Common/interface/Handle.h"
16-
#include "FWCore/Framework/interface/EventSetup.h"
17-
#include "FWCore/Utilities/interface/InputTag.h"
18-
#include "FWCore/ParameterSet/interface/ParameterSet.h"
19-
20-
#include "DataFormats/Common/interface/Ref.h"
21-
#include "DataFormats/TrackReco/interface/Track.h"
22-
23-
//#include "Geometry/CommonDetUnit/interface/GeomDet.h"
24-
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
25-
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
26-
27-
#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
28-
29-
#include "SimDataFormats/Track/interface/SimTrack.h"
30-
#include "SimDataFormats/Track/interface/SimTrackContainer.h"
31-
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
32-
33-
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
34-
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
35-
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
36-
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
37-
38-
class TTree;
39-
class TFile;
40-
class RectangularPixelTopology;
41-
42-
class TransientInitialStateEstimator;
43-
class MagneticField;
44-
class TrackerGeometry;
45-
class TrajectoryStateOnSurface;
46-
class PTrajectoryStateOnDet;
47-
48-
class StdHitNtuplizer : public edm::EDAnalyzer {
49-
public:
50-
explicit StdHitNtuplizer(const edm::ParameterSet& conf);
51-
virtual ~StdHitNtuplizer();
52-
virtual void beginJob();
53-
virtual void endJob();
54-
virtual void analyze(const edm::Event& e, const edm::EventSetup& es);
55-
56-
protected:
57-
void fillEvt(const edm::Event&);
58-
void fillSRecHit(const int subid,
59-
SiStripRecHit2DCollection::DetSet::const_iterator pixeliter,
60-
const GeomDet* theGeom);
61-
void fillSRecHit(const int subid,
62-
SiStripMatchedRecHit2DCollection::DetSet::const_iterator pixeliter,
63-
const GeomDet* theGeom);
64-
void fillSRecHit(const int subid, const FastTrackerRecHit& hit, const GeomDet* theGeom);
65-
//void fillPRecHit(const int subid, SiPixelRecHitCollection::const_iterator pixeliter,
66-
// const GeomDet* PixGeom);
67-
void fillPRecHit(const int subid,
68-
const int layer_num,
69-
SiPixelRecHitCollection::DetSet::const_iterator pixeliter,
70-
const int num_simhit,
71-
std::vector<PSimHit>::const_iterator closest_simhit,
72-
const GeomDet* PixGeom);
73-
void fillPRecHit(const int subid, trackingRecHit_iterator pixeliter, const GeomDet* PixGeom);
74-
75-
private:
76-
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geom_esToken;
77-
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topo_esToken;
78-
edm::ParameterSet conf_;
79-
TrackerHitAssociator::Config trackerHitAssociatorConfig_;
80-
edm::InputTag src_;
81-
edm::InputTag rphiRecHits_;
82-
edm::InputTag stereoRecHits_;
83-
edm::InputTag matchedRecHits_;
84-
85-
void init();
86-
87-
//--- Structures for ntupling:
88-
struct evt {
89-
int run;
90-
int evtnum;
91-
92-
void init();
93-
} evt_, stripevt_;
94-
95-
struct RecHit {
96-
float x;
97-
float y;
98-
float xx;
99-
float xy;
100-
float yy;
101-
float row;
102-
float col;
103-
float gx;
104-
float gy;
105-
float gz;
106-
int subid;
107-
int layer;
108-
int nsimhit;
109-
float hx, hy;
110-
float tx, ty;
111-
float theta, phi;
112-
113-
void init();
114-
} recHit_, striprecHit_;
115-
116-
TFile* tfile_;
117-
TTree* pixeltree_;
118-
TTree* striptree_;
119-
TTree* pixeltree2_;
120-
};
121-
122-
#endif

0 commit comments

Comments
 (0)