Changeset 17339 for trunk/FACT++/src

Timestamp:

11/21/13 17:31:58 (11 years ago)

Author:

tbretz

Message:

Use the new ReadGrid from Interpolator2D

File:

• trunk/FACT++/src/fscctrl.cc (modified) (7 diffs)

trunk/FACT++/src/fscctrl.cc

@@ -11 +11 @@
 #include "Console.h"
 #include "Converter.h"
-#include "../externals/Interpolator2D.h"
+#include "externals/Interpolator2D.h"
 
 #include "tools.h"
@@ -37 +37 @@
 
 protected:
-    vector<pair<double,double>> fPositionsSensors;
-    vector<pair<double,double>> fPositionsBias;
+    vector<Interpolator2D::vec> fPositionsSensors;
+    vector<Interpolator2D::vec> fPositionsBias;
 
     virtual void UpdateTemp(float, const vector<float> &)
@@ -631 +631 @@
     }
 
-    void SetPositionsSensors(const vector<pair<double,double>> &vec)
+    void SetPositionsSensors(const vector<Interpolator2D::vec> &vec)
     {
         fPositionsSensors = vec;
     }
 
-    void SetPositionsBias(const vector<pair<double,double>> &vec)
+    void SetPositionsBias(const vector<Interpolator2D::vec> &vec)
     {
         fPositionsBias = vec;
@@ -682 +682 @@
             {
                 T.emplace_back(temp[i]);
-                xy.emplace_back(fPositionsSensors[i].first, fPositionsSensors[i].second);
+                xy.emplace_back(fPositionsSensors[i]);
 
                 avg += temp[i];
@@ -913 +913 @@
         T::AddEvent("RECONNECT", "O", State::kDisconnected, State::kConnected)
             (bind(&StateMachineFSC::Reconnect, this, placeholders::_1))
-            ("(Re)connect ethernet connection to FTM, a new address can be given"
+            ("(Re)connect ethernet connection to FSC, a new address can be given"
              "|[host][string]:new ethernet address in the form <host:port>");
 
@@ -924 +924 @@
     }
 
-    vector<pair<double,double>> ReadVector(const string &filename) const
-    {
-        vector<pair<double,double>> vec;
-
-        ifstream fin(filename);
-        while (1)
-        {
-            double x, y;
-            fin >> x;
-            fin >> y;
-            if (!fin)
-                break;
-
-            vec.emplace_back(x, y);
-        }
-
-        return vec;
-    }
-
     int EvalOptions(Configuration &conf)
     {
@@ -948 +929 @@
 
         const string fname1 = conf.Get<string>("sensor-pos-file");
-        const auto v1 = ReadVector(fname1);
+        const auto v1 = Interpolator2D::ReadGrid(fname1);
         if (v1.size() != 31)
         {
-            Error("Reading sensor positions from "+fname1+"failed ("+to_string(v1.size())+")");
+            T::Error("Reading sensor positions from "+fname1+"failed ("+to_string(v1.size())+")");
             return 1;
         }
 
         const string fname2 = conf.Get<string>("patch-pos-file");
-        const auto v2 = ReadVector(fname2);
+        const auto v2 = Interpolator2D::ReadGrid(fname2);
         if (v2.size() != 320)
         {
-            Error("Reading bias patch positions from "+fname2+"failed ("+to_string(v2.size())+")");
+            T::Error("Reading bias patch positions from "+fname2+"failed ("+to_string(v2.size())+")");
             return 1;
         }