Changeset 10979 for trunk/FACT++/src

Timestamp:

06/10/11 11:58:49 (13 years ago)

Author:

tbretz

Message:

Replaced Adc_data[1] by Adc_data[]

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/EventBuilder.c

@@ -262 +262 @@
 
    
-   needmem = sizeof(EVENT) + NPIX*nRoi*2 + NTMARK*nRoi*2 - 2 ; //-2 because of dummy adc_data[1]
+   needmem = sizeof(EVENT) + NPIX*nRoi*2 + NTMARK*nRoi*2;
 
    headmem = NBOARDS* sizeof(PEVNT_HEADER) ;

trunk/FACT++/src/EventBuilderWrapper.h

@@ -161 +161 @@
     enum
     {
+        kEndOfFile = 0,
         kIdentifier = 1,
         kRunHeader,
@@ -202 +203 @@
         }
 
+        // FIXME: Split this
         const vector<char> block(sizeof(uint32_t)+sizeof(RUN_TAIL));
         WriteBlockHeader(kRunSummary, 1, 0, block.size());
@@ -221 +223 @@
     virtual bool Write(EVENT *evt)
     {
-        const int sh = sizeof(PEVNT_HEADER)+(NPIX-1)*evt->Roi*2;
+        const int sh = sizeof(EVENT)-2 + NPIX*evt->Roi*2;
 
         WriteBlockHeader(kEvent, 1, fCounter++, sh);
-        fOut.write(reinterpret_cast<char*>(evt)+2, sh-2);
+        fOut.write(reinterpret_cast<char*>(evt)+2, sh);
         return true;
     }
     virtual bool Close(RUN_TAIL *tail= 0)
     {
+        WriteBlockHeader(kEndOfFile, 0, 0, 0);
+
         if (tail)
         {
@@ -522 +526 @@
         fNumRows++;
 
-        const int sh = sizeof(PEVNT_HEADER)+(NPIX-1)*e->Roi*2;
+        const int sh = sizeof(EVENT)+NPIX*e->Roi*2;
 
         // column size pointer

trunk/FACT++/src/FAD.h

@@ -128 +128 @@
    int16_t StartTM[NTMARK]; // First Channel for TimeMark (sorted Hardware ID) ; -1 if not filled
 
-  uint16_t Adc_Data[1];     // final length defined by malloc ....
+  uint16_t Adc_Data[];     // final length defined by malloc ....
 
 } EVENT ;