Skip to content

Commit

Permalink
Address first comments on 43295
Browse files Browse the repository at this point in the history
- missing test for ROOTReadStreamer
  • Loading branch information
AdrianoDee committed Nov 29, 2023
1 parent ac63b7b commit f524bfd
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 325 deletions.
10 changes: 0 additions & 10 deletions DataFormats/BeamSpot/interface/BeamSpotHostProduct.h

This file was deleted.

15 changes: 0 additions & 15 deletions DataFormats/BeamSpot/interface/alpaka/BeamSpotDeviceProduct.h

This file was deleted.

72 changes: 0 additions & 72 deletions DataFormats/Portable/interface/PortableDeviceProduct.h

This file was deleted.

99 changes: 0 additions & 99 deletions DataFormats/Portable/interface/PortableHostProduct.h

This file was deleted.

18 changes: 0 additions & 18 deletions DataFormats/Portable/interface/PortableProduct.h

This file was deleted.

65 changes: 0 additions & 65 deletions DataFormats/Portable/interface/alpaka/PortableProduct.h

This file was deleted.

14 changes: 0 additions & 14 deletions DataFormats/PortableTestObjects/interface/TestHostProduct.h

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/customizeHLTforPatatrack.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -248,7 +248,7 @@ def customizeHLTforAlpakaPixelRecoLocal(process):

# alpaka EDProducer
# consumes
# - BeamSpotDeviceProduct
# - BeamSpotDevice
# - SiPixelClustersSoA
# - SiPixelDigisCollection
# produces
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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_;
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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();
Expand All @@ -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));
}
Expand All @@ -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
Expand Down

0 comments on commit f524bfd

Please sign in to comment.