Index: trunk/Mars/mraw/MRawFitsRead.cc
===================================================================
--- trunk/Mars/mraw/MRawFitsRead.cc	(revision 19939)
+++ trunk/Mars/mraw/MRawFitsRead.cc	(revision 19940)
@@ -170,5 +170,5 @@
         fRawRunHeader->InitFact(fin.GetUInt("NPIX")/9, 9, fin.GetUInt("NROI"), mmap);
     else
-        fRawRunHeader->InitFact(1, fin.GetUInt("NPIX"), fin.GetUInt("NROI"), mmap);
+        fRawRunHeader->InitFact(8, fin.GetUInt("NPIX"), fin.GetUInt("NROI"), mmap);
 
     fRawRunHeader->SetFormat(0xf172, fIsMc ? 0 : fin.GetUInt("BLDVER"));
@@ -263,6 +263,7 @@
     if (!fIsMc)
     {
-        // Skip incomplete events
-        if (fNumBoards!=40)
+        // Skip incomplete events (FACT: 160 'crates', 40 boards, HAWC's Eye: 8 'crate', 2 board)
+        if ((fRawRunheader->GetNumCrates()==160 && fNumBoards!=40) ||
+            (fRawRunheader->GetNumCrates()==8   && fNumBoards!=2))
             return kCONTINUE;