Index: /trunk/FACT++/src/DataWriteFits2.cc
===================================================================
--- /trunk/FACT++/src/DataWriteFits2.cc	(revision 12997)
+++ /trunk/FACT++/src/DataWriteFits2.cc	(revision 12997)
@@ -0,0 +1,324 @@
+#include "DataWriteFits2.h"
+
+#include "HeadersFAD.h"
+#include "FAD.h"
+
+using namespace std;
+
+void DataWriteFits2::WriteHeader(const RUN_HEAD* h, const FAD::RunDescription &d)
+{
+    const int16_t realRoiTM = (h->NroiTM >= 2*h->Nroi && h->Nroi<=512) ? h->Nroi : 0;
+
+    fFile.AddColumnInt("EventNum", "uint32", "FAD board event counter");
+    fFile.AddColumnInt("TriggerNum", "uint32", "FTM board trigger counter");
+    fFile.AddColumnShort("TriggerType", "uint16");
+    fFile.AddColumnInt("NumBoards", "uint32");
+    fFile.AddColumnByte(4, "Errors");
+    fFile.AddColumnInt("SoftTrig");
+    fFile.AddColumnInt(2, "UnixTimeUTC", "uint32", "Unix time seconds and microseconds");
+    fFile.AddColumnInt(NBOARDS, "BoardTime", "uint32");
+    fFile.AddColumnShort(NPIX, "StartCellData", "uint32", "DRS4 start cell of readout");
+    fFile.AddColumnShort(NTMARK, "StartCellTimeMarker", "uint32", "DRS4 start cell of readout time marker");
+    fFile.AddColumnShort(h->NPix*h->Nroi, "Data", "int16");
+    fFile.AddColumnShort(h->NTm*realRoiTM, "TimeMarker", "int16");
+
+    const size_t sz = (h->NPix*h->Nroi + h->NTm*realRoiTM)*2;
+    if (fFile.GetBytesPerRow()-sz+4!=sizeof(EVENT))
+    {
+        ostringstream str;
+        str << "The EVENT structure size (" << sizeof(EVENT) << ") doesn't match the described FITS row (";
+        str << fFile.GetBytesPerRow()-sz+4 << ")";
+        throw runtime_error(str.str());
+    }
+
+    // =============== Default keys from all files ===============
+    const Time now;
+    fFile.SetStr(  "TELESCOP", "FACT",               "Telescope that acquired this data");
+    fFile.SetStr(  "PACKAGE",   PACKAGE_NAME,        "Package name");
+    fFile.SetStr(  "VERSION",   PACKAGE_VERSION,     "Package description");
+    fFile.SetStr(  "CREATOR",   "fadctrl",           "Program that wrote this file");
+    fFile.SetFloat("EXTREL",    1.0,                 "Release Number");
+    fFile.SetStr(  "COMPILED",  __DATE__" "__TIME__, "Compile time");
+    fFile.SetStr(  "REVISION",  REVISION,            "SVN revision");
+    fFile.SetStr(  "ORIGIN",   "FACT",               "Institution that wrote the file");
+    fFile.SetStr(  "DATE",     now.Iso(),            "File creation date");
+    fFile.SetInt(  "NIGHT",    now.NightAsInt(),     "Night as int");
+    fFile.SetStr(  "TIMESYS",  "UTC",                "Time system");
+    fFile.SetStr(  "TIMEUNIT", "d",                  "Time given in days w.r.t. to MJDREF");
+    fFile.SetInt(  "MJDREF",   40587,                "Store times in UNIX time (for convenience, seconds since 1970/1/1)");
+    //WriteKey("CONTACT",   PACKAGE_BUGREPORT, "Current package maintainer");
+    //WriteKey("URL",       PACKAGE_URL, "Current repositiory location");
+
+    // ================ Header keys for raw-data =================
+    fFile.SetInt("BLDVER",   h->Version,  "Builder version");
+    fFile.SetInt("RUNID",    GetRunId(),  "Run number");
+    fFile.SetInt("NBOARD",   h->NBoard,   "Number of acquisition boards");
+    fFile.SetInt("NPIX",     h->NPix,     "Number of pixels");
+    fFile.SetInt("NTMARK",   h->NTm,      "Number of time marker channels");
+    fFile.SetInt("NCELLS",   1024,        "Maximum number of slices per pixels");
+    fFile.SetInt("NROI",     h->Nroi,     "Number of slices per pixels");
+    fFile.SetInt("NROITM",   realRoiTM,   "Number of slices per time-marker");
+
+    const uint16_t realOffset = (h->NroiTM > h->Nroi) ?  h->NroiTM - 2*h->Nroi : 0;
+    fFile.SetInt("TMSHIFT",  realOffset,  "Shift of the start of the time marker readout wrt to data");
+
+    //FIXME should we also put the start and stop time of the received data ?
+    //now the events header related variables
+    fFile.SetStr("CAMERA",   "MGeomCamFACT", "");
+    fFile.SetStr("DAQ",      "DRS4",         "");
+    fFile.SetInt("ADCRANGE", 2000,        "Dynamic range in mV");
+    fFile.SetInt("ADC",      12,          "Resolution in bits");
+    fFile.SetStr("RUNTYPE",  d.name,      "File type according to FAD configuration");
+
+    // Write a single key for:
+    // -----------------------
+    // Start package flag
+    // package length
+    // version number
+    // status
+    // Prescaler
+
+    // Write 40 kays for (?)
+    // Phaseshift
+    // DAC
+
+    for (int i=0; i<h->NBoard; i++)
+    {
+        const PEVNT_HEADER &hh = h->FADhead[i];
+
+        ostringstream sout;
+        sout << "Board " << setw(2) << i<< ": ";
+
+        // Header values whihc won't change during the run
+        fFile.SetInt("ID",    hh.board_id,   sout.str()+"Board ID");
+        fFile.SetInt("FWVER", hh.version_no, sout.str()+"Firmware Version");
+        fFile.SetHex("DNA",   hh.DNA,        sout.str()+"Unique FPGA device identifier (DNA)");
+    }
+
+    // FIXME: Calculate average ref clock frequency
+    for (int i=0; i<h->NBoard; i++)
+    {
+        const PEVNT_HEADER &hh = h->FADhead[i];
+
+        if (hh.start_package_flag==0)
+            continue;
+
+        fFile.SetInt("BOARD", i, "Board number for RUN, PRESC, PHASE and DAC");
+        fFile.SetInt("PRESC", hh.trigger_generator_prescaler, "Trigger generator prescaler");
+        fFile.SetInt("PHASE", (int16_t)hh.adc_clock_phase_shift, "ADC clock phase shift");
+
+        for (int j=0; j<8; j++)
+        {
+            ostringstream dac, cmt;
+            dac << "DAC" << j;
+            cmt << "Command value for " << dac.str();
+            fFile.SetInt(dac.str(), hh.dac[j], cmt.str());
+        }
+
+        break;
+    }
+
+    double avg = 0;
+    int    cnt = 0;
+    for (int i=0; i<h->NBoard; i++)
+    {
+        const PEVNT_HEADER &hh = h->FADhead[i];
+
+        if (hh.start_package_flag==0)
+            continue;
+
+        avg += hh.REFCLK_frequency;
+        cnt ++;
+    }
+
+    // FIXME: I cannot write a double! WHY?
+    fFile.SetFloat("REFCLK", avg/cnt*2.048, "Average reference clock frequency in Hz");
+
+    fFile.SetBool("DRSCALIB", GetDrsStep()>=0, "This file belongs to a DRS calibration");
+    if (GetDrsStep()>=0)
+        fFile.SetInt("DRSSTEP", GetDrsStep(), "Step of the DRS calibration");
+
+    // This is a workaround for the missing information in the event builder
+    fTstart[0] = 0;
+    fTstop[0]  = 0;
+
+    memset(fTriggerCounter.data(), 0, fTriggerCounter.size()*sizeof(uint32_t));
+
+    //Last but not least, add header keys that will be updated when closing the file
+    WriteFooter(NULL);
+
+    fFile.WriteTableHeader("Events");
+};
+
+// --------------------------------------------------------------------------
+//
+//! DataWriteFits constructor. This is the one that should be used, not the default one (parameter-less)
+//! @param runid This parameter should probably be removed. I first thought it was the run number, but apparently it is not
+//! @param h a pointer to the RUN_HEAD structure that contains the informations relative to this run
+//
+bool DataWriteFits2::Open(const RUN_HEAD* h, const FAD::RunDescription &d)
+{
+    //Form filename, based on runid and run-type
+    fFileName = FormFileName("fits");
+
+    try
+    {
+        fFile.open(fFileName.c_str());
+    }
+    catch (const exception &e)
+    {
+        Error("ofits::open() failed for '"+fFileName+"': "+e.what());
+        return false;
+    }
+
+    if (!fFile)
+    {
+        ostringstream str;
+        str << "ofstream::open() failed for '" << fFileName << "': " << strerror(errno) << " [errno=" << errno << "]";
+        Error(str);
+        return false;
+    }
+
+    try
+    {
+        WriteHeader(h, d);
+    }
+    catch (const exception &e)
+    {
+        Error("ofits - Writing header failed for '"+fFileName+"': "+e.what());
+        return false;
+    }
+
+    if (!fFile)
+    {
+        ostringstream str;
+        str << "ofstream::write() failed for '" << fFileName << "': " << strerror(errno) << " [errno=" << errno << "]";
+        Error(str);
+        return false;
+    }
+
+    return true;
+}
+
+// --------------------------------------------------------------------------
+//
+//! This writes one event to the file
+//! @param e the pointer to the EVENT
+//
+bool DataWriteFits2::WriteEvt(EVENT *e)
+{
+    if (e->TriggerType && !(e->TriggerType & FAD::EventHeader::kAll))
+        fTriggerCounter[0]++;
+    else  if ((e->TriggerType&FAD::EventHeader::kPedestal) && !(e->TriggerType&FAD::EventHeader::kTIM))
+        fTriggerCounter[1]++;
+    else if (e->TriggerType & FAD::EventHeader::kLPext)
+        fTriggerCounter[2]++;
+    else if (e->TriggerType & (FAD::EventHeader::kTIM|FAD::EventHeader::kPedestal))
+        fTriggerCounter[3]++;
+    else if (e->TriggerType & FAD::EventHeader::kLPint)
+        fTriggerCounter[4]++;
+    else if (e->TriggerType & FAD::EventHeader::kExt1)
+        fTriggerCounter[5]++;
+    else if (e->TriggerType & FAD::EventHeader::kExt2)
+        fTriggerCounter[6]++;
+    else
+        fTriggerCounter[7]++;
+
+    memcpy(fTstop, &e->PCTime, 2*sizeof(uint32_t));
+    if (fTstart[0]==0)
+        memcpy(fTstart, fTstop, 2*sizeof(uint32_t));
+
+    const int realRoiTM = (e->RoiTM > e->Roi) ? e->Roi : 0;
+    const size_t sz = sizeof(EVENT) + sizeof(e->StartPix)*e->Roi+sizeof(e->StartTM)*realRoiTM; //ETIENNE from RoiTm to Roi
+
+    try
+    {
+        fFile.WriteRow(reinterpret_cast<char*>(e)+4, sz-4);
+    }
+    catch (const exception &ex)
+    {
+        Error("ofits::WriteRow failed for '"+fFileName+"': "+ex.what());
+        return false;
+    }
+
+    ostringstream str;
+    str << "fstream::write() failed for '" << fFileName << "': " << strerror(errno) << " [errno=" << errno << "]";
+    Error(str);
+
+    return false;
+}
+
+void DataWriteFits2::WriteFooter(RUN_TAIL */*rt*/)
+{
+    //FIXME shouldn't we convert start and stop time to MjD first ?
+    //FIXME shouldn't we also add an MjD reference ?
+
+    const Time start(fTstart[0], fTstart[1]);
+    const Time stop (fTstop[0],  fTstop[1]);
+
+    fFile.SetInt("TSTARTI",  uint32_t(floor(start.UnixDate())),
+                 "Time when first event received (integral part)");
+    fFile.SetFloat("TSTARTF",  fmod(start.UnixDate(), 1),
+                   "Time when first event received (fractional part)");
+    fFile.SetInt("TSTOPI",   uint32_t(floor(stop.UnixDate())),
+                 "Time when last event received (integral part)");
+    fFile.SetFloat("TSTOPF",   fmod(stop.UnixDate(), 1),
+                   "Time when last event received (fractional part)");
+    fFile.SetStr("DATE-OBS", start.Iso(),
+                 "Time when first event received");
+    fFile.SetStr("DATE-END", stop.Iso(),
+                 "Time when last event received");
+
+    fFile.SetInt("NTRG",     fTriggerCounter[0], "Number of physics triggers written");
+    fFile.SetInt("NTRGPED",  fTriggerCounter[1], "Number of pure pedestal triggers written");
+    fFile.SetInt("NTRGLPE",  fTriggerCounter[2], "Number of external light pulser triggers written");
+    fFile.SetInt("NTRGTIM",  fTriggerCounter[3], "Number of time calibration triggers written");
+    fFile.SetInt("NTRGLPI",  fTriggerCounter[4], "Number of internal light pulser triggers written");
+    fFile.SetInt("NTRGEXT1", fTriggerCounter[5], "Number of triggers from ext1 written");
+    fFile.SetInt("NTRGEXT2", fTriggerCounter[6], "Number of triggers from ext2 written");
+    fFile.SetInt("NTRGMISC", fTriggerCounter[7], "Number of triggers belonging to no other category written");
+}
+
+// --------------------------------------------------------------------------
+//
+//! Closes the file, and before this it write the TAIL data
+//! @param rt the pointer to the RUN_TAIL data structure
+//
+bool DataWriteFits2::Close(RUN_TAIL *rt)
+{
+    if (!fFile.is_open())
+    {
+        Error("DataWriteFits2::Close() called but file '"+fFileName+"' not open.");
+        return false;
+    }
+
+    try
+    {
+        WriteFooter(rt);
+    }
+    catch (const exception &e)
+    {
+        Error("ofits - Setting footer key values failed for '"+fFileName+"': "+e.what());
+        return false;
+    }
+
+    try
+    {
+        fFile.close();
+    }
+    catch (const exception &e)
+    {
+        Error("ofits::close() failed for '"+fFileName+"': "+e.what());
+        return false;
+    }
+
+    if (!fFile)
+    {
+        ostringstream str;
+        str << "ofstream::close() failed for '" << fFileName << "': " << strerror(errno) << " [errno=" << errno << "]";
+        Error(str);
+        return false;
+    }
+
+    return true;
+}
Index: /trunk/FACT++/src/DataWriteFits2.h
===================================================================
--- /trunk/FACT++/src/DataWriteFits2.h	(revision 12997)
+++ /trunk/FACT++/src/DataWriteFits2.h	(revision 12997)
@@ -0,0 +1,34 @@
+#ifndef FACT_DataWriteFits2
+#define FACT_DataWriteFits2
+
+#include "DataProcessorImp.h"
+#include "externals/ofits.h"
+
+#include <array>
+
+class DataWriteFits2 : public DataProcessorImp
+{
+    std::ofits fFile;
+
+    std::array<uint32_t, 8> fTriggerCounter;
+
+    uint32_t fTstart[2];
+    uint32_t fTstop[2];
+
+    void WriteHeader(const RUN_HEAD* h, const FAD::RunDescription &d);
+    void WriteFooter(RUN_TAIL *rt);
+
+    virtual int GetDrsStep() const { return -1; }
+
+public:
+    DataWriteFits2(const std::string path, uint32_t runid, MessageImp &imp) :
+        DataProcessorImp(path, runid, imp)
+    {
+    }
+
+    bool Open(const RUN_HEAD* h, const FAD::RunDescription &d);
+    bool WriteEvt(EVENT *e);
+    bool Close(RUN_TAIL *rt = 0);
+};
+
+#endif
