Index: trunk/FACT++/gui/design.ui
===================================================================
--- trunk/FACT++/gui/design.ui	(revision 12522)
+++ trunk/FACT++/gui/design.ui	(revision 12523)
@@ -53,5 +53,5 @@
       </property>
       <property name="currentIndex">
-       <number>8</number>
+       <number>7</number>
       </property>
       <property name="documentMode">
@@ -7038,5 +7038,5 @@
                     <widget class="QLabel" name="label_189">
                      <property name="text">
-                      <string>Output  / buffer release rate</string>
+                      <string>Output buffer release rate</string>
                      </property>
                      <property name="alignment">
@@ -7092,6 +7092,13 @@
                 </property>
                 <layout class="QGridLayout" name="gridLayout_39">
+                 <item row="1" column="0">
+                  <widget class="QTextEdit" name="fFadDNA"/>
+                 </item>
                  <item row="0" column="0">
-                  <widget class="QTextEdit" name="fFadDNA"/>
+                  <widget class="Line" name="line_62">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                  </widget>
                  </item>
                 </layout>
@@ -7104,5 +7111,5 @@
                 </property>
                 <layout class="QGridLayout" name="gridLayout_63">
-                 <item row="0" column="0">
+                 <item row="1" column="0">
                   <layout class="QGridLayout" name="gridLayout_62">
                    <property name="rightMargin">
@@ -7373,6 +7380,6 @@
                     </widget>
                    </item>
-                   <item row="0" column="1">
-                    <widget class="QPushButton" name="fFadLedDac0">
+                   <item row="1" column="1">
+                    <widget class="QPushButton" name="fFadLedDac1">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7411,6 +7418,6 @@
                     </widget>
                    </item>
-                   <item row="1" column="1">
-                    <widget class="QPushButton" name="fFadLedDac1">
+                   <item row="2" column="1">
+                    <widget class="QPushButton" name="fFadLedDac2">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7449,6 +7456,6 @@
                     </widget>
                    </item>
-                   <item row="2" column="1">
-                    <widget class="QPushButton" name="fFadLedDac2">
+                   <item row="3" column="1">
+                    <widget class="QPushButton" name="fFadLedDac3">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7487,6 +7494,6 @@
                     </widget>
                    </item>
-                   <item row="3" column="1">
-                    <widget class="QPushButton" name="fFadLedDac3">
+                   <item row="4" column="1">
+                    <widget class="QPushButton" name="fFadLedDac4">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7525,6 +7532,6 @@
                     </widget>
                    </item>
-                   <item row="4" column="1">
-                    <widget class="QPushButton" name="fFadLedDac4">
+                   <item row="5" column="1">
+                    <widget class="QPushButton" name="fFadLedDac5">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7563,6 +7570,6 @@
                     </widget>
                    </item>
-                   <item row="5" column="1">
-                    <widget class="QPushButton" name="fFadLedDac5">
+                   <item row="6" column="1">
+                    <widget class="QPushButton" name="fFadLedDac6">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7601,6 +7608,6 @@
                     </widget>
                    </item>
-                   <item row="6" column="1">
-                    <widget class="QPushButton" name="fFadLedDac6">
+                   <item row="7" column="1">
+                    <widget class="QPushButton" name="fFadLedDac7">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7639,6 +7646,6 @@
                     </widget>
                    </item>
-                   <item row="7" column="1">
-                    <widget class="QPushButton" name="fFadLedDac7">
+                   <item row="0" column="1">
+                    <widget class="QPushButton" name="fFadLedDac0">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7679,6 +7686,549 @@
                   </layout>
                  </item>
+                 <item row="2" column="0">
+                  <spacer name="verticalSpacer_34">
+                   <property name="orientation">
+                    <enum>Qt::Vertical</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>20</width>
+                     <height>40</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="0" column="0">
+                  <widget class="Line" name="line_61">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                  </widget>
+                 </item>
                 </layout>
                </widget>
+              </item>
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_7">
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <widget class="QGroupBox" name="groupBox_28">
+                  <property name="title">
+                   <string>File format</string>
+                  </property>
+                  <layout class="QGridLayout" name="gridLayout_103">
+                   <item row="1" column="1">
+                    <widget class="QPushButton" name="fFadButtonFileFormatNone">
+                     <property name="text">
+                      <string>None</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="1">
+                    <widget class="QPushButton" name="fFadButtonFileFormatDebug">
+                     <property name="text">
+                      <string>Debug</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="3" column="1">
+                    <widget class="QPushButton" name="fFadButtonFileFormatFits">
+                     <property name="text">
+                      <string>FITS</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="4" column="1">
+                    <widget class="QPushButton" name="fFadButtonFileFormatRaw">
+                     <property name="text">
+                      <string>Raw</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="0">
+                    <widget class="QPushButton" name="fFadLedFileFormatNone">
+                     <property name="enabled">
+                      <bool>true</bool>
+                     </property>
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>18</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                     <property name="icon">
+                      <iconset resource="design.qrc">
+                       <normaloff>:/Resources/icons/gray circle 1.png</normaloff>:/Resources/icons/gray circle 1.png</iconset>
+                     </property>
+                     <property name="iconSize">
+                      <size>
+                       <width>16</width>
+                       <height>16</height>
+                      </size>
+                     </property>
+                     <property name="checkable">
+                      <bool>false</bool>
+                     </property>
+                     <property name="flat">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="0">
+                    <widget class="QPushButton" name="fFadLedFileFormatDebug">
+                     <property name="enabled">
+                      <bool>true</bool>
+                     </property>
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>18</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                     <property name="icon">
+                      <iconset resource="design.qrc">
+                       <normaloff>:/Resources/icons/gray circle 1.png</normaloff>:/Resources/icons/gray circle 1.png</iconset>
+                     </property>
+                     <property name="iconSize">
+                      <size>
+                       <width>16</width>
+                       <height>16</height>
+                      </size>
+                     </property>
+                     <property name="checkable">
+                      <bool>false</bool>
+                     </property>
+                     <property name="flat">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="3" column="0">
+                    <widget class="QPushButton" name="fFadLedFileFormatFits">
+                     <property name="enabled">
+                      <bool>true</bool>
+                     </property>
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>18</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                     <property name="icon">
+                      <iconset resource="design.qrc">
+                       <normaloff>:/Resources/icons/gray circle 1.png</normaloff>:/Resources/icons/gray circle 1.png</iconset>
+                     </property>
+                     <property name="iconSize">
+                      <size>
+                       <width>16</width>
+                       <height>16</height>
+                      </size>
+                     </property>
+                     <property name="checkable">
+                      <bool>false</bool>
+                     </property>
+                     <property name="flat">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="4" column="0">
+                    <widget class="QPushButton" name="fFadLedFileFormatRaw">
+                     <property name="enabled">
+                      <bool>true</bool>
+                     </property>
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>18</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                     <property name="icon">
+                      <iconset resource="design.qrc">
+                       <normaloff>:/Resources/icons/gray circle 1.png</normaloff>:/Resources/icons/gray circle 1.png</iconset>
+                     </property>
+                     <property name="iconSize">
+                      <size>
+                       <width>16</width>
+                       <height>16</height>
+                      </size>
+                     </property>
+                     <property name="checkable">
+                      <bool>false</bool>
+                     </property>
+                     <property name="flat">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="0" column="0" colspan="2">
+                    <widget class="Line" name="line_58">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="5" column="1">
+                    <spacer name="verticalSpacer_3">
+                     <property name="orientation">
+                      <enum>Qt::Vertical</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>20</width>
+                       <height>40</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QGroupBox" name="groupBox_29">
+                  <property name="title">
+                   <string>Drs Calibration</string>
+                  </property>
+                  <layout class="QGridLayout" name="gridLayout_107">
+                   <item row="1" column="1">
+                    <widget class="QPushButton" name="fDrsCalibStart2">
+                     <property name="text">
+                      <string>Start</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="1">
+                    <widget class="QSpinBox" name="fDrsCalibBaseline2">
+                     <property name="alignment">
+                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                     </property>
+                     <property name="readOnly">
+                      <bool>true</bool>
+                     </property>
+                     <property name="buttonSymbols">
+                      <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>
+                   </item>
+                   <item row="3" column="1">
+                    <widget class="QSpinBox" name="fDrsCalibGain2">
+                     <property name="alignment">
+                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                     </property>
+                     <property name="readOnly">
+                      <bool>true</bool>
+                     </property>
+                     <property name="buttonSymbols">
+                      <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>
+                   </item>
+                   <item row="4" column="1">
+                    <widget class="QSpinBox" name="fDrsCalibTrgOffset2">
+                     <property name="alignment">
+                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                     </property>
+                     <property name="readOnly">
+                      <bool>true</bool>
+                     </property>
+                     <property name="buttonSymbols">
+                      <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>
+                   </item>
+                   <item row="5" column="1">
+                    <widget class="QPushButton" name="fDrsCalibrationReset2">
+                     <property name="text">
+                      <string>Reset</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="6" column="1">
+                    <widget class="QSpinBox" name="fDrsCalibROI2">
+                     <property name="alignment">
+                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                     </property>
+                     <property name="readOnly">
+                      <bool>true</bool>
+                     </property>
+                     <property name="buttonSymbols">
+                      <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>
+                   </item>
+                   <item row="1" column="0">
+                    <widget class="QPushButton" name="fFadLedFileFormatCalib">
+                     <property name="enabled">
+                      <bool>true</bool>
+                     </property>
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>18</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                     <property name="icon">
+                      <iconset resource="design.qrc">
+                       <normaloff>:/Resources/icons/gray circle 1.png</normaloff>:/Resources/icons/gray circle 1.png</iconset>
+                     </property>
+                     <property name="iconSize">
+                      <size>
+                       <width>16</width>
+                       <height>16</height>
+                      </size>
+                     </property>
+                     <property name="checkable">
+                      <bool>false</bool>
+                     </property>
+                     <property name="flat">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="0">
+                    <widget class="QPushButton" name="fFadLedDrsBaseline">
+                     <property name="enabled">
+                      <bool>true</bool>
+                     </property>
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>18</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                     <property name="icon">
+                      <iconset resource="design.qrc">
+                       <normaloff>:/Resources/icons/gray circle 1.png</normaloff>:/Resources/icons/gray circle 1.png</iconset>
+                     </property>
+                     <property name="iconSize">
+                      <size>
+                       <width>16</width>
+                       <height>16</height>
+                      </size>
+                     </property>
+                     <property name="checkable">
+                      <bool>false</bool>
+                     </property>
+                     <property name="flat">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="3" column="0">
+                    <widget class="QPushButton" name="fFadLedDrsGain">
+                     <property name="enabled">
+                      <bool>true</bool>
+                     </property>
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>18</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                     <property name="icon">
+                      <iconset resource="design.qrc">
+                       <normaloff>:/Resources/icons/gray circle 1.png</normaloff>:/Resources/icons/gray circle 1.png</iconset>
+                     </property>
+                     <property name="iconSize">
+                      <size>
+                       <width>16</width>
+                       <height>16</height>
+                      </size>
+                     </property>
+                     <property name="checkable">
+                      <bool>false</bool>
+                     </property>
+                     <property name="flat">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="4" column="0">
+                    <widget class="QPushButton" name="fFadLedDrsTrgOff">
+                     <property name="enabled">
+                      <bool>true</bool>
+                     </property>
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>18</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                     <property name="icon">
+                      <iconset resource="design.qrc">
+                       <normaloff>:/Resources/icons/gray circle 1.png</normaloff>:/Resources/icons/gray circle 1.png</iconset>
+                     </property>
+                     <property name="iconSize">
+                      <size>
+                       <width>16</width>
+                       <height>16</height>
+                      </size>
+                     </property>
+                     <property name="checkable">
+                      <bool>false</bool>
+                     </property>
+                     <property name="flat">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="0" column="0" colspan="2">
+                    <widget class="Line" name="line_59">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="7" column="1">
+                    <spacer name="verticalSpacer_35">
+                     <property name="orientation">
+                      <enum>Qt::Vertical</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>20</width>
+                       <height>40</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+               </layout>
               </item>
               <item>
@@ -7689,13 +8239,34 @@
                 <layout class="QGridLayout" name="gridLayout_42">
                  <item row="2" column="0">
-                  <layout class="QGridLayout" name="gridLayout_37" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0">
-                   <item row="3" column="1">
-                    <widget class="QPushButton" name="fFadTriggerLineOn">
+                  <layout class="QGridLayout" name="gridLayout_37" rowstretch="0,0,0,0,0,0,0,0,0,0,0">
+                   <item row="0" column="2">
+                    <widget class="QPushButton" name="fFadSingleTrigger">
                      <property name="text">
-                      <string>on</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="3" column="2">
+                      <string>Trigger</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="0" column="3">
+                    <widget class="QPushButton" name="fFadResetTriggerId">
+                     <property name="text">
+                      <string>Reset Evt ID</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="2">
+                    <widget class="QPushButton" name="fFadSocket17">
+                     <property name="text">
+                      <string>Sock 1-7</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="1">
+                    <widget class="QPushButton" name="fFadSocket0">
+                     <property name="text">
+                      <string>Sock 0</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="2">
                     <widget class="QPushButton" name="fFadTriggerLineOff">
                      <property name="text">
@@ -7704,5 +8275,47 @@
                     </widget>
                    </item>
-                   <item row="3" column="3">
+                   <item row="3" column="2">
+                    <widget class="QPushButton" name="fFadContTriggerOff">
+                     <property name="text">
+                      <string>off</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="4" column="2">
+                    <widget class="QPushButton" name="fFadBusyOnOff">
+                     <property name="text">
+                      <string>off</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="5" column="2">
+                    <widget class="QPushButton" name="fFadBusyOffOff">
+                     <property name="text">
+                      <string>off</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="6" column="2">
+                    <widget class="QPushButton" name="fFadDrsOff">
+                     <property name="text">
+                      <string>off</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="7" column="2">
+                    <widget class="QPushButton" name="fFadDwriteOff">
+                     <property name="text">
+                      <string>off</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="3">
+                    <widget class="QLabel" name="label_137">
+                     <property name="text">
+                      <string>Data Sockets</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="3">
                     <widget class="QLabel" name="label_134">
                      <property name="text">
@@ -7711,6 +8324,55 @@
                     </widget>
                    </item>
-                   <item row="3" column="0">
-                    <widget class="QPushButton" name="fFadLedTriggerLine">
+                   <item row="3" column="3">
+                    <widget class="QLabel" name="label_106">
+                     <property name="text">
+                      <string>Continous trigger</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="4" column="3">
+                    <widget class="QLabel" name="label_104">
+                     <property name="text">
+                      <string>Constant busy on</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="5" column="3">
+                    <widget class="QLabel" name="label_180">
+                     <property name="text">
+                      <string>Constant busy off</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="6" column="3">
+                    <widget class="QLabel" name="label_93">
+                     <property name="text">
+                      <string>DRS enable</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="7" column="3">
+                    <widget class="QLabel" name="label_94">
+                     <property name="text">
+                      <string>Write enable</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="8" column="3">
+                    <widget class="QLabel" name="label_95">
+                     <property name="text">
+                      <string>DCM locked</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="9" column="3">
+                    <widget class="QLabel" name="label_96">
+                     <property name="text">
+                      <string>DCM ready</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="0">
+                    <widget class="QPushButton" name="fFadLedSocket">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7749,27 +8411,6 @@
                     </widget>
                    </item>
-                   <item row="2" column="1">
-                    <widget class="QPushButton" name="fFadSocket0">
-                     <property name="text">
-                      <string>Sock 0</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="2" column="2">
-                    <widget class="QPushButton" name="fFadSocket17">
-                     <property name="text">
-                      <string>Sock 1-7</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="2" column="3">
-                    <widget class="QLabel" name="label_137">
-                     <property name="text">
-                      <string>Data Sockets</string>
-                     </property>
-                    </widget>
-                   </item>
                    <item row="2" column="0">
-                    <widget class="QPushButton" name="fFadLedSocket">
+                    <widget class="QPushButton" name="fFadLedTriggerLine">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7808,33 +8449,5 @@
                     </widget>
                    </item>
-                   <item row="5" column="3">
-                    <widget class="QLabel" name="label_104">
-                     <property name="text">
-                      <string>Constant busy on</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="4" column="3">
-                    <widget class="QLabel" name="label_106">
-                     <property name="text">
-                      <string>Continous trigger</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="4" column="2">
-                    <widget class="QPushButton" name="fFadContTriggerOff">
-                     <property name="text">
-                      <string>off</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="4" column="1">
-                    <widget class="QPushButton" name="fFadContTriggerOn">
-                     <property name="text">
-                      <string>on</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="4" column="0">
+                   <item row="3" column="0">
                     <widget class="QPushButton" name="fFadLedContTrigger">
                      <property name="enabled">
@@ -7874,48 +8487,6 @@
                     </widget>
                    </item>
-                   <item row="7" column="1">
-                    <widget class="QPushButton" name="fFadDrsOn">
-                     <property name="text">
-                      <string>on</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="7" column="2">
-                    <widget class="QPushButton" name="fFadDrsOff">
-                     <property name="text">
-                      <string>off</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="7" column="3">
-                    <widget class="QLabel" name="label_93">
-                     <property name="text">
-                      <string>DRS enable</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="8" column="3">
-                    <widget class="QLabel" name="label_94">
-                     <property name="text">
-                      <string>Write enable</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="8" column="2">
-                    <widget class="QPushButton" name="fFadDwriteOff">
-                     <property name="text">
-                      <string>off</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="8" column="1">
-                    <widget class="QPushButton" name="fFadDwriteOn">
-                     <property name="text">
-                      <string>on</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="7" column="0">
-                    <widget class="QPushButton" name="fFadLedDrsEnabled">
+                   <item row="4" column="0">
+                    <widget class="QPushButton" name="fFadLedBusyOn">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7954,6 +8525,6 @@
                     </widget>
                    </item>
-                   <item row="8" column="0">
-                    <widget class="QPushButton" name="fFadLedDrsWrite">
+                   <item row="5" column="0">
+                    <widget class="QPushButton" name="fFadLedBusyOff">
                      <property name="enabled">
                       <bool>true</bool>
@@ -7992,87 +8563,6 @@
                     </widget>
                    </item>
-                   <item row="9" column="1">
-                    <widget class="QPushButton" name="pushButton_8">
-                     <property name="enabled">
-                      <bool>false</bool>
-                     </property>
-                     <property name="text">
-                      <string>on</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="9" column="2">
-                    <widget class="QPushButton" name="pushButton_13">
-                     <property name="enabled">
-                      <bool>false</bool>
-                     </property>
-                     <property name="text">
-                      <string>off</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="10" column="2">
-                    <widget class="QPushButton" name="pushButton_14">
-                     <property name="enabled">
-                      <bool>false</bool>
-                     </property>
-                     <property name="text">
-                      <string>off</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="10" column="1">
-                    <widget class="QPushButton" name="pushButton_9">
-                     <property name="enabled">
-                      <bool>false</bool>
-                     </property>
-                     <property name="text">
-                      <string>on</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="11" column="1">
-                    <widget class="QPushButton" name="pushButton_10">
-                     <property name="enabled">
-                      <bool>false</bool>
-                     </property>
-                     <property name="text">
-                      <string>on</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="11" column="2">
-                    <widget class="QPushButton" name="pushButton_15">
-                     <property name="enabled">
-                      <bool>false</bool>
-                     </property>
-                     <property name="text">
-                      <string>off</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="9" column="3">
-                    <widget class="QLabel" name="label_95">
-                     <property name="text">
-                      <string>DCM locked</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="10" column="3">
-                    <widget class="QLabel" name="label_96">
-                     <property name="text">
-                      <string>DCM ready</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="11" column="3">
-                    <widget class="QLabel" name="label_97">
-                     <property name="text">
-                      <string>SPI serial clock</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="9" column="0">
-                    <widget class="QPushButton" name="fFadLedDcmLocked">
+                   <item row="6" column="0">
+                    <widget class="QPushButton" name="fFadLedDrsEnabled">
                      <property name="enabled">
                       <bool>true</bool>
@@ -8111,6 +8601,6 @@
                     </widget>
                    </item>
-                   <item row="10" column="0">
-                    <widget class="QPushButton" name="fFadLedDcmReady">
+                   <item row="7" column="0">
+                    <widget class="QPushButton" name="fFadLedDrsWrite">
                      <property name="enabled">
                       <bool>true</bool>
@@ -8149,6 +8639,6 @@
                     </widget>
                    </item>
-                   <item row="11" column="0">
-                    <widget class="QPushButton" name="fFadLedSpiSclk">
+                   <item row="8" column="0">
+                    <widget class="QPushButton" name="fFadLedDcmLocked">
                      <property name="enabled">
                       <bool>true</bool>
@@ -8187,20 +8677,6 @@
                     </widget>
                    </item>
-                   <item row="1" column="2">
-                    <widget class="QPushButton" name="fFadSingleTrigger">
-                     <property name="text">
-                      <string>Trigger</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="1" column="3">
-                    <widget class="QPushButton" name="fFadResetTriggerId">
-                     <property name="text">
-                      <string>Reset Evt ID</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="5" column="0">
-                    <widget class="QPushButton" name="fFadLedBusyOn">
+                   <item row="9" column="0">
+                    <widget class="QPushButton" name="fFadLedDcmReady">
                      <property name="enabled">
                       <bool>true</bool>
@@ -8239,6 +8715,48 @@
                     </widget>
                    </item>
-                   <item row="6" column="0">
-                    <widget class="QPushButton" name="fFadLedBusyOff">
+                   <item row="2" column="1">
+                    <widget class="QPushButton" name="fFadTriggerLineOn">
+                     <property name="text">
+                      <string>on</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="3" column="1">
+                    <widget class="QPushButton" name="fFadContTriggerOn">
+                     <property name="text">
+                      <string>on</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="4" column="1">
+                    <widget class="QPushButton" name="fFadBusyOnOn">
+                     <property name="text">
+                      <string>on</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="5" column="1">
+                    <widget class="QPushButton" name="fFadBusyOffOn">
+                     <property name="text">
+                      <string>on</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="6" column="1">
+                    <widget class="QPushButton" name="fFadDrsOn">
+                     <property name="text">
+                      <string>on</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="7" column="1">
+                    <widget class="QPushButton" name="fFadDwriteOn">
+                     <property name="text">
+                      <string>on</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="10" column="0">
+                    <widget class="QPushButton" name="fFadLedSpiSclk">
                      <property name="enabled">
                       <bool>true</bool>
@@ -8277,36 +8795,8 @@
                     </widget>
                    </item>
-                   <item row="5" column="1">
-                    <widget class="QPushButton" name="fFadBusyOnOn">
+                   <item row="10" column="3">
+                    <widget class="QLabel" name="label_97">
                      <property name="text">
-                      <string>on</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="6" column="1">
-                    <widget class="QPushButton" name="fFadBusyOffOn">
-                     <property name="text">
-                      <string>on</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="5" column="2">
-                    <widget class="QPushButton" name="fFadBusyOnOff">
-                     <property name="text">
-                      <string>off</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="6" column="2">
-                    <widget class="QPushButton" name="fFadBusyOffOff">
-                     <property name="text">
-                      <string>off</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="6" column="3">
-                    <widget class="QLabel" name="label_180">
-                     <property name="text">
-                      <string>Constant busy off</string>
+                      <string>SPI serial clock</string>
                      </property>
                     </widget>
@@ -8320,4 +8810,17 @@
                    </property>
                   </widget>
+                 </item>
+                 <item row="3" column="0">
+                  <spacer name="verticalSpacer_36">
+                   <property name="orientation">
+                    <enum>Qt::Vertical</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>20</width>
+                     <height>40</height>
+                    </size>
+                   </property>
+                  </spacer>
                  </item>
                 </layout>
@@ -8826,37 +9329,30 @@
               </item>
               <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_23">
-                <property name="topMargin">
-                 <number>0</number>
-                </property>
-                <item>
-                 <widget class="QSpinBox" name="fDrsCalibROI">
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                  <property name="readOnly">
-                   <bool>true</bool>
-                  </property>
-                  <property name="buttonSymbols">
-                   <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>
-                </item>
-               </layout>
+               <widget class="QSpinBox" name="fDrsCalibROI">
+                <property name="alignment">
+                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                </property>
+                <property name="readOnly">
+                 <bool>true</bool>
+                </property>
+                <property name="buttonSymbols">
+                 <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>
               </item>
              </layout>
@@ -14364,14 +14860,4 @@
               </item>
              </layout>
-            </item>
-            <item row="10" column="1" rowspan="2">
-             <widget class="QWidget" name="widget" native="true">
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>20</height>
-               </size>
-              </property>
-             </widget>
             </item>
             <item row="4" column="1">
