Changeset 12477 for trunk

Timestamp:

11/09/11 21:51:58 (13 years ago)

Author:

tbretz

Message:

Moved RunDescription to HeadersFAD, added it as a second argument to Open and write the run-type to the header.

Location:

trunk/FACT++/src

Files:

• DataProcessorImp.cc (modified) (1 diff)
• DataProcessorImp.h (modified) (3 diffs)
• DataWriteFits.cc (modified) (4 diffs)
• DataWriteRaw.cc (modified) (3 diffs)
• DataWriteRaw.h (modified) (1 diff)
• HeadersFAD.h (modified) (1 diff)

trunk/FACT++/src/DataProcessorImp.cc

@@ -48 +48 @@
 // =======================================================================
 
-bool DataDump::Open(RUN_HEAD* h)
+bool DataDump::Open(const RUN_HEAD* h, const FAD::RunDescription &)
 {
     fFileName = "/dev/null";

trunk/FACT++/src/DataProcessorImp.h

@@ -7 +7 @@
 struct _EVENT;
 struct _RUN_TAIL;
+
+namespace FAD
+{
+    struct RunDescription;
+};
 
 typedef struct _RUN_HEAD RUN_HEAD;
@@ -30 +35 @@
     virtual ~DataProcessorImp() { }
 
-    virtual bool Open(RUN_HEAD* h) = 0;
+    virtual bool Open(const RUN_HEAD* h, const FAD::RunDescription &desc) = 0;
     virtual bool WriteEvt(EVENT *) = 0;
     virtual bool Close(RUN_TAIL * = 0) = 0;
@@ -55 +60 @@
     DataDump(const std::string &path, uint32_t id, MessageImp &imp) : DataProcessorImp(path, id, imp) { }
 
-    bool Open(RUN_HEAD* h);
+    bool Open(const RUN_HEAD* h, const FAD::RunDescription &d);
     bool WriteEvt(EVENT *e);
     bool Close(RUN_TAIL * = 0);

trunk/FACT++/src/DataWriteFits.cc

@@ -1 +1 @@
 #include "DataWriteFits.h"
 
+#include "HeadersFAD.h"
 #include "FAD.h"
 #include "Converter.h"
@@ -30 +31 @@
 //! @param h a pointer to the RUN_HEAD structure that contains the informations relative to this run
 //
-bool DataWriteFits::Open(RUN_HEAD* h)
+bool DataWriteFits::Open(const RUN_HEAD* h, const FAD::RunDescription &d)
 {
     if (fConv)
@@ -94 +95 @@
         fFile.WriteKey("NROI",     h->Nroi,     "Number of slices per pixels");
         fFile.WriteKey("NROITM",   realRoiTM,   "Number of slices per time-marker"); //ETIENNE from NroiTMm to Nroi
-                int realOffset = (h->NroiTM > h->Nroi) ?  h->NroiTM - 2*h->Nroi : 0;
-                fFile.WriteKey("OFFSET", realOffset, "Offset between pixels ROI and TM ROi"); //ETIENNE added
+
+        const uint16_t realOffset = (h->NroiTM > h->Nroi) ?  h->NroiTM - 2*h->Nroi : 0;
+        fFile.WriteKey("OFFSET", realOffset, "Offset between pixels ROI and TM ROi"); //ETIENNE added
 
         //FIXME should we also put the start and stop time of the received data ?
@@ -103 +105 @@
         fFile.WriteKey("ADCRANGE", 2000,        "Dynamic range in mV");
         fFile.WriteKey("ADC",      12,          "Resolution in bits");
-
+        fFile.WriteKey("TYPE",     d.name,      "File type according to FAD configuration (Config database)");
 
         // Write a single key for:

trunk/FACT++/src/DataWriteRaw.cc

@@ -1 +1 @@
 #include "DataWriteRaw.h"
 
+#include "HeadersFAD.h"
 #include "FAD.h"
 
@@ -18 +19 @@
 }
 
-bool DataWriteRaw::Open(RUN_HEAD *h)
+bool DataWriteRaw::Open(const RUN_HEAD *h, const FAD::RunDescription &d)
 {
     const string name = FormFileName("bin");
@@ -51 +52 @@
 
     WriteBlockHeader(kRunHeader, 1, 0, sizeof(RUN_HEAD)-sizeof(PEVNT_HEADER*));
-    fOut.write(reinterpret_cast<char*>(h), sizeof(RUN_HEAD)-sizeof(PEVNT_HEADER*));
+    fOut.write(reinterpret_cast<const char*>(h), sizeof(RUN_HEAD)-sizeof(PEVNT_HEADER*));
 
     for (int i=0; i<40; i++)

trunk/FACT++/src/DataWriteRaw.h

@@ -81 +81 @@
     };
 
-    bool Open(RUN_HEAD *h);
+    bool Open(const RUN_HEAD *h, const FAD::RunDescription &d);
     bool WriteEvt(EVENT *evt);
     bool Close(RUN_TAIL *tail= 0);

trunk/FACT++/src/HeadersFAD.h

@@ -401 +401 @@
     };
 
+    struct RunDescription
+    {
+        uint32_t maxtime;
+        uint32_t maxevt;
+
+        std::string name;
+
+        Configuration reference;
+    };
+
     // --------------------------------------------------------------------
 #ifdef __cplusplus