From ed668dc9d372c00e7fda32ed6f913e28c91e5471 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Tue, 16 Aug 2022 12:33:41 +0200
Subject: [PATCH] Datafield: rename data vec

---
 Device/Data/Datafield.cpp | 26 +++++++++++++-------------
 Device/Data/Datafield.h   |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Device/Data/Datafield.cpp b/Device/Data/Datafield.cpp
index 8977a714776..60cbdd42b65 100644
--- a/Device/Data/Datafield.cpp
+++ b/Device/Data/Datafield.cpp
@@ -23,13 +23,13 @@
 
 Datafield::Datafield(Frame* frame)
     : m_frame(frame)
-    , m_vec(m_frame->size())
+    , m_values(m_frame->size())
 {
 }
 
 Datafield::Datafield(Frame* frame, const std::vector<double>& vector)
     : m_frame(frame)
-    , m_vec(vector)
+    , m_values(vector)
 {
 }
 
@@ -47,29 +47,29 @@ Datafield::~Datafield() {}
 
 Datafield* Datafield::clone() const
 {
-    return new Datafield(m_frame->cloned_axes(), m_vec);
+    return new Datafield(m_frame->cloned_axes(), m_values);
 }
 
 void Datafield::setAt(size_t i, double val)
 {
-    m_vec[i] = val;
+    m_values[i] = val;
 }
 
 double Datafield::valAt(size_t i) const
 {
-    return m_vec[i];
+    return m_values[i];
 }
 
 void Datafield::setAllTo(const double& value)
 {
-    for (double& e : m_vec)
+    for (double& e : m_values)
         e = value;
 }
 
 void Datafield::setVector(const std::vector<double>& vector)
 {
     ASSERT(vector.size() == frame().size());
-    m_vec = vector;
+    m_values = vector;
 }
 
 size_t Datafield::rank() const
@@ -79,7 +79,7 @@ size_t Datafield::rank() const
 
 size_t Datafield::size() const
 {
-    ASSERT(frame().size() == m_vec.size());
+    ASSERT(frame().size() == m_values.size());
     return frame().size();
 }
 
@@ -130,18 +130,18 @@ Datafield* Datafield::normalizedToMaximum() const
     ASSERT(maxval > 0);
     std::vector<double> out(frame().size());
     for (size_t i = 0; i < frame().size(); ++i)
-        out[i] = m_vec[i] / maxval;
+        out[i] = m_values[i] / maxval;
     return new Datafield(m_frame->cloned_axes(), out);
 }
 
 double Datafield::maxVal() const
 {
-    return *std::max_element(m_vec.begin(), m_vec.end());
+    return *std::max_element(m_values.begin(), m_values.end());
 }
 
 double Datafield::minVal() const
 {
-    return *std::min_element(m_vec.begin(), m_vec.end());
+    return *std::min_element(m_values.begin(), m_values.end());
 }
 
 Datafield* Datafield::crop(double xmin, double ymin, double xmax, double ymax) const
@@ -157,7 +157,7 @@ Datafield* Datafield::crop(double xmin, double ymin, double xmax, double ymax) c
         double x = m_frame->projectedCoord(i, 0);
         double y = m_frame->projectedCoord(i, 1);
         if (xaxis->contains(x) && yaxis->contains(y))
-            out[iout++] = m_vec[i];
+            out[iout++] = m_values[i];
     }
     return new Datafield(m_frame->cloned_axes(), out);
 }
@@ -171,7 +171,7 @@ Datafield* Datafield::crop(double xmin, double xmax) const
     for (size_t i = 0; i < size(); ++i) {
         const double x = m_frame->projectedCoord(i, 0);
         if (xaxis->contains(x))
-            out[iout++] = m_vec[i];
+            out[iout++] = m_values[i];
     }
     return new Datafield(m_frame->cloned_axes(), out);
 }
diff --git a/Device/Data/Datafield.h b/Device/Data/Datafield.h
index 481378fe4ce..04e8a54cb1d 100644
--- a/Device/Data/Datafield.h
+++ b/Device/Data/Datafield.h
@@ -75,10 +75,10 @@ public:
     void setVector(const std::vector<double>& data_vector);
 
     //! indexed accessor
-    double& operator[](size_t i) { return m_vec[i]; }
+    double& operator[](size_t i) { return m_values[i]; }
 
     //! ied accessor (const)
-    const double& operator[](size_t i) const { return m_vec[i]; }
+    const double& operator[](size_t i) const { return m_values[i]; }
 
     // helpers
 
@@ -138,7 +138,7 @@ private:
     Datafield* create_yProjection(int xbinlow, int xbinup) const;
 
     std::unique_ptr<Frame> m_frame;
-    std::vector<double> m_vec;
+    std::vector<double> m_values;
 };
 
 #endif // BORNAGAIN_DEVICE_DATA_DATAFIELD_H
-- 
GitLab