Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use TkPixelCPERecord for PixelCPEFastParams* #46852

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Use TkPixelCPERecord for PixelCPEFastParams* #46852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions RecoLocalTracker/Records/interface/PixelCPEFastParamsRecord.h
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions RecoLocalTracker/Records/src/PixelCPEFastParamsRecord.cc
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions RecoLocalTracker/SiPixelRecHits/plugins/alpaka/PixelCPEFastParamsESProducerAlpaka.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
#include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h"

#include "CondFormats/DataRecord/interface/SiPixelGenErrorDBObjectRcd.h"
#include "RecoLocalTracker/Records/interface/PixelCPEFastParamsRecord.h"
#include "RecoLocalTracker/Records/interface/TkPixelCPERecord.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"

namespace ALPAKA_ACCELERATOR_NAMESPACE {
template <typename TrackerTraits>
class PixelCPEFastParamsESProducerAlpaka : public ESProducer {
public:
PixelCPEFastParamsESProducerAlpaka(edm::ParameterSet const& iConfig);
std::unique_ptr<PixelCPEFastParamsHost<TrackerTraits>> produce(const PixelCPEFastParamsRecord& iRecord);
std::unique_ptr<PixelCPEFastParamsHost<TrackerTraits>> produce(const TkPixelCPERecord& iRecord);

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

Expand Down Expand Up @@ -66,7 +66,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {

template <typename TrackerTraits>
std::unique_ptr<PixelCPEFastParamsHost<TrackerTraits>> PixelCPEFastParamsESProducerAlpaka<TrackerTraits>::produce(
const PixelCPEFastParamsRecord& iRecord) {
const TkPixelCPERecord& iRecord) {
// add the new la width object
const SiPixelLorentzAngle* lorentzAngleWidthProduct = &iRecord.get(lorentzAngleWidthToken_);

Expand Down
4 changes: 2 additions & 2 deletions RecoLocalTracker/SiPixelRecHits/plugins/alpaka/SiPixelRecHitAlpaka.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "FWCore/Utilities/interface/InputTag.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "RecoLocalTracker/Records/interface/PixelCPEFastParamsRecord.h"
#include "RecoLocalTracker/Records/interface/TkPixelCPERecord.h"

#include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h"
#include "RecoLocalTracker/SiPixelRecHits/interface/pixelCPEforDevice.h"
Expand All @@ -45,7 +45,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
private:
void produce(edm::StreamID streamID, device::Event& iEvent, const device::EventSetup& iSetup) const override;

const device::ESGetToken<PixelCPEFastParams<TrackerTraits>, PixelCPEFastParamsRecord> cpeToken_;
const device::ESGetToken<PixelCPEFastParams<TrackerTraits>, TkPixelCPERecord> cpeToken_;
const device::EDGetToken<BeamSpotDevice> tBeamSpot;
const device::EDGetToken<SiPixelClustersSoACollection> tokenClusters_;
const device::EDGetToken<SiPixelDigisSoACollection> tokenDigi_;
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/PixelSeeding/plugins/alpaka/CAHitNtuplet.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
#include "RecoTracker/TkMSParametrization/interface/PixelRecoUtilities.h"
#include "RecoLocalTracker/Records/interface/PixelCPEFastParamsRecord.h"
#include "RecoLocalTracker/Records/interface/TkPixelCPERecord.h"
#include "RecoLocalTracker/SiPixelRecHits/interface/alpaka/PixelCPEFastParamsCollection.h"

#include "CAHitNtupletGenerator.h"
Expand All @@ -45,7 +45,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {

private:
const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> tokenField_;
const device::ESGetToken<PixelCPEFastParams<TrackerTraits>, PixelCPEFastParamsRecord> cpeToken_;
const device::ESGetToken<PixelCPEFastParams<TrackerTraits>, TkPixelCPERecord> cpeToken_;
const device::EDGetToken<HitsOnDevice> tokenHit_;
const device::EDPutToken<TkSoADevice> tokenTrack_;

Expand Down