Changeset 12998 for trunk/FACT++

Timestamp:

03/07/12 14:11:12 (13 years ago)

Author:

tbretz

Message:

Added out own FITS streamer to the list of possible file formats (5).

Location:

trunk/FACT++/src

Files:

• EventBuilderWrapper.h (modified) (2 diffs)
• HeadersFAD.h (modified) (1 diff)
• fadctrl.cc (modified) (1 diff)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -21 +21 @@
 #include "DataWriteFits.h"
 #else
-#define DataWriteFits DataWriteRaw
+#define DataWriteFits DataWriteFits2
 #endif
+
+#include "DataWriteFits2.h"
 
 namespace ba = boost::asio;
@@ -609 +611 @@
         switch (fFileFormat)
         {
-        case FAD::kNone:  file = new DataDump(fPath, runid,  fMsg); break;
-        case FAD::kDebug: file = new DataDebug(fPath, runid, fMsg); break;
-        case FAD::kFits:  file = new DataWriteFits(fPath, runid,  fMsg); break;
-        case FAD::kRaw:   file = new DataWriteRaw(fPath, runid,   fMsg); break;
-        case FAD::kCalib: file = new DataCalib(fPath, runid, fDimDrsCalibration, fMsg); break;
+        case FAD::kNone:    file = new DataDump(fPath, runid,  fMsg); break;
+        case FAD::kDebug:   file = new DataDebug(fPath, runid, fMsg); break;
+        case FAD::kCfitsio: file = new DataWriteFits(fPath, runid,  fMsg); break;
+        case FAD::kFits:    file = new DataWriteFits2(fPath, runid,  fMsg); break;
+        case FAD::kRaw:     file = new DataWriteRaw(fPath, runid,   fMsg); break;
+        case FAD::kCalib:   file = new DataCalib(fPath, runid, fDimDrsCalibration, fMsg); break;
         }
 

trunk/FACT++/src/HeadersFAD.h

@@ -72 +72 @@
         kNone = 0,  // Nothing is written just some little output in the log-stream
         kDebug,     // The contents of the headers are output to the console
-        kFits,      // FITS files are written
+        kCfitsio,   // FITS file written with cfitsio
         kRaw,       // Raw binary streams are written
-        kCalib      // DRS calibration in progress
+        kCalib,     // DRS calibration in progress
+        kFits       // FITS file written with streamer class ofits
     };
 

trunk/FACT++/src/fadctrl.cc

@@ -828 +828 @@
         switch (fmt)
         {
-        case FAD::kNone:  
-        case FAD::kDebug: 
-        case FAD::kFits:  
-        case FAD::kRaw:   
+        case FAD::kNone:
+        case FAD::kDebug:
+        case FAD::kFits:
+        case FAD::kCfitsio:
+        case FAD::kRaw:
         case FAD::kCalib:
             SetOutputFormat(FAD::FileFormat_t(fmt));