Changeset 12050 for trunk

Timestamp:

09/08/11 22:25:59 (13 years ago)

Author:

tbretz

Message:

Replaced build in FACTmapV5(a) by a program otpion.

Location:

trunk/FACT++

Files:

• gui/FactGui.h (modified) (1 diff)
• src/biasctrl.cc (modified) (2 diffs)
• src/feedback.cc (modified) (3 diffs)

trunk/FACT++/gui/FactGui.h

@@ -3630 +3630 @@
         // --------------------------------------------------------------------------
 
-        if (!fPixelMap.Read("FACTmapV5a.txt"))
-        {
-            cerr << "ERROR - Problems reading FACTmapV5a.txt" << endl;
+        if (!fPixelMap.Read(conf.Get<string>("pixel-map-file")))
+        {
+            cerr << "ERROR - Problems reading " << conf.Get<string>("pixel-map-file") << endl;
             exit(-1);
         }
 
-/*
-        ifstream fin0("FACTmapV5.txt");
-
-        int l = 0;
-
-        string buf;
-        while (getline(fin0, buf, '\n'))
-        {
-            if (l>1439)
-                break;
-
-            buf = Tools::Trim(buf);
-            if (buf[0]=='#')
-                continue;
-
-            stringstream str(buf);
-
-            int   idummy;
-            float fdummy;
-
-            PixelMapEntry entry;
-
-            str >> entry.index;
-            str >> entry.cbpx;
-            str >> idummy;
-            str >> idummy;
-            str >> entry.gapd;
-            str >> fdummy;
-            str >> entry.hv_board;
-            str >> entry.hv_channel;
-            str >> fdummy;
-            str >> fdummy;
-            str >> fdummy;
-
-            fPixelMap[l++] = entry;
-        }
-
-        if (l!=1440)
-        {
-            cerr << "ERROR - Problems reading FACTmapV5.txt" << endl;
-            exit(-1);
-        }
- */
         // --------------------------------------------------------------------------
 

trunk/FACT++/src/biasctrl.cc

@@ -1938 +1938 @@
 
         PixelMap map;
-        if (!map.Read("FACTmapV5.txt"))
-        {
-            T::Error("Reading reference voltages from FACTmapV5.txt failed.");
+        if (!map.Read(conf.Get<string>("pixel-map-file")))
+        {
+            T::Error("Reading reference voltages from "+conf.Get<string>("pixel-map-file")+" failed.");
             return 5;
         }
@@ -1981 +1981 @@
         ("volt-max-abs",    var<float>(75),      "Absolte upper limit for the voltage (in Volts)")
         ("volt-max-rel",    var<float>(2.5),     "Relative upper limit for the voltage w.r.t. the G-APD reference voltage (in Volts)")
+        ("pixel-map-file",  var<string>("FACTmapV5a.txt"), "Pixel mapping file. Used here to get the default reference voltage.")
         ;
-    // FIXME: Add a bit for OC... there is no -0
 
     conf.AddOptions(control);

trunk/FACT++/src/feedback.cc

@@ -592 +592 @@
     }
 
-    int EvalOptions(Configuration &)
-    {
-        //SetEndpoint(conf.Get<string>("addr"));
-
-        //fFSC.SetVerbose(!conf.Get<bool>("quiet"));
-
-        if (!fMap.Read("FACTmapV5a.txt"))
-        {
-            Error("Reading mapping table from FACTmapV5a.txt failed.");
+    int EvalOptions(Configuration &conf)
+    {
+        if (!fMap.Read(conf.Get<string>("pixel-map-file")))
+        {
+            Error("Reading mapping table from "+conf.Get<string>("pixel-map-file")+" failed.");
             return 1;
         }
-
-        /*
-        if (!fBias.SetNewGapdVoltage(map.Vgapd()))
-        {
-            T::Error("Setting reference voltages failed.");
-            return 6;
-        }*/
 
         return -1;
@@ -623 +612 @@
 {
     return Main::execute<T, StateMachineFeedback>(conf);
+}
+
+void SetupConfiguration(Configuration &conf)
+{
+    po::options_description control("BIAS control options");
+    control.add_options()
+        ("pixel-map-file",  var<string>("FACTmapV5a.txt"), "Pixel mapping file. Used here to get the default reference voltage.")
+        ;
+
+    conf.AddOptions(control);
 }
 
@@ -674 +673 @@
     conf.SetPrintUsage(PrintUsage);
     Main::SetupConfiguration(conf);
+    SetupConfiguration(conf);
 
     if (!conf.DoParse(argc, argv, PrintHelp))