Fixes for MeanVertexObject class

shahor02 · shahor02 · commit a52a3a7becd7 · 2022-09-06T13:29:48.000+02:00
diff --git a/DataFormats/Calibration/include/DataFormatsCalibration/MeanVertexObject.h b/DataFormats/Calibration/include/DataFormatsCalibration/MeanVertexObject.h
@@ -13,8 +13,6 @@
 #define MEAN_VERTEX_OBJECT_H_
 
 #include <array>
-#include "Rtypes.h"
-
 #include "Framework/Logger.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
@@ -28,71 +26,65 @@ class MeanVertexObject : public VertexBase
  public:
   MeanVertexObject(float x, float y, float z, float sigmax, float sigmay, float sigmaz, float slopeX, float slopeY)
   {
-    gpu::gpustd::array<float, kNCov> cov;
-    cov[CovElems::kCovXX] = sigmax;
-    cov[CovElems::kCovYY] = sigmay;
-    cov[CovElems::kCovZZ] = sigmaz;
     setXYZ(x, y, z);
-    setCov(cov);
+    setSigma({sigmax, sigmay, sigmaz});
     mSlopeX = slopeX;
     mSlopeY = slopeY;
   }
   MeanVertexObject(std::array<float, 3> pos, std::array<float, 3> sigma, float slopeX, float slopeY)
   {
     math_utils::Point3D<float> p(pos[0], pos[1], pos[2]);
-    gpu::gpustd::array<float, kNCov> cov;
-    cov[CovElems::kCovXX] = sigma[0];
-    cov[CovElems::kCovYY] = sigma[1];
-    cov[CovElems::kCovZZ] = sigma[2];
     setPos(p);
-    setCov(cov);
+    setSigma(sigma);
     mSlopeX = slopeX;
     mSlopeY = slopeY;
   }
   MeanVertexObject() = default;
   ~MeanVertexObject() = default;
   MeanVertexObject(const MeanVertexObject& other) = default;
   MeanVertexObject(MeanVertexObject&& other) = default;
-  MeanVertexObject& operator=(MeanVertexObject& other) = default;
+  MeanVertexObject& operator=(const MeanVertexObject& other) = default;
   MeanVertexObject& operator=(MeanVertexObject&& other) = default;
 
   void set(int icoord, float val);
   void setSigma(int icoord, float val);
-  void setSigmaX(float val) { setSigmaX2(val); }
-  void setSigmaY(float val) { setSigmaY2(val); }
-  void setSigmaZ(float val) { setSigmaZ2(val); }
   void setSigma(std::array<float, 3> val)
   {
-    setSigmaX2(val[0]);
-    setSigmaY2(val[1]);
-    setSigmaZ2(val[2]);
+    setSigmaX(val[0]);
+    setSigmaY(val[1]);
+    setSigmaZ(val[2]);
   }
   void setSlopeX(float val) { mSlopeX = val; }
   void setSlopeY(float val) { mSlopeY = val; }
 
   math_utils::Point3D<float>& getPos() { return getXYZ(); }
   math_utils::Point3D<float> getPos() const { return getXYZ(); }
-  float getSigmaX() const { return getSigmaX2(); }
-  float getSigmaY() const { return getSigmaY2(); }
-  float getSigmaZ() const { return getSigmaZ2(); }
-  const gpu::gpustd::array<float, kNCov>& getSigma() const { return getCov(); }
 
   float getSlopeX() const { return mSlopeX; }
   float getSlopeY() const { return mSlopeY; }
 
-  float getXAtZ(float z) { return getX() + mSlopeX * (z - getZ()); }
-  float getYAtZ(float z) { return getY() + mSlopeY * (z - getZ()); }
+  float getXAtZ(float z) const { return getX() + mSlopeX * (z - getZ()); }
+  float getYAtZ(float z) const { return getY() + mSlopeY * (z - getZ()); }
 
   void print() const;
   std::string asString() const;
 
-  VertexBase getMeanVertex(float z)
+  VertexBase getMeanVertex(float z) const
   {
+    // set z-dependent x,z, assuming that the cov.matrix is already set
     VertexBase v = *this;
     v.setXYZ(getXAtZ(z), getYAtZ(z), z);
     return v;
   }
 
+  void setMeanXYVertexAtZ(VertexBase& v, float z) const
+  {
+    float dz = z - getZ();
+    v.setX(getX() + mSlopeX * dz);
+    v.setY(getY() + mSlopeY * dz);
+    v.setZ(z);
+  }
+
   const VertexBase& getMeanVertex() const
   {
     return (const VertexBase&)(*this);
diff --git a/DataFormats/Reconstruction/include/ReconstructionDataFormats/Vertex.h b/DataFormats/Reconstruction/include/ReconstructionDataFormats/Vertex.h
@@ -61,6 +61,10 @@ class VertexBase
   GPUd() float getSigmaXY() const { return mCov[kCovXY]; }
   GPUd() float getSigmaXZ() const { return mCov[kCovXZ]; }
   GPUd() float getSigmaYZ() const { return mCov[kCovYZ]; }
+  GPUd() float getSigmaX() const { return gpu::CAMath::Sqrt(getSigmaX2()); }
+  GPUd() float getSigmaY() const { return gpu::CAMath::Sqrt(getSigmaY2()); }
+  GPUd() float getSigmaZ() const { return gpu::CAMath::Sqrt(getSigmaZ2()); }
+
   GPUd() const gpu::gpustd::array<float, kNCov>& getCov() const { return mCov; }
 
   GPUd() math_utils::Point3D<float> getXYZ() const { return mPos; }
@@ -84,6 +88,10 @@ class VertexBase
   GPUd() void setSigmaXY(float v) { mCov[kCovXY] = v; }
   GPUd() void setSigmaXZ(float v) { mCov[kCovXZ] = v; }
   GPUd() void setSigmaYZ(float v) { mCov[kCovYZ] = v; }
+  GPUd() void setSigmaX(float val) { setSigmaX2(val * val); }
+  GPUd() void setSigmaY(float val) { setSigmaY2(val * val); }
+  GPUd() void setSigmaZ(float val) { setSigmaZ2(val * val); }
+
   GPUd() void setCov(float sxx, float sxy, float syy, float sxz, float syz, float szz)
   {
     setSigmaX2(sxx);
