Index: /trunk/FACT++/gui/FactGui.h
===================================================================
--- /trunk/FACT++/gui/FactGui.h	(revision 12471)
+++ /trunk/FACT++/gui/FactGui.h	(revision 12472)
@@ -1389,4 +1389,5 @@
         fDrsCalibGain->setEnabled(fDrsCalibGain->value()>0);
         fDrsCalibTrgOffset->setEnabled(fDrsCalibTrgOffset->value()>0);
+        fDrsCalibROI->setEnabled(fDrsCalibROI->value()>0);
 
         if (d0)//fDrsCalibBaseline->value()==0  || start<0)
@@ -1560,5 +1561,5 @@
         }
 
-        if (d.size()!=sizeof(EVENT)+dat.Roi*4*1440)
+        if (d.size()!=sizeof(EVENT)+dat.Roi*4*1440+dat.Roi*4*160)
         {
             cerr << "Size mismatch in " << d.name << ": Found=" << d.size() << " Expected=" << dat.Roi*4*1440+sizeof(EVENT) << " [roi=" << dat.Roi << "]" << endl;
@@ -1611,15 +1612,18 @@
     void handleFadDrsCalibration(const DimData &d)
     {
+        const size_t sz = 1024*1440*6+1024*160*2;
+
         if (d.size()==0)
         {
-            fDrsCalibBaseline->setValue(0);
-            fDrsCalibGain->setValue(0);
-            fDrsCalibTrgOffset->setValue(0);
-            fDrsCalibration.assign(1024*1440*6+1024*160*2, 0);
+            fDrsCalibBaseline->setValue(-1);
+            fDrsCalibGain->setValue(-1);
+            fDrsCalibTrgOffset->setValue(-1);
+            fDrsCalibROI->setValue(-1);
+            fDrsCalibration.assign(sz, 0);
             DisplayEventData();
             return;
         }
 
-        if (!CheckSize(d, 1024*1440*6*sizeof(float)+1024*160*2*sizeof(float)+3*sizeof(uint32_t)))
+        if (!CheckSize(d, sz*sizeof(float)+4*sizeof(uint32_t)))
             // Do WHAT?
             return;
@@ -1630,7 +1634,8 @@
         fDrsCalibGain->setValue(run[1]);
         fDrsCalibTrgOffset->setValue(run[2]);
+        fDrsCalibROI->setValue(run[3]);
 
         const float *dat = d.ptr<float>(sizeof(uint32_t)*4);
-        fDrsCalibration.assign(dat, dat+1024*1440*6+1024*160*2);
+        fDrsCalibration.assign(dat, dat+sz);
 
         DisplayEventData();
Index: /trunk/FACT++/gui/design.ui
===================================================================
--- /trunk/FACT++/gui/design.ui	(revision 12471)
+++ /trunk/FACT++/gui/design.ui	(revision 12472)
@@ -8633,9 +8633,18 @@
                    <enum>QAbstractSpinBox::NoButtons</enum>
                   </property>
+                  <property name="specialValueText">
+                   <string>n/a</string>
+                  </property>
                   <property name="prefix">
                    <string/>
                   </property>
+                  <property name="minimum">
+                   <number>-1</number>
+                  </property>
                   <property name="maximum">
                    <number>9999</number>
+                  </property>
+                  <property name="value">
+                   <number>-1</number>
                   </property>
                  </widget>
@@ -8694,9 +8703,18 @@
                    <enum>QAbstractSpinBox::NoButtons</enum>
                   </property>
+                  <property name="specialValueText">
+                   <string>n/a</string>
+                  </property>
                   <property name="prefix">
                    <string/>
                   </property>
+                  <property name="minimum">
+                   <number>-1</number>
+                  </property>
                   <property name="maximum">
                    <number>9999</number>
+                  </property>
+                  <property name="value">
+                   <number>-1</number>
                   </property>
                  </widget>
@@ -8755,9 +8773,18 @@
                    <enum>QAbstractSpinBox::NoButtons</enum>
                   </property>
+                  <property name="specialValueText">
+                   <string>n/a</string>
+                  </property>
                   <property name="prefix">
                    <string/>
                   </property>
+                  <property name="minimum">
+                   <number>-1</number>
+                  </property>
                   <property name="maximum">
                    <number>9999</number>
+                  </property>
+                  <property name="value">
+                   <number>-1</number>
                   </property>
                  </widget>
@@ -8788,9 +8815,18 @@
                    <enum>QAbstractSpinBox::NoButtons</enum>
                   </property>
+                  <property name="specialValueText">
+                   <string>n/a</string>
+                  </property>
                   <property name="prefix">
                    <string/>
                   </property>
+                  <property name="minimum">
+                   <number>-1</number>
+                  </property>
                   <property name="maximum">
                    <number>9999</number>
+                  </property>
+                  <property name="value">
+                   <number>-1</number>
                   </property>
                  </widget>