Skip to content

Commit ddb0b6e

Browse files
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 1 deletion
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")),

0 commit comments

Comments
 (0)