Changeset 11486 for trunk/Mars

Timestamp:

07/20/11 17:57:34 (13 years ago)

Author:

tbretz

Message:

Added support for FITS files in readdaq.

Location:

trunk/Mars

Files:

• Changelog (modified) (1 diff)
• readdaq.cc (modified) (4 diffs)

trunk/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2011/07/20 Thomas Bretz
+
+   * readdaq.cc:
+     - added support for FITS files
+
+
 
  2011/07/19 Thomas Bretz

trunk/Mars/readdaq.cc

@@ -15 +15 @@
 #include "MRawEvtData.h"
 #include "MRawCrateArray.h"
-#include "MRawFileRead.h"
+#include "MRawFitsRead.h"
 
 
@@ -48 +48 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << "   readdaq [-h] [-?] [-vn] [-dec] [-a0] inputfile[.raw]" << endl << endl;
+    gLog << "   readdaq [-h] [-?] [-vn] [-dec] [-a0] inputfile[.raw|.fits]" << endl << endl;
     gLog << "     input file:   Magic DAQ binary file." << endl;
     gLog.Usage();
@@ -103 +103 @@
     TString kNamein = arg.GetArgumentStr(0);
   
-    if (!kNamein.EndsWith(".raw") && !kNamein.EndsWith(".raw.gz"))
+    if (!kNamein.EndsWith(".raw")  && !kNamein.EndsWith(".raw.gz") &&
+        !kNamein.EndsWith(".fits") && !kNamein.EndsWith(".fits.gz"))
         kNamein += ".raw";
 
@@ -162 +163 @@
     // be created by MRawFileRead::PreProcess
     //
-    MRawFileRead read(kNamein);
-    read.SetForce(kForce);
-    read.SetForceMode(kForceMode);
-    tasks.AddToList(&read);
+    MRawFileRead *read = MRawFitsRead::IsFits(kNamein) ? new MRawFitsRead(kNamein) : new MRawFileRead(kNamein);
+    read->SetBit(kCanDelete);
+    read->SetForce(kForce);
+    read->SetForceMode(kForceMode);
+    tasks.AddToList(read);
 
     MPrint print0;