Changeset 12628 for trunk/Mars/mraw

Timestamp:

11/23/11 14:17:41 (13 years ago)

Author:

tbretz

Message:

Make sure that no name for the mapping can be given; print the name in the error message; Get the runtype from the header; Use PCTime as a fallback to UnixTimePC

File:

• trunk/Mars/mraw/MRawFitsRead.cc (modified) (4 diffs)

trunk/Mars/mraw/MRawFitsRead.cc

@@ -72 +72 @@
     fPixelMap.resize(1440);
 
+    if (!name)
+        return kTRUE;
+
     ifstream fin(name);
 
@@ -108 +111 @@
     if (l!=1440)
     {
-        gLog << err << "ERROR - Problems reading FACTmapV5.txt" << endl;
+        gLog << err << "ERROR - Problems reading " << name << endl;
         fPixelMap.resize(0);
         return kFALSE;
@@ -136 +139 @@
     }
 
+    const string type = fin.GetStr("RUNTYPE");
+
     fRawRunHeader->SetValidMagicNumber();
     fRawRunHeader->SetNumEvents(fin.GetUInt("NAXIS2"));
     fRawRunHeader->InitPixels(fin.GetUInt("NPIX"));
-    fRawRunHeader->SetObservation("", "FACT");
+    fRawRunHeader->SetObservation(type=="4294967295"?"":fin.GetStr("RUNTYPE"), "FACT");
     fRawRunHeader->SetRunInfo(0, fin.GetUInt("NIGHT"), fin.GetUInt("RUNID"));
     fRawRunHeader->InitFact(fin.GetUInt("NPIX")/9, 9, fin.GetUInt("NROI"), fPixelMap.size()==0?0:fPixelMap.data());
@@ -171 +176 @@
     fPCTime.resize(2);
     if (!fin.SetVecAddress("UnixTimeUTC", fPCTime))
-        return kFALSE;
+        if (!fin.SetVecAddress("PCTime", fPCTime))
+            return kFALSE;
 
     if (!fin.SetPtrAddress("Data", (int16_t*)(*data)->GetArray(), (*data)->GetSize()/2))