Changeset 11582

Timestamp:

07/25/11 12:18:52 (13 years ago)

Author:

tbretz

Message:

The EVENT structure now gives the RoiTM

Location:

trunk/FACT++/src

Files:

• EventBuilderWrapper.h (modified) (4 diffs)
• FAD.h (modified) (1 diff)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -1 @@
-#ifndef FACT_EventBuilderWrapper
+f#ifndef FACT_EventBuilderWrapper
 #define FACT_EventBuilderWrapper
 
@@ -407 +407 @@
     }
 
-        int fRoiTM;
-
     // --------------------------------------------------------------------------
     //
@@ -480 +478 @@
         fmt << ";S:" << h->NPix*h->Nroi + h->NTm*h->NroiTM; // int16_t Adc_Data[]
         */
-        fRoiTM = h->NroiTM;
-
-        cout << "==> " << Converter::ToFormat(dataTypes) << endl;
-
         fConv = new Converter(Converter::ToFormat(dataTypes));
 
@@ -652 +646 @@
 
         // FIXME: Get NPIX and NTMARK from header
-        const size_t sz = sizeof(EVENT) + sizeof(e->StartPix)*e->Roi+sizeof(e->StartTM)*fRoiTM;
-
-        const vector<char> data = fConv->ToFits(reinterpret_cast<char*>(e)+2, sz-2);
+        const size_t sz = sizeof(EVENT) + sizeof(e->StartPix)*e->Roi+sizeof(e->StartTM)*e->RoiTM;
+
+        const vector<char> data = fConv->ToFits(reinterpret_cast<char*>(e)+4, sz-4);
 
         // column size pointer

trunk/FACT++/src/FAD.h

@@ -115 +115 @@
 
 typedef struct {
-  uint16_t Roi ;            // #slices per pixel (same for all pixels and tmarks)
+  uint16_t Roi ;            // #slices per pixel (same for all pixels)
+  uint16_t RoiTM ;          // #slices per pixel (same for all tmarks) [ 0 or Roi ]
   uint32_t EventNum ;       // EventNumber as from FTM
   uint16_t TriggerType ;    // Trigger Type from FTM