Changeset 12998 for trunk


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/EventBuilderWrapper.h

    r12908 r12998  
    2121#include "DataWriteFits.h"
    2222#else
    23 #define DataWriteFits DataWriteRaw
     23#define DataWriteFits DataWriteFits2
    2424#endif
     25
     26#include "DataWriteFits2.h"
    2527
    2628namespace ba = boost::asio;
     
    609611        switch (fFileFormat)
    610612        {
    611         case FAD::kNone:  file = new DataDump(fPath, runid,  fMsg); break;
    612         case FAD::kDebug: file = new DataDebug(fPath, runid, fMsg); break;
    613         case FAD::kFits:  file = new DataWriteFits(fPath, runid,  fMsg); break;
    614         case FAD::kRaw:   file = new DataWriteRaw(fPath, runid,   fMsg); break;
    615         case FAD::kCalib: file = new DataCalib(fPath, runid, fDimDrsCalibration, fMsg); break;
     613        case FAD::kNone:    file = new DataDump(fPath, runid,  fMsg); break;
     614        case FAD::kDebug:   file = new DataDebug(fPath, runid, fMsg); break;
     615        case FAD::kCfitsio: file = new DataWriteFits(fPath, runid,  fMsg); break;
     616        case FAD::kFits:    file = new DataWriteFits2(fPath, runid,  fMsg); break;
     617        case FAD::kRaw:     file = new DataWriteRaw(fPath, runid,   fMsg); break;
     618        case FAD::kCalib:   file = new DataCalib(fPath, runid, fDimDrsCalibration, fMsg); break;
    616619        }
    617620
  • trunk/FACT++/src/HeadersFAD.h

    r12522 r12998  
    7272        kNone = 0,  // Nothing is written just some little output in the log-stream
    7373        kDebug,     // The contents of the headers are output to the console
    74         kFits,      // FITS files are written
     74        kCfitsio,   // FITS file written with cfitsio
    7575        kRaw,       // Raw binary streams are written
    76         kCalib      // DRS calibration in progress
     76        kCalib,     // DRS calibration in progress
     77        kFits       // FITS file written with streamer class ofits
    7778    };
    7879
  • trunk/FACT++/src/fadctrl.cc

    r12954 r12998  
    828828        switch (fmt)
    829829        {
    830         case FAD::kNone: 
    831         case FAD::kDebug:
    832         case FAD::kFits: 
    833         case FAD::kRaw:   
     830        case FAD::kNone:
     831        case FAD::kDebug:
     832        case FAD::kFits:
     833        case FAD::kCfitsio:
     834        case FAD::kRaw:
    834835        case FAD::kCalib:
    835836            SetOutputFormat(FAD::FileFormat_t(fmt));
Note: See TracChangeset for help on using the changeset viewer.