Remove template parameters from ZVertexHost and ZVertexDevice

Author: fwyzard

DataFormats/VertexSoA/interface/ZVertexDevice.h

@@ -9,18 +9,16 @@
 #include "DataFormats/VertexSoA/interface/ZVertexHost.h"
 #include "DataFormats/Portable/interface/PortableDeviceCollection.h"
 
-template <int32_t NVTX, int32_t NTRK, typename TDev>
-class ZVertexDeviceSoA : public PortableDeviceMultiCollection<TDev, reco::ZVertexSoA, reco::ZVertexTracksSoA> {
+template <typename TDev>
+class ZVertexDevice : public PortableDeviceMultiCollection<TDev, reco::ZVertexSoA, reco::ZVertexTracksSoA> {
 public:
-  ZVertexDeviceSoA() = default;  // necessary for ROOT dictionaries
+  ZVertexDevice() = default;  // necessary for ROOT dictionaries
 
   // Constructor which specifies the queue
   template <typename TQueue>
-  explicit ZVertexDeviceSoA(TQueue queue)
-      : PortableDeviceMultiCollection<TDev, reco::ZVertexSoA, reco::ZVertexTracksSoA>({{NVTX, NTRK}}, queue) {}
+  explicit ZVertexDevice(TQueue queue)
+      : PortableDeviceMultiCollection<TDev, reco::ZVertexSoA, reco::ZVertexTracksSoA>(
+            {{zVertex::MAXVTX, zVertex::MAXTRACKS}}, queue) {}
 };
 
-template <typename TDev>
-using ZVertexDevice = ZVertexDeviceSoA<zVertex::MAXVTX, zVertex::MAXTRACKS, TDev>;
-
 #endif  // DataFormats_VertexSoA_interface_ZVertexDevice_h

DataFormats/VertexSoA/interface/ZVertexHost.h

@@ -11,23 +11,22 @@
 #include "DataFormats/Portable/interface/PortableHostCollection.h"
 
 // This alias is needed to call the SET_PORTABLEHOSTMULTICOLLECTION_READ_RULES macro without commas.
-using ZVertexHostSoABase = PortableHostCollection2<reco::ZVertexSoA, reco::ZVertexTracksSoA>;
+using ZVertexHostBase = PortableHostCollection2<reco::ZVertexSoA, reco::ZVertexTracksSoA>;
 
-template <int32_t NVTX, int32_t NTRK>
-class ZVertexHostSoA : public ZVertexHostSoABase {
+class ZVertexHost : public ZVertexHostBase {
 public:
-  ZVertexHostSoA() = default;
+  ZVertexHost() = default;  // necessary for ROOT dictionaries
 
   // Constructor which specifies the queue
   template <typename TQueue>
-  explicit ZVertexHostSoA(TQueue queue)
-      : PortableHostCollection2<reco::ZVertexSoA, reco::ZVertexTracksSoA>({{NVTX, NTRK}}, queue) {}
+  explicit ZVertexHost(TQueue queue)
+      : PortableHostCollection2<reco::ZVertexSoA, reco::ZVertexTracksSoA>({{zVertex::MAXVTX, zVertex::MAXTRACKS}},
+                                                                          queue) {}
 
   // Constructor which specifies the DevHost
-  explicit ZVertexHostSoA(alpaka_common::DevHost const& host)
-      : PortableHostCollection2<reco::ZVertexSoA, reco::ZVertexTracksSoA>({{NVTX, NTRK}}, host) {}
+  explicit ZVertexHost(alpaka_common::DevHost const& host)
+      : PortableHostCollection2<reco::ZVertexSoA, reco::ZVertexTracksSoA>({{zVertex::MAXVTX, zVertex::MAXTRACKS}},
+                                                                          host) {}
 };
 
-using ZVertexHost = ZVertexHostSoA<zVertex::MAXVTX, zVertex::MAXTRACKS>;
-
 #endif  // DataFormats_VertexSoA_ZVertexHost_H

DataFormats/VertexSoA/src/classes.cc

@@ -1,4 +1,4 @@
 #include "DataFormats/Portable/interface/PortableHostCollectionReadRules.h"
 #include "DataFormats/VertexSoA/interface/ZVertexHost.h"
 
-SET_PORTABLEHOSTMULTICOLLECTION_READ_RULES(ZVertexHostSoABase);
+SET_PORTABLEHOSTMULTICOLLECTION_READ_RULES(ZVertexHostBase);

DataFormats/VertexSoA/src/classes_def.xml

@@ -13,7 +13,7 @@
   <class name="portablecollection::CollectionLeaf<1, reco::ZVertexTracksLayout<128, false>>"/>
 
   <!-- Collection declaration for dictionary -->
-  <class name="ZVertexHostSoABase"/>
+  <class name="ZVertexHostBase"/>
   <class name="ZVertexHost"/>
   <class name="edm::Wrapper<ZVertexHost>" splitLevel="0"/>
 </lcgdict>