Changeset 12468 for trunk/FACT++

Timestamp:

11/09/11 16:31:17 (13 years ago)

Author:

tbretz

Message:

Updated mainly the length check for the DRS calibration.

File:

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

trunk/FACT++/gui/FactGui.h

@@ -1616 +1616 @@
             fDrsCalibGain->setValue(0);
             fDrsCalibTrgOffset->setValue(0);
-            fDrsCalibration.assign(1024*1440*6, 0);
+            fDrsCalibration.assign(1024*1440*6+1024*160*2, 0);
             DisplayEventData();
             return;
         }
 
-        if (!CheckSize(d, 1024*1440*6*sizeof(float)+3*sizeof(uint32_t)))
+        if (!CheckSize(d, 1024*1440*6*sizeof(float)+1024*160*2*sizeof(float)+3*sizeof(uint32_t)))
             // Do WHAT?
             return;
@@ -1631 +1631 @@
         fDrsCalibTrgOffset->setValue(run[2]);
 
-        const float *dat = d.ptr<float>(sizeof(uint32_t)*3);
-        fDrsCalibration.assign(dat, dat+1024*1440*6);
+        const float *dat = d.ptr<float>(sizeof(uint32_t)*4);
+        fDrsCalibration.assign(dat, dat+1024*1440*6+1024*160*2);
 
         DisplayEventData();
@@ -3952 +3952 @@
         fDimRateScan           ("RATE_SCAN/DATA",                 (void*)NULL, 0, this),
         //-
-        fEventData(0), fDrsCalibration(1440*1024*6),
+        fEventData(0), fDrsCalibration(1440*1024*6+160*1024*2),
         fTimeStamp0(0)
     {