Index: trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc
===================================================================
--- trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 18538)
+++ trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 18539)
@@ -383,12 +383,15 @@
 {
     PixelMap mypMap;
-    if (map=="")
-    {
-        if (!mypMap.Read("/swdev_nfs/FACT++/FACTmap111030.txt"))
-        {
-            if (!mypMap.Read("./FACTmap111030.txt"))
+    if (map.empty())
+    {
+        if (!mypMap.Read("FACTmap111030.txt"))
+        {
+            if (!mypMap.Read("/swdev_nfs/FACT++/FACTmap111030.txt"))
             {
-                cerr << "ERROR - Problems reading FACTmap111030.txt" << endl;
-                exit(-1);
+                if (!mypMap.Read("./FACTmap111030.txt"))
+                {
+                    cerr << "ERROR - Problems reading FACTmap111030.txt" << endl;
+                    exit(-1);
+                }
             }
         }
@@ -398,5 +401,5 @@
         if (!mypMap.Read(map))
         {
-            cerr << "ERROR - Problems reading " << map << endl;
+            cerr << "ERROR - Problems reading mapping file '" << map << "'" << endl;
             exit(-1);
         }
@@ -671,5 +674,5 @@
     }
     else
-        _softwareOrdering = false;
+        _softwareOrdering = inputFile->Get<string>("ISMC", "F")=="T";
 
     if (inputFile->HasKey("OFFSET"))