Changeset 18539 for trunk/FACT++

Timestamp:

08/21/16 13:11:56 (8 years ago)

Author:

tbretz

Message:

Added local path to default ones for mapping file, implemented the detection of new MC files with overly correct headers.

File:

• trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc (modified) (3 diffs)

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

@@ -383 +383 @@
 {
     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 +401 @@
         if (!mypMap.Read(map))
         {
-            cerr << "ERROR - Problems reading " << map << endl;
+            cerr << "ERROR - Problems reading mapping file '" << map << "'" << endl;
             exit(-1);
         }
@@ -671 +674 @@
     }
     else
-        _softwareOrdering = false;
+        _softwareOrdering = inputFile->Get<string>("ISMC", "F")=="T";
 
     if (inputFile->HasKey("OFFSET"))