diff --git a/CUDADataFormats/CaloCommon/BuildFile.xml b/CUDADataFormats/CaloCommon/BuildFile.xml
deleted file mode 100644
index 9f9d23d5c1f84..0000000000000
--- a/CUDADataFormats/CaloCommon/BuildFile.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/CUDADataFormats/CaloCommon/interface/Common.h b/CUDADataFormats/CaloCommon/interface/Common.h
deleted file mode 100644
index 1be760ec917df..0000000000000
--- a/CUDADataFormats/CaloCommon/interface/Common.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef CUDADataFormats_CaloCommon_interface_Common_h
-#define CUDADataFormats_CaloCommon_interface_Common_h
-
-#include
-
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-namespace calo {
- namespace common {
-
- // FIXME: not able to get enums to work with genreflex
- namespace tags {
-
- struct Vec {};
- struct Ptr {};
- struct DevPtr {};
-
- } // namespace tags
-
- template
- struct AddSize {};
-
- template <>
- struct AddSize {
- uint32_t size;
- };
-
- template <>
- struct AddSize {
- uint32_t size;
- };
-
- struct ViewStoragePolicy {
- using TagType = tags::Ptr;
-
- template
- struct StorageSelector {
- using type = T*;
- };
- };
-
- struct DevStoragePolicy {
- using TagType = tags::DevPtr;
-
- template
- struct StorageSelector {
- using type = cms::cuda::device::unique_ptr;
- };
- };
-
- template typename Allocator = std::allocator>
- struct VecStoragePolicy {
- using TagType = tags::Vec;
-
- template
- struct StorageSelector {
- using type = std::vector>;
- };
- };
-
- template
- using CUDAHostAllocatorAlias = cms::cuda::HostAllocator;
-
- } // namespace common
-} // namespace calo
-
-#endif // CUDADataFormats_CaloCommon_interface_Common_h
diff --git a/CUDADataFormats/EcalDigi/BuildFile.xml b/CUDADataFormats/EcalDigi/BuildFile.xml
deleted file mode 100644
index b479a9f9db1ec..0000000000000
--- a/CUDADataFormats/EcalDigi/BuildFile.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/CUDADataFormats/EcalDigi/interface/DigisCollection.h b/CUDADataFormats/EcalDigi/interface/DigisCollection.h
deleted file mode 100644
index f471dbfb9fac8..0000000000000
--- a/CUDADataFormats/EcalDigi/interface/DigisCollection.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef CUDADataFormats_EcalDigi_interface_DigisCollection_h
-#define CUDADataFormats_EcalDigi_interface_DigisCollection_h
-
-#include "CUDADataFormats/CaloCommon/interface/Common.h"
-
-namespace ecal {
-
- template
- struct DigisCollection : public ::calo::common::AddSize {
- DigisCollection() = default;
- DigisCollection(DigisCollection const &) = default;
- DigisCollection &operator=(DigisCollection const &) = default;
-
- DigisCollection(DigisCollection &&) = default;
- DigisCollection &operator=(DigisCollection &&) = default;
-
- // stride is statically known
- typename StoragePolicy::template StorageSelector::type ids;
- typename StoragePolicy::template StorageSelector::type data;
- };
-
-} // namespace ecal
-
-#endif // CUDADataFormats_EcalDigi_interface_DigisCollection_h
diff --git a/CUDADataFormats/EcalRecHitSoA/BuildFile.xml b/CUDADataFormats/EcalRecHitSoA/BuildFile.xml
deleted file mode 100644
index 6d67c5d5f6220..0000000000000
--- a/CUDADataFormats/EcalRecHitSoA/BuildFile.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/CUDADataFormats/EcalRecHitSoA/interface/EcalRecHit.h b/CUDADataFormats/EcalRecHitSoA/interface/EcalRecHit.h
deleted file mode 100644
index 3e312218a112f..0000000000000
--- a/CUDADataFormats/EcalRecHitSoA/interface/EcalRecHit.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef CUDADataFormats_EcalRecHitSoA_interface_EcalRecHit_h
-#define CUDADataFormats_EcalRecHitSoA_interface_EcalRecHit_h
-
-#include
-#include
-
-#include "CUDADataFormats/CaloCommon/interface/Common.h"
-#include "DataFormats/EcalRecHit/interface/RecoTypes.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-
-namespace ecal {
-
- template
- struct RecHit : public ::calo::common::AddSize {
- RecHit() = default;
- RecHit(const RecHit&) = default;
- RecHit& operator=(const RecHit&) = default;
-
- RecHit(RecHit&&) = default;
- RecHit& operator=(RecHit&&) = default;
-
- typename StoragePolicy::template StorageSelector::type energy;
- typename StoragePolicy::template StorageSelector::type time;
- // should we remove the following, since already included in "extra" ?
- typename StoragePolicy::template StorageSelector::type chi2;
- typename StoragePolicy::template StorageSelector::type
- extra; // packed uint32_t for timeError, chi2, energyError
- typename StoragePolicy::template StorageSelector::type
- flagBits; // store rechit condition (see Flags enum) in a bit-wise way
- typename StoragePolicy::template StorageSelector::type did;
-
- template
- typename std::enable_if::value, void>::type resize(size_t size) {
- energy.resize(size);
- time.resize(size);
- chi2.resize(size);
- extra.resize(size);
- flagBits.resize(size);
- did.resize(size);
- }
- };
-
-} // namespace ecal
-
-#endif // CUDADataFormats_EcalRecHitSoA_interface_EcalRecHit_h
diff --git a/CUDADataFormats/EcalRecHitSoA/interface/EcalUncalibratedRecHit.h b/CUDADataFormats/EcalRecHitSoA/interface/EcalUncalibratedRecHit.h
deleted file mode 100644
index a48850e68858f..0000000000000
--- a/CUDADataFormats/EcalRecHitSoA/interface/EcalUncalibratedRecHit.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef CUDADataFormats_EcalRecHitSoA_interface_EcalUncalibratedRecHit_h
-#define CUDADataFormats_EcalRecHitSoA_interface_EcalUncalibratedRecHit_h
-
-#include "CUDADataFormats/CaloCommon/interface/Common.h"
-#include "DataFormats/EcalDigi/interface/EcalDataFrame.h"
-#include "DataFormats/EcalRecHit/interface/RecoTypes.h"
-
-namespace ecal {
-
- template
- struct UncalibratedRecHit : public ::calo::common::AddSize {
- UncalibratedRecHit() = default;
- UncalibratedRecHit(const UncalibratedRecHit&) = default;
- UncalibratedRecHit& operator=(const UncalibratedRecHit&) = default;
-
- UncalibratedRecHit(UncalibratedRecHit&&) = default;
- UncalibratedRecHit& operator=(UncalibratedRecHit&&) = default;
-
- typename StoragePolicy::template StorageSelector::type amplitudesAll;
- typename StoragePolicy::template StorageSelector::type amplitude;
- typename StoragePolicy::template StorageSelector::type amplitudeError;
- typename StoragePolicy::template StorageSelector::type chi2;
- typename StoragePolicy::template StorageSelector::type pedestal;
- typename StoragePolicy::template StorageSelector::type jitter;
- typename StoragePolicy::template StorageSelector::type jitterError;
- typename StoragePolicy::template StorageSelector::type did;
- typename StoragePolicy::template StorageSelector::type flags;
-
- template
- typename std::enable_if::value, void>::type resize(size_t size) {
- amplitudesAll.resize(size * EcalDataFrame::MAXSAMPLES);
- amplitude.resize(size);
- amplitudeError.resize(size);
- pedestal.resize(size);
- chi2.resize(size);
- did.resize(size);
- flags.resize(size);
- jitter.resize(size);
- jitterError.resize(size);
- }
- };
-
-} // namespace ecal
-
-#endif // CUDADataFormats_EcalRecHitSoA_interface_EcalUncalibratedRecHit_h
diff --git a/CondFormats/EcalObjects/BuildFile.xml b/CondFormats/EcalObjects/BuildFile.xml
index 61c5c69126a5e..7ddf77d34e558 100644
--- a/CondFormats/EcalObjects/BuildFile.xml
+++ b/CondFormats/EcalObjects/BuildFile.xml
@@ -5,17 +5,11 @@
-
-
-
-
-
-
-
+
diff --git a/CondFormats/EcalObjects/interface/EcalGainRatiosGPU.h b/CondFormats/EcalObjects/interface/EcalGainRatiosGPU.h
deleted file mode 100644
index 27a4236acd6e1..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalGainRatiosGPU.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalGainRatiosGPU_h
-#define CondFormats_EcalObjects_interface_EcalGainRatiosGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalGainRatiosGPU {
-public:
- struct Product {
- edm::propagate_const_array> gain12Over6;
- edm::propagate_const_array> gain6Over1;
- };
-
-#ifndef __CUDACC__
-
- // rearrange pedestals
- EcalGainRatiosGPU(EcalGainRatios const&);
-
- // will call dealloation for Product thru ~Product
- ~EcalGainRatiosGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- //
- static std::string name() { return std::string{"ecalGainRatiosGPU"}; }
-
-private:
- // in the future, we need to arrange so to avoid this copy on the host
- // store eb first then ee
- std::vector> gain12Over6_;
- std::vector> gain6Over1_;
-
- cms::cuda::ESProduct product_;
-
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalGainRatiosGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalIntercalibConstantsGPU.h b/CondFormats/EcalObjects/interface/EcalIntercalibConstantsGPU.h
deleted file mode 100644
index 35c172a2920af..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalIntercalibConstantsGPU.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalIntercalibConstantsGPU_h
-#define CondFormats_EcalObjects_interface_EcalIntercalibConstantsGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalIntercalibConstants.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalIntercalibConstantsGPU {
-public:
- struct Product {
- edm::propagate_const_array> values;
- };
-
-#ifndef __CUDACC__
- //
- EcalIntercalibConstantsGPU(EcalIntercalibConstants const&);
-
- // will call dealloation for Product thru ~Product
- ~EcalIntercalibConstantsGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- // TODO: do this centrally
- // get offset for hashes. equals number of barrel items
- uint32_t getOffset() const { return offset_; }
-
- //
- static std::string name() { return std::string{"ecalIntercalibConstantsGPU"}; }
-
-private:
- std::vector> values_;
- uint32_t offset_;
-
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalIntercalibConstantsGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalLaserAPDPNRatiosGPU.h b/CondFormats/EcalObjects/interface/EcalLaserAPDPNRatiosGPU.h
deleted file mode 100644
index f68c405470556..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalLaserAPDPNRatiosGPU.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalLaserAPDPNRatiosGPU_h
-#define CondFormats_EcalObjects_interface_EcalLaserAPDPNRatiosGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalLaserAPDPNRatios.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalLaserAPDPNRatiosGPU {
-public:
- struct Product {
- edm::propagate_const_array> p1;
- edm::propagate_const_array> p2;
- edm::propagate_const_array> p3;
- edm::propagate_const_array> t1;
- edm::propagate_const_array> t2;
- edm::propagate_const_array> t3;
- };
-
-#ifndef __CUDACC__
-
- //
- EcalLaserAPDPNRatiosGPU(EcalLaserAPDPNRatios const &);
-
- // will call dealloation for Product thru ~Product
- ~EcalLaserAPDPNRatiosGPU() = default;
-
- // get device pointers
- Product const &getProduct(cudaStream_t) const;
-
- //
- static std::string name() { return std::string{"ecalLaserAPDPNRatiosGPU"}; }
-
-private:
- // in the future, we need to arrange so to avoid this copy on the host
- // store eb first then ee
- std::vector> p1_;
- std::vector> p2_;
- std::vector> p3_;
-
- std::vector> t1_;
- std::vector> t2_;
- std::vector> t3_;
-
- cms::cuda::ESProduct product_;
-
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalLaserAPDPNRatiosGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalLaserAPDPNRatiosRefGPU.h b/CondFormats/EcalObjects/interface/EcalLaserAPDPNRatiosRefGPU.h
deleted file mode 100644
index 2b9514a081c14..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalLaserAPDPNRatiosRefGPU.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalLaserAPDPNRatiosRefGPU_h
-#define CondFormats_EcalObjects_interface_EcalLaserAPDPNRatiosRefGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalLaserAPDPNRatiosRef.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalLaserAPDPNRatiosRefGPU {
-public:
- struct Product {
- edm::propagate_const_array> values;
- };
-
-#ifndef __CUDACC__
- //
- EcalLaserAPDPNRatiosRefGPU(EcalLaserAPDPNRatiosRef const&);
-
- // will call dealloation for Product thru ~Product
- ~EcalLaserAPDPNRatiosRefGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- // TODO: do this centrally
- // get offset for hashes. equals number of barrel items
- uint32_t getOffset() const { return offset_; }
- uint32_t offset_;
-
- //
- static std::string name() { return std::string{"ecalLaserAPDPNRatiosRefGPU"}; }
-
-private:
- std::vector> values_;
-
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalLaserAPDPNRatiosRefGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalLaserAlphasGPU.h b/CondFormats/EcalObjects/interface/EcalLaserAlphasGPU.h
deleted file mode 100644
index 50599a6afb43f..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalLaserAlphasGPU.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalLaserAlphasGPU_h
-#define CondFormats_EcalObjects_interface_EcalLaserAlphasGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalLaserAlphas.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalLaserAlphasGPU {
-public:
- struct Product {
- edm::propagate_const_array> values;
- };
-
-#ifndef __CUDACC__
- //
- EcalLaserAlphasGPU(EcalLaserAlphas const&);
-
- // will call dealloation for Product thru ~Product
- ~EcalLaserAlphasGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- // TODO: do this centrally
- // get offset for hashes. equals number of barrel items
- uint32_t getOffset() const { return offset_; }
-
- //
- static std::string name() { return std::string{"ecalLaserAlphasGPU"}; }
-
-private:
- std::vector> values_;
- uint32_t offset_;
-
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalLaserAlphasGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalLinearCorrectionsGPU.h b/CondFormats/EcalObjects/interface/EcalLinearCorrectionsGPU.h
deleted file mode 100644
index 8513224071f9d..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalLinearCorrectionsGPU.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalLinearCorrectionsGPU_h
-#define CondFormats_EcalObjects_interface_EcalLinearCorrectionsGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalLinearCorrections.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalLinearCorrectionsGPU {
-public:
- struct Product {
- edm::propagate_const_array> p1;
- edm::propagate_const_array> p2;
- edm::propagate_const_array> p3;
- edm::propagate_const_array> t1;
- edm::propagate_const_array> t2;
- edm::propagate_const_array> t3;
- };
-
-#ifndef __CUDACC__
-
- //
- EcalLinearCorrectionsGPU(EcalLinearCorrections const &);
-
- // will call dealloation for Product thru ~Product
- ~EcalLinearCorrectionsGPU() = default;
-
- // get device pointers
- Product const &getProduct(cudaStream_t) const;
-
- //
- static std::string name() { return std::string{"ecalLinearCorrectionsGPU"}; }
-
-private:
- // in the future, we need to arrange so to avoid this copy on the host
- // store eb first then ee
- std::vector> p1_;
- std::vector> p2_;
- std::vector> p3_;
-
- std::vector> t1_;
- std::vector> t2_;
- std::vector> t3_;
-
- cms::cuda::ESProduct product_;
-
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalLinearCorrectionsGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalMultifitParametersGPU.h b/CondFormats/EcalObjects/interface/EcalMultifitParametersGPU.h
deleted file mode 100644
index 51b59a2d46dc8..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalMultifitParametersGPU.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalMultifitParametersGPU_h
-#define CondFormats_EcalObjects_interface_EcalMultifitParametersGPU_h
-
-#include
-
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalMultifitParametersGPU {
-public:
- struct Product {
- edm::propagate_const_array> amplitudeFitParametersEB;
- edm::propagate_const_array> amplitudeFitParametersEE;
- edm::propagate_const_array> timeFitParametersEB;
- edm::propagate_const_array> timeFitParametersEE;
- };
-
-#ifndef __CUDACC__
- EcalMultifitParametersGPU(std::vector const& amplitudeEB,
- std::vector const& amplitudeEE,
- std::vector const& timeEB,
- std::vector const& timeEE);
-
- ~EcalMultifitParametersGPU() = default;
-
- Product const& getProduct(cudaStream_t) const;
-
- std::array> const>, 4> getValues() const {
- return {{amplitudeFitParametersEB_, amplitudeFitParametersEE_, timeFitParametersEB_, timeFitParametersEE_}};
- }
-
-private:
- std::vector> amplitudeFitParametersEB_, amplitudeFitParametersEE_,
- timeFitParametersEB_, timeFitParametersEE_;
-
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalMultifitParametersGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalPedestalsGPU.h b/CondFormats/EcalObjects/interface/EcalPedestalsGPU.h
deleted file mode 100644
index 80bc2d3a3fb80..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalPedestalsGPU.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalPedestalsGPU_h
-#define CondFormats_EcalObjects_interface_EcalPedestalsGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalPedestalsGPU {
-public:
- struct Product {
- edm::propagate_const_array> mean_x12;
- edm::propagate_const_array> mean_x6;
- edm::propagate_const_array> mean_x1;
- edm::propagate_const_array> rms_x12;
- edm::propagate_const_array> rms_x6;
- edm::propagate_const_array> rms_x1;
- };
-
-#ifndef __CUDACC__
-
- // rearrange pedestals
- EcalPedestalsGPU(EcalPedestals const &);
-
- // will call dealloation for Product thru ~Product
- ~EcalPedestalsGPU() = default;
-
- // get device pointers
- Product const &getProduct(cudaStream_t) const;
-
- //
- static std::string name() { return std::string{"ecalPedestalsGPU"}; }
-
-private:
- // in the future, we need to arrange so to avoid this copy on the host
- // store eb first then ee
- std::vector> mean_x12_;
- std::vector> rms_x12_;
- std::vector> mean_x6_;
- std::vector> rms_x6_;
- std::vector> mean_x1_;
- std::vector> rms_x1_;
-
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalPedestalsGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalPulseCovariancesGPU.h b/CondFormats/EcalObjects/interface/EcalPulseCovariancesGPU.h
deleted file mode 100644
index 56207d8cb4ab3..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalPulseCovariancesGPU.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalPulseCovariancesGPU_h
-#define CondFormats_EcalObjects_interface_EcalPulseCovariancesGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalPulseCovariances.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalPulseCovariancesGPU {
-public:
- struct Product {
- ~Product();
- EcalPulseCovariance* values = nullptr;
- };
-
-#ifndef __CUDACC__
- // rearrange pedestals
- EcalPulseCovariancesGPU(EcalPulseCovariances const&);
-
- // will call dealloation for Product thru ~Product
- ~EcalPulseCovariancesGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- //
- static std::string name() { return std::string{"ecalPulseCovariancesGPU"}; }
-
-private:
- // reuse original vectors (although with default allocator)
- std::vector const& valuesEB_;
- std::vector const& valuesEE_;
-
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalPulseCovariancesGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalPulseShapesGPU.h b/CondFormats/EcalObjects/interface/EcalPulseShapesGPU.h
deleted file mode 100644
index 0caf954409b18..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalPulseShapesGPU.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalPulseShapesGPU_h
-#define CondFormats_EcalObjects_interface_EcalPulseShapesGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalPulseShapes.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalPulseShapesGPU {
-public:
- struct Product {
- ~Product();
- EcalPulseShape* values = nullptr;
- };
-
-#ifndef __CUDACC__
- // rearrange pedestals
- EcalPulseShapesGPU(EcalPulseShapes const&);
-
- // will call dealloation for Product thru ~Product
- ~EcalPulseShapesGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- //
- static std::string name() { return std::string{"ecalPulseShapesGPU"}; }
-
-private:
- // reuse original vectors (although with default allocator)
- std::vector const& valuesEB_;
- std::vector const& valuesEE_;
-
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalPulseShapesGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalRecHitParametersGPU.h b/CondFormats/EcalObjects/interface/EcalRecHitParametersGPU.h
deleted file mode 100644
index 513b1206f3e93..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalRecHitParametersGPU.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalRecHitParametersGPU_h
-#define CondFormats_EcalObjects_interface_EcalRecHitParametersGPU_h
-
-#include
-
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalRecHitParametersGPU {
-public:
- struct Product {
- edm::propagate_const_array> channelStatusToBeExcluded;
- edm::propagate_const_array> expanded_v_DB_reco_flags;
- edm::propagate_const_array> expanded_Sizes_v_DB_reco_flags;
- edm::propagate_const_array> expanded_flagbit_v_DB_reco_flags;
- };
-
-#ifndef __CUDACC__
- struct DBStatus {
- DBStatus(int flag, std::vector status) : recoflagbit{flag}, dbstatus(std::move(status)) {}
- int recoflagbit; //must be a EcalRecHit::Flags
- std::vector dbstatus; //must contain EcalChannelStatusCode::Code
- };
-
- /// channelStatusToBeExcluded must contain EcalChannelStatusCode::Code
- EcalRecHitParametersGPU(std::vector const& channelStatusToBeExcluded,
- std::vector const& flagsMapDBReco);
-
- ~EcalRecHitParametersGPU() = default;
-
- Product const& getProduct(cudaStream_t) const;
-
- using intvec = std::reference_wrapper> const>;
- using uint32vec = std::reference_wrapper> const>;
- std::tuple getValues() const {
- return {channelStatusToBeExcluded_,
- expanded_v_DB_reco_flags_,
- expanded_Sizes_v_DB_reco_flags_,
- expanded_flagbit_v_DB_reco_flags_};
- }
-
-private:
- std::vector> channelStatusToBeExcluded_;
- std::vector> expanded_v_DB_reco_flags_;
- std::vector> expanded_Sizes_v_DB_reco_flags_,
- expanded_flagbit_v_DB_reco_flags_;
-
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalRecHitParametersGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalRechitADCToGeVConstantGPU.h b/CondFormats/EcalObjects/interface/EcalRechitADCToGeVConstantGPU.h
deleted file mode 100644
index a4f2dc1e555b5..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalRechitADCToGeVConstantGPU.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalRechitADCToGeVConstantGPU_h
-#define CondFormats_EcalObjects_interface_EcalRechitADCToGeVConstantGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalADCToGeVConstant.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalRechitADCToGeVConstantGPU {
-public:
- struct Product {
- edm::propagate_const_array> adc2gev;
- };
-
-#ifndef __CUDACC__
-
- //
- EcalRechitADCToGeVConstantGPU(EcalADCToGeVConstant const&);
-
- // will call dealloation for Product thru ~Product
- ~EcalRechitADCToGeVConstantGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- //
- static std::string name() { return std::string{"ecalRechitADCToGeVConstantGPU"}; }
-
-private:
- // in the future, we need to arrange so to avoid this copy on the host
- // store eb first then ee
- std::vector> adc2gev_;
-
- cms::cuda::ESProduct product_;
-
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalRechitADCToGeVConstantGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalRechitChannelStatusGPU.h b/CondFormats/EcalObjects/interface/EcalRechitChannelStatusGPU.h
deleted file mode 100644
index 93e0f6a8dd7c0..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalRechitChannelStatusGPU.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalRechitChannelStatusGPU_h
-#define CondFormats_EcalObjects_interface_EcalRechitChannelStatusGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalChannelStatus.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalRechitChannelStatusGPU {
-public:
- struct Product {
- edm::propagate_const_array> status;
- };
-
-#ifndef __CUDACC__
-
- //
- EcalRechitChannelStatusGPU(EcalChannelStatus const&);
-
- // will call dealloation for Product thru ~Product
- ~EcalRechitChannelStatusGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- //
- static std::string name() { return std::string{"ecalRechitChannelStatusGPU"}; }
-
-private:
- // in the future, we need to arrange so to avoid this copy on the host
- // store eb first then ee
- std::vector> status_;
-
- cms::cuda::ESProduct product_;
-
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalRechitChannelStatusGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalSamplesCorrelationGPU.h b/CondFormats/EcalObjects/interface/EcalSamplesCorrelationGPU.h
deleted file mode 100644
index dd6d48b16a6fa..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalSamplesCorrelationGPU.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalSamplesCorrelationGPU_h
-#define CondFormats_EcalObjects_interface_EcalSamplesCorrelationGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalSamplesCorrelation.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalSamplesCorrelationGPU {
-public:
- struct Product {
- edm::propagate_const_array> EBG12SamplesCorrelation;
- edm::propagate_const_array> EBG6SamplesCorrelation;
- edm::propagate_const_array> EBG1SamplesCorrelation;
- edm::propagate_const_array> EEG12SamplesCorrelation;
- edm::propagate_const_array> EEG6SamplesCorrelation;
- edm::propagate_const_array> EEG1SamplesCorrelation;
- };
-
-#ifndef __CUDACC__
- // rearrange pedestals
- EcalSamplesCorrelationGPU(EcalSamplesCorrelation const&);
-
- // will call dealloation for Product thru ~Product
- ~EcalSamplesCorrelationGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- //
- static std::string name() { return std::string{"ecalSamplesCorrelationGPU"}; }
-
-private:
- std::vector> EBG12SamplesCorrelation_;
- std::vector> EBG6SamplesCorrelation_;
- std::vector> EBG1SamplesCorrelation_;
- std::vector> EEG12SamplesCorrelation_;
- std::vector> EEG6SamplesCorrelation_;
- std::vector> EEG1SamplesCorrelation_;
-
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalSamplesCorrelationGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalTimeBiasCorrectionsGPU.h b/CondFormats/EcalObjects/interface/EcalTimeBiasCorrectionsGPU.h
deleted file mode 100644
index 086decb53f01b..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalTimeBiasCorrectionsGPU.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalTimeBiasCorrectionsGPU_h
-#define CondFormats_EcalObjects_interface_EcalTimeBiasCorrectionsGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalTimeBiasCorrections.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalTimeBiasCorrectionsGPU {
-public:
- struct Product {
- edm::propagate_const_array> ebTimeCorrAmplitudeBins;
- edm::propagate_const_array> ebTimeCorrShiftBins;
- edm::propagate_const_array> eeTimeCorrAmplitudeBins;
- edm::propagate_const_array> eeTimeCorrShiftBins;
- int ebTimeCorrAmplitudeBinsSize, eeTimeCorrAmplitudeBinsSize;
- };
-
- // rearrange pedestals
- EcalTimeBiasCorrectionsGPU(EcalTimeBiasCorrections const&);
-
-#ifndef __CUDACC__
-
- // will call dealloation for Product thru ~Product
- ~EcalTimeBiasCorrectionsGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- //
- static std::string name() { return std::string{"ecalTimeBiasCorrectionsGPU"}; }
-#endif // __CUDACC__
-
-private:
- std::vector> ebTimeCorrAmplitudeBins_;
- std::vector> ebTimeCorrShiftBins_;
- std::vector> eeTimeCorrAmplitudeBins_;
- std::vector> eeTimeCorrShiftBins_;
-
-#ifndef __CUDACC__
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalTimeBiasCorrectionsGPU_h
diff --git a/CondFormats/EcalObjects/interface/EcalTimeCalibConstantsGPU.h b/CondFormats/EcalObjects/interface/EcalTimeCalibConstantsGPU.h
deleted file mode 100644
index 410e7699bdf7b..0000000000000
--- a/CondFormats/EcalObjects/interface/EcalTimeCalibConstantsGPU.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_EcalTimeCalibConstantsGPU_h
-#define CondFormats_EcalObjects_interface_EcalTimeCalibConstantsGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalTimeCalibConstants.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-class EcalTimeCalibConstantsGPU {
-public:
- struct Product {
- edm::propagate_const_array> values;
- };
-
-#ifndef __CUDACC__
- // rearrange pedestals
- EcalTimeCalibConstantsGPU(EcalTimeCalibConstants const&);
-
- // will call dealloation for Product thru ~Product
- ~EcalTimeCalibConstantsGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- // TODO: do this centrally
- // get offset for hashes. equals number of barrel items
- uint32_t getOffset() const { return offset_; }
-
- //
- static std::string name() { return std::string{"ecalTimeCalibConstantsGPU"}; }
-
-private:
- std::vector> values_;
- uint32_t offset_;
-
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
-};
-
-#endif // CondFormats_EcalObjects_interface_EcalTimeCalibConstantsGPU_h
diff --git a/CondFormats/EcalObjects/interface/ElectronicsMappingGPU.h b/CondFormats/EcalObjects/interface/ElectronicsMappingGPU.h
deleted file mode 100644
index 4c0cb30222bb9..0000000000000
--- a/CondFormats/EcalObjects/interface/ElectronicsMappingGPU.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef CondFormats_EcalObjects_interface_ElectronicsMappingGPU_h
-#define CondFormats_EcalObjects_interface_ElectronicsMappingGPU_h
-
-#include "CondFormats/EcalObjects/interface/EcalMappingElectronics.h"
-#include "FWCore/Utilities/interface/propagate_const_array.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-
-#ifndef __CUDACC__
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDACore/interface/ESProduct.h"
-#endif // __CUDACC__
-
-namespace ecal {
- namespace raw {
-
- class ElectronicsMappingGPU {
- public:
- struct Product {
- edm::propagate_const_array> eid2did;
- };
-
-#ifndef __CUDACC__
-
- // rearrange pedestals
- ElectronicsMappingGPU(EcalMappingElectronics const&);
-
- // will call dealloation for Product thru ~Product
- ~ElectronicsMappingGPU() = default;
-
- // get device pointers
- Product const& getProduct(cudaStream_t) const;
-
- //
- static std::string name() { return std::string{"ecalElectronicsMappingGPU"}; }
-
- private:
- // in the future, we need to arrange so to avoid this copy on the host
- // store eb first then ee
- std::vector> eid2did_;
-
- cms::cuda::ESProduct product_;
-#endif // __CUDACC__
- };
-
- } // namespace raw
-} // namespace ecal
-
-#endif // CondFormats_EcalObjects_interface_ElectronicsMappingGPU_h
diff --git a/CondFormats/EcalObjects/src/EcalGainRatiosGPU.cc b/CondFormats/EcalObjects/src/EcalGainRatiosGPU.cc
deleted file mode 100644
index 9e509430c4276..0000000000000
--- a/CondFormats/EcalObjects/src/EcalGainRatiosGPU.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalGainRatiosGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalGainRatiosGPU::EcalGainRatiosGPU(EcalGainRatios const& values)
- : gain12Over6_(values.size()), gain6Over1_(values.size()) {
- // fill in eb
- auto const& barrelValues = values.barrelItems();
- for (unsigned int i = 0; i < barrelValues.size(); i++) {
- gain12Over6_[i] = barrelValues[i].gain12Over6();
- gain6Over1_[i] = barrelValues[i].gain6Over1();
- }
-
- // fill in ee
- auto const& endcapValues = values.endcapItems();
- auto const offset = barrelValues.size();
- for (unsigned int i = 0; i < endcapValues.size(); i++) {
- gain12Over6_[offset + i] = endcapValues[i].gain12Over6();
- gain6Over1_[offset + i] = endcapValues[i].gain6Over1();
- }
-}
-
-EcalGainRatiosGPU::Product const& EcalGainRatiosGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalGainRatiosGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.gain12Over6 = cms::cuda::make_device_unique(gain12Over6_.size(), cudaStream);
- product.gain6Over1 = cms::cuda::make_device_unique(gain6Over1_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.gain12Over6, gain12Over6_, cudaStream);
- cms::cuda::copyAsync(product.gain6Over1, gain6Over1_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalGainRatiosGPU);
diff --git a/CondFormats/EcalObjects/src/EcalIntercalibConstantsGPU.cc b/CondFormats/EcalObjects/src/EcalIntercalibConstantsGPU.cc
deleted file mode 100644
index d85b1e1eb7420..0000000000000
--- a/CondFormats/EcalObjects/src/EcalIntercalibConstantsGPU.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalIntercalibConstantsGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalIntercalibConstantsGPU::EcalIntercalibConstantsGPU(EcalIntercalibConstants const& values) {
- values_.reserve(values.size());
- values_.insert(values_.end(), values.barrelItems().begin(), values.barrelItems().end());
- values_.insert(values_.end(), values.endcapItems().begin(), values.endcapItems().end());
- offset_ = values.barrelItems().size();
-}
-
-EcalIntercalibConstantsGPU::Product const& EcalIntercalibConstantsGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalIntercalibConstantsGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.values = cms::cuda::make_device_unique(values_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.values, values_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalIntercalibConstantsGPU);
diff --git a/CondFormats/EcalObjects/src/EcalLaserAPDPNRatiosGPU.cc b/CondFormats/EcalObjects/src/EcalLaserAPDPNRatiosGPU.cc
deleted file mode 100644
index 3a74f029ec185..0000000000000
--- a/CondFormats/EcalObjects/src/EcalLaserAPDPNRatiosGPU.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalLaserAPDPNRatiosGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalLaserAPDPNRatiosGPU::EcalLaserAPDPNRatiosGPU(EcalLaserAPDPNRatios const& values)
- : p1_(values.getLaserMap().size()),
- p2_(values.getLaserMap().size()),
- p3_(values.getLaserMap().size()),
- t1_(values.getTimeMap().size()),
- t2_(values.getTimeMap().size()),
- t3_(values.getTimeMap().size()) {
- // fill in eb
- // auto const& barrelValues = values.barrelItems();
- for (unsigned int i = 0; i < values.getLaserMap().barrelItems().size(); i++) {
- p1_[i] = values.getLaserMap().barrelItems()[i].p1;
- p2_[i] = values.getLaserMap().barrelItems()[i].p2;
- p3_[i] = values.getLaserMap().barrelItems()[i].p3;
- }
-
- // fill in ee
- // auto const& endcapValues = values.endcapItems();
- auto const offset_laser = values.getLaserMap().barrelItems().size();
- for (unsigned int i = 0; i < values.getLaserMap().endcapItems().size(); i++) {
- p1_[offset_laser + i] = values.getLaserMap().endcapItems()[i].p1;
- p2_[offset_laser + i] = values.getLaserMap().endcapItems()[i].p2;
- p3_[offset_laser + i] = values.getLaserMap().endcapItems()[i].p3;
- }
-
- // Time is a simple std::vector
- // typedef std::vector EcalLaserTimeStampMap;
- for (unsigned int i = 0; i < values.getTimeMap().size(); i++) {
- t1_[i] = values.getTimeMap()[i].t1.value();
- t2_[i] = values.getTimeMap()[i].t2.value();
- t3_[i] = values.getTimeMap()[i].t3.value();
- }
-}
-
-EcalLaserAPDPNRatiosGPU::Product const& EcalLaserAPDPNRatiosGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalLaserAPDPNRatiosGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.p1 = cms::cuda::make_device_unique(p1_.size(), cudaStream);
- product.p2 = cms::cuda::make_device_unique(p2_.size(), cudaStream);
- product.p3 = cms::cuda::make_device_unique(p3_.size(), cudaStream);
- product.t1 = cms::cuda::make_device_unique(t1_.size(), cudaStream);
- product.t2 = cms::cuda::make_device_unique(t2_.size(), cudaStream);
- product.t3 = cms::cuda::make_device_unique(t3_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.p1, p1_, cudaStream);
- cms::cuda::copyAsync(product.p2, p2_, cudaStream);
- cms::cuda::copyAsync(product.p3, p3_, cudaStream);
- cms::cuda::copyAsync(product.t1, t1_, cudaStream);
- cms::cuda::copyAsync(product.t2, t2_, cudaStream);
- cms::cuda::copyAsync(product.t3, t3_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalLaserAPDPNRatiosGPU);
diff --git a/CondFormats/EcalObjects/src/EcalLaserAPDPNRatiosRefGPU.cc b/CondFormats/EcalObjects/src/EcalLaserAPDPNRatiosRefGPU.cc
deleted file mode 100644
index 7cc7117ba48de..0000000000000
--- a/CondFormats/EcalObjects/src/EcalLaserAPDPNRatiosRefGPU.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalLaserAPDPNRatiosRefGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalLaserAPDPNRatiosRefGPU::EcalLaserAPDPNRatiosRefGPU(EcalLaserAPDPNRatiosRef const& values) {
- values_.reserve(values.size());
- values_.insert(values_.end(), values.barrelItems().begin(), values.barrelItems().end());
- values_.insert(values_.end(), values.endcapItems().begin(), values.endcapItems().end());
- offset_ = values.barrelItems().size();
-}
-
-EcalLaserAPDPNRatiosRefGPU::Product const& EcalLaserAPDPNRatiosRefGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalLaserAPDPNRatiosRefGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.values = cms::cuda::make_device_unique(values_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.values, values_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalLaserAPDPNRatiosRefGPU);
diff --git a/CondFormats/EcalObjects/src/EcalLaserAlphasGPU.cc b/CondFormats/EcalObjects/src/EcalLaserAlphasGPU.cc
deleted file mode 100644
index 538c0438829bc..0000000000000
--- a/CondFormats/EcalObjects/src/EcalLaserAlphasGPU.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalLaserAlphasGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalLaserAlphasGPU::EcalLaserAlphasGPU(EcalLaserAlphas const& values) {
- values_.reserve(values.size());
- values_.insert(values_.end(), values.barrelItems().begin(), values.barrelItems().end());
- values_.insert(values_.end(), values.endcapItems().begin(), values.endcapItems().end());
- offset_ = values.barrelItems().size();
-}
-
-EcalLaserAlphasGPU::Product const& EcalLaserAlphasGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalLaserAlphasGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.values = cms::cuda::make_device_unique(values_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.values, values_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalLaserAlphasGPU);
diff --git a/CondFormats/EcalObjects/src/EcalLinearCorrectionsGPU.cc b/CondFormats/EcalObjects/src/EcalLinearCorrectionsGPU.cc
deleted file mode 100644
index b6b706d6b18e8..0000000000000
--- a/CondFormats/EcalObjects/src/EcalLinearCorrectionsGPU.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalLinearCorrectionsGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalLinearCorrectionsGPU::EcalLinearCorrectionsGPU(EcalLinearCorrections const& values)
- : p1_(values.getValueMap().size()),
- p2_(values.getValueMap().size()),
- p3_(values.getValueMap().size()),
- t1_(values.getTimeMap().size()),
- t2_(values.getTimeMap().size()),
- t3_(values.getTimeMap().size()) {
- // fill in eb
- for (unsigned int i = 0; i < values.getValueMap().barrelItems().size(); i++) {
- p1_[i] = values.getValueMap().barrelItems()[i].p1;
- p2_[i] = values.getValueMap().barrelItems()[i].p2;
- p3_[i] = values.getValueMap().barrelItems()[i].p3;
- }
-
- // fill in ee
- auto const offset_laser = values.getValueMap().barrelItems().size();
- for (unsigned int i = 0; i < values.getValueMap().endcapItems().size(); i++) {
- p1_[offset_laser + i] = values.getValueMap().endcapItems()[i].p1;
- p2_[offset_laser + i] = values.getValueMap().endcapItems()[i].p2;
- p3_[offset_laser + i] = values.getValueMap().endcapItems()[i].p3;
- }
-
- // Time is a simple std::vector
- // typedef std::vector EcalLaserTimeStampMap;
- for (unsigned int i = 0; i < values.getTimeMap().size(); i++) {
- t1_[i] = values.getTimeMap()[i].t1.value();
- t2_[i] = values.getTimeMap()[i].t2.value();
- t3_[i] = values.getTimeMap()[i].t3.value();
- }
-}
-
-EcalLinearCorrectionsGPU::Product const& EcalLinearCorrectionsGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalLinearCorrectionsGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.p1 = cms::cuda::make_device_unique(p1_.size(), cudaStream);
- product.p2 = cms::cuda::make_device_unique(p2_.size(), cudaStream);
- product.p3 = cms::cuda::make_device_unique(p3_.size(), cudaStream);
- product.t1 = cms::cuda::make_device_unique(t1_.size(), cudaStream);
- product.t2 = cms::cuda::make_device_unique(t2_.size(), cudaStream);
- product.t3 = cms::cuda::make_device_unique(t3_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.p1, p1_, cudaStream);
- cms::cuda::copyAsync(product.p2, p2_, cudaStream);
- cms::cuda::copyAsync(product.p3, p3_, cudaStream);
- cms::cuda::copyAsync(product.t1, t1_, cudaStream);
- cms::cuda::copyAsync(product.t2, t2_, cudaStream);
- cms::cuda::copyAsync(product.t3, t3_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalLinearCorrectionsGPU);
diff --git a/CondFormats/EcalObjects/src/EcalMultifitParametersGPU.cc b/CondFormats/EcalObjects/src/EcalMultifitParametersGPU.cc
deleted file mode 100644
index 69e4f273d75ab..0000000000000
--- a/CondFormats/EcalObjects/src/EcalMultifitParametersGPU.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalMultifitParametersGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalMultifitParametersGPU::EcalMultifitParametersGPU(std::vector const& amplitudeFitParametersEB,
- std::vector const& amplitudeFitParametersEE,
- std::vector const& timeFitParametersEB,
- std::vector const& timeFitParametersEE) {
- amplitudeFitParametersEB_.resize(amplitudeFitParametersEB.size());
- amplitudeFitParametersEE_.resize(amplitudeFitParametersEE.size());
- timeFitParametersEB_.resize(timeFitParametersEB.size());
- timeFitParametersEE_.resize(timeFitParametersEE.size());
-
- std::copy(amplitudeFitParametersEB.begin(), amplitudeFitParametersEB.end(), amplitudeFitParametersEB_.begin());
- std::copy(amplitudeFitParametersEE.begin(), amplitudeFitParametersEE.end(), amplitudeFitParametersEE_.begin());
- std::copy(timeFitParametersEB.begin(), timeFitParametersEB.end(), timeFitParametersEB_.begin());
- std::copy(timeFitParametersEE.begin(), timeFitParametersEE.end(), timeFitParametersEE_.begin());
-}
-
-EcalMultifitParametersGPU::Product const& EcalMultifitParametersGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalMultifitParametersGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.amplitudeFitParametersEB =
- cms::cuda::make_device_unique(amplitudeFitParametersEB_.size(), cudaStream);
- product.amplitudeFitParametersEE =
- cms::cuda::make_device_unique(amplitudeFitParametersEE_.size(), cudaStream);
- product.timeFitParametersEB = cms::cuda::make_device_unique(timeFitParametersEB_.size(), cudaStream);
- product.timeFitParametersEE = cms::cuda::make_device_unique(timeFitParametersEE_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.amplitudeFitParametersEB, amplitudeFitParametersEB_, cudaStream);
- cms::cuda::copyAsync(product.amplitudeFitParametersEE, amplitudeFitParametersEE_, cudaStream);
- cms::cuda::copyAsync(product.timeFitParametersEB, timeFitParametersEB_, cudaStream);
- cms::cuda::copyAsync(product.timeFitParametersEE, timeFitParametersEE_, cudaStream);
- });
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalMultifitParametersGPU);
diff --git a/CondFormats/EcalObjects/src/EcalPedestalsGPU.cc b/CondFormats/EcalObjects/src/EcalPedestalsGPU.cc
deleted file mode 100644
index 2528dab1665fb..0000000000000
--- a/CondFormats/EcalObjects/src/EcalPedestalsGPU.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalPedestalsGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalPedestalsGPU::EcalPedestalsGPU(EcalPedestals const& pedestals)
- : mean_x12_(pedestals.size()),
- rms_x12_(pedestals.size()),
- mean_x6_(pedestals.size()),
- rms_x6_(pedestals.size()),
- mean_x1_(pedestals.size()),
- rms_x1_(pedestals.size()) {
- // fill in eb
- auto const& barrelValues = pedestals.barrelItems();
- for (unsigned int i = 0; i < barrelValues.size(); i++) {
- mean_x12_[i] = barrelValues[i].mean_x12;
- rms_x12_[i] = barrelValues[i].rms_x12;
- mean_x6_[i] = barrelValues[i].mean_x6;
- rms_x6_[i] = barrelValues[i].rms_x6;
- mean_x1_[i] = barrelValues[i].mean_x1;
- rms_x1_[i] = barrelValues[i].rms_x1;
- }
-
- // fill in ee
- auto const& endcapValues = pedestals.endcapItems();
- auto const offset = barrelValues.size();
- for (unsigned int i = 0; i < endcapValues.size(); i++) {
- mean_x12_[offset + i] = endcapValues[i].mean_x12;
- rms_x12_[offset + i] = endcapValues[i].rms_x12;
- mean_x6_[offset + i] = endcapValues[i].mean_x6;
- rms_x6_[offset + i] = endcapValues[i].rms_x6;
- mean_x1_[offset + i] = endcapValues[i].mean_x1;
- rms_x1_[offset + i] = endcapValues[i].rms_x1;
- }
-}
-
-EcalPedestalsGPU::Product const& EcalPedestalsGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalPedestalsGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.mean_x12 = cms::cuda::make_device_unique(mean_x12_.size(), cudaStream);
- product.mean_x6 = cms::cuda::make_device_unique(mean_x6_.size(), cudaStream);
- product.mean_x1 = cms::cuda::make_device_unique(mean_x1_.size(), cudaStream);
- product.rms_x12 = cms::cuda::make_device_unique(rms_x12_.size(), cudaStream);
- product.rms_x6 = cms::cuda::make_device_unique(rms_x6_.size(), cudaStream);
- product.rms_x1 = cms::cuda::make_device_unique(rms_x1_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.mean_x12, mean_x12_, cudaStream);
- cms::cuda::copyAsync(product.mean_x6, mean_x6_, cudaStream);
- cms::cuda::copyAsync(product.mean_x1, mean_x1_, cudaStream);
- cms::cuda::copyAsync(product.rms_x12, rms_x12_, cudaStream);
- cms::cuda::copyAsync(product.rms_x6, rms_x6_, cudaStream);
- cms::cuda::copyAsync(product.rms_x1, rms_x1_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalPedestalsGPU);
diff --git a/CondFormats/EcalObjects/src/EcalPulseCovariancesGPU.cc b/CondFormats/EcalObjects/src/EcalPulseCovariancesGPU.cc
deleted file mode 100644
index 05586080bff6a..0000000000000
--- a/CondFormats/EcalObjects/src/EcalPulseCovariancesGPU.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalPulseCovariancesGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h"
-
-EcalPulseCovariancesGPU::EcalPulseCovariancesGPU(EcalPulseCovariances const& values)
- : valuesEB_{values.barrelItems()}, valuesEE_{values.endcapItems()} {}
-
-EcalPulseCovariancesGPU::Product::~Product() {
- // deallocation
- cudaCheck(cudaFree(values));
-}
-
-EcalPulseCovariancesGPU::Product const& EcalPulseCovariancesGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalPulseCovariancesGPU::Product& product, cudaStream_t cudaStream) {
- // malloc
- cudaCheck(cudaMalloc((void**)&product.values,
- (this->valuesEE_.size() + this->valuesEB_.size()) * sizeof(EcalPulseCovariance)));
-
- // offset in terms of sizeof(EcalPulseCovariance)
- uint32_t offset = this->valuesEB_.size();
-
- // transfer eb
- cudaCheck(cudaMemcpyAsync(product.values,
- this->valuesEB_.data(),
- this->valuesEB_.size() * sizeof(EcalPulseCovariance),
- cudaMemcpyHostToDevice,
- cudaStream));
-
- // transfer ee starting at values + offset
- cudaCheck(cudaMemcpyAsync(product.values + offset,
- this->valuesEE_.data(),
- this->valuesEE_.size() * sizeof(EcalPulseCovariance),
- cudaMemcpyHostToDevice,
- cudaStream));
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalPulseCovariancesGPU);
diff --git a/CondFormats/EcalObjects/src/EcalPulseShapesGPU.cc b/CondFormats/EcalObjects/src/EcalPulseShapesGPU.cc
deleted file mode 100644
index 96b492f3ad335..0000000000000
--- a/CondFormats/EcalObjects/src/EcalPulseShapesGPU.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalPulseShapesGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h"
-
-EcalPulseShapesGPU::EcalPulseShapesGPU(EcalPulseShapes const& values)
- : valuesEB_{values.barrelItems()}, valuesEE_{values.endcapItems()} {}
-
-EcalPulseShapesGPU::Product::~Product() {
- // deallocation
- cudaCheck(cudaFree(values));
-}
-
-EcalPulseShapesGPU::Product const& EcalPulseShapesGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalPulseShapesGPU::Product& product, cudaStream_t cudaStream) {
- // malloc
- cudaCheck(cudaMalloc((void**)&product.values,
- (this->valuesEE_.size() + this->valuesEB_.size()) * sizeof(EcalPulseShape)));
-
- // offset in terms of sizeof(EcalPulseShape) - plain c array
- uint32_t offset = this->valuesEB_.size();
-
- // transfer eb
- cudaCheck(cudaMemcpyAsync(product.values,
- this->valuesEB_.data(),
- this->valuesEB_.size() * sizeof(EcalPulseShape),
- cudaMemcpyHostToDevice,
- cudaStream));
-
- // transfer ee starting at values + offset
- cudaCheck(cudaMemcpyAsync(product.values + offset,
- this->valuesEE_.data(),
- this->valuesEE_.size() * sizeof(EcalPulseShape),
- cudaMemcpyHostToDevice,
- cudaStream));
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalPulseShapesGPU);
diff --git a/CondFormats/EcalObjects/src/EcalRecHitParametersGPU.cc b/CondFormats/EcalObjects/src/EcalRecHitParametersGPU.cc
deleted file mode 100644
index 4398d249624a7..0000000000000
--- a/CondFormats/EcalObjects/src/EcalRecHitParametersGPU.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalRecHitParametersGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-#include "CondFormats/EcalObjects/interface/EcalRechitChannelStatusGPU.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
-
-EcalRecHitParametersGPU::EcalRecHitParametersGPU(std::vector const& channelStatusToBeExcluded,
- std::vector const& flagsMapDBReco) {
- channelStatusToBeExcluded_.resize(channelStatusToBeExcluded.size());
- std::copy(channelStatusToBeExcluded.begin(), channelStatusToBeExcluded.end(), channelStatusToBeExcluded_.begin());
-
- for (auto const& flagInfo : flagsMapDBReco) {
- EcalRecHit::Flags recoflagbit = static_cast(flagInfo.recoflagbit);
- for (auto v : flagInfo.dbstatus) {
- EcalChannelStatusCode::Code dbstatus = static_cast(v);
- expanded_v_DB_reco_flags_.push_back(dbstatus);
- }
-
- expanded_Sizes_v_DB_reco_flags_.push_back(flagInfo.dbstatus.size());
- expanded_flagbit_v_DB_reco_flags_.push_back(recoflagbit);
- }
-}
-
-EcalRecHitParametersGPU::Product const& EcalRecHitParametersGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalRecHitParametersGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.channelStatusToBeExcluded =
- cms::cuda::make_device_unique(channelStatusToBeExcluded_.size(), cudaStream);
- product.expanded_v_DB_reco_flags =
- cms::cuda::make_device_unique(expanded_v_DB_reco_flags_.size(), cudaStream);
- product.expanded_Sizes_v_DB_reco_flags =
- cms::cuda::make_device_unique(expanded_Sizes_v_DB_reco_flags_.size(), cudaStream);
- product.expanded_flagbit_v_DB_reco_flags =
- cms::cuda::make_device_unique(expanded_flagbit_v_DB_reco_flags_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.channelStatusToBeExcluded, channelStatusToBeExcluded_, cudaStream);
- cms::cuda::copyAsync(product.expanded_v_DB_reco_flags, expanded_v_DB_reco_flags_, cudaStream);
- cms::cuda::copyAsync(product.expanded_Sizes_v_DB_reco_flags, expanded_Sizes_v_DB_reco_flags_, cudaStream);
- cms::cuda::copyAsync(product.expanded_flagbit_v_DB_reco_flags, expanded_flagbit_v_DB_reco_flags_, cudaStream);
- });
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalRecHitParametersGPU);
diff --git a/CondFormats/EcalObjects/src/EcalRechitADCToGeVConstantGPU.cc b/CondFormats/EcalObjects/src/EcalRechitADCToGeVConstantGPU.cc
deleted file mode 100644
index a71266d1615dc..0000000000000
--- a/CondFormats/EcalObjects/src/EcalRechitADCToGeVConstantGPU.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalRechitADCToGeVConstantGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalRechitADCToGeVConstantGPU::EcalRechitADCToGeVConstantGPU(EcalADCToGeVConstant const& values)
- : adc2gev_(2) // size is 2, one form EB and one for EE
-{
- adc2gev_[0] = values.getEBValue();
- adc2gev_[1] = values.getEEValue();
-}
-
-EcalRechitADCToGeVConstantGPU::Product const& EcalRechitADCToGeVConstantGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalRechitADCToGeVConstantGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.adc2gev = cms::cuda::make_device_unique(adc2gev_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.adc2gev, adc2gev_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalRechitADCToGeVConstantGPU);
diff --git a/CondFormats/EcalObjects/src/EcalRechitChannelStatusGPU.cc b/CondFormats/EcalObjects/src/EcalRechitChannelStatusGPU.cc
deleted file mode 100644
index 2a0740828f6cf..0000000000000
--- a/CondFormats/EcalObjects/src/EcalRechitChannelStatusGPU.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalRechitChannelStatusGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalRechitChannelStatusGPU::EcalRechitChannelStatusGPU(EcalChannelStatus const& values) : status_(values.size()) {
- // fill in eb
- auto const& barrelValues = values.barrelItems();
- for (unsigned int i = 0; i < barrelValues.size(); i++) {
- status_[i] = barrelValues[i].getEncodedStatusCode();
- }
-
- // fill in ee
- auto const& endcapValues = values.endcapItems();
- auto const offset = barrelValues.size();
- for (unsigned int i = 0; i < endcapValues.size(); i++) {
- status_[offset + i] = endcapValues[i].getEncodedStatusCode();
- }
-}
-
-EcalRechitChannelStatusGPU::Product const& EcalRechitChannelStatusGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalRechitChannelStatusGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.status = cms::cuda::make_device_unique(status_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.status, status_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalRechitChannelStatusGPU);
diff --git a/CondFormats/EcalObjects/src/EcalSamplesCorrelationGPU.cc b/CondFormats/EcalObjects/src/EcalSamplesCorrelationGPU.cc
deleted file mode 100644
index 9e355045149ea..0000000000000
--- a/CondFormats/EcalObjects/src/EcalSamplesCorrelationGPU.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalSamplesCorrelationGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalSamplesCorrelationGPU::EcalSamplesCorrelationGPU(EcalSamplesCorrelation const& values) {
- EBG12SamplesCorrelation_.reserve(values.EBG12SamplesCorrelation.size());
- for (const auto& EBG12SamplesCorrelation : values.EBG12SamplesCorrelation) {
- EBG12SamplesCorrelation_.emplace_back(EBG12SamplesCorrelation);
- }
-
- EBG6SamplesCorrelation_.reserve(values.EBG6SamplesCorrelation.size());
- for (const auto& EBG6SamplesCorrelation : values.EBG6SamplesCorrelation) {
- EBG6SamplesCorrelation_.emplace_back(EBG6SamplesCorrelation);
- }
-
- EBG1SamplesCorrelation_.reserve(values.EBG1SamplesCorrelation.size());
- for (const auto& EBG1SamplesCorrelation : values.EBG1SamplesCorrelation) {
- EBG1SamplesCorrelation_.emplace_back(EBG1SamplesCorrelation);
- }
-
- EEG12SamplesCorrelation_.reserve(values.EEG12SamplesCorrelation.size());
- for (const auto& EEG12SamplesCorrelation : values.EEG12SamplesCorrelation) {
- EEG12SamplesCorrelation_.emplace_back(EEG12SamplesCorrelation);
- }
-
- EEG6SamplesCorrelation_.reserve(values.EEG6SamplesCorrelation.size());
- for (const auto& EEG6SamplesCorrelation : values.EEG6SamplesCorrelation) {
- EEG6SamplesCorrelation_.emplace_back(EEG6SamplesCorrelation);
- }
-
- EEG1SamplesCorrelation_.reserve(values.EEG1SamplesCorrelation.size());
- for (const auto& EEG1SamplesCorrelation : values.EEG1SamplesCorrelation) {
- EEG1SamplesCorrelation_.emplace_back(EEG1SamplesCorrelation);
- }
-}
-
-EcalSamplesCorrelationGPU::Product const& EcalSamplesCorrelationGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalSamplesCorrelationGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.EBG12SamplesCorrelation =
- cms::cuda::make_device_unique(EBG12SamplesCorrelation_.size(), cudaStream);
- product.EBG6SamplesCorrelation =
- cms::cuda::make_device_unique(EBG6SamplesCorrelation_.size(), cudaStream);
- product.EBG1SamplesCorrelation =
- cms::cuda::make_device_unique(EBG1SamplesCorrelation_.size(), cudaStream);
- product.EEG12SamplesCorrelation =
- cms::cuda::make_device_unique(EEG12SamplesCorrelation_.size(), cudaStream);
- product.EEG6SamplesCorrelation =
- cms::cuda::make_device_unique(EEG6SamplesCorrelation_.size(), cudaStream);
- product.EEG1SamplesCorrelation =
- cms::cuda::make_device_unique(EEG1SamplesCorrelation_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.EBG12SamplesCorrelation, EBG12SamplesCorrelation_, cudaStream);
- cms::cuda::copyAsync(product.EBG6SamplesCorrelation, EBG6SamplesCorrelation_, cudaStream);
- cms::cuda::copyAsync(product.EBG1SamplesCorrelation, EBG1SamplesCorrelation_, cudaStream);
- cms::cuda::copyAsync(product.EEG12SamplesCorrelation, EEG12SamplesCorrelation_, cudaStream);
- cms::cuda::copyAsync(product.EEG6SamplesCorrelation, EEG6SamplesCorrelation_, cudaStream);
- cms::cuda::copyAsync(product.EEG1SamplesCorrelation, EEG1SamplesCorrelation_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalSamplesCorrelationGPU);
diff --git a/CondFormats/EcalObjects/src/EcalTimeBiasCorrectionsGPU.cc b/CondFormats/EcalObjects/src/EcalTimeBiasCorrectionsGPU.cc
deleted file mode 100644
index 268a22f7182f5..0000000000000
--- a/CondFormats/EcalObjects/src/EcalTimeBiasCorrectionsGPU.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalTimeBiasCorrectionsGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalTimeBiasCorrectionsGPU::EcalTimeBiasCorrectionsGPU(EcalTimeBiasCorrections const& values) {
- ebTimeCorrAmplitudeBins_.reserve(values.EBTimeCorrAmplitudeBins.size());
- for (const auto& ebTimeCorrAmplitudeBin : values.EBTimeCorrAmplitudeBins) {
- ebTimeCorrAmplitudeBins_.emplace_back(ebTimeCorrAmplitudeBin);
- }
-
- ebTimeCorrShiftBins_.reserve(values.EBTimeCorrAmplitudeBins.size());
- for (const auto& ebTimeCorrShiftBin : values.EBTimeCorrShiftBins) {
- ebTimeCorrShiftBins_.emplace_back(ebTimeCorrShiftBin);
- }
-
- eeTimeCorrAmplitudeBins_.reserve(values.EETimeCorrAmplitudeBins.size());
- for (const auto& eeTimeCorrAmplitudeBin : values.EETimeCorrAmplitudeBins) {
- eeTimeCorrAmplitudeBins_.emplace_back(eeTimeCorrAmplitudeBin);
- }
-
- eeTimeCorrShiftBins_.reserve(values.EETimeCorrAmplitudeBins.size());
- for (const auto& eeTimeCorrShiftBin : values.EETimeCorrShiftBins) {
- eeTimeCorrShiftBins_.emplace_back(eeTimeCorrShiftBin);
- }
-}
-
-EcalTimeBiasCorrectionsGPU::Product const& EcalTimeBiasCorrectionsGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalTimeBiasCorrectionsGPU::Product& product, cudaStream_t cudaStream) {
- // to get the size of vectors later on
- // should be removed and host conditions' objects used directly
- product.ebTimeCorrAmplitudeBinsSize = this->ebTimeCorrAmplitudeBins_.size();
- product.eeTimeCorrAmplitudeBinsSize = this->eeTimeCorrAmplitudeBins_.size();
-
- // allocate
- product.ebTimeCorrAmplitudeBins =
- cms::cuda::make_device_unique(ebTimeCorrAmplitudeBins_.size(), cudaStream);
- product.ebTimeCorrShiftBins = cms::cuda::make_device_unique(ebTimeCorrShiftBins_.size(), cudaStream);
- product.eeTimeCorrAmplitudeBins =
- cms::cuda::make_device_unique(eeTimeCorrAmplitudeBins_.size(), cudaStream);
- product.eeTimeCorrShiftBins = cms::cuda::make_device_unique(eeTimeCorrShiftBins_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.ebTimeCorrAmplitudeBins, ebTimeCorrAmplitudeBins_, cudaStream);
- cms::cuda::copyAsync(product.ebTimeCorrShiftBins, ebTimeCorrShiftBins_, cudaStream);
- cms::cuda::copyAsync(product.eeTimeCorrAmplitudeBins, eeTimeCorrAmplitudeBins_, cudaStream);
- cms::cuda::copyAsync(product.eeTimeCorrShiftBins, eeTimeCorrShiftBins_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalTimeBiasCorrectionsGPU);
diff --git a/CondFormats/EcalObjects/src/EcalTimeCalibConstantsGPU.cc b/CondFormats/EcalObjects/src/EcalTimeCalibConstantsGPU.cc
deleted file mode 100644
index 80537fa9f07c8..0000000000000
--- a/CondFormats/EcalObjects/src/EcalTimeCalibConstantsGPU.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "CondFormats/EcalObjects/interface/EcalTimeCalibConstantsGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-EcalTimeCalibConstantsGPU::EcalTimeCalibConstantsGPU(EcalTimeCalibConstants const& values) {
- values_.reserve(values.size());
- for (size_t i = 0; i < values.size(); ++i) {
- values_.emplace_back(values[i]);
- }
- offset_ = values.barrelItems().size();
-}
-
-EcalTimeCalibConstantsGPU::Product const& EcalTimeCalibConstantsGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](EcalTimeCalibConstantsGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.values = cms::cuda::make_device_unique(values_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.values, values_, cudaStream);
- });
-
- return product;
-}
-
-TYPELOOKUP_DATA_REG(EcalTimeCalibConstantsGPU);
diff --git a/CondFormats/EcalObjects/src/ElectronicsMappingGPU.cc b/CondFormats/EcalObjects/src/ElectronicsMappingGPU.cc
deleted file mode 100644
index 343441e5d059a..0000000000000
--- a/CondFormats/EcalObjects/src/ElectronicsMappingGPU.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "CondFormats/EcalObjects/interface/ElectronicsMappingGPU.h"
-
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-
-#include "DataFormats/EcalDetId/interface/EcalElectronicsId.h"
-
-namespace ecal {
- namespace raw {
-
- // TODO: 0x3FFFFF * 4B ~= 16MB
- // tmp solution for linear mapping of eid -> did
- ElectronicsMappingGPU::ElectronicsMappingGPU(EcalMappingElectronics const& mapping) : eid2did_(0x3FFFFF) {
- // fill in eb
- // TODO: EB vector is actually empty
- auto const& barrelValues = mapping.barrelItems();
- for (unsigned int i = 0; i < barrelValues.size(); i++) {
- EcalElectronicsId eid{barrelValues[i].electronicsid};
- EBDetId did{EBDetId::unhashIndex(i)};
- eid2did_[eid.linearIndex()] = did.rawId();
- }
-
- // fill in ee
- auto const& endcapValues = mapping.endcapItems();
- for (unsigned int i = 0; i < endcapValues.size(); i++) {
- EcalElectronicsId eid{endcapValues[i].electronicsid};
- EEDetId did{EEDetId::unhashIndex(i)};
- eid2did_[eid.linearIndex()] = did.rawId();
- }
- }
-
- ElectronicsMappingGPU::Product const& ElectronicsMappingGPU::getProduct(cudaStream_t cudaStream) const {
- auto const& product = product_.dataForCurrentDeviceAsync(
- cudaStream, [this](ElectronicsMappingGPU::Product& product, cudaStream_t cudaStream) {
- // allocate
- product.eid2did = cms::cuda::make_device_unique(eid2did_.size(), cudaStream);
- // transfer
- cms::cuda::copyAsync(product.eid2did, eid2did_, cudaStream);
- });
-
- return product;
- }
-
- } // namespace raw
-} // namespace ecal
-
-TYPELOOKUP_DATA_REG(ecal::raw::ElectronicsMappingGPU);
diff --git a/EventFilter/EcalRawToDigi/plugins/BuildFile.xml b/EventFilter/EcalRawToDigi/plugins/BuildFile.xml
index 96962e9b142ce..a5e629e02e46a 100644
--- a/EventFilter/EcalRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/EcalRawToDigi/plugins/BuildFile.xml
@@ -7,16 +7,8 @@
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/EventFilter/EcalRawToDigi/plugins/DeclsForKernels.h b/EventFilter/EcalRawToDigi/plugins/DeclsForKernels.h
deleted file mode 100644
index 6873173704e40..0000000000000
--- a/EventFilter/EcalRawToDigi/plugins/DeclsForKernels.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef EventFilter_EcalRawToDigi_plugins_DeclsForKernels_h
-#define EventFilter_EcalRawToDigi_plugins_DeclsForKernels_h
-
-#include
-
-#include "CUDADataFormats/EcalDigi/interface/DigisCollection.h"
-#include "CondFormats/EcalObjects/interface/ElectronicsMappingGPU.h"
-#include "DataFormats/EcalDigi/interface/EcalDataFrame.h"
-#include "EventFilter/EcalRawToDigi/interface/DCCRawDataDefinitions.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/host_unique_ptr.h"
-
-namespace ecal {
- namespace raw {
-
- struct InputDataCPU {
- cms::cuda::host::unique_ptr data;
- cms::cuda::host::unique_ptr offsets;
- cms::cuda::host::unique_ptr feds;
- };
-
- struct ConfigurationParameters {
- uint32_t maxChannelsEE;
- uint32_t maxChannelsEB;
- };
-
- struct OutputDataCPU {
- // [0] - eb, [1] - ee
- cms::cuda::host::unique_ptr nchannels;
- };
-
- struct OutputDataGPU {
- DigisCollection<::calo::common::DevStoragePolicy> digisEB, digisEE;
-
- void allocate(ConfigurationParameters const &config, cudaStream_t cudaStream) {
- digisEB.data =
- cms::cuda::make_device_unique(config.maxChannelsEB * EcalDataFrame::MAXSAMPLES, cudaStream);
- digisEE.data =
- cms::cuda::make_device_unique(config.maxChannelsEE * EcalDataFrame::MAXSAMPLES, cudaStream);
- digisEB.ids = cms::cuda::make_device_unique(config.maxChannelsEB, cudaStream);
- digisEE.ids = cms::cuda::make_device_unique(config.maxChannelsEE, cudaStream);
- }
- };
-
- struct ScratchDataGPU {
- // [0] = EB
- // [1] = EE
- cms::cuda::device::unique_ptr pChannelsCounter;
- };
-
- struct InputDataGPU {
- cms::cuda::device::unique_ptr data;
- cms::cuda::device::unique_ptr offsets;
- cms::cuda::device::unique_ptr feds;
- };
-
- struct ConditionsProducts {
- ElectronicsMappingGPU::Product const &eMappingProduct;
- };
-
- } // namespace raw
-} // namespace ecal
-
-#endif // EventFilter_EcalRawToDigi_plugins_DeclsForKernels_h
diff --git a/EventFilter/EcalRawToDigi/plugins/EcalCPUDigisProducer.cc b/EventFilter/EcalRawToDigi/plugins/EcalCPUDigisProducer.cc
deleted file mode 100644
index 827ad7f568bc0..0000000000000
--- a/EventFilter/EcalRawToDigi/plugins/EcalCPUDigisProducer.cc
+++ /dev/null
@@ -1,242 +0,0 @@
-#include
-#include
-
-#include "CUDADataFormats/EcalDigi/interface/DigisCollection.h"
-#include "CondFormats/DataRecord/interface/EcalMappingElectronicsRcd.h"
-#include "CondFormats/EcalObjects/interface/ElectronicsMappingGPU.h"
-#include "DataFormats/EcalDetId/interface/EcalDetIdCollections.h"
-#include "DataFormats/EcalDigi/interface/EcalDataFrame.h"
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
-#include "DataFormats/EcalRawData/interface/EcalRawDataCollections.h"
-#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "HeterogeneousCore/CUDACore/interface/ScopedContext.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/HostAllocator.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h"
-
-#include "DeclsForKernels.h"
-#include "UnpackGPU.h"
-
-class EcalCPUDigisProducer : public edm::stream::EDProducer {
-public:
- explicit EcalCPUDigisProducer(edm::ParameterSet const& ps);
- ~EcalCPUDigisProducer() override = default;
- static void fillDescriptions(edm::ConfigurationDescriptions&);
-
-private:
- void acquire(edm::Event const&, edm::EventSetup const&, edm::WaitingTaskWithArenaHolder) override;
- void produce(edm::Event&, edm::EventSetup const&) override;
-
- template
- edm::EDPutTokenT dummyProduces(ARGS&&... args) {
- return (produceDummyIntegrityCollections_) ? produces(std::forward(args)...)
- : edm::EDPutTokenT{};
- }
-
-private:
- // input digi collections in GPU-friendly format
- using InputProduct = cms::cuda::Product>;
- edm::EDGetTokenT digisInEBToken_;
- edm::EDGetTokenT digisInEEToken_;
-
- // output digi collections in legacy format
- edm::EDPutTokenT digisOutEBToken_;
- edm::EDPutTokenT digisOutEEToken_;
-
- // whether to produce dummy integrity collections
- bool produceDummyIntegrityCollections_;
-
- // dummy producer collections
- edm::EDPutTokenT ebSrFlagToken_;
- edm::EDPutTokenT eeSrFlagToken_;
-
- // dummy ECAL raw data collection
- edm::EDPutTokenT ecalRawDataToken_;
-
- // dummy integrity for xtal data
- edm::EDPutTokenT ebIntegrityGainErrorsToken_;
- edm::EDPutTokenT ebIntegrityGainSwitchErrorsToken_;
- edm::EDPutTokenT ebIntegrityChIdErrorsToken_;
-
- // dummy integrity for xtal data - EE specific (to be rivisited towards EB+EE common collection)
- edm::EDPutTokenT eeIntegrityGainErrorsToken_;
- edm::EDPutTokenT eeIntegrityGainSwitchErrorsToken_;
- edm::EDPutTokenT