Merge pull request cms-sw#21 from PixelTracksAlpaka/merge_all_Pixel_A…

…lpaka_Migration_PRs_fix

Fix for the hits.

- missing memsets in PixelCPEFastParamsHost::fillParamsForDevice();
- proper CPE naming in SiPixelRecHitAlpaka;
- some commented code clean-up.

RecoLocalTracker/SiPixelRecHits/plugins/alpaka/SiPixelRecHitAlpaka.cc

@@ -18,7 +18,15 @@
 #include "HeterogeneousCore/AlpakaCore/interface/alpaka/global/EDProducer.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/config.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/memory.h"
-#include "RecoLocalTracker/Records/interface/TkPixelCPERecord.h"
+
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#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/SiPixelRecHits/interface/PixelCPEBase.h"
 #include "RecoLocalTracker/SiPixelRecHits/interface/pixelCPEforDevice.h"
 #include "RecoLocalTracker/SiPixelRecHits/interface/alpaka/PixelCPEFastParamsCollection.h"
@@ -39,7 +47,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>, TkPixelCPERecord> cpeToken_;
+    const device::ESGetToken<PixelCPEFastParams<TrackerTraits>, PixelCPEFastParamsRecord> cpeToken_;
     const device::EDGetToken<BeamSpotDeviceProduct> tBeamSpot;
     const device::EDGetToken<SiPixelClustersSoA> tokenClusters_;
     const device::EDGetToken<SiPixelDigisSoA> tokenDigi_;
@@ -63,7 +71,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     desc.add<edm::InputTag>("beamSpot", edm::InputTag("offlineBeamSpotDevice"));
     desc.add<edm::InputTag>("src", edm::InputTag("siPixelClustersPreSplittingAlpaka"));
 
-    std::string cpe = "PixelCPEFast";
+    std::string cpe = "PixelCPEFastParams";
     cpe += TrackerTraits::nameModifier;
     desc.add<std::string>("CPE", cpe);