Changeset 11442 for trunk

Timestamp:

07/18/11 16:23:36 (13 years ago)

Author:

tbretz

Message:

Replaced DimEventData by EVENT

File:

• trunk/FACT++/gui/FactGui.h (modified) (3 diffs)

trunk/FACT++/gui/FactGui.h

@@ -1072 +1072 @@
     }
 
-    struct DimEventData
-    {
-        uint16_t Roi ;            // #slices per pixel (same for all pixels and tmarks)
-        uint32_t EventNum ;       // EventNumber as from FTM
-        uint16_t TriggerType ;    // Trigger Type from FTM
-
-        uint32_t PCTime ;         // when did event start to arrive at PC
-        uint32_t BoardTime;       //
-
-        int16_t StartPix;         // First Channel per Pixel (Pixels sorted according Software ID)  ; -1 if not filled
-        int16_t StartTM;          // First Channel for TimeMark (sorted Hardware ID) ; -1 if not filled
-
-         int16_t Adc_Data[];     // final length defined by malloc ....
-
-    } __attribute__((__packed__));;
-
-    DimEventData *fEventData;
+    EVENT *fEventData;
 
     void DisplayEventData()
@@ -1126 +1110 @@
         str << "   Trigger type = " << fEventData->TriggerType;
         str << "   Board time = " << fEventData->BoardTime;
-        str << "   (" << Time(fEventData->PCTime, 0) << ")";
+        str << "   (" << Time(fEventData->PCTime[0], fEventData->PCTime[1]) << ")";
         h->SetTitle(str.str().c_str());
         str.str("");
@@ -1167 +1151 @@
             return;
 
-        const DimEventData &dat = d.ref<DimEventData>();
-
-        if (d.size()<sizeof(DimEventData))
-        {
-            cout << "Size mismatch in " << d.name << ": Found=" << d.size() << " Expected=" << sizeof(DimEventData) << endl;
-            return;
-        }
-
-        if (d.size()!=sizeof(DimEventData)+dat.Roi*2*1440)
-        {
-            cout << "Size mismatch in " << d.name << ": Found=" << d.size() << " Expected=" << dat.Roi*2+sizeof(DimEventData) << endl;
+        const EVENT &dat = d.ref<EVENT>();
+
+        if (d.size()<sizeof(EVENT))
+        {
+            cout << "Size mismatch in " << d.name << ": Found=" << d.size() << " Expected>=" << sizeof(EVENT) << endl;
+            return;
+        }
+
+        if (d.size()!=sizeof(EVENT)+dat.Roi*2*1440)
+        {
+            cout << "Size mismatch in " << d.name << ": Found=" << d.size() << " Expected=" << dat.Roi*2*1440+sizeof(EVENT) << endl;
             return;
         }
 
         delete fEventData;
-        fEventData = reinterpret_cast<DimEventData*>(new char[d.size()]);
+        fEventData = reinterpret_cast<EVENT*>(new char[d.size()]);
         memcpy(fEventData, d.ptr<void>(), d.size());