Address first comments on 43295

- missing test for ROOTReadStreamer
cms-sw · Nov 29, 2023 · f524bfd · f524bfd
1 parent ac63b7b
commit f524bfd
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 325 deletions.
diff --git a/DataFormats/BeamSpot/interface/BeamSpotHostProduct.h b/DataFormats/BeamSpot/interface/BeamSpotHostProduct.h
diff --git a/DataFormats/BeamSpot/interface/alpaka/BeamSpotDeviceProduct.h b/DataFormats/BeamSpot/interface/alpaka/BeamSpotDeviceProduct.h
diff --git a/DataFormats/Portable/interface/PortableDeviceProduct.h b/DataFormats/Portable/interface/PortableDeviceProduct.h
diff --git a/DataFormats/Portable/interface/PortableHostProduct.h b/DataFormats/Portable/interface/PortableHostProduct.h
diff --git a/DataFormats/Portable/interface/PortableProduct.h b/DataFormats/Portable/interface/PortableProduct.h
diff --git a/DataFormats/Portable/interface/alpaka/PortableProduct.h b/DataFormats/Portable/interface/alpaka/PortableProduct.h
diff --git a/DataFormats/PortableTestObjects/interface/TestHostProduct.h b/DataFormats/PortableTestObjects/interface/TestHostProduct.h
diff --git a/DataFormats/PortableTestObjects/interface/alpaka/TestDeviceProduct.h b/DataFormats/PortableTestObjects/interface/alpaka/TestDeviceProduct.h
diff --git a/HLTrigger/Configuration/python/customizeHLTforPatatrack.py b/HLTrigger/Configuration/python/customizeHLTforPatatrack.py
@@ -175,7 +175,7 @@ def customizeHLTforAlpakaPixelRecoLocal(process):
     # consumes
     #  - reco::BeamSpot
     # produces
-    #  - BeamSpotDeviceProduct
+    #  - BeamSpotDevice
     process.hltOnlineBeamSpotDevice = cms.EDProducer('BeamSpotDeviceProducer@alpaka',
         src = cms.InputTag('hltOnlineBeamSpot'),
         alpaka = cms.untracked.PSet(
@@ -248,7 +248,7 @@ def customizeHLTforAlpakaPixelRecoLocal(process):
 
     # alpaka EDProducer
     # consumes
-    #  - BeamSpotDeviceProduct
+    #  - BeamSpotDevice
     #  - SiPixelClustersSoA
     #  - SiPixelDigisCollection
     # produces

diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/alpaka/SiPixelRecHitAlpaka.cc b/RecoLocalTracker/SiPixelRecHits/plugins/alpaka/SiPixelRecHitAlpaka.cc
@@ -1,5 +1,5 @@
 #include "DataFormats/BeamSpot/interface/BeamSpotPOD.h"
-#include "DataFormats/BeamSpot/interface/alpaka/BeamSpotDeviceProduct.h"
+#include "DataFormats/BeamSpot/interface/alpaka/BeamSpotDevice.h"
 #include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersDevice.h"
 #include "DataFormats/SiPixelClusterSoA/interface/alpaka/SiPixelClustersCollection.h"
 #include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisDevice.h"
@@ -48,7 +48,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     void produce(edm::StreamID streamID, device::Event& iEvent, const device::EventSetup& iSetup) const override;
 
     const device::ESGetToken<PixelCPEFastParams<TrackerTraits>, PixelCPEFastParamsRecord> cpeToken_;
-    const device::EDGetToken<BeamSpotDeviceProduct> tBeamSpot;
+    const device::EDGetToken<BeamSpotDevice> tBeamSpot;
     const device::EDGetToken<SiPixelClustersCollection> tokenClusters_;
     const device::EDGetToken<SiPixelDigisCollection> tokenDigi_;
     const device::EDPutToken<TrackingRecHitAlpakaCollection<TrackerTraits>> tokenHit_;

diff --git a/RecoVertex/BeamSpotProducer/plugins/alpaka/BeamSpotDeviceProducer.cc b/RecoVertex/BeamSpotProducer/plugins/alpaka/BeamSpotDeviceProducer.cc
@@ -1,7 +1,7 @@
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
-#include "DataFormats/BeamSpot/interface/BeamSpotHostProduct.h"
+#include "DataFormats/BeamSpot/interface/BeamSpotHost.h"
 #include "DataFormats/BeamSpot/interface/BeamSpotPOD.h"
-#include "DataFormats/BeamSpot/interface/alpaka/BeamSpotDeviceProduct.h"
+#include "DataFormats/BeamSpot/interface/alpaka/BeamSpotDevice.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
@@ -20,7 +20,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     void produce(edm::StreamID, device::Event& event, device::EventSetup const& setup) const override {
       reco::BeamSpot const& beamspot = event.get(legacyToken_);
 
-      BeamSpotHostProduct hostProduct{event.queue()};
+      BeamSpotHost hostProduct{event.queue()};
       hostProduct->x = beamspot.x0();
       hostProduct->y = beamspot.y0();
       hostProduct->z = beamspot.z0();
@@ -36,7 +36,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
       if constexpr (std::is_same_v<Device, alpaka::DevCpu>) {
         event.emplace(deviceToken_, std::move(hostProduct));
       } else {
-        BeamSpotDeviceProduct deviceProduct{event.queue()};
+        BeamSpotDevice deviceProduct{event.queue()};
         alpaka::memcpy(event.queue(), deviceProduct.buffer(), hostProduct.const_buffer());
         event.emplace(deviceToken_, std::move(deviceProduct));
       }
@@ -50,7 +50,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
 
   private:
     const edm::EDGetTokenT<reco::BeamSpot> legacyToken_;
-    const device::EDPutToken<BeamSpotDeviceProduct> deviceToken_;
+    const device::EDPutToken<BeamSpotDevice> deviceToken_;
   };
 
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE