Skip to content

Commit 0d708af

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#36695 from mmusich/getRidDeprecationWarningsEventFilterSiRawToDigi
get rid of CMSDEPRECATED_X warnings from `EventFilter/Si*RawToDigi`
2 parents 728e0d8 + 185d83a commit 0d708af

File tree

11 files changed

+49
-60
lines changed

11 files changed

+49
-60
lines changed

‎EventFilter/SiPixelRawToDigi/test/FedErrorDumper.cc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Works for CMSSW7X (bytoken)d.k.
88
*/
99

10-
#include "FWCore/Framework/interface/EDAnalyzer.h"
10+
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
1111
#include "FWCore/Framework/interface/Event.h"
1212
#include "FWCore/ParameterSet/interface/ParameterSet.h"
1313

@@ -312,18 +312,16 @@ int MyDecode::data(int word, int &fedChannel, int fed, bool print) {
312312

313313
////////////////////////////////////////////////////////////////////////////
314314

315-
class FedErrorDumper : public edm::EDAnalyzer {
315+
class FedErrorDumper : public edm::one::EDAnalyzer<edm::one::SharedResources> {
316316
public:
317317
/// ctor
318318
explicit FedErrorDumper(const edm::ParameterSet &cfg);
319319

320320
/// dtor
321-
virtual ~FedErrorDumper() {}
321+
virtual ~FedErrorDumper() = default;
322322

323323
void beginJob();
324324

325-
//void beginRun( const edm::EventSetup& ) {}
326-
327325
// end of job
328326
void endJob();
329327

@@ -359,6 +357,7 @@ FedErrorDumper::FedErrorDumper(const edm::ParameterSet &cfg) : theConfig(cfg) {
359357

360358
// For the ByToken method
361359
fedErrorContainer = consumes<edm::DetSetVector<SiPixelRawDataError> >(src);
360+
usesResource(TFileService::kSharedResource);
362361
}
363362

364363
//---------------------------------

‎EventFilter/SiPixelRawToDigi/test/SiPixelRawDumper.cc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Works with v7x, comment out the digis access.
77
*/
88

9-
#include "FWCore/Framework/interface/EDAnalyzer.h"
9+
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
1010
#include "FWCore/Framework/interface/Event.h"
1111
#include "FWCore/ParameterSet/interface/ParameterSet.h"
1212

@@ -504,7 +504,7 @@ int MyDecode::data(int word, int &fedChannel, int fed, int &stat1, int &stat2, b
504504
}
505505
////////////////////////////////////////////////////////////////////////////
506506

507-
class SiPixelRawDumper : public edm::EDAnalyzer {
507+
class SiPixelRawDumper : public edm::one::EDAnalyzer<edm::one::SharedResources> {
508508
public:
509509
/// ctor
510510
explicit SiPixelRawDumper(const edm::ParameterSet &cfg);
@@ -513,12 +513,10 @@ class SiPixelRawDumper : public edm::EDAnalyzer {
513513
//consumes<FEDRawDataCollection>(theConfig.getUntrackedParameter<std::string>("InputLabel","source"));}
514514

515515
/// dtor
516-
virtual ~SiPixelRawDumper() {}
516+
virtual ~SiPixelRawDumper() = default;
517517

518518
void beginJob();
519519

520-
//void beginRun( const edm::EventSetup& ) {}
521-
522520
// end of job
523521
void endJob();
524522

@@ -582,6 +580,7 @@ SiPixelRawDumper::SiPixelRawDumper(const edm::ParameterSet &cfg) : theConfig(cfg
582580
string label = theConfig.getUntrackedParameter<std::string>("InputLabel", "source");
583581
// For the ByToken method
584582
rawData = consumes<FEDRawDataCollection>(label);
583+
usesResource(TFileService::kSharedResource);
585584
}
586585
//----------------------------------------------------------------------------------------
587586
void SiPixelRawDumper::endJob() {

‎EventFilter/SiPixelRawToDigi/test/findHotPixels.cc‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Works in v352
44
*/
55

6-
#include "FWCore/Framework/interface/EDAnalyzer.h"
6+
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
77
#include "FWCore/Framework/interface/Event.h"
88
#include "FWCore/ParameterSet/interface/ParameterSet.h"
99

@@ -426,20 +426,18 @@ void HotPixels::print(int events, int fed_id) {
426426

427427
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
428428
// Main program
429-
class findHotPixels : public edm::EDAnalyzer {
429+
class findHotPixels : public edm::one::EDAnalyzer<> {
430430
public:
431431
/// ctor
432432
explicit findHotPixels(const edm::ParameterSet &cfg) : theConfig(cfg) {
433433
consumes<FEDRawDataCollection>(theConfig.getUntrackedParameter<std::string>("InputLabel", "source"));
434434
}
435435

436436
/// dtor
437-
virtual ~findHotPixels() {}
437+
virtual ~findHotPixels() = default;
438438

439439
void beginJob();
440440

441-
//void beginRun( const edm::EventSetup& ) {}
442-
443441
// end of job
444442
void endJob();
445443

‎EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.cc‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
#include "FWCore/Framework/interface/Event.h"
66
#include "FWCore/ParameterSet/interface/ParameterSet.h"
77
#include "FWCore/MessageLogger/interface/MessageLogger.h"
8-
#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h"
9-
#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
108
#include "DataFormats/Common/interface/DetSetVector.h"
119
#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
1210
#include "DataFormats/SiStripCommon/interface/SiStripFedKey.h"
@@ -64,7 +62,7 @@ void SiStripTrivialDigiAnalysis::print(stringstream& ss) {
6462
// -----------------------------------------------------------------------------
6563
//
6664
SiStripDigiAnalyzer::SiStripDigiAnalyzer(const edm::ParameterSet& pset)
67-
: inputModuleLabel_(pset.getParameter<string>("InputModuleLabel")) {
65+
: esTokenCabling_(esConsumes()), inputModuleLabel_(pset.getParameter<string>("InputModuleLabel")) {
6866
consumes<edm::DetSetVector<SiStripRawDigi> >(edm::InputTag(inputModuleLabel_, "VirginRaw"));
6967
consumes<edm::DetSetVector<SiStripRawDigi> >(edm::InputTag(inputModuleLabel_, "ProcessedRaw"));
7068
consumes<edm::DetSetVector<SiStripRawDigi> >(edm::InputTag(inputModuleLabel_, "ScopeMode"));
@@ -119,8 +117,7 @@ void SiStripDigiAnalyzer::analyze(const edm::Event& event, const edm::EventSetup
119117
<< " Analyzing run " << event.id().run() << " and event " << event.id().event();
120118

121119
// Retrieve FED (reatout) and FEC (control) cabling
122-
edm::ESHandle<SiStripFedCabling> fed_cabling;
123-
setup.get<SiStripFedCablingRcd>().get(fed_cabling);
120+
edm::ESHandle<SiStripFedCabling> fed_cabling = setup.getHandle(esTokenCabling_);
124121

125122
// Retrieve "real" digis
126123
edm::Handle<edm::DetSetVector<SiStripRawDigi> > vr;

‎EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#ifndef EventFilter_SiStripRawToDigi_test_AnalyzeSiStripDigis_H
22
#define EventFilter_SiStripRawToDigi_test_AnalyzeSiStripDigis_H
33

4-
#include "FWCore/Framework/interface/EDAnalyzer.h"
4+
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
5+
#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h"
6+
#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
57
#include <string>
68
#include <sstream>
79
#include <vector>
@@ -43,7 +45,7 @@ class SiStripTrivialDigiAnalysis {
4345
std::vector<uint16_t> adc_;
4446
};
4547

46-
class SiStripDigiAnalyzer : public edm::EDAnalyzer {
48+
class SiStripDigiAnalyzer : public edm::one::EDAnalyzer<> {
4749
public:
4850
SiStripDigiAnalyzer(const edm::ParameterSet&);
4951
~SiStripDigiAnalyzer();
@@ -53,6 +55,7 @@ class SiStripDigiAnalyzer : public edm::EDAnalyzer {
5355
void endJob();
5456

5557
private:
58+
const edm::ESGetToken<SiStripFedCabling, SiStripFedCablingRcd> esTokenCabling_;
5659
std::string inputModuleLabel_;
5760

5861
SiStripTrivialDigiAnalysis anal_;

‎EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.cc‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h"
2-
#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
31
#include "DataFormats/Common/interface/Handle.h"
42
#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
53
#include "DataFormats/FEDRawData/interface/FEDTrailer.h"
64
#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
7-
#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
85
#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.h"
96
#include "EventFilter/SiStripRawToDigi/interface/SiStripFEDBuffer.h"
107
#include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -19,7 +16,7 @@ using namespace std;
1916
// -----------------------------------------------------------------------------
2017
//
2118
SiStripFEDRawDataAnalyzer::SiStripFEDRawDataAnalyzer(const edm::ParameterSet& pset)
22-
: label_(pset.getParameter<edm::InputTag>("InputLabel")) {
19+
: esTokenCabling_(esConsumes()), label_(pset.getParameter<edm::InputTag>("InputLabel")) {
2320
LogDebug("SiStripFEDRawDataAnalyzer") << "[SiStripFEDRawDataAnalyzer::" << __func__ << "]"
2421
<< "Constructing object...";
2522
consumes<FEDRawDataCollection>(label_);
@@ -48,8 +45,7 @@ void SiStripFEDRawDataAnalyzer::endJob() {
4845
//
4946
void SiStripFEDRawDataAnalyzer::analyze(const edm::Event& event, const edm::EventSetup& setup) {
5047
// Retrieve FED cabling object
51-
edm::ESHandle<SiStripFedCabling> cabling;
52-
setup.get<SiStripFedCablingRcd>().get(cabling);
48+
edm::ESHandle<SiStripFedCabling> cabling = setup.getHandle(esTokenCabling_);
5349

5450
// Retrieve FEDRawData collection
5551
edm::Handle<FEDRawDataCollection> buffers;

‎EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#ifndef EventFilter_SiStripRawToDigi_SiStripFEDRawDataAnalyzer_H
22
#define EventFilter_SiStripRawToDigi_SiStripFEDRawDataAnalyzer_H
33

4-
#include "FWCore/Framework/interface/EDAnalyzer.h"
4+
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
55
#include "FWCore/Framework/interface/EventSetup.h"
66
#include "FWCore/Framework/interface/Event.h"
77
#include "FWCore/ParameterSet/interface/ParameterSet.h"
8+
#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h"
9+
#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
810
#include <utility>
911
#include <vector>
1012

@@ -13,7 +15,7 @@
1315
@brief Analyzes contents of FEDRawData collection
1416
*/
1517

16-
class SiStripFEDRawDataAnalyzer : public edm::EDAnalyzer {
18+
class SiStripFEDRawDataAnalyzer : public edm::one::EDAnalyzer<> {
1719
public:
1820
typedef std::pair<uint16_t, uint16_t> Fed;
1921
typedef std::vector<Fed> Feds;
@@ -28,6 +30,7 @@ class SiStripFEDRawDataAnalyzer : public edm::EDAnalyzer {
2830
void endJob();
2931

3032
private:
33+
const edm::ESGetToken<SiStripFedCabling, SiStripFedCablingRcd> esTokenCabling_;
3134
edm::InputTag label_;
3235
};
3336

‎EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.cc‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.h"
2-
#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
32

43
SiStripTrivialClusterSource::SiStripTrivialClusterSource(const edm::ParameterSet& pset)
5-
:
6-
4+
: esTokenCabling_(esConsumes<edm::Transition::BeginRun>()),
75
minocc_(pset.getUntrackedParameter<double>("MinOccupancy", 0.001)),
86
maxocc_(pset.getUntrackedParameter<double>("MaxOccupancy", 0.03)),
97
mincluster_(pset.getUntrackedParameter<unsigned int>("MinCluster", 4)),
@@ -16,10 +14,10 @@ SiStripTrivialClusterSource::SiStripTrivialClusterSource(const edm::ParameterSet
1614
produces<edm::DetSetVector<SiStripDigi>>();
1715
}
1816

19-
SiStripTrivialClusterSource::~SiStripTrivialClusterSource() {}
17+
SiStripTrivialClusterSource::~SiStripTrivialClusterSource() = default;
2018

2119
void SiStripTrivialClusterSource::beginRun(const edm::Run&, const edm::EventSetup& setup) {
22-
setup.get<SiStripDetCablingRcd>().get(cabling_);
20+
cabling_ = setup.getHandle(esTokenCabling_);
2321
cabling_->addAllDetectorsRawIds(detids_);
2422
for (unsigned int i = 0; i < detids_.size(); i++) {
2523
nstrips_ += cabling_->getConnections(detids_[i]).size() * 256;

‎EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef EventFilter_SiStripRawToDigi_SiStripTrivialClusterSource_H
22
#define EventFilter_SiStripRawToDigi_SiStripTrivialClusterSource_H
33

4-
#include "FWCore/Framework/interface/EDProducer.h"
4+
#include "FWCore/Framework/interface/stream/EDProducer.h"
55
#include "FWCore/Framework/interface/Event.h"
66
#include "FWCore/Framework/interface/EventSetup.h"
77
#include "FWCore/Framework/interface/ESHandle.h"
@@ -11,6 +11,7 @@
1111
#include "DataFormats/Common/interface/Handle.h"
1212
#include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
1313
#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
14+
#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
1415
#include "TRandom.h"
1516
#include <vector>
1617

@@ -22,7 +23,7 @@
2223
to test the final DigiToRaw and RawToDigi/RawToCluster converters.
2324
*/
2425

25-
class SiStripTrivialClusterSource : public edm::EDProducer {
26+
class SiStripTrivialClusterSource : public edm::stream::EDProducer<> {
2627
public:
2728
SiStripTrivialClusterSource(const edm::ParameterSet&);
2829
~SiStripTrivialClusterSource() override;
@@ -37,6 +38,9 @@ class SiStripTrivialClusterSource : public edm::EDProducer {
3738
/** Add cluster to module */
3839
void addcluster(edm::DetSet<SiStripDigi>&, const uint16_t, const uint16_t);
3940

41+
/** token */
42+
const edm::ESGetToken<SiStripDetCabling, SiStripDetCablingRcd> esTokenCabling_;
43+
4044
/** Configurables */
4145
double minocc_;
4246
double maxocc_;

‎EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.cc‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
21
#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.h"
3-
#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h"
4-
#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
52
#include "DataFormats/Common/interface/DetSetVector.h"
63
#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
74
#include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
@@ -24,7 +21,8 @@
2421
// -----------------------------------------------------------------------------
2522
//
2623
SiStripTrivialDigiSource::SiStripTrivialDigiSource(const edm::ParameterSet& pset)
27-
: meanOcc_(pset.getUntrackedParameter<double>("MeanOccupancy", 1.)),
24+
: esTokenCabling_(esConsumes()),
25+
meanOcc_(pset.getUntrackedParameter<double>("MeanOccupancy", 1.)),
2826
rmsOcc_(pset.getUntrackedParameter<double>("RmsOccupancy", 0.1)),
2927
ped_(pset.getUntrackedParameter<int>("PedestalLevel", 100)),
3028
raw_(pset.getUntrackedParameter<bool>("FedRawDataMode", false)),
@@ -43,13 +41,12 @@ SiStripTrivialDigiSource::~SiStripTrivialDigiSource() {
4341

4442
// -----------------------------------------------------------------------------
4543
//
46-
void SiStripTrivialDigiSource::produce(edm::Event& event, const edm::EventSetup& setup) {
44+
void SiStripTrivialDigiSource::produce(edm::StreamID, edm::Event& event, const edm::EventSetup& setup) const {
4745
LogTrace("TrivialDigiSource") << "[SiStripRawToDigiModule::" << __func__ << "]"
4846
<< " Analyzing run/event " << event.id().run() << "/" << event.id().event();
4947

5048
// Retrieve cabling
51-
edm::ESHandle<SiStripFedCabling> cabling;
52-
setup.get<SiStripFedCablingRcd>().get(cabling);
49+
edm::ESHandle<SiStripFedCabling> cabling = setup.getHandle(esTokenCabling_);
5350

5451
// Temp container
5552
typedef std::vector<edm::DetSet<SiStripDigi>> digi_work_vector;

0 commit comments

Comments
 (0)