Changeset 19707 for trunk/Mars

Timestamp:

10/01/19 15:28:40 (5 years ago)

Author:

tbretz

Message:

Handle the MC MGeomCamFAMOUS data reasonably

File:

• trunk/Mars/mraw/MRawFitsRead.cc (modified) (1 diff)

trunk/Mars/mraw/MRawFitsRead.cc

@@ -165 +165 @@
     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());
+    if (fin.GetStr("CAMERA")!="MGeomCamFAMOUS")
+        fRawRunHeader->InitFact(fin.GetUInt("NPIX")/9, 9, fin.GetUInt("NROI"), fPixelMap.size()==0?0:fPixelMap.data());
+    else
+        fRawRunHeader->InitFact(1, fin.GetUInt("NPIX"), fin.GetUInt("NROI"), fPixelMap.size()==0?0:fPixelMap.data());
+    fRawRunHeader->InitFact(1, fin.GetUInt("NPIX"), fin.GetUInt("NROI"), fPixelMap.size()==0?0:fPixelMap.data());
     fRawRunHeader->SetFormat(0xf172, fIsMc ? 0 : fin.GetUInt("BLDVER"));
     fRawRunHeader->SetRunType(fIsMc ? 0x0100/*mc*/ : 0/*data*/);