make TPCFastTransformPOD fully independent of FlatObject and root

Author: matthias-kleiner

GPU/TPCFastTransformation/Spline1D.h

@@ -134,12 +134,14 @@ namespace gpu
 ///    YdimT = 0 : the number of Y dimensions will be set in the runtime
 ///    YdimT < 0 : the number of Y dimensions will be set in the runtime, and it will not exceed abs(YdimT)
 ///
-template <typename DataT, int32_t YdimT = 0>
-class Spline1D
-  : public Spline1DSpec<DataT, YdimT, SplineUtil::getSpec(YdimT)>
+/// Common implementation (no ClassDefNV — ROOT dictionary is in the FlatObject specialization below)
+template <typename DataT, int32_t YdimT, class FlatBase>
+class Spline1DBase
+  : public Spline1DSpec<DataT, YdimT, SplineUtil::getSpec(YdimT), FlatBase>
 {
-  typedef Spline1DContainer<DataT> TVeryBase;
-  typedef Spline1DSpec<DataT, YdimT, SplineUtil::getSpec(YdimT)> TBase;
+ protected:
+  typedef Spline1DContainerBase<DataT, FlatBase> TVeryBase;
+  typedef Spline1DSpec<DataT, YdimT, SplineUtil::getSpec(YdimT), FlatBase> TBase;
 
  public:
   typedef typename TVeryBase::SafetyLevel SafetyLevel;
@@ -148,34 +150,56 @@ class Spline1D
 #if !defined(GPUCA_GPUCODE)
   using TBase::TBase; // inherit constructors
 
-  /// Assignment operator
-  Spline1D() = default;
-  Spline1D(const Spline1D& v) : TBase(v)
+  Spline1DBase() = default;
+  Spline1DBase(const Spline1DBase& v) : TBase(v)
   {
-    TVeryBase::cloneFromObject(v, nullptr);
+    static_cast<TVeryBase*>(this)->cloneFromObject(v, nullptr);
   }
-  Spline1D& operator=(const Spline1D& v)
+  Spline1DBase& operator=(const Spline1DBase& v)
   {
-    TVeryBase::cloneFromObject(v, nullptr);
+    static_cast<TVeryBase*>(this)->cloneFromObject(v, nullptr);
     return *this;
   }
 #else
-  /// Disable constructors for the GPU implementation
-  Spline1D() = delete;
-  Spline1D(const Spline1D&) = delete;
+  Spline1DBase() = delete;
+  Spline1DBase(const Spline1DBase&) = delete;
 #endif
 
 #if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
-  /// read a class object from the file
-  static Spline1D* readFromFile(TFile& inpf, const char* name)
+  static Spline1DBase* readFromFile(TFile& inpf, const char* name)
   {
-    return (Spline1D*)TVeryBase::readFromFile(inpf, name);
+    return (Spline1DBase*)TVeryBase::readFromFile(inpf, name);
   }
 #endif
+};
 
+/// Forward declaration — specializations below select ClassDefNV based on FlatBase
+template <typename DataT, int32_t YdimT = 0, class FlatBase = FlatObject>
+class Spline1D;
+
+/// FlatObject specialization — carries ClassDefNV for ROOT I/O
+template <typename DataT, int32_t YdimT>
+class Spline1D<DataT, YdimT, FlatObject> : public Spline1DBase<DataT, YdimT, FlatObject>
+{
+ public:
+  using Spline1DBase<DataT, YdimT, FlatObject>::Spline1DBase;
+#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
+  static Spline1D* readFromFile(TFile& inpf, const char* name)
+  {
+    return (Spline1D*)Spline1DContainerBase<DataT, FlatObject>::readFromFile(inpf, name);
+  }
+#endif
   ClassDefNV(Spline1D, 0);
 };
 
+/// NoFlatObject specialization — no ROOT ClassDef overhead
+template <typename DataT, int32_t YdimT>
+class Spline1D<DataT, YdimT, NoFlatObject> : public Spline1DBase<DataT, YdimT, NoFlatObject>
+{
+ public:
+  using Spline1DBase<DataT, YdimT, NoFlatObject>::Spline1DBase;
+};
+
 } // namespace gpu
 } // namespace o2
 

GPU/TPCFastTransformation/Spline1DHelper.cxx

@@ -133,7 +133,7 @@ void Spline1DHelper<DataT>::getDDDScoefficients(const typename Spline1D<double>:
 
 template <typename DataT>
 void Spline1DHelper<DataT>::approximateDataPoints(
-  Spline1DContainer<DataT>& spline,
+  Spline1DContainerBase<DataT, FlatObject>& spline,
   double xMin, double xMax,
   const double vx[], const double vf[], int32_t nDataPoints)
 {
@@ -246,7 +246,7 @@ void Spline1DHelper<DataT>::approximateDataPoints(
 
 template <typename DataT>
 void Spline1DHelper<DataT>::approximateDerivatives(
-  Spline1DContainer<DataT>& spline,
+  Spline1DContainerBase<DataT, FlatObject>& spline,
   const double vx[], const double vf[], int32_t nDataPoints)
 {
   /// Create best-fit spline parameters for a given input function F
@@ -298,7 +298,7 @@ void Spline1DHelper<DataT>::approximateDerivatives(
 }
 
 template <typename DataT>
-void Spline1DHelper<DataT>::approximateFunctionClassic(Spline1DContainer<DataT>& spline,
+void Spline1DHelper<DataT>::approximateFunctionClassic(Spline1DContainerBase<DataT, FlatObject>& spline,
                                                        double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F)
 {
   /// Create classic spline parameters for a given input function F
@@ -422,7 +422,7 @@ void Spline1DHelper<DataT>::approximateFunctionClassic(Spline1DContainer<DataT>&
 
 template <typename DataT>
 void Spline1DHelper<DataT>::makeDataPoints(
-  Spline1DContainer<DataT>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
+  Spline1DContainerBase<DataT, FlatObject>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
   int32_t nAuxiliaryDataPoints, std::vector<double>& vx, std::vector<double>& vf)
 {
   /// Create best-fit spline parameters for a given input function F
@@ -451,7 +451,7 @@ void Spline1DHelper<DataT>::makeDataPoints(
 
 template <typename DataT>
 void Spline1DHelper<DataT>::approximateFunction(
-  Spline1DContainer<DataT>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
+  Spline1DContainerBase<DataT, FlatObject>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
   int32_t nAuxiliaryDataPoints)
 {
   /// Create best-fit spline parameters for a given input function F
@@ -463,7 +463,7 @@ void Spline1DHelper<DataT>::approximateFunction(
 
 template <typename DataT>
 void Spline1DHelper<DataT>::approximateFunctionGradually(
-  Spline1DContainer<DataT>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
+  Spline1DContainerBase<DataT, FlatObject>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
   int32_t nAuxiliaryDataPoints)
 {
   /// Create best-fit spline parameters for a given input function F
@@ -491,7 +491,7 @@ void Spline1DHelper<DataT>::approximateFunctionGradually(
 }
 
 template <typename DataT>
-void Spline1DHelper<DataT>::setSpline(const Spline1DContainer<DataT>& spline)
+void Spline1DHelper<DataT>::setSpline(const Spline1DContainerBase<DataT, FlatObject>& spline)
 {
   const int32_t nKnots = spline.getNumberOfKnots();
   std::vector<int32_t> knots(nKnots);

GPU/TPCFastTransformation/Spline1DHelper.h

@@ -52,25 +52,25 @@ class Spline1DHelper
   /// _______________  Main functionality  ________________________
 
   /// Create best-fit spline parameters for a set of data points
-  void approximateDataPoints(Spline1DContainer<DataT>& spline,
+  void approximateDataPoints(Spline1DContainerBase<DataT, FlatObject>& spline,
                              double xMin, double xMax,
                              const double vx[], const double vf[], int32_t nDataPoints);
 
   /// Create best-fit spline parameters for a function F
   void approximateFunction(
-    Spline1DContainer<DataT>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
+    Spline1DContainerBase<DataT, FlatObject>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
     int32_t nAuxiliaryDataPoints = 4);
 
   /// Approximate only derivatives assuming the spline values at knozts are already set
-  void approximateDerivatives(Spline1DContainer<DataT>& spline,
+  void approximateDerivatives(Spline1DContainerBase<DataT, FlatObject>& spline,
                               const double vx[], const double vf[], int32_t nDataPoints);
 
   void approximateFunctionGradually(
-    Spline1DContainer<DataT>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
+    Spline1DContainerBase<DataT, FlatObject>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
     int32_t nAuxiliaryDataPoints);
 
   /// Create classic spline parameters for a given input function F
-  void approximateFunctionClassic(Spline1DContainer<DataT>& spline,
+  void approximateFunctionClassic(Spline1DContainerBase<DataT, FlatObject>& spline,
                                   double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F);
 
   /// _______________  Utilities   ________________________
@@ -110,9 +110,9 @@ class Spline1DHelper
 
   std::string mError = ""; ///< error string
 
-  void setSpline(const Spline1DContainer<DataT>& spline);
+  void setSpline(const Spline1DContainerBase<DataT, FlatObject>& spline);
 
-  void makeDataPoints(Spline1DContainer<DataT>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
+  void makeDataPoints(Spline1DContainerBase<DataT, FlatObject>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
                       int32_t nAuxiliaryDataPoints, std::vector<double>& vx, std::vector<double>& vf);
 
   /// helpers for the construction of 1D spline

GPU/TPCFastTransformation/Spline1DHelperOld.cxx

@@ -129,7 +129,7 @@ void Spline1DHelperOld<DataT>::getDDDScoefficients(const typename Spline1D<doubl
 }
 
 template <typename DataT>
-void Spline1DHelperOld<DataT>::approximateFunctionClassic(Spline1DContainer<DataT>& spline,
+void Spline1DHelperOld<DataT>::approximateFunctionClassic(Spline1DContainerBase<DataT, FlatObject>& spline,
                                                           double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F)
 {
   /// Create classic spline parameters for a given input function F
@@ -253,7 +253,7 @@ void Spline1DHelperOld<DataT>::approximateFunctionClassic(Spline1DContainer<Data
 
 template <typename DataT>
 void Spline1DHelperOld<DataT>::approximateDataPoints(
-  Spline1DContainer<DataT>& spline,
+  Spline1DContainerBase<DataT, FlatObject>& spline,
   double xMin, double xMax,
   double vx[], double vf[], int32_t nDataPoints)
 {
@@ -266,7 +266,7 @@ void Spline1DHelperOld<DataT>::approximateDataPoints(
 
 template <typename DataT>
 void Spline1DHelperOld<DataT>::approximateFunction(
-  Spline1DContainer<DataT>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
+  Spline1DContainerBase<DataT, FlatObject>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
   int32_t nAuxiliaryDataPoints)
 {
   /// Create best-fit spline parameters for a given input function F
@@ -277,7 +277,7 @@ void Spline1DHelperOld<DataT>::approximateFunction(
 
 template <typename DataT>
 void Spline1DHelperOld<DataT>::approximateFunctionGradually(
-  Spline1DContainer<DataT>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
+  Spline1DContainerBase<DataT, FlatObject>& spline, double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
   int32_t nAuxiliaryDataPoints)
 {
   /// Create best-fit spline parameters gradually for a given input function F
@@ -316,7 +316,7 @@ void Spline1DHelperOld<DataT>::approximateFunctionGradually(
 
 template <typename DataT>
 int32_t Spline1DHelperOld<DataT>::setSpline(
-  const Spline1DContainer<DataT>& spline, int32_t nFdimensions, int32_t nAuxiliaryDataPoints)
+  const Spline1DContainerBase<DataT, FlatObject>& spline, int32_t nFdimensions, int32_t nAuxiliaryDataPoints)
 {
   // Prepare creation of a best-fit spline
   //
@@ -463,7 +463,7 @@ int32_t Spline1DHelperOld<DataT>::setSpline(
 
 template <typename DataT>
 int32_t Spline1DHelperOld<DataT>::setSpline(
-  const Spline1DContainer<DataT>& spline, int32_t nFdimensions, double xMin, double xMax, double vx[], int32_t nDataPoints)
+  const Spline1DContainerBase<DataT, FlatObject>& spline, int32_t nFdimensions, double xMin, double xMax, double vx[], int32_t nDataPoints)
 {
   // Prepare creation of a best-fit spline
   //

GPU/TPCFastTransformation/Spline1DHelperOld.h

@@ -69,31 +69,31 @@ class Spline1DHelperOld
   void bandGauss(double A[], double b[], int32_t n);
 
   /// Create best-fit spline parameters for a given input function F
-  void approximateDataPoints(Spline1DContainer<DataT>& spline,
+  void approximateDataPoints(Spline1DContainerBase<DataT, FlatObject>& spline,
                              double xMin, double xMax,
                              double x[], double f[], int32_t nDataPoints);
 
   /// Create best-fit spline parameters for a given input function F
-  void approximateFunction(Spline1DContainer<DataT>& spline,
+  void approximateFunction(Spline1DContainerBase<DataT, FlatObject>& spline,
                            double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
                            int32_t nAuxiliaryDataPoints = 4);
 
   /// Create best-fit spline parameters gradually for a given input function F
-  void approximateFunctionGradually(Spline1DContainer<DataT>& spline,
+  void approximateFunctionGradually(Spline1DContainerBase<DataT, FlatObject>& spline,
                                     double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F,
                                     int32_t nAuxiliaryDataPoints = 4);
 
   /// Create classic spline parameters for a given input function F
-  void approximateFunctionClassic(Spline1DContainer<DataT>& spline,
+  void approximateFunctionClassic(Spline1DContainerBase<DataT, FlatObject>& spline,
                                   double xMin, double xMax, std::function<void(double x, double f[/*spline.getFdimensions()*/])> F);
 
   /// _______________   Interface for a step-wise construction of the best-fit spline   ________________________
 
   /// precompute everything needed for the construction
-  int32_t setSpline(const Spline1DContainer<DataT>& spline, int32_t nFdimensions, int32_t nAuxiliaryDataPoints);
+  int32_t setSpline(const Spline1DContainerBase<DataT, FlatObject>& spline, int32_t nFdimensions, int32_t nAuxiliaryDataPoints);
 
   /// precompute everything needed for the construction
-  int32_t setSpline(const Spline1DContainer<DataT>& spline, int32_t nFdimensions, double xMin, double xMax, double vx[], int32_t nDataPoints);
+  int32_t setSpline(const Spline1DContainerBase<DataT, FlatObject>& spline, int32_t nFdimensions, double xMin, double xMax, double vx[], int32_t nDataPoints);
 
   /// approximate std::function, output in Fparameters
   void approximateFunction(DataT* Fparameters, double xMin, double xMax, std::function<void(double x, double f[])> F) const;