Code Review

Address Major Issues:
- Ensure m_directURL_EventPlaneCalib is not empty before passing it to hasValidTree
- Removed unused vectors in EventPlaneRecov2 (south_psi, north_psi, northsouth_psi)
- Guard against order == 0 to avoid divide-by-zero.
- Add bounds checks before indexing Q-vector storage.

Author: Steepspace

offline/packages/eventplaneinfo/EventPlaneRecov2.cc

@@ -78,7 +78,7 @@ int EventPlaneRecov2::Init(PHCompositeNode *topNode)
 {
   std::string calibdir = CDBInterface::instance()->getUrl(m_calibName);
 
-  if (hasValidTree(m_directURL_EventPlaneCalib))
+  if (!m_directURL_EventPlaneCalib.empty() && hasValidTree(m_directURL_EventPlaneCalib))
   {
     m_cdbttree = std::make_unique<CDBTTree>(m_directURL_EventPlaneCalib);
     std::cout << PHWHERE << " Custom Event Plane Calib Found: " << m_directURL_EventPlaneCalib << std::endl;
@@ -552,10 +552,6 @@ int EventPlaneRecov2::FillNode(PHCompositeNode *topNode)
   std::vector<std::pair<double, double>> northsouth_Qvec_recentered(vec_size, {NAN, NAN});
   std::vector<std::pair<double, double>> northsouth_Qvec(vec_size, {NAN, NAN});
 
-  std::vector<double> south_psi(vec_size, NAN);
-  std::vector<double> north_psi(vec_size, NAN);
-  std::vector<double> northsouth_psi(vec_size, NAN);
-
   for (size_t h_idx = 0; h_idx < m_harmonics.size(); ++h_idx)
   {
     int n = m_harmonics[h_idx];

offline/packages/eventplaneinfo/Eventplaneinfov2.cc

@@ -10,14 +10,13 @@ void Eventplaneinfov2::identify(std::ostream& os) const
 
 double Eventplaneinfov2::GetPsi(const double Qx, const double Qy, const unsigned int order) const
 {
-  double temp;
-  if ((Qx == 0.0) && (Qy == 0.0))
+  if (order == 0)
   {
-    temp = NAN;
+    return NAN;
   }
-  else
+  if ((Qx == 0.0) && (Qy == 0.0))
   {
-    temp = atan2(Qy, Qx) / ((double) order);
+    return NAN;
   }
-  return temp;
+  return atan2(Qy, Qx) / static_cast<double>(order);
 }

offline/packages/eventplaneinfo/Eventplaneinfov2.h

@@ -32,17 +32,49 @@ class Eventplaneinfov2 : public Eventplaneinfo
   void set_qvector_raw(const std::vector<std::pair<double, double>>& Qvec) override { mQvec_raw = Qvec; }
   void set_qvector_recentered(const std::vector<std::pair<double, double>>& Qvec) override { mQvec_recentered = Qvec; }
   void set_shifted_psi(std::vector<double> Psi_Shifted) override { mPsi_Shifted = Psi_Shifted; }
-  std::pair<double, double> get_qvector(int order) const override { return std::make_pair(mQvec[order - 1].first, mQvec[order - 1].second); }
-  std::pair<double, double> get_qvector_raw(int order) const override { return std::make_pair(mQvec_raw[order - 1].first, mQvec_raw[order - 1].second); }
-  std::pair<double, double> get_qvector_recentered(int order) const override { return std::make_pair(mQvec_recentered[order - 1].first, mQvec_recentered[order - 1].second); }
+  std::pair<double, double> get_qvector(int order) const override { return safe_qvec(mQvec, order); }
+  std::pair<double, double> get_qvector_raw(int order) const override { return safe_qvec(mQvec_raw, order); }
+  std::pair<double, double> get_qvector_recentered(int order) const override { return safe_qvec(mQvec_recentered, order); }
   void set_ring_qvector(std::vector<std::vector<std::pair<double, double>>> Qvec) override { ring_Qvec = Qvec; }
-  std::pair<double, double> get_ring_qvector(int ring_index, int order) const override { return ring_Qvec[ring_index][order - 1]; }
-  double get_ring_psi(int ring_index, int order) const override {return GetPsi(ring_Qvec[ring_index][order - 1].first,ring_Qvec[ring_index][order - 1].second,order);}
+  std::pair<double, double> get_ring_qvector(int ring_index, int order) const override
+  {
+    if (ring_index < 0 || static_cast<size_t>(ring_index) >= ring_Qvec.size())
+    {
+      return {NAN, NAN};
+    }
+    return safe_qvec(ring_Qvec[ring_index], order);
+  }
+  double get_ring_psi(int ring_index, int order) const override
+  {
+    auto q = get_ring_qvector(ring_index, order);
+    return GetPsi(q.first, q.second, static_cast<unsigned int>(order));
+  }
+
   double GetPsi(double Qx, double Qy, unsigned int order) const override;
-  double get_psi(int order) const override { return GetPsi(mQvec[order - 1].first, mQvec[order - 1].second, order);}
-  double get_shifted_psi(int order) const override { return mPsi_Shifted[order - 1]; }
-     
+  double get_psi(int order) const override
+  {
+    auto q = get_qvector(order);
+    return GetPsi(q.first, q.second, static_cast<unsigned int>(order));
+  }
+  double get_shifted_psi(int order) const override
+  {
+    if (order <= 0 || static_cast<size_t>(order) > mPsi_Shifted.size())
+    {
+      return NAN;
+    }
+    return mPsi_Shifted[order - 1];
+  }
+
  private:
+  static std::pair<double, double> safe_qvec(const std::vector<std::pair<double, double>>& v, int order)
+  {
+    if (order <= 0 || static_cast<size_t>(order) > v.size())
+    {
+      return {NAN, NAN};
+    }
+    return v[order - 1];
+  }
+
   std::vector<std::pair<double, double>> mQvec;
   std::vector<std::pair<double, double>> mQvec_raw;
   std::vector<std::pair<double, double>> mQvec_recentered;