Changeset 17035 for trunk/Mars/mraw

Timestamp:

08/21/13 16:35:22 (11 years ago)

Author:

lyard

Message:

Added error when using wrong fits class and adapted MRawFitsRead to deal with compressed .fz fits

File:

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

trunk/Mars/mraw/MRawFitsRead.cc

@@ -45 +45 @@
 #include "MLogManip.h"
 
-#include "fits.h"
+#include "factfits.h"
 #include "MTime.h"
 
@@ -133 +133 @@
 Bool_t MRawFitsRead::IsFits(const char *name)
 {
-    return fits(name).good();
+    return factfits(name).good();
 }
 
 istream *MRawFitsRead::OpenFile(const char *filename)
 {
-    return new fits(filename);
+    return new factfits(filename);
 }
 
 Bool_t MRawFitsRead::ReadRunHeader(istream &stream)
 {
-    fits &fin = static_cast<fits&>(stream);
+    factfits &fin = static_cast<factfits&>(stream);
 
     if (fin.GetStr("TELESCOP")!="FACT")
@@ -154 +154 @@
 
     fRawRunHeader->SetValidMagicNumber();
-    fRawRunHeader->SetNumEvents(fin.GetUInt("NAXIS2"));
+    fRawRunHeader->SetNumEvents(fin.GetNumRows());//GetUInt("NAXIS2"));
     fRawRunHeader->InitPixels(fin.GetUInt("NPIX"));
     fRawRunHeader->SetObservation(type=="4294967295"?"":fin.GetStr("RUNTYPE"), "FACT");
@@ -175 +175 @@
 Bool_t  MRawFitsRead::InitReadData(istream &stream)
 {
-    fits &fin = static_cast<fits&>(stream);
+    factfits &fin = static_cast<factfits&>(stream);
 
     MArrayB **data   = reinterpret_cast<MArrayB**>(fRawEvtData1->DataMember("fHiGainFadcSamples"));
@@ -216 +216 @@
 Bool_t MRawFitsRead::ReadEvent(istream &stream)
 {
-    if (!static_cast<fits&>(stream).GetNextRow())
+    if (!static_cast<factfits&>(stream).GetNextRow())
         return kFALSE;
 
@@ -231 +231 @@
 void MRawFitsRead::SkipEvent(istream &fin)
 {
-    static_cast<fits&>(fin).SkipNextRow();
-}
+    static_cast<factfits&>(fin).SkipNextRow();
+}