Changeset 17036 for trunk

Timestamp:

08/21/13 16:55:27 (11 years ago)

Author:

lyard

Message:

remove the hard-coding of the pixels map

Location:

trunk/FACT++/gui/RawEventsViewer

Files:

• RawEventsViewer.cc (modified) (4 diffs)
• RawEventsViewer.h (modified) (1 diff)

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

@@ -376 +376 @@
     SetAutoRefresh(true);
     runType = "unkown";
+
+
+}
+
+void RawDataViewer::assignPixelMapFile(const string& map)
+{
     PixelMap mypMap;
-    if (!mypMap.Read("/swdev_nfs/FACT++/FACTmap111030.txt"))
-    {
-        cerr << "ERROR - Problems reading FACTmap111030.txt" << endl;
-        exit(-1);
+    if (map=="")
+    {
+        if (!mypMap.Read("/swdev_nfs/FACT++/FACTmap111030.txt"))
+        {
+            if (!mypMap.Read("./FACTmap111030.txt"))
+            {
+                cerr << "ERROR - Problems reading FACTmap111030.txt" << endl;
+                exit(-1);
+            }
+        }
+    }
+    else
+    {
+        if (!mypMap.Read(map))
+        {
+            cerr << "ERROR - Problems reading " << map << endl;
+            exit(-1);
+        }
     }
 
@@ -395 +415 @@
 
     _softwareOrdering = false;
-
 }
 /************************************************************
@@ -2244 +2263 @@
     RawDataViewer *canvas = GLWindow;
 
+    if (conf.Has("mappingFile"))
+    {
+        canvas->assignPixelMapFile(conf.Get<string>("mappingFile"));
+    }
+    else
+        canvas->assignPixelMapFile("");
+
     if (conf.Has("color.range"))
     {
@@ -2339 +2365 @@
         ("file,f",      var<string>(),  "File to be loaded")
         ("drs,d",       var<string>(),  "DRS calibration file to be loaded")
+        ("mappingFile", var<string>(),  "Which pixels mapping file to use")
         ;
     conf.AddOptions(configs);

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h

@@ -59 +59 @@
                                                      const int roiTM);
     int getCurrentPixel(){return selectedPixel;}
+    void assignPixelMapFile(const string& map="");
 public Q_SLOTS:
     void plusEvent();