Skip to content

Commit ddb0b6e

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47216 from makortel/alpakaEDProducersMigratePassParameterSet
Migrate Alpaka EDProducers to pass the edm::ParameterSet to base class constructor
2 parents ab3deda + 27e19c3 commit ddb0b6e

File tree

23 files changed

+45
-23
lines changed

23 files changed

+45
-23
lines changed

‎EventFilter/EcalRawToDigi/plugins/alpaka/EcalRawToDigiPortable.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
5757
}
5858

5959
EcalRawToDigiPortable::EcalRawToDigiPortable(const edm::ParameterSet& ps)
60-
: rawDataToken_{consumes<FEDRawDataCollection>(ps.getParameter<edm::InputTag>("InputLabel"))},
60+
: EDProducer(ps),
61+
rawDataToken_{consumes<FEDRawDataCollection>(ps.getParameter<edm::InputTag>("InputLabel"))},
6162
digisDevEBToken_{produces(ps.getParameter<std::string>("digisLabelEB"))},
6263
digisDevEEToken_{produces(ps.getParameter<std::string>("digisLabelEE"))},
6364
eMappingToken_{esConsumes()},

‎EventFilter/HcalRawToDigi/plugins/alpaka/HcalDigisSoAProducer.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
6565
}
6666

6767
HcalDigisSoAProducer::HcalDigisSoAProducer(const edm::ParameterSet& ps)
68-
: hbheDigiToken_{consumes(ps.getParameter<edm::InputTag>("hbheDigisLabel"))},
68+
: EDProducer(ps),
69+
hbheDigiToken_{consumes(ps.getParameter<edm::InputTag>("hbheDigisLabel"))},
6970
qie11DigiToken_{consumes(ps.getParameter<edm::InputTag>("qie11DigiLabel"))},
7071
digisF01HEToken_{produces(ps.getParameter<std::string>("digisLabelF01HE"))},
7172
digisF5HBToken_{produces(ps.getParameter<std::string>("digisLabelF5HB"))},

‎HeterogeneousCore/AlpakaCore/plugins/alpaka/AlpakaBackendProducer.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
1212

1313
class AlpakaBackendProducer : public global::EDProducer<> {
1414
public:
15-
AlpakaBackendProducer(edm::ParameterSet const& config) {}
15+
AlpakaBackendProducer(edm::ParameterSet const& config) : EDProducer(config) {}
1616

1717
void produce(edm::StreamID sid, device::Event& event, device::EventSetup const&) const override {}
1818

‎HeterogeneousCore/AlpakaTest/plugins/alpaka/TestAlpakaGlobalProducerCopyToDeviceCache.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
1919
class TestAlpakaGlobalProducerCopyToDeviceCache : public global::EDProducer<> {
2020
public:
2121
TestAlpakaGlobalProducerCopyToDeviceCache(edm::ParameterSet const& config)
22-
: getToken_(consumes(config.getParameter<edm::InputTag>("source"))),
22+
: EDProducer(config),
23+
getToken_(consumes(config.getParameter<edm::InputTag>("source"))),
2324
getTokenMulti2_(consumes(config.getParameter<edm::InputTag>("source"))),
2425
getTokenMulti3_(consumes(config.getParameter<edm::InputTag>("source"))),
2526
putToken_{produces()},

‎HeterogeneousCore/AlpakaTest/plugins/alpaka/TestAlpakaGlobalProducerMoveToDeviceCache.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
2020
class TestAlpakaGlobalProducerMoveToDeviceCache : public global::EDProducer<> {
2121
public:
2222
TestAlpakaGlobalProducerMoveToDeviceCache(edm::ParameterSet const& config)
23-
: getToken_(consumes(config.getParameter<edm::InputTag>("source"))),
23+
: EDProducer(config),
24+
getToken_(consumes(config.getParameter<edm::InputTag>("source"))),
2425
getTokenMulti2_(consumes(config.getParameter<edm::InputTag>("source"))),
2526
getTokenMulti3_(consumes(config.getParameter<edm::InputTag>("source"))),
2627
putToken_{produces()},

‎RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalRecHitProducerPortable.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
137137
}
138138

139139
EcalRecHitProducerPortable::EcalRecHitProducerPortable(const edm::ParameterSet& ps, EcalRecHitParametersCache const*)
140-
: isPhase2_{ps.getParameter<bool>("isPhase2")},
140+
: EDProducer(ps),
141+
isPhase2_{ps.getParameter<bool>("isPhase2")},
141142
uncalibRecHitsTokenEB_{consumes(ps.getParameter<edm::InputTag>("uncalibrecHitsInLabelEB"))},
142143
uncalibRecHitsTokenEE_{isPhase2_ ? device::EDGetToken<InputProduct>{}
143144
: consumes(ps.getParameter<edm::InputTag>("uncalibrecHitsInLabelEE"))},

‎RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalUncalibRecHitProducerPortable.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
138138

139139
EcalUncalibRecHitProducerPortable::EcalUncalibRecHitProducerPortable(const edm::ParameterSet& ps,
140140
EcalMultifitParametersCache const*)
141-
: digisTokenEB_{consumes(ps.getParameter<edm::InputTag>("digisLabelEB"))},
141+
: SynchronizingEDProducer(ps),
142+
digisTokenEB_{consumes(ps.getParameter<edm::InputTag>("digisLabelEB"))},
142143
digisTokenEE_{consumes(ps.getParameter<edm::InputTag>("digisLabelEE"))},
143144
uncalibRecHitsTokenEB_{produces(ps.getParameter<std::string>("recHitsLabelEB"))},
144145
uncalibRecHitsTokenEE_{produces(ps.getParameter<std::string>("recHitsLabelEE"))},

‎RecoLocalCalo/HGCalRecAlgos/plugins/alpaka/HGCalRecHitProducers.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
5555
};
5656

5757
HGCalRecHitsProducer::HGCalRecHitsProducer(const edm::ParameterSet& iConfig)
58-
: digisToken_{consumes<hgcaldigi::HGCalDigiHost>(iConfig.getParameter<edm::InputTag>("digis"))},
58+
: EDProducer(iConfig),
59+
digisToken_{consumes<hgcaldigi::HGCalDigiHost>(iConfig.getParameter<edm::InputTag>("digis"))},
5960
calibToken_{esConsumes(iConfig.getParameter<edm::ESInputTag>("calibSource"))},
6061
configToken_{esConsumes(iConfig.getParameter<edm::ESInputTag>("configSource"))},
6162
recHitsToken_{produces()},

‎RecoLocalCalo/HGCalRecAlgos/test/alpaka/HGCalRecHitESProducersTest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
4444
device::ESGetToken<hgcalrechit::HGCalCalibParamDevice, HGCalModuleConfigurationRcd> calibParamToken_;
4545
};
4646

47-
HGCalRecHitESProducersTest::HGCalRecHitESProducersTest(const edm::ParameterSet& iConfig) {
47+
HGCalRecHitESProducersTest::HGCalRecHitESProducersTest(const edm::ParameterSet& iConfig) : EDProducer(iConfig) {
4848
std::cout << "HGCalRecHitESProducersTest::HGCalRecHitESProducersTest" << std::endl;
4949
indexerToken_ = esConsumes(iConfig.getParameter<edm::ESInputTag>("indexSource"));
5050
configToken_ = esConsumes(iConfig.getParameter<edm::ESInputTag>("configSource"));

‎RecoLocalCalo/HGCalRecProducers/plugins/alpaka/HGCalSoALayerClustersProducer.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
2626
class HGCalSoALayerClustersProducer : public stream::SynchronizingEDProducer<> {
2727
public:
2828
HGCalSoALayerClustersProducer(edm::ParameterSet const& config)
29-
: getTokenDeviceRecHits_{consumes(config.getParameter<edm::InputTag>("hgcalRecHitsSoA"))},
29+
: SynchronizingEDProducer(config),
30+
getTokenDeviceRecHits_{consumes(config.getParameter<edm::InputTag>("hgcalRecHitsSoA"))},
3031
getTokenDeviceClusters_{consumes(config.getParameter<edm::InputTag>("hgcalRecHitsLayerClustersSoA"))},
3132
deviceTokenSoAClusters_{produces()},
3233
thresholdW0_(config.getParameter<double>("thresholdW0")),

‎RecoLocalCalo/HGCalRecProducers/plugins/alpaka/HGCalSoARecHitsLayerClustersProducer.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
3333
class HGCalSoARecHitsLayerClustersProducer : public stream::EDProducer<> {
3434
public:
3535
HGCalSoARecHitsLayerClustersProducer(edm::ParameterSet const& config)
36-
: getTokenDevice_{consumes(config.getParameter<edm::InputTag>("hgcalRecHitsSoA"))},
36+
: EDProducer(config),
37+
getTokenDevice_{consumes(config.getParameter<edm::InputTag>("hgcalRecHitsSoA"))},
3738
deviceToken_{produces()},
3839
deltac_((float)config.getParameter<double>("deltac")),
3940
kappa_((float)config.getParameter<double>("kappa")),

‎RecoLocalCalo/HGCalRecProducers/plugins/alpaka/HGCalSoARecHitsProducer.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
2222
class HGCalSoARecHitsProducer : public stream::EDProducer<> {
2323
public:
2424
HGCalSoARecHitsProducer(edm::ParameterSet const& config)
25-
: detector_(config.getParameter<std::string>("detector")),
25+
: EDProducer(config),
26+
detector_(config.getParameter<std::string>("detector")),
2627
initialized_(false),
2728
isNose_(detector_ == "HFNose"),
2829
maxNumberOfThickIndices_(config.getParameter<unsigned>("maxNumberOfThickIndices")),

‎RecoLocalCalo/HcalRecProducers/plugins/alpaka/HBHERecHitProducerPortable.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
6565
};
6666

6767
HBHERecHitProducerPortable::HBHERecHitProducerPortable(edm::ParameterSet const& ps, HcalMahiPulseOffsetsCache const*)
68-
: digisTokenF01HE_{consumes(ps.getParameter<edm::InputTag>("digisLabelF01HE"))},
68+
: EDProducer(ps),
69+
digisTokenF01HE_{consumes(ps.getParameter<edm::InputTag>("digisLabelF01HE"))},
6970
digisTokenF5HB_{consumes(ps.getParameter<edm::InputTag>("digisLabelF5HB"))},
7071
digisTokenF3HB_{consumes(ps.getParameter<edm::InputTag>("digisLabelF3HB"))},
7172
rechitsM0Token_{produces()},

‎RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/SiPixelPhase2DigiToCluster.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
5454
};
5555

5656
SiPixelPhase2DigiToCluster::SiPixelPhase2DigiToCluster(const edm::ParameterSet& iConfig)
57-
: geomToken_(esConsumes()),
57+
: SynchronizingEDProducer(iConfig),
58+
geomToken_(esConsumes()),
5859
pixelDigiToken_(consumes<edm::DetSetVector<PixelDigi>>(iConfig.getParameter<edm::InputTag>("InputDigis"))),
5960
digiPutToken_(produces()),
6061
clusterPutToken_(produces()),

‎RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/SiPixelRawToCluster.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
8080

8181
template <typename TrackerTraits>
8282
SiPixelRawToCluster<TrackerTraits>::SiPixelRawToCluster(const edm::ParameterSet& iConfig)
83-
: rawGetToken_(consumes(iConfig.getParameter<edm::InputTag>("InputLabel"))),
83+
: SynchronizingEDProducer(iConfig),
84+
rawGetToken_(consumes(iConfig.getParameter<edm::InputTag>("InputLabel"))),
8485
digiPutToken_(produces()),
8586
clusterPutToken_(produces()),
8687
mapToken_(esConsumes()),

‎RecoLocalTracker/SiPixelRecHits/plugins/alpaka/SiPixelRecHitAlpaka.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
5656

5757
template <typename TrackerTraits>
5858
SiPixelRecHitAlpaka<TrackerTraits>::SiPixelRecHitAlpaka(const edm::ParameterSet& iConfig)
59-
: cpeToken_(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("CPE")))),
59+
: EDProducer(iConfig),
60+
cpeToken_(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("CPE")))),
6061
tBeamSpot(consumes(iConfig.getParameter<edm::InputTag>("beamSpot"))),
6162
tokenClusters_(consumes(iConfig.getParameter<edm::InputTag>("src"))),
6263
tokenDigi_(consumes(iConfig.getParameter<edm::InputTag>("src"))),

‎RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducer.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
152152
}
153153

154154
PFClusterSoAProducer(edm::ParameterSet const& config, PFClusterParamsCache const*)
155-
: topologyToken_(esConsumes(config.getParameter<edm::ESInputTag>("topology"))),
155+
: SynchronizingEDProducer(config),
156+
topologyToken_(esConsumes(config.getParameter<edm::ESInputTag>("topology"))),
156157
inputPFRecHitSoA_Token_{consumes(config.getParameter<edm::InputTag>("pfRecHits"))},
157158
inputPFRecHitNum_Token_{consumes(config.getParameter<edm::InputTag>("pfRecHits"))},
158159
outputPFClusterSoA_Token_{produces()},

‎RecoParticleFlow/PFRecHitProducer/plugins/alpaka/CaloRecHitSoAProducer.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
2626
class CaloRecHitSoAProducer : public global::EDProducer<> {
2727
public:
2828
CaloRecHitSoAProducer(edm::ParameterSet const& config)
29-
: recHitsToken_(consumes(config.getParameter<edm::InputTag>("src"))),
29+
: EDProducer(config),
30+
recHitsToken_(consumes(config.getParameter<edm::InputTag>("src"))),
3031
deviceToken_(produces()),
3132
synchronise_(config.getUntrackedParameter<bool>("synchronise")) {}
3233

‎RecoParticleFlow/PFRecHitProducer/plugins/alpaka/PFRecHitSoAProducer.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
2222
class PFRecHitSoAProducer : public stream::SynchronizingEDProducer<> {
2323
public:
2424
PFRecHitSoAProducer(edm::ParameterSet const& config)
25-
: topologyToken_(esConsumes(config.getParameter<edm::ESInputTag>("topology"))),
25+
: SynchronizingEDProducer(config),
26+
topologyToken_(esConsumes(config.getParameter<edm::ESInputTag>("topology"))),
2627
pfRecHitsToken_(produces()),
2728
sizeToken_(produces()),
2829
synchronise_(config.getUntrackedParameter<bool>("synchronise")),

‎RecoTracker/LST/plugins/alpaka/LSTProducer.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
2626
class LSTProducer : public stream::SynchronizingEDProducer<> {
2727
public:
2828
LSTProducer(edm::ParameterSet const& config)
29-
: lstPixelSeedInputToken_{consumes(config.getParameter<edm::InputTag>("pixelSeedInput"))},
29+
: SynchronizingEDProducer(config),
30+
lstPixelSeedInputToken_{consumes(config.getParameter<edm::InputTag>("pixelSeedInput"))},
3031
lstPhase2OTHitsInputToken_{consumes(config.getParameter<edm::InputTag>("phase2OTHitsInput"))},
3132
lstESToken_{esConsumes(edm::ESInputTag("", config.getParameter<std::string>("ptCutLabel")))},
3233
verbose_(config.getParameter<bool>("verbose")),

‎RecoTracker/PixelSeeding/plugins/alpaka/CAHitNtuplet.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
5454

5555
template <typename TrackerTraits>
5656
CAHitNtupletAlpaka<TrackerTraits>::CAHitNtupletAlpaka(const edm::ParameterSet& iConfig)
57-
: tokenField_(esConsumes()),
57+
: EDProducer(iConfig),
58+
tokenField_(esConsumes()),
5859
cpeToken_(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("CPE")))),
5960
tokenHit_(consumes(iConfig.getParameter<edm::InputTag>("pixelRecHitSrc"))),
6061
tokenTrack_(produces()),

‎RecoVertex/BeamSpotProducer/plugins/alpaka/BeamSpotDeviceProducer.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
1515
class BeamSpotDeviceProducer : public global::EDProducer<> {
1616
public:
1717
BeamSpotDeviceProducer(edm::ParameterSet const& config)
18-
: legacyToken_{consumes(config.getParameter<edm::InputTag>("src"))}, deviceToken_{produces()} {}
18+
: EDProducer(config),
19+
legacyToken_{consumes(config.getParameter<edm::InputTag>("src"))},
20+
deviceToken_{produces()} {}
1921

2022
void produce(edm::StreamID, device::Event& event, device::EventSetup const& setup) const override {
2123
reco::BeamSpot const& beamspot = event.get(legacyToken_);

‎RecoVertex/PixelVertexFinding/plugins/alpaka/PixelVertexProducerAlpaka.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
5555

5656
template <typename TrackerTraits>
5757
PixelVertexProducerAlpaka<TrackerTraits>::PixelVertexProducerAlpaka(const edm::ParameterSet& conf)
58-
: algo_(conf.getParameter<bool>("oneKernel"),
58+
: EDProducer(conf),
59+
algo_(conf.getParameter<bool>("oneKernel"),
5960
conf.getParameter<bool>("useDensity"),
6061
conf.getParameter<bool>("useDBSCAN"),
6162
conf.getParameter<bool>("useIterative"),

0 commit comments

Comments
 (0)