Skip to content

Commit 5cda0cd

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47611 from AdrianoDee/flexible_ca_final
A More Flexible And Lightweight CA
2 parents 5c7b422 + 39cf7f8 commit 5cda0cd

File tree

96 files changed

+3756
-2553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3756
-2553
lines changed

‎DQM/SiPixelHeterogeneous/plugins/SiPixelCompareRecHits.cc‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
2121

2222
// TODO: change class name to SiPixelCompareRecHitsSoA when CUDA code is removed
23-
template <typename T>
2423
class SiPixelCompareRecHits : public DQMEDAnalyzer {
2524
public:
26-
using HitsSoA = TrackingRecHitHost<T>;
25+
using HitsSoA = reco::TrackingRecHitHost;
2726

2827
explicit SiPixelCompareRecHits(const edm::ParameterSet&);
2928
~SiPixelCompareRecHits() override = default;
@@ -75,8 +74,8 @@ class SiPixelCompareRecHits : public DQMEDAnalyzer {
7574
//
7675
// constructors
7776
//
78-
template <typename T>
79-
SiPixelCompareRecHits<T>::SiPixelCompareRecHits(const edm::ParameterSet& iConfig)
77+
78+
SiPixelCompareRecHits::SiPixelCompareRecHits(const edm::ParameterSet& iConfig)
8079
: geomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>()),
8180
topoToken_(esConsumes<TrackerTopology, TrackerTopologyRcd, edm::Transition::BeginRun>()),
8281
tokenSoAHitsReference_(consumes(iConfig.getParameter<edm::InputTag>("pixelHitsReferenceSoA"))),
@@ -87,15 +86,14 @@ SiPixelCompareRecHits<T>::SiPixelCompareRecHits(const edm::ParameterSet& iConfig
8786
//
8887
// Begin Run
8988
//
90-
template <typename T>
91-
void SiPixelCompareRecHits<T>::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {
89+
90+
void SiPixelCompareRecHits::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {
9291
tkGeom_ = &iSetup.getData(geomToken_);
9392
tTopo_ = &iSetup.getData(topoToken_);
9493
}
9594

96-
template <typename T>
9795
template <typename U, typename V>
98-
void SiPixelCompareRecHits<T>::analyzeSeparate(U tokenRef, V tokenTar, const edm::Event& iEvent) {
96+
void SiPixelCompareRecHits::analyzeSeparate(U tokenRef, V tokenTar, const edm::Event& iEvent) {
9997
const auto& rhsoaHandleRef = iEvent.getHandle(tokenRef);
10098
const auto& rhsoaHandleTar = iEvent.getHandle(tokenTar);
10199

@@ -206,8 +204,8 @@ void SiPixelCompareRecHits<T>::analyzeSeparate(U tokenRef, V tokenTar, const edm
206204
//
207205
// -- Analyze
208206
//
209-
template <typename T>
210-
void SiPixelCompareRecHits<T>::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
207+
208+
void SiPixelCompareRecHits::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
211209
// The default use case is to use vertices from Alpaka reconstructed on CPU and GPU;
212210
// The function is left templated if any other cases need to be added
213211
analyzeSeparate(tokenSoAHitsReference_, tokenSoAHitsTarget_, iEvent);
@@ -216,10 +214,10 @@ void SiPixelCompareRecHits<T>::analyze(const edm::Event& iEvent, const edm::Even
216214
//
217215
// -- Book Histograms
218216
//
219-
template <typename T>
220-
void SiPixelCompareRecHits<T>::bookHistograms(DQMStore::IBooker& iBook,
221-
edm::Run const& iRun,
222-
edm::EventSetup const& iSetup) {
217+
218+
void SiPixelCompareRecHits::bookHistograms(DQMStore::IBooker& iBook,
219+
edm::Run const& iRun,
220+
edm::EventSetup const& iSetup) {
223221
iBook.cd();
224222
iBook.setCurrentFolder(topFolderName_);
225223

@@ -259,8 +257,8 @@ void SiPixelCompareRecHits<T>::bookHistograms(DQMStore::IBooker& iBook,
259257
hFposYDiff_ = iBook.book1D("rechitsposYDiffFpix","y-position difference of rechits in FPix; rechit y-pos difference (Reference - Target)", 1000, -10, 10);
260258
}
261259

262-
template<typename T>
263-
void SiPixelCompareRecHits<T>::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
260+
261+
void SiPixelCompareRecHits::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
264262
// monitorpixelRecHitsSoAAlpaka
265263
edm::ParameterSetDescription desc;
266264
desc.add<edm::InputTag>("pixelHitsReferenceSoA", edm::InputTag("siPixelRecHitsPreSplittingAlpakaSerial"));
@@ -270,12 +268,15 @@ void SiPixelCompareRecHits<T>::fillDescriptions(edm::ConfigurationDescriptions&
270268
descriptions.addWithDefaultLabel(desc);
271269
}
272270

273-
using SiPixelPhase1CompareRecHits = SiPixelCompareRecHits<pixelTopology::Phase1>;
274-
using SiPixelPhase2CompareRecHits = SiPixelCompareRecHits<pixelTopology::Phase2>;
275-
using SiPixelHIonPhase1CompareRecHits = SiPixelCompareRecHits<pixelTopology::HIonPhase1>;
271+
using SiPixelCompareRecHits = SiPixelCompareRecHits;
272+
// keeping the old names to allow a smooth HLT migration
273+
using SiPixelPhase1CompareRecHits = SiPixelCompareRecHits;
274+
using SiPixelPhase2CompareRecHits = SiPixelCompareRecHits;
275+
using SiPixelHIonPhase1CompareRecHits = SiPixelCompareRecHits;
276276

277277
#include "FWCore/Framework/interface/MakerMacros.h"
278278
// TODO: change module names to SiPixel*CompareRecHitsSoA when CUDA code is removed
279+
DEFINE_FWK_MODULE(SiPixelCompareRecHits);
279280
DEFINE_FWK_MODULE(SiPixelPhase1CompareRecHits);
280281
DEFINE_FWK_MODULE(SiPixelPhase2CompareRecHits);
281282
DEFINE_FWK_MODULE(SiPixelHIonPhase1CompareRecHits);

‎DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTracks.cc‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ namespace {
6969
} // namespace
7070

7171
// TODO: change class name to SiPixelCompareTracksSoA when CUDA code is removed
72-
template <typename T>
72+
7373
class SiPixelCompareTracks : public DQMEDAnalyzer {
7474
public:
75-
using PixelTrackSoA = TracksHost<T>;
75+
using PixelTrackSoA = reco::TracksHost;
7676

7777
explicit SiPixelCompareTracks(const edm::ParameterSet&);
7878
~SiPixelCompareTracks() override = default;
@@ -135,20 +135,16 @@ class SiPixelCompareTracks : public DQMEDAnalyzer {
135135
// constructors
136136
//
137137

138-
template <typename T>
139-
SiPixelCompareTracks<T>::SiPixelCompareTracks(const edm::ParameterSet& iConfig)
138+
SiPixelCompareTracks::SiPixelCompareTracks(const edm::ParameterSet& iConfig)
140139
: tokenSoATrackReference_(consumes<PixelTrackSoA>(iConfig.getParameter<edm::InputTag>("pixelTrackReferenceSoA"))),
141140
tokenSoATrackTarget_(consumes<PixelTrackSoA>(iConfig.getParameter<edm::InputTag>("pixelTrackTargetSoA"))),
142141
topFolderName_(iConfig.getParameter<std::string>("topFolderName")),
143142
useQualityCut_(iConfig.getParameter<bool>("useQualityCut")),
144143
minQuality_(pixelTrack::qualityByName(iConfig.getParameter<std::string>("minQuality"))),
145144
dr2cut_(iConfig.getParameter<double>("deltaR2cut")) {}
146145

147-
template <typename T>
148146
template <typename U, typename V>
149-
void SiPixelCompareTracks<T>::analyzeSeparate(U tokenRef, V tokenTar, const edm::Event& iEvent) {
150-
using helper = TracksUtilities<T>;
151-
147+
void SiPixelCompareTracks::analyzeSeparate(U tokenRef, V tokenTar, const edm::Event& iEvent) {
152148
const auto& tsoaHandleRef = iEvent.getHandle(tokenRef);
153149
const auto& tsoaHandleTar = iEvent.getHandle(tokenTar);
154150

@@ -182,7 +178,7 @@ void SiPixelCompareTracks<T>::analyzeSeparate(U tokenRef, V tokenTar, const edm:
182178
//Loop over Tar tracks and store the indices of the loose tracks. Whats happens if useQualityCut_ is false?
183179
std::vector<int32_t> looseTrkidxTar;
184180
for (int32_t jt = 0; jt < maxTracksTar; ++jt) {
185-
if (helper::nHits(tsoaTar.view(), jt) == 0)
181+
if (reco::nHits(tsoaTar.view(), jt) == 0)
186182
break; // this is a guard
187183
if (!(tsoaTar.view()[jt].pt() > 0.))
188184
continue;
@@ -195,7 +191,7 @@ void SiPixelCompareTracks<T>::analyzeSeparate(U tokenRef, V tokenTar, const edm:
195191

196192
//Now loop over Ref tracks//nested loop for loose gPU tracks
197193
for (int32_t it = 0; it < maxTracksRef; ++it) {
198-
int nHitsRef = helper::nHits(tsoaRef.view(), it);
194+
int nHitsRef = reco::nHits(tsoaRef.view(), it);
199195

200196
if (nHitsRef == 0)
201197
break; // this is a guard
@@ -238,7 +234,7 @@ void SiPixelCompareTracks<T>::analyzeSeparate(U tokenRef, V tokenTar, const edm:
238234

239235
hchi2_->Fill(tsoaRef.view()[it].chi2(), tsoaTar.view()[closestTkidx].chi2());
240236
hCharge_->Fill(qRef, reco::charge(tsoaTar.view(), closestTkidx));
241-
hnHits_->Fill(helper::nHits(tsoaRef.view(), it), helper::nHits(tsoaTar.view(), closestTkidx));
237+
hnHits_->Fill(reco::nHits(tsoaRef.view(), it), reco::nHits(tsoaTar.view(), closestTkidx));
242238
hnLayers_->Fill(tsoaRef.view()[it].nLayers(), tsoaTar.view()[closestTkidx].nLayers());
243239
hpt_->Fill(ptRef, tsoaTar.view()[closestTkidx].pt());
244240
hCurvature_->Fill(qRef / ptRef, reco::charge(tsoaTar.view(), closestTkidx) / tsoaTar.view()[closestTkidx].pt());
@@ -279,8 +275,8 @@ void SiPixelCompareTracks<T>::analyzeSeparate(U tokenRef, V tokenTar, const edm:
279275
//
280276
// -- Analyze
281277
//
282-
template <typename T>
283-
void SiPixelCompareTracks<T>::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
278+
279+
void SiPixelCompareTracks::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
284280
// The default use case is to use vertices from Alpaka reconstructed on CPU and GPU;
285281
// The function is left templated if any other cases need to be added
286282
analyzeSeparate(tokenSoATrackReference_, tokenSoATrackTarget_, iEvent);
@@ -289,10 +285,10 @@ void SiPixelCompareTracks<T>::analyze(const edm::Event& iEvent, const edm::Event
289285
//
290286
// -- Book Histograms
291287
//
292-
template <typename T>
293-
void SiPixelCompareTracks<T>::bookHistograms(DQMStore::IBooker& iBook,
294-
edm::Run const& iRun,
295-
edm::EventSetup const& iSetup) {
288+
289+
void SiPixelCompareTracks::bookHistograms(DQMStore::IBooker& iBook,
290+
edm::Run const& iRun,
291+
edm::EventSetup const& iSetup) {
296292
iBook.cd();
297293
iBook.setCurrentFolder(topFolderName_);
298294

@@ -371,8 +367,7 @@ void SiPixelCompareTracks<T>::bookHistograms(DQMStore::IBooker& iBook,
371367

372368
}
373369

374-
template<typename T>
375-
void SiPixelCompareTracks<T>::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
370+
void SiPixelCompareTracks::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
376371
// monitorpixelTrackSoA
377372
edm::ParameterSetDescription desc;
378373
desc.add<edm::InputTag>("pixelTrackReferenceSoA", edm::InputTag("pixelTracksAlpakaSerial"));
@@ -386,10 +381,12 @@ void SiPixelCompareTracks<T>::fillDescriptions(edm::ConfigurationDescriptions& d
386381

387382
// TODO: change module names to SiPixel*CompareTracksSoA when CUDA code is removed
388383

389-
using SiPixelPhase1CompareTracks = SiPixelCompareTracks<pixelTopology::Phase1>;
390-
using SiPixelPhase2CompareTracks = SiPixelCompareTracks<pixelTopology::Phase2>;
391-
using SiPixelHIonPhase1CompareTracks = SiPixelCompareTracks<pixelTopology::HIonPhase1>;
384+
using SiPixelPhase1CompareTracks = SiPixelCompareTracks;
385+
using SiPixelPhase2CompareTracks = SiPixelCompareTracks;
386+
using SiPixelHIonPhase1CompareTracks = SiPixelCompareTracks;
392387

388+
// Duplicates to keep them alive for the HLT menu to migrate to the new modules
389+
DEFINE_FWK_MODULE(SiPixelCompareTracks);
393390
DEFINE_FWK_MODULE(SiPixelPhase1CompareTracks);
394391
DEFINE_FWK_MODULE(SiPixelPhase2CompareTracks);
395392
DEFINE_FWK_MODULE(SiPixelHIonPhase1CompareTracks);

‎DQM/SiPixelHeterogeneous/plugins/SiPixelMonitorRecHitsSoAAlpaka.cc‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
1717
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
1818

19-
template <typename T>
2019
class SiPixelMonitorRecHitsSoAAlpaka : public DQMEDAnalyzer {
2120
public:
22-
using HitsOnHost = TrackingRecHitHost<T>;
21+
using HitsOnHost = reco::TrackingRecHitHost;
2322

2423
explicit SiPixelMonitorRecHitsSoAAlpaka(const edm::ParameterSet&);
2524
~SiPixelMonitorRecHitsSoAAlpaka() override = default;
@@ -61,8 +60,8 @@ class SiPixelMonitorRecHitsSoAAlpaka : public DQMEDAnalyzer {
6160
//
6261
// constructors
6362
//
64-
template <typename T>
65-
SiPixelMonitorRecHitsSoAAlpaka<T>::SiPixelMonitorRecHitsSoAAlpaka(const edm::ParameterSet& iConfig)
63+
64+
SiPixelMonitorRecHitsSoAAlpaka::SiPixelMonitorRecHitsSoAAlpaka(const edm::ParameterSet& iConfig)
6665
: geomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>()),
6766
topoToken_(esConsumes<TrackerTopology, TrackerTopologyRcd, edm::Transition::BeginRun>()),
6867
tokenSoAHits_(consumes(iConfig.getParameter<edm::InputTag>("pixelHitsSrc"))),
@@ -71,17 +70,17 @@ SiPixelMonitorRecHitsSoAAlpaka<T>::SiPixelMonitorRecHitsSoAAlpaka(const edm::Par
7170
//
7271
// Begin Run
7372
//
74-
template <typename T>
75-
void SiPixelMonitorRecHitsSoAAlpaka<T>::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {
73+
74+
void SiPixelMonitorRecHitsSoAAlpaka::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {
7675
tkGeom_ = &iSetup.getData(geomToken_);
7776
tTopo_ = &iSetup.getData(topoToken_);
7877
}
7978

8079
//
8180
// -- Analyze
8281
//
83-
template <typename T>
84-
void SiPixelMonitorRecHitsSoAAlpaka<T>::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
82+
83+
void SiPixelMonitorRecHitsSoAAlpaka::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
8584
const auto& rhsoaHandle = iEvent.getHandle(tokenSoAHits_);
8685
if (!rhsoaHandle.isValid()) {
8786
edm::LogWarning("SiPixelMonitorRecHitsSoAAlpaka") << "No RecHits SoA found \n returning!";
@@ -136,10 +135,10 @@ void SiPixelMonitorRecHitsSoAAlpaka<T>::analyze(const edm::Event& iEvent, const
136135
//
137136
// -- Book Histograms
138137
//
139-
template <typename T>
140-
void SiPixelMonitorRecHitsSoAAlpaka<T>::bookHistograms(DQMStore::IBooker& iBook,
141-
edm::Run const& iRun,
142-
edm::EventSetup const& iSetup) {
138+
139+
void SiPixelMonitorRecHitsSoAAlpaka::bookHistograms(DQMStore::IBooker& iBook,
140+
edm::Run const& iRun,
141+
edm::EventSetup const& iSetup) {
143142
iBook.cd();
144143
iBook.setCurrentFolder(topFolderName_);
145144

@@ -179,20 +178,21 @@ void SiPixelMonitorRecHitsSoAAlpaka<T>::bookHistograms(DQMStore::IBooker& iBook,
179178
}
180179
}
181180

182-
template<typename T>
183-
void SiPixelMonitorRecHitsSoAAlpaka<T>::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
181+
void SiPixelMonitorRecHitsSoAAlpaka::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
184182
// monitorpixelRecHitsSoA
185183
edm::ParameterSetDescription desc;
186184
desc.add<edm::InputTag>("pixelHitsSrc", edm::InputTag("siPixelRecHitsPreSplittingAlpaka"));
187185
desc.add<std::string>("TopFolderName", "SiPixelHeterogeneous/PixelRecHitsAlpaka");
188186
descriptions.addWithDefaultLabel(desc);
189187
}
190188

191-
using SiPixelPhase1MonitorRecHitsSoAAlpaka = SiPixelMonitorRecHitsSoAAlpaka<pixelTopology::Phase1>;
192-
using SiPixelPhase2MonitorRecHitsSoAAlpaka = SiPixelMonitorRecHitsSoAAlpaka<pixelTopology::Phase2>;
193-
using SiPixelHIonPhase1MonitorRecHitsSoAAlpaka = SiPixelMonitorRecHitsSoAAlpaka<pixelTopology::HIonPhase1>;
189+
using SiPixelPhase1MonitorRecHitsSoAAlpaka = SiPixelMonitorRecHitsSoAAlpaka;
190+
using SiPixelPhase2MonitorRecHitsSoAAlpaka = SiPixelMonitorRecHitsSoAAlpaka;
191+
using SiPixelHIonPhase1MonitorRecHitsSoAAlpaka = SiPixelMonitorRecHitsSoAAlpaka;
194192

195193
#include "FWCore/Framework/interface/MakerMacros.h"
194+
DEFINE_FWK_MODULE(SiPixelMonitorRecHitsSoAAlpaka);
196195
DEFINE_FWK_MODULE(SiPixelPhase1MonitorRecHitsSoAAlpaka);
197196
DEFINE_FWK_MODULE(SiPixelPhase2MonitorRecHitsSoAAlpaka);
198197
DEFINE_FWK_MODULE(SiPixelHIonPhase1MonitorRecHitsSoAAlpaka);
198+

‎DQM/SiPixelHeterogeneous/plugins/SiPixelMonitorTrackSoAAlpaka.cc‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
2525
#include "DQMServices/Core/interface/DQMStore.h"
2626
#include "DataFormats/TrackSoA/interface/TracksHost.h"
27+
#include "DataFormats/TrackSoA/interface/alpaka/TrackUtilities.h"
2728

28-
template <typename T>
2929
class SiPixelMonitorTrackSoAAlpaka : public DQMEDAnalyzer {
3030
public:
31-
using PixelTrackHeterogeneous = TracksHost<T>;
31+
using PixelTrackHeterogeneous = reco::TracksHost;
3232
explicit SiPixelMonitorTrackSoAAlpaka(const edm::ParameterSet&);
3333
~SiPixelMonitorTrackSoAAlpaka() override = default;
3434
void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const& iSetup) override;
@@ -64,8 +64,7 @@ class SiPixelMonitorTrackSoAAlpaka : public DQMEDAnalyzer {
6464
// constructors
6565
//
6666

67-
template <typename T>
68-
SiPixelMonitorTrackSoAAlpaka<T>::SiPixelMonitorTrackSoAAlpaka(const edm::ParameterSet& iConfig) {
67+
SiPixelMonitorTrackSoAAlpaka::SiPixelMonitorTrackSoAAlpaka(const edm::ParameterSet& iConfig) {
6968
tokenSoATrack_ = consumes<PixelTrackHeterogeneous>(iConfig.getParameter<edm::InputTag>("pixelTrackSrc"));
7069
topFolderName_ = iConfig.getParameter<std::string>("topFolderName"); //"SiPixelHeterogeneous/PixelTrackSoA";
7170
useQualityCut_ = iConfig.getParameter<bool>("useQualityCut");
@@ -75,8 +74,8 @@ SiPixelMonitorTrackSoAAlpaka<T>::SiPixelMonitorTrackSoAAlpaka(const edm::Paramet
7574
//
7675
// -- Analyze
7776
//
78-
template <typename T>
79-
void SiPixelMonitorTrackSoAAlpaka<T>::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
77+
78+
void SiPixelMonitorTrackSoAAlpaka::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
8079
const auto& tsoaHandle = iEvent.getHandle(tokenSoATrack_);
8180
if (!tsoaHandle.isValid()) {
8281
edm::LogWarning("SiPixelMonitorTrackSoAAlpaka") << "No Track SoA found \n returning!" << std::endl;
@@ -90,7 +89,7 @@ void SiPixelMonitorTrackSoAAlpaka<T>::analyze(const edm::Event& iEvent, const ed
9089
int32_t nLooseAndAboveTracks = 0;
9190

9291
for (int32_t it = 0; it < maxTracks; ++it) {
93-
auto nHits = tsoa.view().detIndices().size(it);
92+
auto nHits = reco::nHits(tsoa.const_view(), it);
9493
auto nLayers = tsoa.view()[it].nLayers();
9594
if (nHits == 0)
9695
break; // this is a guard
@@ -139,10 +138,10 @@ void SiPixelMonitorTrackSoAAlpaka<T>::analyze(const edm::Event& iEvent, const ed
139138
//
140139
// -- Book Histograms
141140
//
142-
template <typename T>
143-
void SiPixelMonitorTrackSoAAlpaka<T>::bookHistograms(DQMStore::IBooker& iBook,
144-
edm::Run const& iRun,
145-
edm::EventSetup const& iSetup) {
141+
142+
void SiPixelMonitorTrackSoAAlpaka::bookHistograms(DQMStore::IBooker& iBook,
143+
edm::Run const& iRun,
144+
edm::EventSetup const& iSetup) {
146145
iBook.cd();
147146
iBook.setCurrentFolder(topFolderName_);
148147

@@ -181,8 +180,7 @@ hChi2VsEta = iBook.bookProfile("nChi2ndofVsEta", fmt::format("{} vs track #eta;T
181180
}
182181
}
183182

184-
template <typename T>
185-
void SiPixelMonitorTrackSoAAlpaka<T>::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
183+
void SiPixelMonitorTrackSoAAlpaka::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
186184
// monitorpixelTrackSoA
187185
edm::ParameterSetDescription desc;
188186
desc.add<edm::InputTag>("pixelTrackSrc", edm::InputTag("pixelTracksAlpaka"));
@@ -192,10 +190,12 @@ void SiPixelMonitorTrackSoAAlpaka<T>::fillDescriptions(edm::ConfigurationDescrip
192190
descriptions.addWithDefaultLabel(desc);
193191
}
194192

195-
using SiPixelPhase1MonitorTrackSoAAlpaka = SiPixelMonitorTrackSoAAlpaka<pixelTopology::Phase1>;
196-
using SiPixelPhase2MonitorTrackSoAAlpaka = SiPixelMonitorTrackSoAAlpaka<pixelTopology::Phase2>;
197-
using SiPixelHIonPhase1MonitorTrackSoAAlpaka = SiPixelMonitorTrackSoAAlpaka<pixelTopology::HIonPhase1>;
193+
using SiPixelPhase1MonitorTrackSoAAlpaka = SiPixelMonitorTrackSoAAlpaka;
194+
using SiPixelPhase2MonitorTrackSoAAlpaka = SiPixelMonitorTrackSoAAlpaka;
195+
using SiPixelHIonPhase1MonitorTrackSoAAlpaka = SiPixelMonitorTrackSoAAlpaka;
198196

197+
// Duplicates to keep them alive for the HLT menu to migrate to the new modules
198+
DEFINE_FWK_MODULE(SiPixelMonitorTrackSoAAlpaka);
199199
DEFINE_FWK_MODULE(SiPixelPhase1MonitorTrackSoAAlpaka);
200200
DEFINE_FWK_MODULE(SiPixelPhase2MonitorTrackSoAAlpaka);
201201
DEFINE_FWK_MODULE(SiPixelHIonPhase1MonitorTrackSoAAlpaka);

‎DataFormats/TrackSoA/interface/TrackDefinitions.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef DataFormats_Track_interface_TrackDefinitions_h
2-
#define DataFormats_Track_interface_TrackDefinitions_h
1+
#ifndef DataFormats_TrackSoA_interface_TrackDefinitions_h
2+
#define DataFormats_TrackSoA_interface_TrackDefinitions_h
33
#include <string>
44
#include <algorithm>
55
#include <stdexcept>

0 commit comments

Comments
 (0)