Index: trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc
===================================================================
--- trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 17035)
+++ trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 17036)
@@ -376,9 +376,29 @@
     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,5 +415,4 @@
 
     _softwareOrdering = false;
-
 }
 /************************************************************
@@ -2244,4 +2263,11 @@
     RawDataViewer *canvas = GLWindow;
 
+    if (conf.Has("mappingFile"))
+    {
+        canvas->assignPixelMapFile(conf.Get<string>("mappingFile"));
+    }
+    else
+        canvas->assignPixelMapFile("");
+
     if (conf.Has("color.range"))
     {
@@ -2339,4 +2365,5 @@
         ("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);
Index: trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h
===================================================================
--- trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h	(revision 17035)
+++ trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h	(revision 17036)
@@ -59,4 +59,5 @@
                                                      const int roiTM);
     int getCurrentPixel(){return selectedPixel;}
+    void assignPixelMapFile(const string& map="");
 public Q_SLOTS:
     void plusEvent();