Changeset 11453

Timestamp:

07/18/11 17:47:44 (13 years ago)

Author:

tbretz

Message:

Use FITS reader instead of raw-reader if it is a FITS raw file.

File:

• trunk/Mars/mjobs/MJMerpp.cc (modified) (3 diffs)

trunk/Mars/mjobs/MJMerpp.cc

@@ -46 +46 @@
 
 #include "MRawFileRead.h"
+#include "MRawFitsRead.h"
 #include "MReportFileReadCC.h"
 #include "MWriteRootFile.h"
@@ -152 +153 @@
 void MJMerpp::SetupRaw(MRawFileRead &read, MWriteRootFile *write) const
 {
-    read.SetInterleave(fInterleave);
-    read.SetForceMode(fForceProcessing);
+//    read.SetInterleave(fInterleave);
+//    read.SetForceMode(fForceProcessing);
 
     if (!write)
@@ -305 +306 @@
     else
     {
-        MRawFileRead *r = new MRawFileRead(fPathIn);
+        MRawFileRead *r = MRawFitsRead::IsFits(fPathIn) ? new MRawFitsRead(fPathIn) : new MRawFileRead(fPathIn);
         SetupRaw(*r, write);
         read = r;