Index: /trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- /trunk/FACT++/src/EventBuilderWrapper.h	(revision 12997)
+++ /trunk/FACT++/src/EventBuilderWrapper.h	(revision 12998)
@@ -21,6 +21,8 @@
 #include "DataWriteFits.h"
 #else
-#define DataWriteFits DataWriteRaw
+#define DataWriteFits DataWriteFits2
 #endif
+
+#include "DataWriteFits2.h"
 
 namespace ba = boost::asio;
@@ -609,9 +611,10 @@
         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;
         }
 
Index: /trunk/FACT++/src/HeadersFAD.h
===================================================================
--- /trunk/FACT++/src/HeadersFAD.h	(revision 12997)
+++ /trunk/FACT++/src/HeadersFAD.h	(revision 12998)
@@ -72,7 +72,8 @@
         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
     };
 
Index: /trunk/FACT++/src/fadctrl.cc
===================================================================
--- /trunk/FACT++/src/fadctrl.cc	(revision 12997)
+++ /trunk/FACT++/src/fadctrl.cc	(revision 12998)
@@ -828,8 +828,9 @@
 	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));