Changeset 11965 for trunk/FACT++

Timestamp:

09/05/11 16:25:53 (13 years ago)

Author:

tbretz

Message:

Replaced reading of the FACTmapV5 by the PixelMap class.

File:

• trunk/FACT++/src/biasctrl.cc (modified) (3 diffs)

trunk/FACT++/src/biasctrl.cc

@@ -11 +11 @@
 #include "Console.h"
 #include "Converter.h"
+#include "PixelMap.h"
 
 #include "tools.h"
@@ -1785 +1786 @@
         // --------------------------------------------------------------------------
 
-        ifstream fin("FACTmapV5.txt");
-
-        int l = 0;
-
-        vector<float> vec(kNumChannels);
-
-        string buf;
-        while (getline(fin, buf, '\n'))
-        {
-            if (l>1439)
-                break;
-
-            buf = Tools::Trim(buf);
-            if (buf[0]=='#')
-                continue;
-
-            stringstream str(buf);
-
-            int   idummy, board, channel;
-            float fdummy, volt;
-
-            str >> idummy >> idummy >> idummy >> idummy >> idummy;
-            str >> volt;
-            str >> board;
-            str >> channel;
-            str >> fdummy >> fdummy >> fdummy;
-
-            if (channel+32*board>=kNumChannels)
-            {
-                T::Error("Invalid board/channel read from FACTmapV5.txt.");
-                return 4;
-            }
-
-            vec[channel+32*board] = volt;
-            l++;
-        }
-
-        if (l!=1440)
+        PixelMap map;
+        if (!map.Read("FACTmapV5.txt"))
         {
             T::Error("Reading reference voltages from FACTmapV5.txt failed.");
@@ -1828 +1793 @@
         }
 
-        if (!fBias.SetNewGapdVoltage(vec))
+        if (!fBias.SetNewGapdVoltage(map.Vgapd()))
         {
             T::Error("Setting reference voltages failed.");