Some further debugging and some nice optics

ui/OpticsPlotGui.py

@@ -44,19 +44,6 @@ class Ui_OpticsPlotGUI(object):
         self.PBetax.setChecked(True)
         self.PBetax.setObjectName("PBetax")
         self.gridLayout_4.addWidget(self.PBetax, 0, 0, 1, 1)
-        self.PBetay = QtWidgets.QPushButton(self.widget_2)
-        self.PBetay.setCheckable(True)
-        self.PBetay.setChecked(True)
-        self.PBetay.setObjectName("PBetay")
-        self.gridLayout_4.addWidget(self.PBetay, 0, 1, 1, 1)
-        self.PAlphax = QtWidgets.QPushButton(self.widget_2)
-        self.PAlphax.setCheckable(True)
-        self.PAlphax.setObjectName("PAlphax")
-        self.gridLayout_4.addWidget(self.PAlphax, 1, 0, 1, 1)
-        self.PAlphay = QtWidgets.QPushButton(self.widget_2)
-        self.PAlphay.setCheckable(True)
-        self.PAlphay.setObjectName("PAlphay")
-        self.gridLayout_4.addWidget(self.PAlphay, 1, 1, 1, 1)
         self.PEtax = QtWidgets.QPushButton(self.widget_2)
         self.PEtax.setCheckable(True)
         self.PEtax.setObjectName("PEtax")
@@ -65,15 +52,36 @@ class Ui_OpticsPlotGUI(object):
         self.PEtay.setCheckable(True)
         self.PEtay.setObjectName("PEtay")
         self.gridLayout_4.addWidget(self.PEtay, 2, 1, 1, 1)
-        self.PR56 = QtWidgets.QPushButton(self.widget_2)
-        self.PR56.setCheckable(True)
-        self.PR56.setObjectName("PR56")
-        self.gridLayout_4.addWidget(self.PR56, 3, 0, 1, 1)
         self.PEnergy = QtWidgets.QPushButton(self.widget_2)
         self.PEnergy.setEnabled(True)
         self.PEnergy.setCheckable(True)
         self.PEnergy.setObjectName("PEnergy")
-        self.gridLayout_4.addWidget(self.PEnergy, 3, 1, 1, 1)
+        self.gridLayout_4.addWidget(self.PEnergy, 4, 1, 1, 1)
+        self.PAlphay = QtWidgets.QPushButton(self.widget_2)
+        self.PAlphay.setCheckable(True)
+        self.PAlphay.setObjectName("PAlphay")
+        self.gridLayout_4.addWidget(self.PAlphay, 1, 1, 1, 1)
+        self.PR56 = QtWidgets.QPushButton(self.widget_2)
+        self.PR56.setCheckable(True)
+        self.PR56.setObjectName("PR56")
+        self.gridLayout_4.addWidget(self.PR56, 4, 0, 1, 1)
+        self.PAlphax = QtWidgets.QPushButton(self.widget_2)
+        self.PAlphax.setCheckable(True)
+        self.PAlphax.setObjectName("PAlphax")
+        self.gridLayout_4.addWidget(self.PAlphax, 1, 0, 1, 1)
+        self.PBetay = QtWidgets.QPushButton(self.widget_2)
+        self.PBetay.setCheckable(True)
+        self.PBetay.setChecked(True)
+        self.PBetay.setObjectName("PBetay")
+        self.gridLayout_4.addWidget(self.PBetay, 0, 1, 1, 1)
+        self.PMux = QtWidgets.QPushButton(self.widget_2)
+        self.PMux.setCheckable(True)
+        self.PMux.setObjectName("PMux")
+        self.gridLayout_4.addWidget(self.PMux, 3, 0, 1, 1)
+        self.PMuy = QtWidgets.QPushButton(self.widget_2)
+        self.PMuy.setCheckable(True)
+        self.PMuy.setObjectName("PMuy")
+        self.gridLayout_4.addWidget(self.PMuy, 3, 1, 1, 1)
         self.verticalLayout_5.addLayout(self.gridLayout_4)
         self.gridLayout_5 = QtWidgets.QGridLayout()
         self.gridLayout_5.setObjectName("gridLayout_5")
@@ -274,13 +282,15 @@ class Ui_OpticsPlotGUI(object):
         OpticsPlotGUI.setWindowTitle(_translate("OpticsPlotGUI", "SwissFEL Optics"))
         self.label_31.setText(_translate("OpticsPlotGUI", "Plotting"))
         self.PBetax.setText(_translate("OpticsPlotGUI", "Betax"))
-        self.PBetay.setText(_translate("OpticsPlotGUI", "Betay"))
-        self.PAlphax.setText(_translate("OpticsPlotGUI", "Alphax"))
-        self.PAlphay.setText(_translate("OpticsPlotGUI", "AlphaY"))
         self.PEtax.setText(_translate("OpticsPlotGUI", "Etax"))
         self.PEtay.setText(_translate("OpticsPlotGUI", "Etay"))
-        self.PR56.setText(_translate("OpticsPlotGUI", "R56"))
         self.PEnergy.setText(_translate("OpticsPlotGUI", "Energy"))
+        self.PAlphay.setText(_translate("OpticsPlotGUI", "AlphaY"))
+        self.PR56.setText(_translate("OpticsPlotGUI", "R56"))
+        self.PAlphax.setText(_translate("OpticsPlotGUI", "Alphax"))
+        self.PBetay.setText(_translate("OpticsPlotGUI", "Betay"))
+        self.PMux.setText(_translate("OpticsPlotGUI", "Mux"))
+        self.PMuy.setText(_translate("OpticsPlotGUI", "Muy"))
         self.label_22.setText(_translate("OpticsPlotGUI", "Plot Start"))
         self.PStart.setText(_translate("OpticsPlotGUI", "0"))
         self.label_21.setText(_translate("OpticsPlotGUI", "Plot End"))

ui/OpticsPlotGui.ui

@@ -56,39 +56,6 @@
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QPushButton" name="PBetay">
-               <property name="text">
-                <string>Betay</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-               <property name="checked">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QPushButton" name="PAlphax">
-               <property name="text">
-                <string>Alphax</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QPushButton" name="PAlphay">
-               <property name="text">
-                <string>AlphaY</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
              <item row="2" column="0">
               <widget class="QPushButton" name="PEtax">
                <property name="text">
@@ -109,7 +76,30 @@
                </property>
               </widget>
              </item>
-             <item row="3" column="0">
+             <item row="4" column="1">
+              <widget class="QPushButton" name="PEnergy">
+               <property name="enabled">
+                <bool>true</bool>
+               </property>
+               <property name="text">
+                <string>Energy</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QPushButton" name="PAlphay">
+               <property name="text">
+                <string>AlphaY</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="0">
               <widget class="QPushButton" name="PR56">
                <property name="text">
                 <string>R56</string>
@@ -119,13 +109,43 @@
                </property>
               </widget>
              </item>
-             <item row="3" column="1">
-              <widget class="QPushButton" name="PEnergy">
-               <property name="enabled">
+             <item row="1" column="0">
+              <widget class="QPushButton" name="PAlphax">
+               <property name="text">
+                <string>Alphax</string>
+               </property>
+               <property name="checkable">
                 <bool>true</bool>
                </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QPushButton" name="PBetay">
                <property name="text">
-                <string>Energy</string>
+                <string>Betay</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+               <property name="checked">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0">
+              <widget class="QPushButton" name="PMux">
+               <property name="text">
+                <string>Mux</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="1">
+              <widget class="QPushButton" name="PMuy">
+               <property name="text">
+                <string>Muy</string>
                </property>
                <property name="checkable">
                 <bool>true</bool>

ui/OpticsToolsGui.py

@@ -429,6 +429,9 @@ class Ui_OpticsGUI(object):
         spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         self.verticalLayout_5.addItem(spacerItem2)
         self.horizontalLayout_7.addLayout(self.verticalLayout_5)
+        self.UIMatchLog = QtWidgets.QPlainTextEdit(self.tab)
+        self.UIMatchLog.setObjectName("UIMatchLog")
+        self.horizontalLayout_7.addWidget(self.UIMatchLog)
         spacerItem3 = QtWidgets.QSpacerItem(380, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.horizontalLayout_7.addItem(spacerItem3)
         self.TabMaster.addTab(self.tab, "")

ui/OpticsToolsGui.ui

@@ -752,6 +752,9 @@
           </item>
          </layout>
         </item>
+        <item>
+         <widget class="QPlainTextEdit" name="UIMatchLog"/>
+        </item>
         <item>
          <spacer name="horizontalSpacer_2">
           <property name="orientation">