diff --git a/FOFBApp/Db/FOFBRtm.template b/FOFBApp/Db/FOFBRtm.template
index 361b950..6319110 100644
--- a/FOFBApp/Db/FOFBRtm.template
+++ b/FOFBApp/Db/FOFBRtm.template
@@ -285,26 +285,44 @@ record(longin,"$(P)$(R)TestPIDacCntMax-RB"){
     field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_PI_OL_DAC_CNT_MAX_DATA")
 }
 
-record(longout,"$(P)$(R)TestCurrLowLim-SP"){
+record(longout,"$(P)$(R)TestLowLim-SP"){
     field(DTYP,"asynUInt32Digital")
     field(DESC,"set PI setpoint inferior limit")
     field(SCAN,"Passive")
     field(OUT,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_PI_SP_LIM_INF_DATA")
     field(PINI,"YES")
 }
-record(longin,"$(P)$(R)TestCurrLowLim-RB"){
+record(longin,"$(P)$(R)TestLowLim-RB"){
     field(DTYP,"asynUInt32Digital")
     field(DESC,"get PI setpoint inferior limit")
     field(SCAN,"I/O Intr")
     field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_PI_SP_LIM_INF_DATA")
 }
 
+record(longout,"$(S)$(RTM_CHAN)TestHighLim-SP"){
+    field(DTYP,"asynUInt32Digital")
+    field(DESC,"set PI setpoint parameter")
+    field(SCAN,"Passive")
+    field(OUT,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_PI_SP_DATA")
+    field(PINI,"YES")
+}
+
+record(longin,"$(S)$(RTM_CHAN)TestHighLim-RB"){
+    field(DTYP,"asynUInt32Digital")
+    field(DESC,"get PI setpoint parameter in ADC counts")
+    field(SCAN,"I/O Intr")
+    field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_PI_SP_DATA")
+    field(FLNK,"$(S)$(RTM_CHAN)CurrentConv2-SP CPP NMS")
+}
+
 record(ao,"$(S)$(RTM_CHAN)Current-SP"){
-  field(DESC,"set PI setpoint parameter")
-  field(PINI,"YES")
-  field(SCAN,"Passive")
-  field(PREC,"15")
-  field(FLNK,"$(S)$(RTM_CHAN)CurrentConv-SP CPP NMS")
+    field(DESC,"set PI setpoint parameter")
+    field(PINI,"YES")
+    field(SCAN,"Passive")
+    field(PREC,"15")
+    field(DRVH, "0.95")
+    field(DRVL, "-0.95")
+    field(FLNK,"$(S)$(RTM_CHAN)CurrentConv-SP CPP NMS")
 }
 record(calcout,"$(S)$(RTM_CHAN)CurrentConv-SP"){
     field(DESC,"set PI setpoint parameter in ADC counts")
@@ -320,6 +338,8 @@ record(longout,"$(S)$(RTM_CHAN)CurrentRaw-SP"){
     field(DTYP,"asynUInt32Digital")
     field(DESC,"set PI setpoint parameter")
     field(SCAN,"Passive")
+    field(DRVH, "15200")
+    field(DRVL, "-15200")
     field(OUT,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_PI_SP_DATA")
     field(PINI,"YES")
 }
@@ -347,4 +367,6 @@ record(ai,"$(S)$(RTM_CHAN)Current-RB"){
     field(DESC,"get PI setpoint parameter")
     field(SCAN,"Passive")
     field(PREC,"15")
+    field(FLINK, "$(S)$(RTM_CHAN)TestHighLim-RB CA NMS")
 }
+
diff --git a/FOFBApp/Db/FOFBRtm_settings.req b/FOFBApp/Db/FOFBRtm_settings.req
index f1a8296..e31f6cc 100644
--- a/FOFBApp/Db/FOFBRtm_settings.req
+++ b/FOFBApp/Db/FOFBRtm_settings.req
@@ -9,7 +9,8 @@ $(S)$(RTM_CHAN)DacWr-Cmd
 $(S)$(RTM_CHAN)CtrlLoopKp-SP
 $(S)$(RTM_CHAN)CtrlLoopTi-SP
 $(P)$(R)TestPIDacCntMax-SP
-$(P)$(R)TestCurrLowLim-SP
+$(P)$(R)TestLowLim-SP
+$(S)$(RTM_CHAN)TestHighLim-SP
 $(S)$(RTM_CHAN)$(GAIN)-SP
 $(S)$(RTM_CHAN)$(OFFSET)-SP
 $(S)$(RTM_CHAN)CurrentRaw-SP
diff --git a/scripts/python/all_racks_set_parameters.py b/scripts/python/all_racks_set_parameters.py
index b208cd9..46b25f5 100644
--- a/scripts/python/all_racks_set_parameters.py
+++ b/scripts/python/all_racks_set_parameters.py
@@ -40,124 +40,130 @@
 print('         # # # # # # # # # # # # # # # # # # # # # # # # # #\n')
 
 for crate_number in crates:
-	
-	# PV prefixes
-
-	prefix_fofb    = "IA-" + crate_number + "RaBPM:BS-FOFBCtrl:" 
-	
-	prefix_rtmch00 = "SI-" + crate_number + "M1:PS-FCH:"
-	prefix_rtmch01 = "SI-" + crate_number + "M1:PS-FCV:"
-	prefix_rtmch02 = "SI-" + crate_number + "M2:PS-FCH:"
-	prefix_rtmch03 = "SI-" + crate_number + "M2:PS-FCV:"
-	prefix_rtmch04 = "SI-" + crate_number + "C2:PS-FCH:"
-	prefix_rtmch05 = "SI-" + crate_number + "C2:PS-FCV:"
-	prefix_rtmch06 = "SI-" + crate_number + "C3:PS-FCH:"
-	prefix_rtmch07 = "SI-" + crate_number + "C3:PS-FCV:"
-	prefix_rtmch08 = "SI-" + crate_number + "XX:PS-FC08:"
-	prefix_rtmch09 = "SI-" + crate_number + "XX:PS-FC09:"
-	prefix_rtmch10 = "SI-" + crate_number + "XX:PS-FC10:"
-	prefix_rtmch11 = "SI-" + crate_number + "XX:PS-FC11:"
 
-	prefix_rtm = [prefix_rtmch00, prefix_rtmch01, prefix_rtmch02, prefix_rtmch03, prefix_rtmch04, prefix_rtmch05,
-		            prefix_rtmch06, prefix_rtmch07, prefix_rtmch08, prefix_rtmch09, prefix_rtmch10, prefix_rtmch11]
+  # PV prefixes
 
-	# global PVs
+  prefix_fofb    = "IA-" + crate_number + "RaBPM:BS-FOFBCtrl:" 
 
-	pv_acq_trigger_rep        = str(prefix_fofb) + str("ACQTriggerRep-Sel")
-	pv_acq_trigger_event      = str(prefix_fofb) + str("ACQTriggerEvent-Sel")
-	pv_acq_samples_pre        = str(prefix_fofb) + str("ACQSamplesPre-SP")
-	pv_current_setpoint_inf   = str(prefix_fofb) + str("TestCurrLowLim-SP")
-	pv_dac_cnt_max            = str(prefix_fofb) + str("TestPIDacCntMax-SP")
+  prefix_rtmch00 = "SI-" + crate_number + "M1:PS-FCH:"
+  prefix_rtmch01 = "SI-" + crate_number + "M1:PS-FCV:"
+  prefix_rtmch02 = "SI-" + crate_number + "M2:PS-FCH:"
+  prefix_rtmch03 = "SI-" + crate_number + "M2:PS-FCV:"
+  prefix_rtmch04 = "SI-" + crate_number + "C2:PS-FCH:"
+  prefix_rtmch05 = "SI-" + crate_number + "C2:PS-FCV:"
+  prefix_rtmch06 = "SI-" + crate_number + "C3:PS-FCH:"
+  prefix_rtmch07 = "SI-" + crate_number + "C3:PS-FCV:"
+  prefix_rtmch08 = "SI-" + crate_number + "XX:PS-FC08:"
+  prefix_rtmch09 = "SI-" + crate_number + "XX:PS-FC09:"
+  prefix_rtmch10 = "SI-" + crate_number + "XX:PS-FC10:"
+  prefix_rtmch11 = "SI-" + crate_number + "XX:PS-FC11:"
 
-	# PVs per channel
+  prefix_rtm = [prefix_rtmch00, prefix_rtmch01, prefix_rtmch02, prefix_rtmch03, prefix_rtmch04, prefix_rtmch05,
+                  prefix_rtmch06, prefix_rtmch07, prefix_rtmch08, prefix_rtmch09, prefix_rtmch10, prefix_rtmch11]
 
-	pv_current_ArrayDataRAW   = []
-	pv_current_gain           = []
-	pv_voltage_gain           = []
-	pv_current_offset         = []
-	pv_voltage_offset         = []
-	pv_current_setpoint       = []
-	pv_amp_enable             = []
-	pv_pi_enable              = []
-	pv_pi_kp                  = []
-	pv_pi_ti                  = []
+  # global PVs
 
-	# getting lists of PV names, so we can reutilize them in all tests
+  pv_acq_trigger_rep        = str(prefix_fofb) + str("ACQTriggerRep-Sel")
+  pv_acq_trigger_event      = str(prefix_fofb) + str("ACQTriggerEvent-Sel")
+  pv_acq_samples_pre        = str(prefix_fofb) + str("ACQSamplesPre-SP")
+  pv_setpoint_inf           = str(prefix_fofb) + str("TestLowLim-SP")
+  pv_dac_cnt_max            = str(prefix_fofb) + str("TestPIDacCntMax-SP")
 
-	for i in range(0, channels):
-		pv_current_ArrayDataRAW.append(str(prefix_fofb) + str("GEN_CH")     + str(i) + str("ArrayData"))
+  # PVs per channel
 
-	for pv_prefix in prefix_rtm:
-		pv_current_gain.append(        str(pv_prefix)   + str("CurrGain")   + str("-SP"))
-		pv_voltage_gain.append(        str(pv_prefix)   + str("VoltGain")   + str("-SP"))
-		pv_current_offset.append(      str(pv_prefix)   + str("CurrOffset") + str("-SP"))
-		pv_voltage_offset.append(      str(pv_prefix)   + str("VoltOffset") + str("-SP"))
-		pv_current_setpoint.append(    str(pv_prefix)   + str("Current")    + str("-SP"))
-		pv_amp_enable.append(          str(pv_prefix)   + str("PwrState")   + str("-Sel"))
-		pv_pi_enable.append(           str(pv_prefix)   + str("CtrlLoop")   + str("-Sel"))
-		pv_pi_kp.append(               str(pv_prefix)   + str("CtrlLoopKp") + str("-SP"))
-		pv_pi_ti.append(               str(pv_prefix)   + str("CtrlLoopTi") + str("-SP"))
+  pv_current_ArrayDataRAW   = []
+  pv_current_gain           = []
+  pv_voltage_gain           = []
+  pv_current_offset         = []
+  pv_voltage_offset         = []
+  pv_current_setpoint       = []
+  pv_amp_enable             = []
+  pv_pi_enable              = []
+  pv_pi_kp                  = []
+  pv_pi_ti                  = []
+  pv_square_wave_openloop   = []
+  pv_test_high_lim          = []
 
+  # getting lists of PV names, so we can reutilize them in all tests
 
-	print('\n--------------------------------------------------------------------------')
-	print('>> Set parameters for RACK', crate_number)
-	print('--------------------------------------------------------------------------\n')
+  for i in range(0, channels):
+    pv_current_ArrayDataRAW.append(str(prefix_fofb) + str("GEN_CH")     + str(i) + str("ArrayData"))
 
-	print('>>> Set initial values for gain, offset, PI Kp and PI Ti ...')
+  for pv_prefix in prefix_rtm:
+    pv_current_gain.append(        str(pv_prefix)   + str("CurrGain")   + str("-SP"))
+    pv_voltage_gain.append(        str(pv_prefix)   + str("VoltGain")   + str("-SP"))
+    pv_current_offset.append(      str(pv_prefix)   + str("CurrOffset") + str("-SP"))
+    pv_voltage_offset.append(      str(pv_prefix)   + str("VoltOffset") + str("-SP"))
+    pv_current_setpoint.append(    str(pv_prefix)   + str("Current")    + str("-SP"))
+    pv_test_high_lim.append(       str(pv_prefix)   + str("TestHighLim")+ str("-SP"))
+    pv_amp_enable.append(          str(pv_prefix)   + str("PwrState")   + str("-Sel"))
+    pv_pi_enable.append(           str(pv_prefix)   + str("CtrlLoop")   + str("-Sel"))
+    pv_pi_kp.append(               str(pv_prefix)   + str("CtrlLoopKp") + str("-SP"))
+    pv_pi_ti.append(               str(pv_prefix)   + str("CtrlLoopTi") + str("-SP"))
+    pv_square_wave_openloop.append(str(pv_prefix)   + str("TestOpenLoopSquare") + str("-Sel"))
 
-	# initializing some PVs with default values
 
-	for i in range(0, channels):
-		PV(pv_current_gain[i]).put(current_gain,     wait=True)
-		PV(pv_current_offset[i]).put(current_offset, wait=True)
-		PV(pv_voltage_gain[i]).put(voltage_gain,     wait=True)
-		PV(pv_voltage_offset[i]).put(voltage_offset, wait=True)
-		PV(pv_pi_kp[i]).put(pi_kp,                   wait=True)
-		PV(pv_pi_ti[i]).put(pi_ti,                   wait=True)
-		PV(pv_amp_enable[i]).put(0,                  wait=True)
-		PV(pv_pi_enable[i]).put(0,                   wait=True)
+  print('\n--------------------------------------------------------------------------')
+  print('>> Set parameters for RACK', crate_number)
+  print('--------------------------------------------------------------------------\n')
 
-	print('>>> Set initial values for gain, offset, PI Kp and PI Ti... Done!\n')
+  print('>>> Set initial values for gain, offset, PI Kp and PI Ti ...')
 
-	print('>>> Set the period for 10ms...')
+  # initializing some PVs with default values
 
-	PV(pv_dac_cnt_max).put(dac_cnt_max, wait=True)
+  for i in range(0, channels):
+    PV(pv_current_gain[i]).put(current_gain,     wait=True)
+    PV(pv_current_offset[i]).put(current_offset, wait=True)
+    PV(pv_voltage_gain[i]).put(voltage_gain,     wait=True)
+    PV(pv_voltage_offset[i]).put(voltage_offset, wait=True)
+    PV(pv_pi_kp[i]).put(pi_kp,                   wait=True)
+    PV(pv_pi_ti[i]).put(pi_ti,                   wait=True)
+    PV(pv_amp_enable[i]).put(0,                  wait=True)
+    PV(pv_pi_enable[i]).put(0,                   wait=True)
+    PV(pv_square_wave_openloop[i]).put(0,        wait=True)
 
-	print('>>> Set the period for 10ms... Done!\n')
+  print('>>> Set initial values for gain, offset, PI Kp and PI Ti... Done!\n')
 
-	print('>>> Set zero for the current setpoints...')
+  print('>>> Set the period for 10ms...')
 
-	for i in range(0, channels):
-		  PV(pv_current_setpoint[i]).put(0, wait=True)
-	PV(pv_current_setpoint_inf).put(0,    wait=True)
+  PV(pv_dac_cnt_max).put(dac_cnt_max, wait=True)
 
-	print('>>> Set zero for the current setpoints... Done!')
+  print('>>> Set the period for 10ms... Done!\n')
 
-	print('\n>>> New acquisition...')
+  print('>>> Set zero for the current setpoints...')
 
-	# do an acquisition and stop the event,
-	# so the array data will be the same until we do another acquisition
+  for i in range(0, channels):
+    PV(pv_current_setpoint[i]).put(0, wait=True)
+    PV(pv_test_high_lim[i]).put(0,    wait=True)
+  PV(pv_setpoint_inf).put(0,          wait=True)
 
-	PV(pv_acq_samples_pre).put(samples, wait=True)
-	PV(pv_acq_trigger_rep).put(0,       wait=True)
-	PV(pv_acq_trigger_event).put(0,     wait=True)
-	time.sleep(0.5) # just to see the waveform change in graphical interface
-	PV(pv_acq_trigger_event).put(1,     wait=True)
+  print('>>> Set zero for the current setpoints... Done!')
 
-	print('>>> New acquisition... Done!')
+  print('\n>>> New acquisition...')
 
-	new_offset = np.zeros(channels)
-	for i in range(0, channels):
-		new_offset[i] = int(np.mean(PV(pv_current_ArrayDataRAW[i]).get()))
+  # do an acquisition and stop the event,
+  # so the array data will be the same until we do another acquisition
 
-	print('\n>> New current offset values: \n', new_offset)
+  PV(pv_acq_samples_pre).put(samples, wait=True)
+  PV(pv_acq_trigger_rep).put(0,       wait=True)
+  PV(pv_acq_trigger_event).put(0,     wait=True)
+  time.sleep(0.5) # just to see the waveform change in graphical interface
+  PV(pv_acq_trigger_event).put(1,     wait=True)
 
-	print('\n>>> Set the new current offset for all channels...')
+  print('>>> New acquisition... Done!')
 
-	for i in range(0, channels):
-		PV(pv_current_offset[i]).put(new_offset[i])
+  new_offset = np.zeros(channels)
+  for i in range(0, channels):
+    new_offset[i] = int(np.mean(PV(pv_current_ArrayDataRAW[i]).get()))
 
-	print('>>> Set the new current offset for all channels... Done!')
+  print('\n>> New current offset values: \n', new_offset)
+
+  print('\n>>> Set the new current offset for all channels...')
+
+  for i in range(0, channels):
+    PV(pv_current_offset[i]).put(new_offset[i])
+
+  print('>>> Set the new current offset for all channels... Done!')
 
 print('\n--------------------------------------------------------------------------')
 print('----------------------------------- END ----------------------------------')
diff --git a/scripts/python/all_racks_test_open_loop.py b/scripts/python/all_racks_test_open_loop.py
index 61e3391..fd23c12 100644
--- a/scripts/python/all_racks_test_open_loop.py
+++ b/scripts/python/all_racks_test_open_loop.py
@@ -83,7 +83,7 @@
   pv_acq_trigger_rep        = str(prefix_fofb) + str("ACQTriggerRep-Sel")
   pv_acq_trigger_event      = str(prefix_fofb) + str("ACQTriggerEvent-Sel")
   pv_acq_samples_pre        = str(prefix_fofb) + str("ACQSamplesPre-SP")
-  pv_current_setpoint_inf   = str(prefix_fofb) + str("TestCurrLowLim-SP")
+  pv_current_setpoint_inf   = str(prefix_fofb) + str("TestLowLim-SP")
   pv_dac_cnt_max            = str(prefix_fofb) + str("TestPIDacCntMax-SP")
   pv_dac_data_wb            = str(prefix_fofb) + str("DacDataSrc-Sel")
 
@@ -117,7 +117,7 @@
     pv_voltage_gain.append(        str(pv_prefix) + str("VoltGain")   + str("-SP"))
     pv_current_offset.append(      str(pv_prefix) + str("CurrOffset") + str("-SP"))
     pv_voltage_offset.append(      str(pv_prefix) + str("VoltOffset") + str("-SP"))
-    pv_current_setpoint.append(    str(pv_prefix) + str("CurrentRaw") + str("-SP"))
+    pv_current_setpoint.append(    str(pv_prefix) + str("TestHighLim")+ str("-SP"))
     pv_amp_enable.append(          str(pv_prefix) + str("PwrState")   + str("-Sel"))
     pv_pi_enable.append(           str(pv_prefix) + str("CtrlLoop")   + str("-Sel"))
     pv_pi_kp.append(               str(pv_prefix) + str("CtrlLoopKp") + str("-SP"))
diff --git a/scripts/python/fofb_gui.ui b/scripts/python/fofb_gui.ui
index c311df4..11b1ee7 100644
--- a/scripts/python/fofb_gui.ui
+++ b/scripts/python/fofb_gui.ui
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>dialog</class>
  <widget class="QDialog" name="dialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -87,37 +90,20 @@
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
-        <item row="22" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_17">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CtrlLoopTi-RB</string>
-          </property>
-         </widget>
-        </item>
-        <item row="17" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_53">
+        <item row="15" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_28">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:TestClosedLoopSquare-Sel</string>
-          </property>
-         </widget>
-        </item>
-        <item row="27" column="0">
-         <widget class="QLabel" name="label_223">
-          <property name="text">
-           <string>VoltGain:</string>
+           <string>SI-${CRATE}M1:PS-FCH:TestOpenLoopTriang-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="0">
-         <widget class="QLabel" name="label_16">
+        <item row="26" column="0">
+         <widget class="QLabel" name="label_221">
           <property name="text">
-           <string>TestOpenLoopTriang:</string>
+           <string>CurrGain:</string>
           </property>
          </widget>
         </item>
@@ -128,100 +114,103 @@
           </property>
          </widget>
         </item>
-        <item row="25" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_116">
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_13">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CurrGain-SP</string>
+           <string>SI-${CRATE}M1:PS-FCH:VoltGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="0">
-         <widget class="QLabel" name="label_17">
+        <item row="27" column="0">
+         <widget class="QLabel" name="label_222">
           <property name="text">
-           <string>TestOpenLoopSquare:</string>
+           <string>CurrOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_58">
+        <item row="19" column="1" colspan="2">
+         <widget class="PyDMPushButton" name="PyDMPushButton">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="precision" stdset="0">
-           <number>0</number>
-          </property>
-          <property name="precisionFromPV" stdset="0">
-           <bool>true</bool>
+          <property name="text">
+           <string>press to pulse</string>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:Current-RB</string>
+           <string>SI-${CRATE}M1:PS-FCH:DacWr-Cmd</string>
+          </property>
+          <property name="pressValue" stdset="0">
+           <string>1</string>
+          </property>
+          <property name="releaseValue" stdset="0">
+           <string>0</string>
+          </property>
+          <property name="writeWhenRelease" stdset="0">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="27" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_118">
+        <item row="17" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_53">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:VoltGain-SP</string>
+           <string>SI-${CRATE}M1:PS-FCH:TestClosedLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_65">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CtrlLoop-Sel</string>
+        <item row="22" column="0">
+         <widget class="QLabel" name="label_22">
+          <property name="text">
+           <string>CtrlLoopTi:</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_22">
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_21">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:TestClosedLoopSquare-Sts</string>
+           <string>SI-${CRATE}M1:PS-FCH:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_41">
+        <item row="29" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_14">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:TestOpenLoopSquare-Sel</string>
+           <string>SI-${CRATE}M1:PS-FCH:VoltOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_23">
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_24">
+          <property name="text">
+           <string>TestClosedLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="27" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_117">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:TestOpenLoopSquare-Sts</string>
-          </property>
-         </widget>
-        </item>
-        <item row="28" column="0">
-         <widget class="QLabel" name="label_224">
-          <property name="text">
-           <string>VoltOffset:</string>
+           <string>SI-${CRATE}M1:PS-FCH:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_15">
+        <item row="18" column="0">
+         <widget class="QLabel" name="label_25">
           <property name="text">
-           <string>PwrState:</string>
+           <string>CtrlLoop:</string>
           </property>
          </widget>
         </item>
@@ -235,268 +224,309 @@
           </property>
          </widget>
         </item>
-        <item row="18" column="0">
-         <widget class="QLabel" name="label_25">
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_15">
           <property name="text">
-           <string>CtrlLoop:</string>
+           <string>PwrState:</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_119">
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_19">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:VoltOffset-SP</string>
+           <string>SI-${CRATE}M1:PS-FCH:TestHighLim-SP</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_14">
+        <item row="15" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_40">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:VoltOffset-RB</string>
+           <string>SI-${CRATE}M1:PS-FCH:TestOpenLoopTriang-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_20">
+        <item row="22" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_17">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:DacData-RB</string>
-          </property>
-         </widget>
-        </item>
-        <item row="26" column="0">
-         <widget class="QLabel" name="label_222">
-          <property name="text">
-           <string>CurrOffset:</string>
+           <string>SI-${CRATE}M1:PS-FCH:CtrlLoopTi-RB</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_15">
+        <item row="23" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_16">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:PwrState-Sts</string>
+           <string>SI-${CRATE}M1:PS-FCH:TestHighLim-RB</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_12">
+        <item row="26" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_116">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CurrOffset-RB</string>
+           <string>SI-${CRATE}M1:PS-FCH:CurrGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_19">
+        <item row="21" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_18">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CurrentRaw-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_380">
-          <property name="text">
-           <string>Current:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="22" column="0">
-         <widget class="QLabel" name="label_22">
-          <property name="text">
-           <string>CtrlLoopTi:</string>
+           <string>SI-${CRATE}M1:PS-FCH:CtrlLoopKp-RB</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_21">
+        <item row="21" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_21">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}M1:PS-FCH:CtrlLoopKp-SP</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="0">
-         <widget class="QLabel" name="label_18">
+        <item row="28" column="0">
+         <widget class="QLabel" name="label_223">
           <property name="text">
-           <string>CurrentRaw:</string>
+           <string>VoltGain:</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_23">
-          <property name="text">
-           <string>CtrlLoopKp:</string>
+        <item row="17" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_22">
+          <property name="toolTip">
+           <string/>
           </property>
-         </widget>
-        </item>
-        <item row="25" column="0">
-         <widget class="QLabel" name="label_221">
-          <property name="text">
-           <string>CurrGain:</string>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M1:PS-FCH:TestClosedLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_28">
+        <item row="25" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_58">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="precision" stdset="0">
+           <number>0</number>
+          </property>
+          <property name="precisionFromPV" stdset="0">
+           <bool>true</bool>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:TestOpenLoopTriang-Sts</string>
+           <string>SI-${CRATE}M1:PS-FCH:Current-RB</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_117">
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_28">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CurrOffset-SP</string>
+           <string>SI-${CRATE}M1:PS-FCH:PwrState-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_18">
+        <item row="16" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_41">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CtrlLoopKp-RB</string>
+           <string>SI-${CRATE}M1:PS-FCH:TestOpenLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_20">
+        <item row="29" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_119">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CtrlLoopTi-SP</string>
+           <string>SI-${CRATE}M1:PS-FCH:VoltOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_40">
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_65">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:TestOpenLoopTriang-Sel</string>
+           <string>SI-${CRATE}M1:PS-FCH:CtrlLoop-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="0">
-         <widget class="QLabel" name="label_26">
+        <item row="25" column="0">
+         <widget class="QLabel" name="label_380">
           <property name="text">
-           <string>DacData:</string>
+           <string>Current:</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_16">
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_12">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CurrentRaw-RB</string>
+           <string>SI-${CRATE}M1:PS-FCH:CurrOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_13">
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_18">
+          <property name="text">
+           <string>TestHighLim:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="22" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_20">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:VoltGain-RB</string>
+           <string>SI-${CRATE}M1:PS-FCH:CtrlLoopTi-SP</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_218">
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_23">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:Current-SP</string>
+           <string>SI-${CRATE}M1:PS-FCH:TestOpenLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_21">
+        <item row="15" column="0">
+         <widget class="QLabel" name="label_16">
+          <property name="text">
+           <string>TestOpenLoopTriang:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_23">
+          <property name="text">
+           <string>CtrlLoopKp:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="20" column="0">
+         <widget class="QLabel" name="label_26">
+          <property name="text">
+           <string>DacData:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="14" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_15">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CtrlLoopKp-SP</string>
+           <string>SI-${CRATE}M1:PS-FCH:PwrState-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_11">
+        <item row="29" column="0">
+         <widget class="QLabel" name="label_224">
+          <property name="text">
+           <string>VoltOffset:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="25" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_218">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:CurrGain-RB</string>
+           <string>SI-${CRATE}M1:PS-FCH:Current-SP</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_24">
+        <item row="20" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_20">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M1:PS-FCH:DacData-RB</string>
+          </property>
+         </widget>
+        </item>
+        <item row="16" column="0">
+         <widget class="QLabel" name="label_17">
           <property name="text">
-           <string>TestClosedLoopSquare:</string>
+           <string>TestOpenLoopSquare:</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_28">
+        <item row="26" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_11">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:PwrState-Sel</string>
+           <string>SI-${CRATE}M1:PS-FCH:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="1" colspan="2">
-         <widget class="PyDMPushButton" name="PyDMPushButton">
+        <item row="28" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_118">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M1:PS-FCH:VoltGain-SP</string>
+          </property>
+         </widget>
+        </item>
+        <item row="24" column="0">
+         <widget class="QLabel" name="label_2">
           <property name="text">
-           <string>press to pulse</string>
+           <string>CurrentRaw:</string>
           </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCH:DacWr-Cmd</string>
+         </widget>
+        </item>
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_19">
+          <property name="toolTip">
+           <string/>
           </property>
-          <property name="pressValue" stdset="0">
-           <string>1</string>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M1:PS-FCH:CurrentRaw-RB</string>
           </property>
-          <property name="releaseValue" stdset="0">
-           <string>0</string>
+         </widget>
+        </item>
+        <item row="24" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_22">
+          <property name="toolTip">
+           <string/>
           </property>
-          <property name="writeWhenRelease" stdset="0">
-           <bool>true</bool>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M1:PS-FCH:CurrentRaw-SP</string>
           </property>
          </widget>
         </item>
@@ -517,27 +547,27 @@
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_5">
-        <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_51">
+        <item row="21" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_55">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CurrentRaw-RB</string>
+           <string>SI-${CRATE}M1:PS-FCV:CtrlLoopKp-RB</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_57">
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_54">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:TestClosedLoopSquare-Sel</string>
+           <string>SI-${CRATE}M1:PS-FCV:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
+        <item row="29" column="1">
          <widget class="PyDMLabel" name="PyDMLabel_335">
           <property name="toolTip">
            <string/>
@@ -547,157 +577,119 @@
           </property>
          </widget>
         </item>
-        <item row="20" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_46">
+        <item row="17" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_57">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:DacData-SP</string>
+           <string>SI-${CRATE}M1:PS-FCV:TestClosedLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_333">
+        <item row="16" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_44">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CurrOffset-RB</string>
-          </property>
-         </widget>
-        </item>
-        <item row="16" column="0">
-         <widget class="QLabel" name="label_54">
-          <property name="text">
-           <string>TestOpenLoopSquare:</string>
+           <string>SI-${CRATE}M1:PS-FCV:TestOpenLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_27">
+        <item row="15" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_39">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:PwrState-Sel</string>
+           <string>SI-${CRATE}M1:PS-FCV:TestOpenLoopTriang-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_152">
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_51">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CurrGain-SP</string>
+           <string>SI-${CRATE}M1:PS-FCV:CurrentRaw-RB</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_153">
+        <item row="19" column="1" colspan="2">
+         <widget class="PyDMPushButton" name="PyDMPushButton_7">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CurrOffset-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="22" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_48">
-          <property name="toolTip">
-           <string/>
+          <property name="text">
+           <string>press to pulse</string>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CtrlLoopTi-RB</string>
+           <string>SI-${CRATE}M1:PS-FCV:DacWr-Cmd</string>
           </property>
-         </widget>
-        </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_56">
-          <property name="text">
-           <string>PwrState:</string>
+          <property name="pressValue" stdset="0">
+           <string>1</string>
           </property>
-         </widget>
-        </item>
-        <item row="21" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_41">
-          <property name="toolTip">
-           <string/>
+          <property name="releaseValue" stdset="0">
+           <string>0</string>
           </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CtrlLoopKp-SP</string>
+          <property name="writeWhenRelease" stdset="0">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="23" column="0">
-         <widget class="QLabel" name="label_48">
+        <item row="22" column="0">
+         <widget class="QLabel" name="label_53">
           <property name="text">
-           <string>CurrentRaw:</string>
+           <string>CtrlLoopTi:</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_52">
+        <item row="26" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_332">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:TestOpenLoopSquare-Sts</string>
+           <string>SI-${CRATE}M1:PS-FCV:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_44">
+        <item row="25" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_125">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:TestOpenLoopSquare-Sel</string>
-          </property>
-         </widget>
-        </item>
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_49">
-          <property name="text">
-           <string>CtrlLoopKp:</string>
+           <string>SI-${CRATE}M1:PS-FCV:Current-SP</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_154">
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_27">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:VoltGain-SP</string>
+           <string>SI-${CRATE}M1:PS-FCV:PwrState-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_57">
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_334">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="precision" stdset="0">
-           <number>0</number>
-          </property>
-          <property name="precisionFromPV" stdset="0">
-           <bool>true</bool>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:Current-RB</string>
+           <string>SI-${CRATE}M1:PS-FCV:VoltGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_56">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:TestClosedLoopSquare-Sts</string>
+        <item row="28" column="0">
+         <widget class="QLabel" name="label_235">
+          <property name="text">
+           <string>VoltGain:</string>
           </property>
          </widget>
         </item>
@@ -711,23 +703,34 @@
           </property>
          </widget>
         </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_74">
-          <property name="toolTip">
-           <string/>
+        <item row="26" column="0">
+         <widget class="QLabel" name="label_233">
+          <property name="text">
+           <string>CurrGain:</string>
           </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CtrlLoop-Sel</string>
+         </widget>
+        </item>
+        <item row="20" column="0">
+         <widget class="QLabel" name="label_51">
+          <property name="text">
+           <string>DacData:</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_332">
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_49">
+          <property name="text">
+           <string>CtrlLoopKp:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_52">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CurrGain-RB</string>
+           <string>SI-${CRATE}M1:PS-FCV:TestOpenLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
@@ -738,129 +741,144 @@
           </property>
          </widget>
         </item>
-        <item row="21" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_55">
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_55">
+          <property name="text">
+           <string>TestClosedLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="21" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_41">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CtrlLoopKp-RB</string>
+           <string>SI-${CRATE}M1:PS-FCV:CtrlLoopKp-SP</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_125">
+        <item row="20" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_46">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:Current-SP</string>
+           <string>SI-${CRATE}M1:PS-FCV:DacData-SP</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_55">
+        <item row="19" column="0">
+         <widget class="QLabel" name="label_47">
           <property name="text">
-           <string>TestClosedLoopSquare:</string>
+           <string>DacWr:</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_40">
+        <item row="14" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_47">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CtrlLoopTi-SP</string>
+           <string>SI-${CRATE}M1:PS-FCV:PwrState-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_334">
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_74">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:VoltGain-RB</string>
+           <string>SI-${CRATE}M1:PS-FCV:CtrlLoop-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_54">
+        <item row="16" column="0">
+         <widget class="QLabel" name="label_54">
+          <property name="text">
+           <string>TestOpenLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="26" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_152">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}M1:PS-FCV:CurrGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="0">
-         <widget class="QLabel" name="label_234">
-          <property name="text">
-           <string>CurrOffset:</string>
+        <item row="27" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_153">
+          <property name="toolTip">
+           <string/>
           </property>
-         </widget>
-        </item>
-        <item row="20" column="0">
-         <widget class="QLabel" name="label_51">
-          <property name="text">
-           <string>DacData:</string>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M1:PS-FCV:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_47">
+        <item row="24" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_45">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:PwrState-Sts</string>
+           <string>SI-${CRATE}M1:PS-FCV:CurrentRaw-SP</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_49">
+        <item row="22" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_48">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:TestOpenLoopTriang-Sts</string>
+           <string>SI-${CRATE}M1:PS-FCV:CtrlLoopTi-RB</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="0">
-         <widget class="QLabel" name="label_53">
-          <property name="text">
-           <string>CtrlLoopTi:</string>
+        <item row="22" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_40">
+          <property name="toolTip">
+           <string/>
           </property>
-         </widget>
-        </item>
-        <item row="18" column="0">
-         <widget class="QLabel" name="label_52">
-          <property name="text">
-           <string>CtrlLoop:</string>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M1:PS-FCV:CtrlLoopTi-SP</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_225">
-          <property name="text">
-           <string>Current:</string>
+        <item row="25" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_57">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="precision" stdset="0">
+           <number>0</number>
+          </property>
+          <property name="precisionFromPV" stdset="0">
+           <bool>true</bool>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M1:PS-FCV:Current-RB</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_39">
+        <item row="17" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_56">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:TestOpenLoopTriang-Sel</string>
+           <string>SI-${CRATE}M1:PS-FCV:TestClosedLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="2">
+        <item row="29" column="2">
          <widget class="PyDMLineEdit" name="PyDMLineEdit_155">
           <property name="toolTip">
            <string/>
@@ -870,63 +888,102 @@
           </property>
          </widget>
         </item>
-        <item row="28" column="0">
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_56">
+          <property name="text">
+           <string>PwrState:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_333">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M1:PS-FCV:CurrOffset-RB</string>
+          </property>
+         </widget>
+        </item>
+        <item row="29" column="0">
          <widget class="QLabel" name="label_236">
           <property name="text">
            <string>VoltOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="0">
-         <widget class="QLabel" name="label_47">
+        <item row="18" column="0">
+         <widget class="QLabel" name="label_52">
           <property name="text">
-           <string>DacWr:</string>
+           <string>CtrlLoop:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="24" column="0">
+         <widget class="QLabel" name="label_48">
+          <property name="text">
+           <string>CurrentRaw:</string>
           </property>
          </widget>
         </item>
         <item row="25" column="0">
-         <widget class="QLabel" name="label_233">
+         <widget class="QLabel" name="label_225">
           <property name="text">
-           <string>CurrGain:</string>
+           <string>Current:</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_45">
+        <item row="15" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_49">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:CurrentRaw-SP</string>
+           <string>SI-${CRATE}M1:PS-FCV:TestOpenLoopTriang-Sts</string>
           </property>
          </widget>
         </item>
         <item row="27" column="0">
-         <widget class="QLabel" name="label_235">
+         <widget class="QLabel" name="label_234">
           <property name="text">
-           <string>VoltGain:</string>
+           <string>CurrOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="1" colspan="2">
-         <widget class="PyDMPushButton" name="PyDMPushButton_7">
+        <item row="28" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_154">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="text">
-           <string>press to pulse</string>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M1:PS-FCV:VoltGain-SP</string>
+          </property>
+         </widget>
+        </item>
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_43">
+          <property name="toolTip">
+           <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M1:PS-FCV:DacWr-Cmd</string>
+           <string>SI-${CRATE}M1:PS-FCV:TestHighLim-SP</string>
           </property>
-          <property name="pressValue" stdset="0">
-           <string>1</string>
+         </widget>
+        </item>
+        <item row="23" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_24">
+          <property name="toolTip">
+           <string/>
           </property>
-          <property name="releaseValue" stdset="0">
-           <string>0</string>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M1:PS-FCV:TestHighLim-RB</string>
           </property>
-          <property name="writeWhenRelease" stdset="0">
-           <bool>true</bool>
+         </widget>
+        </item>
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_19">
+          <property name="text">
+           <string>TestHighLim:</string>
           </property>
          </widget>
         </item>
@@ -947,84 +1004,90 @@
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_4">
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_39">
+        <item row="25" column="0">
+         <widget class="QLabel" name="label_383">
           <property name="text">
-           <string>CtrlLoopKp:</string>
+           <string>Current:</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_181">
+        <item row="27" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_139">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CurrGain-RB</string>
+           <string>SI-${CRATE}M2:PS-FCH:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_38">
+        <item row="21" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_45">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CtrlLoopTi-RB</string>
+           <string>SI-${CRATE}M2:PS-FCH:CtrlLoopKp-RB</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="0">
-         <widget class="QLabel" name="label_42">
-          <property name="text">
-           <string>CtrlLoop:</string>
+        <item row="25" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_60">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="precision" stdset="0">
+           <number>0</number>
+          </property>
+          <property name="precisionFromPV" stdset="0">
+           <bool>true</bool>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M2:PS-FCH:Current-RB</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_45">
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_42">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CtrlLoopKp-RB</string>
+           <string>SI-${CRATE}M2:PS-FCH:TestOpenLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="0">
-         <widget class="QLabel" name="label_231">
-          <property name="text">
-           <string>VoltGain:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="24" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_217">
+        <item row="29" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_184">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:Current-SP</string>
+           <string>SI-${CRATE}M2:PS-FCH:VoltOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_41">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CurrentRaw-RB</string>
+        <item row="29" column="0">
+         <widget class="QLabel" name="label_232">
+          <property name="text">
+           <string>VoltOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_47">
+        <item row="15" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_39">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:TestOpenLoopSquare-Sel</string>
+           <string>SI-${CRATE}M2:PS-FCH:TestOpenLoopTriang-Sts</string>
+          </property>
+         </widget>
+        </item>
+        <item row="22" column="0">
+         <widget class="QLabel" name="label_43">
+          <property name="text">
+           <string>CtrlLoopTi:</string>
           </property>
          </widget>
         </item>
@@ -1035,171 +1098,143 @@
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_183">
-          <property name="toolTip">
-           <string/>
+        <item row="26" column="0">
+         <widget class="QLabel" name="label_229">
+          <property name="text">
+           <string>CurrGain:</string>
           </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:VoltGain-RB</string>
+         </widget>
+        </item>
+        <item row="19" column="0">
+         <widget class="QLabel" name="label_37">
+          <property name="text">
+           <string>DacWr:</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="0">
-         <widget class="QLabel" name="label_41">
+        <item row="15" column="0">
+         <widget class="QLabel" name="label_40">
           <property name="text">
-           <string>DacData:</string>
+           <string>TestOpenLoopTriang:</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_46">
+        <item row="26" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_137">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:TestClosedLoopSquare-Sts</string>
+           <string>SI-${CRATE}M2:PS-FCH:CurrGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_184">
+        <item row="24" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_35">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:VoltOffset-RB</string>
+           <string>SI-${CRATE}M2:PS-FCH:CurrentRaw-SP</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_42">
+        <item row="21" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_30">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:TestOpenLoopSquare-Sts</string>
+           <string>SI-${CRATE}M2:PS-FCH:CtrlLoopKp-SP</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_37">
+        <item row="22" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_29">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:PwrState-Sts</string>
+           <string>SI-${CRATE}M2:PS-FCH:CtrlLoopTi-SP</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_43">
+        <item row="15" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_38">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:DacData-RB</string>
-          </property>
-         </widget>
-        </item>
-        <item row="28" column="0">
-         <widget class="QLabel" name="label_232">
-          <property name="text">
-           <string>VoltOffset:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="25" column="0">
-         <widget class="QLabel" name="label_229">
-          <property name="text">
-           <string>CurrGain:</string>
+           <string>SI-${CRATE}M2:PS-FCH:TestOpenLoopTriang-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_39">
+        <item row="20" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_43">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:TestOpenLoopTriang-Sts</string>
+           <string>SI-${CRATE}M2:PS-FCH:DacData-RB</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_182">
+        <item row="17" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_46">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CurrOffset-RB</string>
+           <string>SI-${CRATE}M2:PS-FCH:TestClosedLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_147">
+        <item row="29" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_151">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:VoltGain-SP</string>
+           <string>SI-${CRATE}M2:PS-FCH:VoltOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_60">
+        <item row="19" column="1" colspan="2">
+         <widget class="PyDMPushButton" name="PyDMPushButton_6">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="precision" stdset="0">
-           <number>0</number>
-          </property>
-          <property name="precisionFromPV" stdset="0">
-           <bool>true</bool>
+          <property name="text">
+           <string>press to pulse</string>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:Current-RB</string>
+           <string>SI-${CRATE}M2:PS-FCH:DacWr-Cmd</string>
           </property>
-         </widget>
-        </item>
-        <item row="23" column="0">
-         <widget class="QLabel" name="label_38">
-          <property name="text">
-           <string>CurrentRaw:</string>
+          <property name="pressValue" stdset="0">
+           <string>1</string>
           </property>
-         </widget>
-        </item>
-        <item row="25" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_137">
-          <property name="toolTip">
-           <string/>
+          <property name="releaseValue" stdset="0">
+           <string>0</string>
           </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CurrGain-SP</string>
+          <property name="writeWhenRelease" stdset="0">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_26">
+        <item row="26" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_181">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:PwrState-Sel</string>
-          </property>
-         </widget>
-        </item>
-        <item row="26" column="0">
-         <widget class="QLabel" name="label_230">
-          <property name="text">
-           <string>CurrOffset:</string>
+           <string>SI-${CRATE}M2:PS-FCH:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="0">
-         <widget class="QLabel" name="label_37">
+        <item row="20" column="0">
+         <widget class="QLabel" name="label_41">
           <property name="text">
-           <string>DacWr:</string>
+           <string>DacData:</string>
           </property>
          </widget>
         </item>
@@ -1213,118 +1248,94 @@
           </property>
          </widget>
         </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_383">
-          <property name="text">
-           <string>Current:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_72">
+        <item row="14" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_37">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CtrlLoop-Sel</string>
+           <string>SI-${CRATE}M2:PS-FCH:PwrState-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="0">
-         <widget class="QLabel" name="label_43">
+        <item row="28" column="0">
+         <widget class="QLabel" name="label_231">
           <property name="text">
-           <string>CtrlLoopTi:</string>
+           <string>VoltGain:</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_151">
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_44">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:VoltOffset-SP</string>
+           <string>SI-${CRATE}M2:PS-FCH:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_29">
+        <item row="16" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_47">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CtrlLoopTi-SP</string>
+           <string>SI-${CRATE}M2:PS-FCH:TestOpenLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_38">
+        <item row="22" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_38">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:TestOpenLoopTriang-Sel</string>
+           <string>SI-${CRATE}M2:PS-FCH:CtrlLoopTi-RB</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_30">
+        <item row="25" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_217">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CtrlLoopKp-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="15" column="0">
-         <widget class="QLabel" name="label_40">
-          <property name="text">
-           <string>TestOpenLoopTriang:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_45">
-          <property name="text">
-           <string>TestClosedLoopSquare:</string>
+           <string>SI-${CRATE}M2:PS-FCH:Current-SP</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_44">
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_182">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}M2:PS-FCH:CurrOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_139">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CurrOffset-SP</string>
+        <item row="24" column="0">
+         <widget class="QLabel" name="label_38">
+          <property name="text">
+           <string>CurrentRaw:</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_35">
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_183">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:CurrentRaw-SP</string>
+           <string>SI-${CRATE}M2:PS-FCH:VoltGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="0">
-         <widget class="QLabel" name="label_44">
+        <item row="18" column="0">
+         <widget class="QLabel" name="label_42">
           <property name="text">
-           <string>TestOpenLoopSquare:</string>
+           <string>CtrlLoop:</string>
           </property>
          </widget>
         </item>
@@ -1338,25 +1349,98 @@
           </property>
          </widget>
         </item>
-        <item row="19" column="1" colspan="2">
-         <widget class="PyDMPushButton" name="PyDMPushButton_6">
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_39">
+          <property name="text">
+           <string>CtrlLoopKp:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_26">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M2:PS-FCH:PwrState-Sel</string>
+          </property>
+         </widget>
+        </item>
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_41">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M2:PS-FCH:CurrentRaw-RB</string>
+          </property>
+         </widget>
+        </item>
+        <item row="16" column="0">
+         <widget class="QLabel" name="label_44">
           <property name="text">
-           <string>press to pulse</string>
+           <string>TestOpenLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="27" column="0">
+         <widget class="QLabel" name="label_230">
+          <property name="text">
+           <string>CurrOffset:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="28" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_147">
+          <property name="toolTip">
+           <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCH:DacWr-Cmd</string>
+           <string>SI-${CRATE}M2:PS-FCH:VoltGain-SP</string>
           </property>
-          <property name="pressValue" stdset="0">
-           <string>1</string>
+         </widget>
+        </item>
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_72">
+          <property name="toolTip">
+           <string/>
           </property>
-          <property name="releaseValue" stdset="0">
-           <string>0</string>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M2:PS-FCH:CtrlLoop-Sel</string>
           </property>
-          <property name="writeWhenRelease" stdset="0">
-           <bool>true</bool>
+         </widget>
+        </item>
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_45">
+          <property name="text">
+           <string>TestClosedLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_42">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M2:PS-FCH:TestHighLim-SP</string>
+          </property>
+         </widget>
+        </item>
+        <item row="23" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_25">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M2:PS-FCH:TestHighLim-RB</string>
+          </property>
+         </widget>
+        </item>
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_226">
+          <property name="text">
+           <string>TestHighLim:</string>
           </property>
          </widget>
         </item>
@@ -1377,135 +1461,156 @@
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_6">
-        <item row="17" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_70">
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_72">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:TestClosedLoopSquare-Sts</string>
+           <string>SI-${CRATE}M2:PS-FCV:CurrOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="0">
+        <item row="27" column="0">
          <widget class="QLabel" name="label_238">
           <property name="text">
            <string>CurrOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="0">
-         <widget class="QLabel" name="label_58">
+        <item row="29" column="0">
+         <widget class="QLabel" name="label_240">
           <property name="text">
-           <string>CurrentRaw:</string>
+           <string>VoltOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_46">
+        <item row="22" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_50">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:TestOpenLoopSquare-Sel</string>
+           <string>SI-${CRATE}M2:PS-FCV:CtrlLoopTi-SP</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_72">
+        <item row="15" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_63">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:CurrOffset-RB</string>
+           <string>SI-${CRATE}M2:PS-FCV:TestOpenLoopTriang-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_55">
+        <item row="26" column="0">
+         <widget class="QLabel" name="label_237">
+          <property name="text">
+           <string>CurrGain:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="16" column="0">
+         <widget class="QLabel" name="label_64">
+          <property name="text">
+           <string>TestOpenLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="15" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_37">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:CurrentRaw-SP</string>
+           <string>SI-${CRATE}M2:PS-FCV:TestOpenLoopTriang-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_69">
+        <item row="21" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_51">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:CtrlLoopKp-RB</string>
+           <string>SI-${CRATE}M2:PS-FCV:CtrlLoopKp-SP</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_156">
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_66">
+          <property name="text">
+           <string>PwrState:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_66">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:CurrGain-SP</string>
+           <string>SI-${CRATE}M2:PS-FCV:TestOpenLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_216">
+        <item row="17" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_54">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:Current-SP</string>
+           <string>SI-${CRATE}M2:PS-FCV:TestClosedLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="0">
-         <widget class="QLabel" name="label_240">
-          <property name="text">
-           <string>VoltOffset:</string>
+        <item row="24" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_55">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M2:PS-FCV:CurrentRaw-SP</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="0">
-         <widget class="QLabel" name="label_64">
+        <item row="18" column="0">
+         <widget class="QLabel" name="label_62">
           <property name="text">
-           <string>TestOpenLoopSquare:</string>
+           <string>CtrlLoop:</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="0">
-         <widget class="QLabel" name="label_61">
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_65">
           <property name="text">
-           <string>DacData:</string>
+           <string>TestClosedLoopSquare:</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_50">
+        <item row="26" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_156">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:CtrlLoopTi-SP</string>
+           <string>SI-${CRATE}M2:PS-FCV:CurrGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_66">
+        <item row="28" column="0">
+         <widget class="QLabel" name="label_239">
           <property name="text">
-           <string>PwrState:</string>
+           <string>VoltGain:</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_74">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:VoltOffset-RB</string>
+        <item row="22" column="0">
+         <widget class="QLabel" name="label_63">
+          <property name="text">
+           <string>CtrlLoopTi:</string>
           </property>
          </widget>
         </item>
@@ -1516,27 +1621,34 @@
           </property>
          </widget>
         </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_157">
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_68">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:CurrOffset-SP</string>
+           <string>SI-${CRATE}M2:PS-FCV:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_63">
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_59">
+          <property name="text">
+           <string>CtrlLoopKp:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="17" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_70">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:TestOpenLoopTriang-Sts</string>
+           <string>SI-${CRATE}M2:PS-FCV:TestClosedLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="2">
+        <item row="28" column="2">
          <widget class="PyDMLineEdit" name="PyDMLineEdit_158">
           <property name="toolTip">
            <string/>
@@ -1546,47 +1658,47 @@
           </property>
          </widget>
         </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_71">
+        <item row="29" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_74">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:CtrlLoop-Sel</string>
+           <string>SI-${CRATE}M2:PS-FCV:VoltOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="0">
-         <widget class="QLabel" name="label_239">
+        <item row="24" column="0">
+         <widget class="QLabel" name="label_58">
           <property name="text">
-           <string>VoltGain:</string>
+           <string>CurrentRaw:</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="0">
-         <widget class="QLabel" name="label_62">
+        <item row="20" column="0">
+         <widget class="QLabel" name="label_61">
           <property name="text">
-           <string>CtrlLoop:</string>
+           <string>DacData:</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_65">
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_25">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:CurrentRaw-RB</string>
+           <string>SI-${CRATE}M2:PS-FCV:PwrState-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_37">
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_73">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:TestOpenLoopTriang-Sel</string>
+           <string>SI-${CRATE}M2:PS-FCV:VoltGain-RB</string>
           </property>
          </widget>
         </item>
@@ -1600,23 +1712,40 @@
           </property>
          </widget>
         </item>
-        <item row="21" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_51">
-          <property name="toolTip">
-           <string/>
-          </property>
+        <item row="25" column="0">
+         <widget class="QLabel" name="label_382">
+          <property name="text">
+           <string>Current:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_71">
+          <property name="toolTip">
+           <string/>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:CtrlLoopKp-SP</string>
+           <string>SI-${CRATE}M2:PS-FCV:CtrlLoop-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_71">
+        <item row="16" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_46">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:CurrGain-RB</string>
+           <string>SI-${CRATE}M2:PS-FCV:TestOpenLoopSquare-Sel</string>
+          </property>
+         </widget>
+        </item>
+        <item row="27" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_157">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M2:PS-FCV:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
@@ -1630,51 +1759,59 @@
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_68">
+        <item row="19" column="1" colspan="2">
+         <widget class="PyDMPushButton" name="PyDMPushButton_5">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="text">
+           <string>press to pulse</string>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}M2:PS-FCV:DacWr-Cmd</string>
+          </property>
+          <property name="pressValue" stdset="0">
+           <string>1</string>
+          </property>
+          <property name="releaseValue" stdset="0">
+           <string>0</string>
+          </property>
+          <property name="writeWhenRelease" stdset="0">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_66">
+        <item row="25" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_216">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:TestOpenLoopSquare-Sts</string>
+           <string>SI-${CRATE}M2:PS-FCV:Current-SP</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_67">
+        <item row="29" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_159">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:DacData-RB</string>
+           <string>SI-${CRATE}M2:PS-FCV:VoltOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_59">
-          <property name="text">
-           <string>CtrlLoopKp:</string>
+        <item row="26" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_71">
+          <property name="toolTip">
+           <string/>
           </property>
-         </widget>
-        </item>
-        <item row="22" column="0">
-         <widget class="QLabel" name="label_63">
-          <property name="text">
-           <string>CtrlLoopTi:</string>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}M2:PS-FCV:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
+        <item row="25" column="1">
          <widget class="PyDMLabel" name="PyDMLabel_59">
           <property name="toolTip">
            <string/>
@@ -1690,103 +1827,77 @@
           </property>
          </widget>
         </item>
-        <item row="28" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_159">
+        <item row="21" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_69">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:VoltOffset-SP</string>
+           <string>SI-${CRATE}M2:PS-FCV:CtrlLoopKp-RB</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="0">
-         <widget class="QLabel" name="label_237">
+        <item row="19" column="0">
+         <widget class="QLabel" name="label_57">
           <property name="text">
-           <string>CurrGain:</string>
+           <string>DacWr:</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_73">
+        <item row="20" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_56">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:VoltGain-RB</string>
-          </property>
-         </widget>
-        </item>
-        <item row="19" column="0">
-         <widget class="QLabel" name="label_57">
-          <property name="text">
-           <string>DacWr:</string>
+           <string>SI-${CRATE}M2:PS-FCV:DacData-SP</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_25">
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_65">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:PwrState-Sel</string>
+           <string>SI-${CRATE}M2:PS-FCV:CurrentRaw-RB</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_54">
+        <item row="20" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_67">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:TestClosedLoopSquare-Sel</string>
-          </property>
-         </widget>
-        </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_65">
-          <property name="text">
-           <string>TestClosedLoopSquare:</string>
+           <string>SI-${CRATE}M2:PS-FCV:DacData-RB</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_56">
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_39">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:DacData-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_382">
-          <property name="text">
-           <string>Current:</string>
+           <string>SI-${CRATE}M2:PS-FCV:TestHighLim-SP</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="1" colspan="2">
-         <widget class="PyDMPushButton" name="PyDMPushButton_5">
+        <item row="23" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_27">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="text">
-           <string>press to pulse</string>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}M2:PS-FCV:DacWr-Cmd</string>
-          </property>
-          <property name="pressValue" stdset="0">
-           <string>1</string>
-          </property>
-          <property name="releaseValue" stdset="0">
-           <string>0</string>
+           <string>SI-${CRATE}M2:PS-FCV:TestHighLim-RB</string>
           </property>
-          <property name="writeWhenRelease" stdset="0">
-           <bool>true</bool>
+         </widget>
+        </item>
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_36">
+          <property name="text">
+           <string>TestHighLim:</string>
           </property>
          </widget>
         </item>
@@ -1807,98 +1918,113 @@
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_7">
-        <item row="22" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_60">
+        <item row="20" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_81">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:CtrlLoopTi-SP</string>
+           <string>SI-${CRATE}C2:PS-FCH:DacData-RB</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_82">
+        <item row="19" column="1" colspan="2">
+         <widget class="PyDMPushButton" name="PyDMPushButton_4">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="text">
+           <string>press to pulse</string>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}C2:PS-FCH:DacWr-Cmd</string>
           </property>
-         </widget>
-        </item>
-        <item row="15" column="0">
-         <widget class="QLabel" name="label_70">
-          <property name="text">
-           <string>TestOpenLoopTriang:</string>
+          <property name="pressValue" stdset="0">
+           <string>1</string>
+          </property>
+          <property name="releaseValue" stdset="0">
+           <string>0</string>
+          </property>
+          <property name="writeWhenRelease" stdset="0">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_76">
+        <item row="24" column="0">
+         <widget class="QLabel" name="label_68">
           <property name="text">
-           <string>PwrState:</string>
+           <string>CurrentRaw:</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="0">
-         <widget class="QLabel" name="label_73">
-          <property name="text">
-           <string>CtrlLoopTi:</string>
+        <item row="21" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_83">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C2:PS-FCH:CtrlLoopKp-RB</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="0">
-         <widget class="QLabel" name="label_241">
+        <item row="19" column="0">
+         <widget class="QLabel" name="label_67">
           <property name="text">
-           <string>CurrGain:</string>
+           <string>DacWr:</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_88">
+        <item row="26" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_85">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:VoltOffset-RB</string>
+           <string>SI-${CRATE}C2:PS-FCH:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_65">
+        <item row="25" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_136">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:CurrentRaw-SP</string>
+           <string>SI-${CRATE}C2:PS-FCH:Current-SP</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_85">
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_24">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:CurrGain-RB</string>
+           <string>SI-${CRATE}C2:PS-FCH:PwrState-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_75">
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_69">
           <property name="text">
-           <string>TestClosedLoopSquare:</string>
+           <string>CtrlLoopKp:</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_163">
+        <item row="29" column="0">
+         <widget class="QLabel" name="label_244">
+          <property name="text">
+           <string>VoltOffset:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="17" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_84">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:VoltOffset-SP</string>
+           <string>SI-${CRATE}C2:PS-FCH:TestClosedLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
@@ -1912,94 +2038,84 @@
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_80">
+        <item row="25" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_185">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="precision" stdset="0">
+           <number>0</number>
+          </property>
+          <property name="precisionFromPV" stdset="0">
+           <bool>true</bool>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:TestOpenLoopSquare-Sts</string>
+           <string>SI-${CRATE}C2:PS-FCH:Current-RB</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_86">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:CurrOffset-RB</string>
-          </property>
-         </widget>
-        </item>
-        <item row="19" column="0">
-         <widget class="QLabel" name="label_67">
+        <item row="25" column="0">
+         <widget class="QLabel" name="label_381">
           <property name="text">
-           <string>DacWr:</string>
+           <string>Current:</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_161">
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_87">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:CurrOffset-SP</string>
+           <string>SI-${CRATE}C2:PS-FCH:VoltGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_77">
+        <item row="20" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_66">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:TestOpenLoopTriang-Sts</string>
+           <string>SI-${CRATE}C2:PS-FCH:DacData-SP</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="0">
-         <widget class="QLabel" name="label_68">
+        <item row="18" column="0">
+         <widget class="QLabel" name="label_72">
           <property name="text">
-           <string>CurrentRaw:</string>
+           <string>CtrlLoop:</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_81">
+        <item row="15" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_77">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:DacData-RB</string>
+           <string>SI-${CRATE}C2:PS-FCH:TestOpenLoopTriang-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="0">
-         <widget class="QLabel" name="label_244">
+        <item row="22" column="0">
+         <widget class="QLabel" name="label_73">
           <property name="text">
-           <string>VoltOffset:</string>
+           <string>CtrlLoopTi:</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_162">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:VoltGain-SP</string>
+        <item row="28" column="0">
+         <widget class="QLabel" name="label_243">
+          <property name="text">
+           <string>VoltGain:</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_84">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:TestClosedLoopSquare-Sts</string>
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_76">
+          <property name="text">
+           <string>PwrState:</string>
           </property>
          </widget>
         </item>
@@ -2013,13 +2129,13 @@
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_24">
+        <item row="17" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_55">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:PwrState-Sel</string>
+           <string>SI-${CRATE}C2:PS-FCH:TestClosedLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
@@ -2033,16 +2149,6 @@
           </property>
          </widget>
         </item>
-        <item row="14" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_75">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:PwrState-Sts</string>
-          </property>
-         </widget>
-        </item>
         <item row="20" column="0">
          <widget class="QLabel" name="label_71">
           <property name="text">
@@ -2050,124 +2156,144 @@
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_185">
+        <item row="15" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_36">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="precision" stdset="0">
-           <number>0</number>
-          </property>
-          <property name="precisionFromPV" stdset="0">
-           <bool>true</bool>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:Current-RB</string>
+           <string>SI-${CRATE}C2:PS-FCH:TestOpenLoopTriang-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_76">
+        <item row="22" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_60">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:CtrlLoop-Sel</string>
+           <string>SI-${CRATE}C2:PS-FCH:CtrlLoopTi-SP</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_69">
-          <property name="text">
-           <string>CtrlLoopKp:</string>
+        <item row="26" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_160">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C2:PS-FCH:CurrGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_381">
+        <item row="15" column="0">
+         <widget class="QLabel" name="label_70">
           <property name="text">
-           <string>Current:</string>
+           <string>TestOpenLoopTriang:</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_160">
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_86">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:CurrGain-SP</string>
+           <string>SI-${CRATE}C2:PS-FCH:CurrOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_36">
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_82">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:TestOpenLoopTriang-Sel</string>
+           <string>SI-${CRATE}C2:PS-FCH:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="0">
-         <widget class="QLabel" name="label_72">
-          <property name="text">
-           <string>CtrlLoop:</string>
+        <item row="27" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_161">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C2:PS-FCH:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_87">
+        <item row="28" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_162">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:VoltGain-RB</string>
+           <string>SI-${CRATE}C2:PS-FCH:VoltGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="0">
-         <widget class="QLabel" name="label_242">
-          <property name="text">
-           <string>CurrOffset:</string>
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_79">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C2:PS-FCH:CurrentRaw-RB</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_66">
+        <item row="29" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_88">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:DacData-SP</string>
+           <string>SI-${CRATE}C2:PS-FCH:VoltOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_79">
+        <item row="24" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_65">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:CurrentRaw-RB</string>
+           <string>SI-${CRATE}C2:PS-FCH:CurrentRaw-SP</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="0">
-         <widget class="QLabel" name="label_243">
-          <property name="text">
-           <string>VoltGain:</string>
+        <item row="29" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_163">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C2:PS-FCH:VoltOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_136">
+        <item row="14" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_75">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:Current-SP</string>
+           <string>SI-${CRATE}C2:PS-FCH:PwrState-Sts</string>
+          </property>
+         </widget>
+        </item>
+        <item row="26" column="0">
+         <widget class="QLabel" name="label_241">
+          <property name="text">
+           <string>CurrGain:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_75">
+          <property name="text">
+           <string>TestClosedLoopSquare:</string>
           </property>
          </widget>
         </item>
@@ -2178,45 +2304,57 @@
           </property>
          </widget>
         </item>
-        <item row="21" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_83">
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_80">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:CtrlLoopKp-RB</string>
+           <string>SI-${CRATE}C2:PS-FCH:TestOpenLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_55">
+        <item row="27" column="0">
+         <widget class="QLabel" name="label_242">
+          <property name="text">
+           <string>CurrOffset:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_76">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:TestClosedLoopSquare-Sel</string>
+           <string>SI-${CRATE}C2:PS-FCH:CtrlLoop-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="1" colspan="2">
-         <widget class="PyDMPushButton" name="PyDMPushButton_4">
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_38">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="text">
-           <string>press to pulse</string>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCH:DacWr-Cmd</string>
+           <string>SI-${CRATE}C2:PS-FCH:TestHighLim-SP</string>
           </property>
-          <property name="pressValue" stdset="0">
-           <string>1</string>
+         </widget>
+        </item>
+        <item row="23" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_29">
+          <property name="toolTip">
+           <string/>
           </property>
-          <property name="releaseValue" stdset="0">
-           <string>0</string>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C2:PS-FCH:TestHighLim-RB</string>
           </property>
-          <property name="writeWhenRelease" stdset="0">
-           <bool>true</bool>
+         </widget>
+        </item>
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_31">
+          <property name="text">
+           <string>TestHighLim:</string>
           </property>
          </widget>
         </item>
@@ -2237,266 +2375,319 @@
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_8">
-        <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_93">
+        <item row="20" column="0">
+         <widget class="QLabel" name="label_81">
+          <property name="text">
+           <string>DacData:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="22" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_70">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:CurrentRaw-RB</string>
+           <string>SI-${CRATE}C2:PS-FCV:CtrlLoopTi-SP</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_166">
+        <item row="15" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_91">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:VoltGain-SP</string>
+           <string>SI-${CRATE}C2:PS-FCV:TestOpenLoopTriang-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_43">
+        <item row="24" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_75">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:TestOpenLoopSquare-Sel</string>
+           <string>SI-${CRATE}C2:PS-FCV:CurrentRaw-SP</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_91">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:TestOpenLoopTriang-Sts</string>
+        <item row="29" column="0">
+         <widget class="QLabel" name="label_248">
+          <property name="text">
+           <string>VoltOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_89">
+        <item row="29" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_167">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:PwrState-Sts</string>
+           <string>SI-${CRATE}C2:PS-FCV:VoltOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="0">
-         <widget class="QLabel" name="label_246">
+        <item row="18" column="0">
+         <widget class="QLabel" name="label_82">
           <property name="text">
-           <string>CurrOffset:</string>
+           <string>CtrlLoop:</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_164">
+        <item row="21" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_161">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:CurrOffset-RB</string>
+           <string>SI-${CRATE}C2:PS-FCV:CtrlLoopKp-RB</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_76">
+        <item row="22" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_90">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:DacData-SP</string>
+           <string>SI-${CRATE}C2:PS-FCV:CtrlLoopTi-RB</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_166">
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_85">
+          <property name="text">
+           <string>TestClosedLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="25" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_132">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="precision" stdset="0">
+           <number>0</number>
+          </property>
+          <property name="precisionFromPV" stdset="0">
+           <bool>true</bool>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:VoltOffset-RB</string>
+           <string>SI-${CRATE}C2:PS-FCV:Current-RB</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="0">
-         <widget class="QLabel" name="label_77">
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_86">
           <property name="text">
-           <string>DacWr:</string>
+           <string>PwrState:</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_94">
+        <item row="28" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_166">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:TestOpenLoopSquare-Sts</string>
+           <string>SI-${CRATE}C2:PS-FCV:VoltGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_95">
+        <item row="29" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_166">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:DacData-RB</string>
+           <string>SI-${CRATE}C2:PS-FCV:VoltOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_165">
+        <item row="16" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_43">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:CurrOffset-SP</string>
+           <string>SI-${CRATE}C2:PS-FCV:TestOpenLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="0">
-         <widget class="QLabel" name="label_82">
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_79">
           <property name="text">
-           <string>CtrlLoop:</string>
+           <string>CtrlLoopKp:</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_96">
+        <item row="17" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_162">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}C2:PS-FCV:TestClosedLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="0">
-         <widget class="QLabel" name="label_248">
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_165">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C2:PS-FCV:VoltGain-RB</string>
+          </property>
+         </widget>
+        </item>
+        <item row="16" column="0">
+         <widget class="QLabel" name="label_84">
           <property name="text">
-           <string>VoltOffset:</string>
+           <string>TestOpenLoopSquare:</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="0">
-         <widget class="QLabel" name="label_245">
+        <item row="15" column="0">
+         <widget class="QLabel" name="label_80">
           <property name="text">
-           <string>CurrGain:</string>
+           <string>TestOpenLoopTriang:</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="0">
-         <widget class="QLabel" name="label_78">
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_164">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C2:PS-FCV:CurrOffset-RB</string>
+          </property>
+         </widget>
+        </item>
+        <item row="26" column="0">
+         <widget class="QLabel" name="label_245">
           <property name="text">
-           <string>CurrentRaw:</string>
+           <string>CurrGain:</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_70">
+        <item row="26" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_163">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:CtrlLoop-Sel</string>
+           <string>SI-${CRATE}C2:PS-FCV:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_35">
+        <item row="20" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_95">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:TestOpenLoopTriang-Sel</string>
+           <string>SI-${CRATE}C2:PS-FCV:DacData-RB</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="0">
-         <widget class="QLabel" name="label_84">
-          <property name="text">
-           <string>TestOpenLoopSquare:</string>
+        <item row="14" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_89">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C2:PS-FCV:PwrState-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_227">
+        <item row="27" column="0">
+         <widget class="QLabel" name="label_246">
           <property name="text">
-           <string>Current:</string>
+           <string>CurrOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_165">
+        <item row="25" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_135">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:VoltGain-RB</string>
+           <string>SI-${CRATE}C2:PS-FCV:Current-SP</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_132">
+        <item row="19" column="1" colspan="2">
+         <widget class="PyDMPushButton" name="PyDMPushButton_3">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="precision" stdset="0">
-           <number>0</number>
-          </property>
-          <property name="precisionFromPV" stdset="0">
-           <bool>true</bool>
+          <property name="text">
+           <string>press to pulse</string>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:Current-RB</string>
+           <string>SI-${CRATE}C2:PS-FCV:DacWr-Cmd</string>
+          </property>
+          <property name="pressValue" stdset="0">
+           <string>1</string>
+          </property>
+          <property name="releaseValue" stdset="0">
+           <string>0</string>
+          </property>
+          <property name="writeWhenRelease" stdset="0">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_86">
+        <item row="19" column="0">
+         <widget class="QLabel" name="label_77">
           <property name="text">
-           <string>PwrState:</string>
+           <string>DacWr:</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_163">
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_23">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:CurrGain-RB</string>
+           <string>SI-${CRATE}C2:PS-FCV:PwrState-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_162">
+        <item row="25" column="0">
+         <widget class="QLabel" name="label_227">
+          <property name="text">
+           <string>Current:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_94">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:TestClosedLoopSquare-Sts</string>
+           <string>SI-${CRATE}C2:PS-FCV:TestOpenLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_167">
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_93">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:VoltOffset-SP</string>
+           <string>SI-${CRATE}C2:PS-FCV:CurrentRaw-RB</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="2">
+        <item row="26" column="2">
          <widget class="PyDMLineEdit" name="PyDMLineEdit_164">
           <property name="toolTip">
            <string/>
@@ -2506,57 +2697,60 @@
           </property>
          </widget>
         </item>
-        <item row="22" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_70">
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_70">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:CtrlLoopTi-SP</string>
+           <string>SI-${CRATE}C2:PS-FCV:CtrlLoop-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_161">
+        <item row="15" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_35">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:CtrlLoopKp-RB</string>
+           <string>SI-${CRATE}C2:PS-FCV:TestOpenLoopTriang-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="0">
-         <widget class="QLabel" name="label_80">
-          <property name="text">
-           <string>TestOpenLoopTriang:</string>
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_96">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C2:PS-FCV:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_75">
+        <item row="20" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_76">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:CurrentRaw-SP</string>
+           <string>SI-${CRATE}C2:PS-FCV:DacData-SP</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="0">
-         <widget class="QLabel" name="label_247">
-          <property name="text">
-           <string>VoltGain:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="22" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_90">
+        <item row="17" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_61">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:CtrlLoopTi-RB</string>
+           <string>SI-${CRATE}C2:PS-FCV:TestClosedLoopSquare-Sel</string>
+          </property>
+         </widget>
+        </item>
+        <item row="24" column="0">
+         <widget class="QLabel" name="label_78">
+          <property name="text">
+           <string>CurrentRaw:</string>
           </property>
          </widget>
         </item>
@@ -2567,86 +2761,57 @@
           </property>
          </widget>
         </item>
-        <item row="17" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_61">
+        <item row="21" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_71">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:TestClosedLoopSquare-Sel</string>
+           <string>SI-${CRATE}C2:PS-FCV:CtrlLoopKp-SP</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="0">
-         <widget class="QLabel" name="label_81">
+        <item row="28" column="0">
+         <widget class="QLabel" name="label_247">
           <property name="text">
-           <string>DacData:</string>
+           <string>VoltGain:</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_71">
+        <item row="27" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_165">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:CtrlLoopKp-SP</string>
+           <string>SI-${CRATE}C2:PS-FCV:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_135">
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_37">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:Current-SP</string>
+           <string>SI-${CRATE}C2:PS-FCV:TestHighLim-SP</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_23">
+        <item row="23" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_30">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:PwrState-Sel</string>
-          </property>
-         </widget>
-        </item>
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_79">
-          <property name="text">
-           <string>CtrlLoopKp:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_85">
-          <property name="text">
-           <string>TestClosedLoopSquare:</string>
+           <string>SI-${CRATE}C2:PS-FCV:TestHighLim-RB</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="1" colspan="2">
-         <widget class="PyDMPushButton" name="PyDMPushButton_3">
-          <property name="toolTip">
-           <string/>
-          </property>
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_34">
           <property name="text">
-           <string>press to pulse</string>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C2:PS-FCV:DacWr-Cmd</string>
-          </property>
-          <property name="pressValue" stdset="0">
-           <string>1</string>
-          </property>
-          <property name="releaseValue" stdset="0">
-           <string>0</string>
-          </property>
-          <property name="writeWhenRelease" stdset="0">
-           <bool>true</bool>
+           <string>TestHighLim:</string>
           </property>
          </widget>
         </item>
@@ -2667,125 +2832,81 @@
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_9">
-        <item row="27" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_170">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:VoltGain-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="25" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_168">
+        <item row="21" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_175">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CurrGain-SP</string>
+           <string>SI-${CRATE}C3:PS-FCH:CtrlLoopKp-RB</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_175">
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_69">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CtrlLoopKp-RB</string>
+           <string>SI-${CRATE}C3:PS-FCH:CtrlLoop-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="0">
+        <item row="27" column="0">
          <widget class="QLabel" name="label_250">
           <property name="text">
            <string>CurrOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_80">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CtrlLoopTi-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="20" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_173">
+        <item row="21" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_81">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:DacData-RB</string>
+           <string>SI-${CRATE}C3:PS-FCH:CtrlLoopKp-SP</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_85">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CurrentRaw-SP</string>
+        <item row="20" column="0">
+         <widget class="QLabel" name="label_91">
+          <property name="text">
+           <string>DacData:</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="0">
-         <widget class="QLabel" name="label_251">
+        <item row="25" column="0">
+         <widget class="QLabel" name="label_410">
           <property name="text">
-           <string>VoltGain:</string>
+           <string>Current:</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_95">
+        <item row="29" column="0">
+         <widget class="QLabel" name="label_252">
           <property name="text">
-           <string>TestClosedLoopSquare:</string>
+           <string>VoltOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_169">
+        <item row="29" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_180">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:TestOpenLoopTriang-Sts</string>
-          </property>
-         </widget>
-        </item>
-        <item row="16" column="0">
-         <widget class="QLabel" name="label_94">
-          <property name="text">
-           <string>TestOpenLoopSquare:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_410">
-          <property name="text">
-           <string>Current:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="22" column="0">
-         <widget class="QLabel" name="label_93">
-          <property name="text">
-           <string>CtrlLoopTi:</string>
+           <string>SI-${CRATE}C3:PS-FCH:VoltOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_168">
+        <item row="20" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_173">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CtrlLoopTi-RB</string>
+           <string>SI-${CRATE}C3:PS-FCH:DacData-RB</string>
           </property>
          </widget>
         </item>
@@ -2796,68 +2917,47 @@
           </property>
          </widget>
         </item>
-        <item row="20" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_86">
+        <item row="29" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_171">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:DacData-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="28" column="0">
-         <widget class="QLabel" name="label_252">
-          <property name="text">
-           <string>VoltOffset:</string>
+           <string>SI-${CRATE}C3:PS-FCH:VoltOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_51">
+        <item row="15" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_34">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:TestOpenLoopSquare-Sel</string>
+           <string>SI-${CRATE}C3:PS-FCH:TestOpenLoopTriang-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_167">
+        <item row="25" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_132">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:PwrState-Sts</string>
-          </property>
-         </widget>
-        </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_96">
-          <property name="text">
-           <string>PwrState:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="25" column="0">
-         <widget class="QLabel" name="label_249">
-          <property name="text">
-           <string>CurrGain:</string>
+           <string>SI-${CRATE}C3:PS-FCH:Current-SP</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_69">
+        <item row="14" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_167">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CtrlLoop-Sel</string>
+           <string>SI-${CRATE}C3:PS-FCH:PwrState-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
+        <item row="25" column="1">
          <widget class="PyDMLabel" name="PyDMLabel_100">
           <property name="toolTip">
            <string/>
@@ -2873,67 +2973,61 @@
           </property>
          </widget>
         </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_169">
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_172">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CurrOffset-SP</string>
+           <string>SI-${CRATE}C3:PS-FCH:TestOpenLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_179">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:VoltGain-RB</string>
+        <item row="22" column="0">
+         <widget class="QLabel" name="label_93">
+          <property name="text">
+           <string>CtrlLoopTi:</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_178">
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_174">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CurrOffset-RB</string>
+           <string>SI-${CRATE}C3:PS-FCH:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_89">
+        <item row="16" column="0">
+         <widget class="QLabel" name="label_94">
           <property name="text">
-           <string>CtrlLoopKp:</string>
+           <string>TestOpenLoopSquare:</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="0">
-         <widget class="QLabel" name="label_88">
+        <item row="15" column="0">
+         <widget class="QLabel" name="label_90">
           <property name="text">
-           <string>CurrentRaw:</string>
+           <string>TestOpenLoopTriang:</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_171">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:VoltOffset-SP</string>
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_95">
+          <property name="text">
+           <string>TestClosedLoopSquare:</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_177">
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_178">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CurrGain-RB</string>
+           <string>SI-${CRATE}C3:PS-FCH:CurrOffset-RB</string>
           </property>
          </widget>
         </item>
@@ -2947,87 +3041,99 @@
           </property>
          </widget>
         </item>
-        <item row="20" column="0">
-         <widget class="QLabel" name="label_91">
+        <item row="24" column="0">
+         <widget class="QLabel" name="label_88">
           <property name="text">
-           <string>DacData:</string>
+           <string>CurrentRaw:</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_174">
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_22">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}C3:PS-FCH:PwrState-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_180">
+        <item row="22" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_80">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:VoltOffset-RB</string>
+           <string>SI-${CRATE}C3:PS-FCH:CtrlLoopTi-SP</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_171">
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_89">
+          <property name="text">
+           <string>CtrlLoopKp:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="19" column="1" colspan="2">
+         <widget class="PyDMPushButton" name="PyDMPushButton_2">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="text">
+           <string>press to pulse</string>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CurrentRaw-RB</string>
+           <string>SI-${CRATE}C3:PS-FCH:DacWr-Cmd</string>
+          </property>
+          <property name="pressValue" stdset="0">
+           <string>1</string>
+          </property>
+          <property name="releaseValue" stdset="0">
+           <string>0</string>
+          </property>
+          <property name="writeWhenRelease" stdset="0">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="21" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_81">
+        <item row="26" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_168">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:CtrlLoopKp-SP</string>
+           <string>SI-${CRATE}C3:PS-FCH:CurrGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_34">
+        <item row="16" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_51">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:TestOpenLoopTriang-Sel</string>
-          </property>
-         </widget>
-        </item>
-        <item row="15" column="0">
-         <widget class="QLabel" name="label_90">
-          <property name="text">
-           <string>TestOpenLoopTriang:</string>
+           <string>SI-${CRATE}C3:PS-FCH:TestOpenLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_172">
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_179">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:TestOpenLoopSquare-Sts</string>
+           <string>SI-${CRATE}C3:PS-FCH:VoltGain-RB</string>
           </property>
          </widget>
         </item>
         <item row="24" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_132">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_85">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:Current-SP</string>
+           <string>SI-${CRATE}C3:PS-FCH:CurrentRaw-SP</string>
           </property>
          </widget>
         </item>
@@ -3038,331 +3144,323 @@
           </property>
          </widget>
         </item>
-        <item row="17" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_59">
+        <item row="15" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_169">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:TestClosedLoopSquare-Sel</string>
+           <string>SI-${CRATE}C3:PS-FCH:TestOpenLoopTriang-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_22">
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_171">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:PwrState-Sel</string>
+           <string>SI-${CRATE}C3:PS-FCH:CurrentRaw-RB</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="1" colspan="2">
-         <widget class="PyDMPushButton" name="PyDMPushButton_2">
+        <item row="20" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_86">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="text">
-           <string>press to pulse</string>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCH:DacWr-Cmd</string>
-          </property>
-          <property name="pressValue" stdset="0">
-           <string>1</string>
-          </property>
-          <property name="releaseValue" stdset="0">
-           <string>0</string>
-          </property>
-          <property name="writeWhenRelease" stdset="0">
-           <bool>true</bool>
+           <string>SI-${CRATE}C3:PS-FCH:DacData-SP</string>
           </property>
          </widget>
         </item>
-       </layout>
-      </widget>
-     </widget>
-     <widget class="QWidget" name="tab_10">
-      <attribute name="title">
-       <string>C7</string>
-      </attribute>
-      <widget class="QWidget" name="gridLayoutWidget_9">
-       <property name="geometry">
-        <rect>
-         <x>10</x>
-         <y>10</y>
-         <width>501</width>
-         <height>461</height>
-        </rect>
-       </property>
-       <layout class="QGridLayout" name="gridLayout_16">
         <item row="28" column="0">
-         <widget class="QLabel" name="label_291">
+         <widget class="QLabel" name="label_251">
           <property name="text">
-           <string>VoltOffset:</string>
+           <string>VoltGain:</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_258">
+        <item row="28" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_170">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:VoltGain-RB</string>
+           <string>SI-${CRATE}C3:PS-FCH:VoltGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_252">
+        <item row="22" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_168">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:DacData-RB</string>
+           <string>SI-${CRATE}C3:PS-FCH:CtrlLoopTi-RB</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_60">
+        <item row="26" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_177">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:TestClosedLoopSquare-Sel</string>
+           <string>SI-${CRATE}C3:PS-FCH:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_97">
+        <item row="27" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_169">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:DacData-SP</string>
+           <string>SI-${CRATE}C3:PS-FCH:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_281">
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_96">
           <property name="text">
-           <string>CtrlLoopKp:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_173">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CurrOffset-SP</string>
+           <string>PwrState:</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="0">
-         <widget class="QLabel" name="label_284">
+        <item row="26" column="0">
+         <widget class="QLabel" name="label_249">
           <property name="text">
-           <string>DacData:</string>
+           <string>CurrGain:</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="0">
-         <widget class="QLabel" name="label_285">
-          <property name="text">
-           <string>CtrlLoop:</string>
+        <item row="17" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_59">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C3:PS-FCH:TestClosedLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_92">
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_34">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CtrlLoopKp-SP</string>
+           <string>SI-${CRATE}C3:PS-FCH:TestHighLim-SP</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_90">
+        <item row="23" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_31">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CtrlLoopTi-SP</string>
+           <string>SI-${CRATE}C3:PS-FCH:TestHighLim-RB</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="0">
-         <widget class="QLabel" name="label_288">
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_30">
           <property name="text">
-           <string>TestOpenLoopSquare:</string>
+           <string>TestHighLim:</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_21">
+       </layout>
+      </widget>
+     </widget>
+     <widget class="QWidget" name="tab_10">
+      <attribute name="title">
+       <string>C7</string>
+      </attribute>
+      <widget class="QWidget" name="gridLayoutWidget_9">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>10</y>
+         <width>501</width>
+         <height>461</height>
+        </rect>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_16">
+        <item row="26" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_172">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:PwrState-Sel</string>
+           <string>SI-${CRATE}C3:PS-FCV:CurrGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_174">
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_21">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:VoltGain-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_290">
-          <property name="text">
-           <string>PwrState:</string>
+           <string>SI-${CRATE}C3:PS-FCV:PwrState-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_42">
+        <item row="25" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_221">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:TestOpenLoopSquare-Sel</string>
-          </property>
-         </widget>
-        </item>
-        <item row="27" column="0">
-         <widget class="QLabel" name="label_286">
-          <property name="text">
-           <string>VoltGain:</string>
+           <string>SI-${CRATE}C3:PS-FCV:Current-SP</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_172">
+        <item row="29" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_175">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CurrGain-SP</string>
+           <string>SI-${CRATE}C3:PS-FCV:VoltOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_248">
+        <item row="24" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_96">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:TestOpenLoopTriang-Sts</string>
+           <string>SI-${CRATE}C3:PS-FCV:CurrentRaw-SP</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_289">
+        <item row="28" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_174">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C3:PS-FCV:VoltGain-SP</string>
+          </property>
+         </widget>
+        </item>
+        <item row="24" column="0">
+         <widget class="QLabel" name="label_212">
           <property name="text">
-           <string>TestClosedLoopSquare:</string>
+           <string>CurrentRaw:</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_259">
+        <item row="18" column="0">
+         <widget class="QLabel" name="label_285">
+          <property name="text">
+           <string>CtrlLoop:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="22" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_90">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:VoltOffset-RB</string>
+           <string>SI-${CRATE}C3:PS-FCV:CtrlLoopTi-SP</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_221">
+        <item row="21" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_254">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:Current-SP</string>
+           <string>SI-${CRATE}C3:PS-FCV:CtrlLoopKp-RB</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_187">
+        <item row="15" column="0">
+         <widget class="QLabel" name="label_283">
+          <property name="text">
+           <string>TestOpenLoopTriang:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_257">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="precision" stdset="0">
-           <number>0</number>
-          </property>
-          <property name="precisionFromPV" stdset="0">
-           <bool>true</bool>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:Current-RB</string>
+           <string>SI-${CRATE}C3:PS-FCV:CurrOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_33">
+        <item row="29" column="0">
+         <widget class="QLabel" name="label_291">
+          <property name="text">
+           <string>VoltOffset:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="20" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_97">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:TestOpenLoopTriang-Sel</string>
+           <string>SI-${CRATE}C3:PS-FCV:DacData-SP</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_68">
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_250">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CtrlLoop-Sel</string>
+           <string>SI-${CRATE}C3:PS-FCV:CurrentRaw-RB</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="0">
-         <widget class="QLabel" name="label_280">
+        <item row="28" column="0">
+         <widget class="QLabel" name="label_286">
           <property name="text">
-           <string>CurrGain:</string>
+           <string>VoltGain:</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_255">
+        <item row="14" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_188">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:TestClosedLoopSquare-Sts</string>
+           <string>SI-${CRATE}C3:PS-FCV:PwrState-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_175">
+        <item row="20" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_252">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:VoltOffset-SP</string>
+           <string>SI-${CRATE}C3:PS-FCV:DacData-RB</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_188">
+        <item row="16" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_42">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:PwrState-Sts</string>
+           <string>SI-${CRATE}C3:PS-FCV:TestOpenLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
@@ -3373,118 +3471,142 @@
           </property>
          </widget>
         </item>
-        <item row="21" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_254">
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_253">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CtrlLoopKp-RB</string>
+           <string>SI-${CRATE}C3:PS-FCV:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_250">
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_289">
+          <property name="text">
+           <string>TestClosedLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="26" column="0">
+         <widget class="QLabel" name="label_280">
+          <property name="text">
+           <string>CurrGain:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_68">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CurrentRaw-RB</string>
+           <string>SI-${CRATE}C3:PS-FCV:CtrlLoop-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="0">
-         <widget class="QLabel" name="label_110">
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_290">
           <property name="text">
-           <string>DacWr:</string>
+           <string>PwrState:</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="0">
-         <widget class="QLabel" name="label_283">
+        <item row="19" column="0">
+         <widget class="QLabel" name="label_110">
           <property name="text">
-           <string>TestOpenLoopTriang:</string>
+           <string>DacWr:</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_251">
+        <item row="15" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_248">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:TestOpenLoopSquare-Sts</string>
+           <string>SI-${CRATE}C3:PS-FCV:TestOpenLoopTriang-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_253">
+        <item row="26" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_256">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}C3:PS-FCV:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_96">
+        <item row="17" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_60">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CurrentRaw-SP</string>
+           <string>SI-${CRATE}C3:PS-FCV:TestClosedLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_257">
+        <item row="21" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_92">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CurrOffset-RB</string>
+           <string>SI-${CRATE}C3:PS-FCV:CtrlLoopKp-SP</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="0">
-         <widget class="QLabel" name="label_212">
-          <property name="text">
-           <string>CurrentRaw:</string>
+        <item row="22" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_202">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C3:PS-FCV:CtrlLoopTi-RB</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_256">
+        <item row="17" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_255">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CurrGain-RB</string>
+           <string>SI-${CRATE}C3:PS-FCV:TestClosedLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_202">
+        <item row="16" column="0">
+         <widget class="QLabel" name="label_288">
+          <property name="text">
+           <string>TestOpenLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="15" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_33">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}C3:PS-FCV:CtrlLoopTi-RB</string>
+           <string>SI-${CRATE}C3:PS-FCV:TestOpenLoopTriang-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_385">
+        <item row="27" column="0">
+         <widget class="QLabel" name="label_282">
           <property name="text">
-           <string>Current:</string>
+           <string>CurrOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="0">
-         <widget class="QLabel" name="label_282">
+        <item row="25" column="0">
+         <widget class="QLabel" name="label_385">
           <property name="text">
-           <string>CurrOffset:</string>
+           <string>Current:</string>
           </property>
          </widget>
         </item>
@@ -3510,192 +3632,203 @@
           </property>
          </widget>
         </item>
-       </layout>
-      </widget>
-     </widget>
-     <widget class="QWidget" name="tab_15">
-      <attribute name="title">
-       <string>C8</string>
-      </attribute>
-      <widget class="QWidget" name="gridLayoutWidget_16">
-       <property name="geometry">
-        <rect>
-         <x>10</x>
-         <y>10</y>
-         <width>501</width>
-         <height>461</height>
-        </rect>
-       </property>
-       <layout class="QGridLayout" name="gridLayout_17">
-        <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_264">
+        <item row="25" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_187">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="precision" stdset="0">
+           <number>0</number>
+          </property>
+          <property name="precisionFromPV" stdset="0">
+           <bool>true</bool>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:CurrentRaw-RB</string>
+           <string>SI-${CRATE}C3:PS-FCV:Current-RB</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_220">
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_251">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:Current-SP</string>
+           <string>SI-${CRATE}C3:PS-FCV:TestOpenLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_48">
-          <property name="toolTip">
-           <string/>
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_281">
+          <property name="text">
+           <string>CtrlLoopKp:</string>
           </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:TestOpenLoopSquare-Sel</string>
+         </widget>
+        </item>
+        <item row="20" column="0">
+         <widget class="QLabel" name="label_284">
+          <property name="text">
+           <string>DacData:</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_101">
+        <item row="29" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_259">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:CtrlLoopTi-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_295">
-          <property name="text">
-           <string>CtrlLoopKp:</string>
+           <string>SI-${CRATE}C3:PS-FCV:VoltOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_32">
+        <item row="27" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_173">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:TestOpenLoopTriang-Sel</string>
+           <string>SI-${CRATE}C3:PS-FCV:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_268">
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_258">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:CtrlLoopKp-RB</string>
+           <string>SI-${CRATE}C3:PS-FCV:VoltGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="0">
-         <widget class="QLabel" name="label_302">
-          <property name="text">
-           <string>TestOpenLoopSquare:</string>
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_33">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}C3:PS-FCV:TestHighLim-SP</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_266">
+        <item row="23" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_33">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:DacData-RB</string>
+           <string>SI-${CRATE}C3:PS-FCV:TestHighLim-RB</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="0">
-         <widget class="QLabel" name="label_305">
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_29">
           <property name="text">
-           <string>VoltOffset:</string>
+           <string>TestHighLim:</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="0">
-         <widget class="QLabel" name="label_301">
+       </layout>
+      </widget>
+     </widget>
+     <widget class="QWidget" name="tab_15">
+      <attribute name="title">
+       <string>C8</string>
+      </attribute>
+      <widget class="QWidget" name="gridLayoutWidget_16">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>10</y>
+         <width>501</width>
+         <height>461</height>
+        </rect>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_17">
+        <item row="16" column="0">
+         <widget class="QLabel" name="label_302">
           <property name="text">
-           <string>CtrlLoopTi:</string>
+           <string>TestOpenLoopSquare:</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_176">
+        <item row="19" column="1" colspan="2">
+         <widget class="PyDMPushButton" name="PyDMPushButton_11">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="text">
+           <string>press to pulse</string>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:CurrGain-SP</string>
+           <string>SI-${CRATE}XX:PS-FC08:DacWr-Cmd</string>
+          </property>
+          <property name="pressValue" stdset="0">
+           <string>1</string>
+          </property>
+          <property name="releaseValue" stdset="0">
+           <string>0</string>
+          </property>
+          <property name="writeWhenRelease" stdset="0">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="17" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_269">
+        <item row="16" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_48">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:TestClosedLoopSquare-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC08:TestOpenLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_179">
+        <item row="29" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_273">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:VoltOffset-SP</string>
+           <string>SI-${CRATE}XX:PS-FC08:VoltOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_67">
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_267">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:CtrlLoop-Sel</string>
-          </property>
-         </widget>
-        </item>
-        <item row="15" column="0">
-         <widget class="QLabel" name="label_297">
-          <property name="text">
-           <string>TestOpenLoopTriang:</string>
+           <string>SI-${CRATE}XX:PS-FC08:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="0">
-         <widget class="QLabel" name="label_294">
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_304">
           <property name="text">
-           <string>CurrentRaw:</string>
+           <string>PwrState:</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_106">
+        <item row="14" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_260">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:CurrentRaw-SP</string>
+           <string>SI-${CRATE}XX:PS-FC08:PwrState-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_265">
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_271">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:TestOpenLoopSquare-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC08:CurrOffset-RB</string>
           </property>
          </widget>
         </item>
@@ -3709,190 +3842,186 @@
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_20">
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_303">
+          <property name="text">
+           <string>TestClosedLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="24" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_106">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:PwrState-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC08:CurrentRaw-SP</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_262">
+        <item row="17" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_58">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:TestOpenLoopTriang-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC08:TestClosedLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="0">
-         <widget class="QLabel" name="label_298">
+        <item row="25" column="0">
+         <widget class="QLabel" name="label_384">
           <property name="text">
-           <string>DacData:</string>
+           <string>Current:</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_304">
+        <item row="19" column="0">
+         <widget class="QLabel" name="label_292">
           <property name="text">
-           <string>PwrState:</string>
+           <string>DacWr:</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_273">
+        <item row="24" column="0">
+         <widget class="QLabel" name="label_294">
+          <property name="text">
+           <string>CurrentRaw:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="20" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_107">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:VoltOffset-RB</string>
+           <string>SI-${CRATE}XX:PS-FC08:DacData-SP</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_384">
+        <item row="22" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_101">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC08:CtrlLoopTi-SP</string>
+          </property>
+         </widget>
+        </item>
+        <item row="22" column="0">
+         <widget class="QLabel" name="label_301">
           <property name="text">
-           <string>Current:</string>
+           <string>CtrlLoopTi:</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_58">
+        <item row="29" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_179">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:TestClosedLoopSquare-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC08:VoltOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_177">
+        <item row="28" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_178">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:CurrOffset-SP</string>
+           <string>SI-${CRATE}XX:PS-FC08:VoltGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_267">
+        <item row="25" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_220">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC08:Current-SP</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_270">
+        <item row="17" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_269">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:CurrGain-RB</string>
+           <string>SI-${CRATE}XX:PS-FC08:TestClosedLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
         <item row="27" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_178">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_177">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:VoltGain-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_303">
-          <property name="text">
-           <string>TestClosedLoopSquare:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="18" column="0">
-         <widget class="QLabel" name="label_299">
-          <property name="text">
-           <string>CtrlLoop:</string>
+           <string>SI-${CRATE}XX:PS-FC08:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
         <item row="26" column="0">
-         <widget class="QLabel" name="label_296">
+         <widget class="QLabel" name="label_293">
           <property name="text">
-           <string>CurrOffset:</string>
+           <string>CurrGain:</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="0">
-         <widget class="QLabel" name="label_292">
-          <property name="text">
-           <string>DacWr:</string>
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_272">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC08:VoltGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_271">
+        <item row="26" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_176">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:CurrOffset-RB</string>
+           <string>SI-${CRATE}XX:PS-FC08:CurrGain-SP</string>
           </property>
          </widget>
         </item>
         <item row="27" column="0">
-         <widget class="QLabel" name="label_300">
+         <widget class="QLabel" name="label_296">
           <property name="text">
-           <string>VoltGain:</string>
+           <string>CurrOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_261">
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_264">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:CtrlLoopTi-RB</string>
+           <string>SI-${CRATE}XX:PS-FC08:CurrentRaw-RB</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="0">
-         <widget class="QLabel" name="label_293">
-          <property name="text">
-           <string>CurrGain:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="14" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_260">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:PwrState-Sts</string>
-          </property>
-         </widget>
-        </item>
-        <item row="20" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_107">
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_265">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:DacData-SP</string>
+           <string>SI-${CRATE}XX:PS-FC08:TestOpenLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
+        <item row="25" column="1">
          <widget class="PyDMLabel" name="PyDMLabel_186">
           <property name="toolTip">
            <string/>
@@ -3908,308 +4037,301 @@
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_272">
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_67">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:VoltGain-RB</string>
+           <string>SI-${CRATE}XX:PS-FC08:CtrlLoop-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="1" colspan="2">
-         <widget class="PyDMPushButton" name="PyDMPushButton_11">
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_20">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="text">
-           <string>press to pulse</string>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC08:DacWr-Cmd</string>
-          </property>
-          <property name="pressValue" stdset="0">
-           <string>1</string>
-          </property>
-          <property name="releaseValue" stdset="0">
-           <string>0</string>
-          </property>
-          <property name="writeWhenRelease" stdset="0">
-           <bool>true</bool>
+           <string>SI-${CRATE}XX:PS-FC08:PwrState-Sel</string>
           </property>
          </widget>
         </item>
-       </layout>
-      </widget>
-     </widget>
-     <widget class="QWidget" name="tab_16">
-      <attribute name="title">
-       <string>C9</string>
-      </attribute>
-      <widget class="QWidget" name="gridLayoutWidget_17">
-       <property name="geometry">
-        <rect>
-         <x>10</x>
-         <y>10</y>
-         <width>501</width>
-         <height>461</height>
-        </rect>
-       </property>
-       <layout class="QGridLayout" name="gridLayout_18">
-        <item row="21" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_282">
+        <item row="15" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_262">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:CtrlLoopKp-RB</string>
-          </property>
-         </widget>
-        </item>
-        <item row="26" column="0">
-         <widget class="QLabel" name="label_310">
-          <property name="text">
-           <string>CurrOffset:</string>
+           <string>SI-${CRATE}XX:PS-FC08:TestOpenLoopTriang-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_309">
+        <item row="20" column="0">
+         <widget class="QLabel" name="label_298">
           <property name="text">
-           <string>CtrlLoopKp:</string>
+           <string>DacData:</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_50">
+        <item row="26" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_270">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:TestOpenLoopSquare-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC08:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="0">
-         <widget class="QLabel" name="label_316">
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_295">
           <property name="text">
-           <string>TestOpenLoopSquare:</string>
+           <string>CtrlLoopKp:</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_275">
+        <item row="18" column="0">
+         <widget class="QLabel" name="label_299">
+          <property name="text">
+           <string>CtrlLoop:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="20" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_266">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:CtrlLoopTi-RB</string>
+           <string>SI-${CRATE}XX:PS-FC08:DacData-RB</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_287">
+        <item row="21" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_268">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:VoltOffset-RB</string>
+           <string>SI-${CRATE}XX:PS-FC08:CtrlLoopKp-RB</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_276">
+        <item row="22" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_261">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:TestOpenLoopTriang-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC08:CtrlLoopTi-RB</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="0">
-         <widget class="QLabel" name="label_313">
+        <item row="29" column="0">
+         <widget class="QLabel" name="label_305">
           <property name="text">
-           <string>CtrlLoop:</string>
+           <string>VoltOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="0">
-         <widget class="QLabel" name="label_306">
+        <item row="28" column="0">
+         <widget class="QLabel" name="label_300">
           <property name="text">
-           <string>DacWr:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_66">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:CtrlLoop-Sel</string>
+           <string>VoltGain:</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_318">
+        <item row="15" column="0">
+         <widget class="QLabel" name="label_297">
           <property name="text">
-           <string>PwrState:</string>
+           <string>TestOpenLoopTriang:</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_337">
+        <item row="15" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_32">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="precision" stdset="0">
-           <number>0</number>
-          </property>
-          <property name="precisionFromPV" stdset="0">
-           <bool>true</bool>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:Current-RB</string>
+           <string>SI-${CRATE}XX:PS-FC08:TestOpenLoopTriang-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_181">
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_32">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:DacData-SP</string>
+           <string>SI-${CRATE}XX:PS-FC08:TestHighLim-SP</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_279">
+        <item row="23" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_35">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:TestOpenLoopSquare-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC08:TestHighLim-RB</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_187">
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_28">
+          <property name="text">
+           <string>TestHighLim:</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+     <widget class="QWidget" name="tab_16">
+      <attribute name="title">
+       <string>C9</string>
+      </attribute>
+      <widget class="QWidget" name="gridLayoutWidget_17">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>10</y>
+         <width>501</width>
+         <height>461</height>
+        </rect>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_18">
+        <item row="17" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_283">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:VoltOffset-SP</string>
+           <string>SI-${CRATE}XX:PS-FC09:TestClosedLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_280">
+        <item row="15" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_31">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:DacData-RB</string>
+           <string>SI-${CRATE}XX:PS-FC09:TestOpenLoopTriang-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_184">
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_66">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:CurrGain-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="28" column="0">
-         <widget class="QLabel" name="label_319">
-          <property name="text">
-           <string>VoltOffset:</string>
+           <string>SI-${CRATE}XX:PS-FC09:CtrlLoop-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_285">
+        <item row="17" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_64">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:CurrOffset-RB</string>
+           <string>SI-${CRATE}XX:PS-FC09:TestClosedLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="0">
+        <item row="26" column="0">
+         <widget class="QLabel" name="label_307">
+          <property name="text">
+           <string>CurrGain:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="24" column="0">
          <widget class="QLabel" name="label_308">
           <property name="text">
            <string>CurrentRaw:</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_219">
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_279">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:Current-SP</string>
+           <string>SI-${CRATE}XX:PS-FC09:TestOpenLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_278">
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_281">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:CurrentRaw-RB</string>
+           <string>SI-${CRATE}XX:PS-FC09:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_31">
+        <item row="16" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_50">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:TestOpenLoopTriang-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC09:TestOpenLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_286">
+        <item row="14" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_274">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:VoltGain-RB</string>
+           <string>SI-${CRATE}XX:PS-FC09:PwrState-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_185">
+        <item row="20" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_280">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:CurrOffset-SP</string>
+           <string>SI-${CRATE}XX:PS-FC09:DacData-RB</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_274">
+        <item row="21" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_112">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:PwrState-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC09:CtrlLoopKp-SP</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="0">
+        <item row="25" column="0">
+         <widget class="QLabel" name="label_413">
+          <property name="text">
+           <string>Current:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="29" column="0">
+         <widget class="QLabel" name="label_319">
+          <property name="text">
+           <string>VoltOffset:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="28" column="0">
          <widget class="QLabel" name="label_314">
           <property name="text">
            <string>VoltGain:</string>
@@ -4226,101 +4348,110 @@
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_19">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:PwrState-Sel</string>
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_309">
+          <property name="text">
+           <string>CtrlLoopKp:</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_281">
+        <item row="22" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_275">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC09:CtrlLoopTi-RB</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="0">
-         <widget class="QLabel" name="label_307">
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_317">
           <property name="text">
-           <string>CurrGain:</string>
+           <string>TestClosedLoopSquare:</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_180">
+        <item row="26" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_284">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:CurrentRaw-SP</string>
+           <string>SI-${CRATE}XX:PS-FC09:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_112">
+        <item row="27" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_185">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:CtrlLoopKp-SP</string>
+           <string>SI-${CRATE}XX:PS-FC09:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_186">
+        <item row="26" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_184">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:VoltGain-SP</string>
+           <string>SI-${CRATE}XX:PS-FC09:CurrGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_413">
+        <item row="18" column="0">
+         <widget class="QLabel" name="label_313">
           <property name="text">
-           <string>Current:</string>
+           <string>CtrlLoop:</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_284">
+        <item row="19" column="1" colspan="2">
+         <widget class="PyDMPushButton" name="PyDMPushButton_10">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="text">
+           <string>press to pulse</string>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:CurrGain-RB</string>
+           <string>SI-${CRATE}XX:PS-FC09:DacWr-Cmd</string>
           </property>
-         </widget>
-        </item>
-        <item row="15" column="0">
-         <widget class="QLabel" name="label_311">
-          <property name="text">
-           <string>TestOpenLoopTriang:</string>
+          <property name="pressValue" stdset="0">
+           <string>1</string>
+          </property>
+          <property name="releaseValue" stdset="0">
+           <string>0</string>
+          </property>
+          <property name="writeWhenRelease" stdset="0">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="17" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_64">
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_19">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:TestClosedLoopSquare-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC09:PwrState-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="0">
-         <widget class="QLabel" name="label_315">
+        <item row="27" column="0">
+         <widget class="QLabel" name="label_310">
           <property name="text">
-           <string>CtrlLoopTi:</string>
+           <string>CurrOffset:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="19" column="0">
+         <widget class="QLabel" name="label_306">
+          <property name="text">
+           <string>DacWr:</string>
           </property>
          </widget>
         </item>
@@ -4331,302 +4462,299 @@
           </property>
          </widget>
         </item>
-        <item row="17" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_283">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:TestClosedLoopSquare-Sts</string>
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_318">
+          <property name="text">
+           <string>PwrState:</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_317">
+        <item row="15" column="0">
+         <widget class="QLabel" name="label_311">
           <property name="text">
-           <string>TestClosedLoopSquare:</string>
+           <string>TestOpenLoopTriang:</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="1" colspan="2">
-         <widget class="PyDMPushButton" name="PyDMPushButton_10">
+        <item row="20" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_181">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="text">
-           <string>press to pulse</string>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC09:DacWr-Cmd</string>
-          </property>
-          <property name="pressValue" stdset="0">
-           <string>1</string>
+           <string>SI-${CRATE}XX:PS-FC09:DacData-SP</string>
           </property>
-          <property name="releaseValue" stdset="0">
-           <string>0</string>
+         </widget>
+        </item>
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_285">
+          <property name="toolTip">
+           <string/>
           </property>
-          <property name="writeWhenRelease" stdset="0">
-           <bool>true</bool>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC09:CurrOffset-RB</string>
           </property>
          </widget>
         </item>
-       </layout>
-      </widget>
-     </widget>
-     <widget class="QWidget" name="tab_17">
-      <attribute name="title">
-       <string>C10</string>
-      </attribute>
-      <widget class="QWidget" name="gridLayoutWidget_18">
-       <property name="geometry">
-        <rect>
-         <x>10</x>
-         <y>10</y>
-         <width>501</width>
-         <height>461</height>
-        </rect>
-       </property>
-       <layout class="QGridLayout" name="gridLayout_19">
-        <item row="20" column="0">
-         <widget class="QLabel" name="label_326">
+        <item row="22" column="0">
+         <widget class="QLabel" name="label_315">
           <property name="text">
-           <string>DacData:</string>
+           <string>CtrlLoopTi:</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_297">
+        <item row="25" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_219">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:TestClosedLoopSquare-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC09:Current-SP</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_189">
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_278">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:CtrlLoopTi-SP</string>
+           <string>SI-${CRATE}XX:PS-FC09:CurrentRaw-RB</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_300">
+        <item row="24" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_180">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:VoltGain-RB</string>
+           <string>SI-${CRATE}XX:PS-FC09:CurrentRaw-SP</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_301">
+        <item row="29" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_287">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:VoltOffset-RB</string>
+           <string>SI-${CRATE}XX:PS-FC09:VoltOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_295">
+        <item row="21" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_282">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC09:CtrlLoopKp-RB</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_75">
+        <item row="15" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_276">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:CtrlLoop-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC09:TestOpenLoopTriang-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_336">
+        <item row="29" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_187">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="precision" stdset="0">
-           <number>0</number>
-          </property>
-          <property name="precisionFromPV" stdset="0">
-           <bool>true</bool>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:Current-RB</string>
+           <string>SI-${CRATE}XX:PS-FC09:VoltOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="0">
-         <widget class="QLabel" name="label_325">
-          <property name="text">
-           <string>TestOpenLoopTriang:</string>
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_286">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC09:VoltGain-RB</string>
           </property>
          </widget>
         </item>
         <item row="16" column="0">
-         <widget class="QLabel" name="label_330">
+         <widget class="QLabel" name="label_316">
           <property name="text">
            <string>TestOpenLoopSquare:</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="0">
-         <widget class="QLabel" name="label_328">
-          <property name="text">
-           <string>VoltGain:</string>
-          </property>
-         </widget>
-        </item>
         <item row="28" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_201">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_186">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:VoltOffset-SP</string>
-          </property>
-         </widget>
-        </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_331">
-          <property name="text">
-           <string>TestClosedLoopSquare:</string>
+           <string>SI-${CRATE}XX:PS-FC09:VoltGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_294">
+        <item row="25" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_337">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="precision" stdset="0">
+           <number>0</number>
+          </property>
+          <property name="precisionFromPV" stdset="0">
+           <bool>true</bool>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:DacData-RB</string>
+           <string>SI-${CRATE}XX:PS-FC09:Current-RB</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_63">
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_28">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:TestClosedLoopSquare-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC09:TestHighLim-SP</string>
           </property>
          </widget>
         </item>
         <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_292">
+         <widget class="PyDMLabel" name="PyDMLabel_32">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:CurrentRaw-RB</string>
+           <string>SI-${CRATE}XX:PS-FC09:TestHighLim-RB</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_194">
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_33">
+          <property name="text">
+           <string>TestHighLim:</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+     <widget class="QWidget" name="tab_17">
+      <attribute name="title">
+       <string>C10</string>
+      </attribute>
+      <widget class="QWidget" name="gridLayoutWidget_18">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>10</y>
+         <width>501</width>
+         <height>461</height>
+        </rect>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_19">
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_292">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:CurrentRaw-SP</string>
+           <string>SI-${CRATE}XX:PS-FC10:CurrentRaw-RB</string>
           </property>
          </widget>
         </item>
         <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_299">
+         <widget class="PyDMLabel" name="PyDMLabel_298">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:CurrOffset-RB</string>
+           <string>SI-${CRATE}XX:PS-FC10:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_195">
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:DacData-SP</string>
+        <item row="16" column="0">
+         <widget class="QLabel" name="label_330">
+          <property name="text">
+           <string>TestOpenLoopSquare:</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_323">
+        <item row="29" column="0">
+         <widget class="QLabel" name="label_333">
           <property name="text">
-           <string>CtrlLoopKp:</string>
+           <string>VoltOffset:</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="0">
-         <widget class="QLabel" name="label_329">
+        <item row="25" column="0">
+         <widget class="QLabel" name="label_411">
           <property name="text">
-           <string>CtrlLoopTi:</string>
+           <string>Current:</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_190">
+        <item row="17" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_63">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:CtrlLoopKp-SP</string>
+           <string>SI-${CRATE}XX:PS-FC10:TestClosedLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="0">
-         <widget class="QLabel" name="label_322">
-          <property name="text">
-           <string>CurrentRaw:</string>
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_295">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC10:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="0">
-         <widget class="QLabel" name="label_320">
-          <property name="text">
-           <string>DacWr:</string>
+        <item row="26" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_198">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC10:CurrGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="0">
-         <widget class="QLabel" name="label_321">
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_323">
           <property name="text">
-           <string>CurrGain:</string>
+           <string>CtrlLoopKp:</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="0">
-         <widget class="QLabel" name="label_333">
-          <property name="text">
-           <string>VoltOffset:</string>
+        <item row="22" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_289">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC10:CtrlLoopTi-RB</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_223">
+        <item row="14" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_288">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:Current-SP</string>
+           <string>SI-${CRATE}XX:PS-FC10:PwrState-Sts</string>
           </property>
          </widget>
         </item>
@@ -4640,50 +4768,53 @@
           </property>
          </widget>
         </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_332">
-          <property name="text">
-           <string>PwrState:</string>
+        <item row="20" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_195">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC10:DacData-SP</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_289">
+        <item row="28" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_200">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:CtrlLoopTi-RB</string>
+           <string>SI-${CRATE}XX:PS-FC10:VoltGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_18">
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_300">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:PwrState-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC10:VoltGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_200">
+        <item row="29" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_301">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:VoltGain-SP</string>
+           <string>SI-${CRATE}XX:PS-FC10:VoltOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_49">
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_18">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:TestOpenLoopSquare-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC10:PwrState-Sel</string>
           </property>
          </widget>
         </item>
@@ -4694,10 +4825,37 @@
           </property>
          </widget>
         </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_411">
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_293">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC10:TestOpenLoopSquare-Sts</string>
+          </property>
+         </widget>
+        </item>
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_299">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC10:CurrOffset-RB</string>
+          </property>
+         </widget>
+        </item>
+        <item row="22" column="0">
+         <widget class="QLabel" name="label_329">
           <property name="text">
-           <string>Current:</string>
+           <string>CtrlLoopTi:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="19" column="0">
+         <widget class="QLabel" name="label_320">
+          <property name="text">
+           <string>DacWr:</string>
           </property>
          </widget>
         </item>
@@ -4711,60 +4869,90 @@
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_293">
+        <item row="22" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_189">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:TestOpenLoopSquare-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC10:CtrlLoopTi-SP</string>
           </property>
          </widget>
         </item>
         <item row="25" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_198">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_223">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:CurrGain-SP</string>
+           <string>SI-${CRATE}XX:PS-FC10:Current-SP</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_288">
+        <item row="29" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_201">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:PwrState-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC10:VoltOffset-SP</string>
+          </property>
+         </widget>
+        </item>
+        <item row="24" column="0">
+         <widget class="QLabel" name="label_322">
+          <property name="text">
+           <string>CurrentRaw:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="28" column="0">
+         <widget class="QLabel" name="label_328">
+          <property name="text">
+           <string>VoltGain:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="27" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_199">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC10:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
         <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_298">
+         <widget class="PyDMLabel" name="PyDMLabel_336">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="precision" stdset="0">
+           <number>0</number>
+          </property>
+          <property name="precisionFromPV" stdset="0">
+           <bool>true</bool>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:CurrGain-RB</string>
+           <string>SI-${CRATE}XX:PS-FC10:Current-RB</string>
           </property>
          </widget>
         </item>
         <item row="26" column="0">
-         <widget class="QLabel" name="label_324">
+         <widget class="QLabel" name="label_321">
           <property name="text">
-           <string>CurrOffset:</string>
+           <string>CurrGain:</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_199">
+        <item row="20" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_294">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC10:CurrOffset-SP</string>
+           <string>SI-${CRATE}XX:PS-FC10:DacData-RB</string>
           </property>
          </widget>
         </item>
@@ -4800,114 +4988,207 @@
           </property>
          </widget>
         </item>
-       </layout>
-      </widget>
-     </widget>
-     <widget class="QWidget" name="tab_18">
-      <attribute name="title">
-       <string>C11</string>
-      </attribute>
-      <widget class="QWidget" name="gridLayoutWidget_19">
-       <property name="geometry">
-        <rect>
-         <x>10</x>
-         <y>10</y>
-         <width>501</width>
-         <height>461</height>
-        </rect>
-       </property>
-       <layout class="QGridLayout" name="gridLayout_20">
+        <item row="15" column="0">
+         <widget class="QLabel" name="label_325">
+          <property name="text">
+           <string>TestOpenLoopTriang:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="27" column="0">
+         <widget class="QLabel" name="label_324">
+          <property name="text">
+           <string>CurrOffset:</string>
+          </property>
+         </widget>
+        </item>
         <item row="20" column="0">
-         <widget class="QLabel" name="label_340">
+         <widget class="QLabel" name="label_326">
           <property name="text">
            <string>DacData:</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_214">
+        <item row="17" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_297">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:VoltGain-SP</string>
+           <string>SI-${CRATE}XX:PS-FC10:TestClosedLoopSquare-Sts</string>
+          </property>
+         </widget>
+        </item>
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_332">
+          <property name="text">
+           <string>PwrState:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_331">
+          <property name="text">
+           <string>TestClosedLoopSquare:</string>
           </property>
          </widget>
         </item>
         <item row="16" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_52">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_49">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:TestOpenLoopSquare-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC10:TestOpenLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="0">
-         <widget class="QLabel" name="label_337">
-          <property name="text">
-           <string>CtrlLoopKp:</string>
+        <item row="24" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_194">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC10:CurrentRaw-SP</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_315">
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_75">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:VoltOffset-RB</string>
+           <string>SI-${CRATE}XX:PS-FC10:CtrlLoop-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="27" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_314">
+        <item row="21" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_190">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:VoltGain-RB</string>
+           <string>SI-${CRATE}XX:PS-FC10:CtrlLoopKp-SP</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_312">
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_27">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:CurrGain-RB</string>
+           <string>SI-${CRATE}XX:PS-FC10:TestHighLim-SP</string>
           </property>
          </widget>
         </item>
+        <item row="23" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_36">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC10:TestHighLim-RB</string>
+          </property>
+         </widget>
+        </item>
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_21">
+          <property name="text">
+           <string>TestHighLim:</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+     <widget class="QWidget" name="tab_18">
+      <attribute name="title">
+       <string>C11</string>
+      </attribute>
+      <widget class="QWidget" name="gridLayoutWidget_19">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>10</y>
+         <width>501</width>
+         <height>461</height>
+        </rect>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_20">
         <item row="28" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_215">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_214">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:VoltOffset-SP</string>
+           <string>SI-${CRATE}XX:PS-FC11:VoltGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_209">
+        <item row="17" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_311">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:DacData-SP</string>
+           <string>SI-${CRATE}XX:PS-FC11:TestClosedLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_309">
+        <item row="20" column="0">
+         <widget class="QLabel" name="label_340">
+          <property name="text">
+           <string>DacData:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="24" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_208">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:CtrlLoop-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC11:CurrentRaw-SP</string>
+          </property>
+         </widget>
+        </item>
+        <item row="28" column="0">
+         <widget class="QLabel" name="label_342">
+          <property name="text">
+           <string>VoltGain:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="17" column="0">
+         <widget class="QLabel" name="label_345">
+          <property name="text">
+           <string>TestClosedLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="29" column="0">
+         <widget class="QLabel" name="label_347">
+          <property name="text">
+           <string>VoltOffset:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="22" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_203">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC11:CtrlLoopTi-SP</string>
+          </property>
+         </widget>
+        </item>
+        <item row="22" column="0">
+         <widget class="QLabel" name="label_343">
+          <property name="text">
+           <string>CtrlLoopTi:</string>
           </property>
          </widget>
         </item>
@@ -4918,95 +5199,136 @@
           </property>
          </widget>
         </item>
-        <item row="21" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_204">
+        <item row="16" column="0">
+         <widget class="QLabel" name="label_344">
+          <property name="text">
+           <string>TestOpenLoopSquare:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="18" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_73">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:CtrlLoopKp-SP</string>
+           <string>SI-${CRATE}XX:PS-FC11:CtrlLoop-Sel</string>
+          </property>
+         </widget>
+        </item>
+        <item row="19" column="1" colspan="2">
+         <widget class="PyDMPushButton" name="PyDMPushButton_8">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="text">
+           <string>press to pulse</string>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC11:DacWr-Cmd</string>
+          </property>
+          <property name="pressValue" stdset="0">
+           <string>1</string>
+          </property>
+          <property name="releaseValue" stdset="0">
+           <string>0</string>
+          </property>
+          <property name="writeWhenRelease" stdset="0">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="25" column="0">
+         <widget class="QLabel" name="label_412">
+          <property name="text">
+           <string>Current:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="24" column="0">
+         <widget class="QLabel" name="label_336">
+          <property name="text">
+           <string>CurrentRaw:</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="0">
-         <widget class="QLabel" name="label_344">
+        <item row="21" column="0">
+         <widget class="QLabel" name="label_337">
           <property name="text">
-           <string>TestOpenLoopSquare:</string>
+           <string>CtrlLoopKp:</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_208">
+        <item row="28" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_314">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:CurrentRaw-SP</string>
+           <string>SI-${CRATE}XX:PS-FC11:VoltGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="0">
-         <widget class="QLabel" name="label_341">
-          <property name="text">
-           <string>CtrlLoop:</string>
+        <item row="27" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_213">
+          <property name="toolTip">
+           <string/>
           </property>
-         </widget>
-        </item>
-        <item row="27" column="0">
-         <widget class="QLabel" name="label_342">
-          <property name="text">
-           <string>VoltGain:</string>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC11:CurrOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="0">
-         <widget class="QLabel" name="label_334">
-          <property name="text">
-           <string>DacWr:</string>
+        <item row="26" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_212">
+          <property name="toolTip">
+           <string/>
           </property>
-         </widget>
-        </item>
-        <item row="17" column="0">
-         <widget class="QLabel" name="label_345">
-          <property name="text">
-           <string>TestClosedLoopSquare:</string>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC11:CurrGain-SP</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_203">
+        <item row="20" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_308">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:CtrlLoopTi-SP</string>
+           <string>SI-${CRATE}XX:PS-FC11:DacData-RB</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_29">
+        <item row="17" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_62">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:TestOpenLoopTriang-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC11:TestClosedLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="28" column="0">
-         <widget class="QLabel" name="label_347">
+        <item row="19" column="0">
+         <widget class="QLabel" name="label_334">
           <property name="text">
-           <string>VoltOffset:</string>
+           <string>DacWr:</string>
           </property>
          </widget>
         </item>
-        <item row="18" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_73">
+        <item row="25" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_338">
           <property name="toolTip">
            <string/>
           </property>
+          <property name="precision" stdset="0">
+           <number>0</number>
+          </property>
+          <property name="precisionFromPV" stdset="0">
+           <bool>true</bool>
+          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:CtrlLoop-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC11:Current-RB</string>
           </property>
          </widget>
         </item>
@@ -5020,14 +5342,7 @@
           </property>
          </widget>
         </item>
-        <item row="25" column="0">
-         <widget class="QLabel" name="label_335">
-          <property name="text">
-           <string>CurrGain:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="24" column="2">
+        <item row="25" column="2">
          <widget class="PyDMLineEdit" name="PyDMLineEdit_222">
           <property name="toolTip">
            <string/>
@@ -5037,196 +5352,208 @@
           </property>
          </widget>
         </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_346">
-          <property name="text">
-           <string>PwrState:</string>
+        <item row="14" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_17">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC11:PwrState-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="20" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_308">
+        <item row="21" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_204">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:DacData-RB</string>
+           <string>SI-${CRATE}XX:PS-FC11:CtrlLoopKp-SP</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_311">
+        <item row="18" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_309">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:TestClosedLoopSquare-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC11:CtrlLoop-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_338">
+        <item row="15" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_29">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="precision" stdset="0">
-           <number>0</number>
-          </property>
-          <property name="precisionFromPV" stdset="0">
-           <bool>true</bool>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:Current-RB</string>
+           <string>SI-${CRATE}XX:PS-FC11:TestOpenLoopTriang-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="24" column="0">
-         <widget class="QLabel" name="label_412">
-          <property name="text">
-           <string>Current:</string>
+        <item row="14" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_302">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC11:PwrState-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="21" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_310">
+        <item row="15" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_304">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:CtrlLoopKp-RB</string>
+           <string>SI-${CRATE}XX:PS-FC11:TestOpenLoopTriang-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="0">
-         <widget class="QLabel" name="label_336">
-          <property name="text">
-           <string>CurrentRaw:</string>
+        <item row="26" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_312">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC11:CurrGain-RB</string>
           </property>
          </widget>
         </item>
-        <item row="23" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_306">
+        <item row="16" column="2">
+         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_52">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:CurrentRaw-RB</string>
+           <string>SI-${CRATE}XX:PS-FC11:TestOpenLoopSquare-Sel</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="0">
-         <widget class="QLabel" name="label_338">
-          <property name="text">
-           <string>CurrOffset:</string>
+        <item row="20" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_209">
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="channel" stdset="0">
+           <string>SI-${CRATE}XX:PS-FC11:DacData-SP</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_213">
+        <item row="27" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_313">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:CurrOffset-SP</string>
+           <string>SI-${CRATE}XX:PS-FC11:CurrOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="22" column="0">
-         <widget class="QLabel" name="label_343">
+        <item row="26" column="0">
+         <widget class="QLabel" name="label_335">
           <property name="text">
-           <string>CtrlLoopTi:</string>
+           <string>CurrGain:</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_302">
+        <item row="24" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_306">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:PwrState-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC11:CurrentRaw-RB</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_307">
-          <property name="toolTip">
-           <string/>
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_346">
+          <property name="text">
+           <string>PwrState:</string>
           </property>
-          <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:TestOpenLoopSquare-Sts</string>
+         </widget>
+        </item>
+        <item row="18" column="0">
+         <widget class="QLabel" name="label_341">
+          <property name="text">
+           <string>CtrlLoop:</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_17">
+        <item row="29" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_215">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:PwrState-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC11:VoltOffset-SP</string>
           </property>
          </widget>
         </item>
-        <item row="25" column="2">
-         <widget class="PyDMLineEdit" name="PyDMLineEdit_212">
+        <item row="29" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_315">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:CurrGain-SP</string>
+           <string>SI-${CRATE}XX:PS-FC11:VoltOffset-RB</string>
           </property>
          </widget>
         </item>
-        <item row="15" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_304">
+        <item row="21" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_310">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:TestOpenLoopTriang-Sts</string>
+           <string>SI-${CRATE}XX:PS-FC11:CtrlLoopKp-RB</string>
           </property>
          </widget>
         </item>
-        <item row="26" column="1">
-         <widget class="PyDMLabel" name="PyDMLabel_313">
+        <item row="16" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_307">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:CurrOffset-RB</string>
+           <string>SI-${CRATE}XX:PS-FC11:TestOpenLoopSquare-Sts</string>
           </property>
          </widget>
         </item>
-        <item row="17" column="2">
-         <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_62">
+        <item row="27" column="0">
+         <widget class="QLabel" name="label_338">
+          <property name="text">
+           <string>CurrOffset:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="23" column="2">
+         <widget class="PyDMLineEdit" name="PyDMLineEdit_26">
           <property name="toolTip">
            <string/>
           </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:TestClosedLoopSquare-Sel</string>
+           <string>SI-${CRATE}XX:PS-FC11:TestHighLim-SP</string>
           </property>
          </widget>
         </item>
-        <item row="19" column="1" colspan="2">
-         <widget class="PyDMPushButton" name="PyDMPushButton_8">
+        <item row="23" column="1">
+         <widget class="PyDMLabel" name="PyDMLabel_40">
           <property name="toolTip">
            <string/>
           </property>
-          <property name="text">
-           <string>press to pulse</string>
-          </property>
           <property name="channel" stdset="0">
-           <string>SI-${CRATE}XX:PS-FC11:DacWr-Cmd</string>
-          </property>
-          <property name="pressValue" stdset="0">
-           <string>1</string>
+           <string>SI-${CRATE}XX:PS-FC11:TestHighLim-RB</string>
           </property>
-          <property name="releaseValue" stdset="0">
-           <string>0</string>
-          </property>
-          <property name="writeWhenRelease" stdset="0">
-           <bool>true</bool>
+         </widget>
+        </item>
+        <item row="23" column="0">
+         <widget class="QLabel" name="label_228">
+          <property name="text">
+           <string>TestHighLim:</string>
           </property>
          </widget>
         </item>
@@ -9994,7 +10321,7 @@
        <string/>
       </property>
       <property name="channel" stdset="0">
-       <string>${SECTION}-${CRATE}${SLOT}RaBPM:BS-FOFBCtrl:TestCurrLowLim-SP</string>
+       <string>${SECTION}-${CRATE}${SLOT}RaBPM:BS-FOFBCtrl:TestLowLim-SP</string>
       </property>
      </widget>
      <widget class="PyDMLabel" name="PyDMLabel_34">
@@ -10036,7 +10363,7 @@
        </rect>
       </property>
       <property name="text">
-       <string> TestCurrLowLim:</string>
+       <string> TestLowLim:</string>
       </property>
      </widget>
      <widget class="PyDMLineEdit" name="PyDMLineEdit_31">
@@ -10097,7 +10424,7 @@
        <string/>
       </property>
       <property name="channel" stdset="0">
-       <string>${SECTION}-${CRATE}${SLOT}RaBPM:BS-FOFBCtrl:TestCurrLowLim-RB</string>
+       <string>${SECTION}-${CRATE}${SLOT}RaBPM:BS-FOFBCtrl:TestLowLim-RB</string>
       </property>
      </widget>
      <widget class="PyDMEnumComboBox" name="PyDMEnumComboBox_89">
@@ -10116,6 +10443,19 @@
        <string>${SECTION}-${CRATE}${SLOT}RaBPM:BS-FOFBCtrl:DacDataSrc-Sel</string>
       </property>
      </widget>
+     <widget class="QLabel" name="label_32">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>142</width>
+        <height>23</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>TestHighLim:</string>
+      </property>
+     </widget>
     </widget>
     <widget class="QLabel" name="label">
      <property name="geometry">
diff --git a/scripts/python/rtm_lamp_test.py b/scripts/python/rtm_lamp_test.py
index d3fed39..c0b68bf 100644
--- a/scripts/python/rtm_lamp_test.py
+++ b/scripts/python/rtm_lamp_test.py
@@ -73,7 +73,7 @@
 pv_acq_trigger_rep        = str(prefix_fofb) + str("ACQTriggerRep-Sel")
 pv_acq_trigger_event      = str(prefix_fofb) + str("ACQTriggerEvent-Sel")
 pv_acq_samples_pre        = str(prefix_fofb) + str("ACQSamplesPre-SP")
-pv_current_setpoint_inf   = str(prefix_fofb) + str("TestCurrLowLim-SP")
+pv_current_setpoint_inf   = str(prefix_fofb) + str("TestLowLim-SP")
 pv_dac_cnt_max            = str(prefix_fofb) + str("TestPIDacCntMax-SP")
 pv_dac_data_wb            = str(prefix_fofb) + str("DacDataSrc-Sel")
 
@@ -107,7 +107,7 @@
   pv_current_offset.append(        str(pv_prefix)  + str("CurrOffset")           + str("-SP"))
   pv_voltage_offset.append(        str(pv_prefix)  + str("VoltOffset")           + str("-SP"))
   pv_current_setpoint.append(      str(pv_prefix)  + str("Current")              + str("-SP"))
-  pv_current_setpoint_raw.append(  str(pv_prefix)  + str("CurrentRaw")           + str("-SP"))
+  pv_current_setpoint_raw.append(  str(pv_prefix)  + str("TestHighLim")          + str("-SP"))
   pv_dac_data.append(              str(pv_prefix)  + str("DacData")              + str("-SP"))
   pv_amp_enable.append(            str(pv_prefix)  + str("PwrState")             + str("-Sel"))
   pv_pi_enable.append(             str(pv_prefix)  + str("CtrlLoop")             + str("-Sel"))
diff --git a/scripts/python/set_initial_parameters.py b/scripts/python/set_initial_parameters.py
index 17d3f14..06a5e1b 100644
--- a/scripts/python/set_initial_parameters.py
+++ b/scripts/python/set_initial_parameters.py
@@ -59,7 +59,7 @@
 pv_acq_trigger_rep        = str(prefix_fofb) + str("ACQTriggerRep-Sel")
 pv_acq_trigger_event      = str(prefix_fofb) + str("ACQTriggerEvent-Sel")
 pv_acq_samples_pre        = str(prefix_fofb) + str("ACQSamplesPre-SP")
-pv_current_setpoint_inf   = str(prefix_fofb) + str("TestCurrLowLim-SP")
+pv_setpoint_inf           = str(prefix_fofb) + str("TestLowLim-SP")
 pv_dac_cnt_max            = str(prefix_fofb) + str("TestPIDacCntMax-SP")
 
 # PVs per channel
@@ -75,22 +75,24 @@
 pv_pi_kp                  = []
 pv_pi_ti                  = []
 pv_square_wave_openloop   = []
+pv_test_high_lim          = []
 
 # getting lists of PV names, so we can reutilize them in all tests
 
 for i in range(0, channels):
-  pv_current_ArrayDataRAW.append(str(prefix_fofb) + str("GEN_CH")     + str(i) + str("ArrayData"))
+  pv_current_ArrayDataRAW.append(str(prefix_fofb) + str("GEN_CH") + str(i) + str("ArrayData"))
 
 for pv_prefix in prefix_rtm:
-  pv_current_gain.append(        str(pv_prefix)   + str("CurrGain")   + str("-SP"))
-  pv_voltage_gain.append(        str(pv_prefix)   + str("VoltGain")   + str("-SP"))
-  pv_current_offset.append(      str(pv_prefix)   + str("CurrOffset") + str("-SP"))
-  pv_voltage_offset.append(      str(pv_prefix)   + str("VoltOffset") + str("-SP"))
-  pv_current_setpoint.append(    str(pv_prefix)   + str("Current")    + str("-SP"))
-  pv_amp_enable.append(          str(pv_prefix)   + str("PwrState")   + str("-Sel"))
-  pv_pi_enable.append(           str(pv_prefix)   + str("CtrlLoop")   + str("-Sel"))
-  pv_pi_kp.append(               str(pv_prefix)   + str("CtrlLoopKp") + str("-SP"))
-  pv_pi_ti.append(               str(pv_prefix)   + str("CtrlLoopTi") + str("-SP"))
+  pv_current_gain.append(        str(pv_prefix)   + str("CurrGain")           + str("-SP"))
+  pv_voltage_gain.append(        str(pv_prefix)   + str("VoltGain")           + str("-SP"))
+  pv_current_offset.append(      str(pv_prefix)   + str("CurrOffset")         + str("-SP"))
+  pv_voltage_offset.append(      str(pv_prefix)   + str("VoltOffset")         + str("-SP"))
+  pv_current_setpoint.append(    str(pv_prefix)   + str("Current")            + str("-SP"))
+  pv_test_high_lim.append(       str(pv_prefix)   + str("TestHighLim")        + str("-SP"))
+  pv_amp_enable.append(          str(pv_prefix)   + str("PwrState")           + str("-Sel"))
+  pv_pi_enable.append(           str(pv_prefix)   + str("CtrlLoop")           + str("-Sel"))
+  pv_pi_kp.append(               str(pv_prefix)   + str("CtrlLoopKp")         + str("-SP"))
+  pv_pi_ti.append(               str(pv_prefix)   + str("CtrlLoopTi")         + str("-SP"))
   pv_square_wave_openloop.append(str(pv_prefix)   + str("TestOpenLoopSquare") + str("-Sel"))
 
 print('\n')
@@ -130,7 +132,8 @@
 
 for i in range(0, channels):
     PV(pv_current_setpoint[i]).put(0, wait=True)
-PV(pv_current_setpoint_inf).put(0,    wait=True)
+    PV(pv_test_high_lim[i]).put(0,    wait=True)
+PV(pv_setpoint_inf).put(0,            wait=True)
 
 print('>>> Set zero for the current setpoints... Done!')
 
diff --git a/scripts/python/test_closed_loop.py b/scripts/python/test_closed_loop.py
index 6514b65..15a9cf3 100644
--- a/scripts/python/test_closed_loop.py
+++ b/scripts/python/test_closed_loop.py
@@ -68,7 +68,7 @@
 pv_acq_trigger_rep        = str(prefix_fofb) + str("ACQTriggerRep-Sel")
 pv_acq_trigger_event      = str(prefix_fofb) + str("ACQTriggerEvent-Sel")
 pv_acq_samples_pre        = str(prefix_fofb) + str("ACQSamplesPre-SP")
-pv_current_setpoint_inf   = str(prefix_fofb) + str("TestCurrLowLim-SP")
+pv_current_setpoint_inf   = str(prefix_fofb) + str("TestLowLim-SP")
 pv_dac_cnt_max            = str(prefix_fofb) + str("TestPIDacCntMax-SP")
 pv_dac_data_wb            = str(prefix_fofb) + str("DacDataSrc-Sel")
 
@@ -102,7 +102,7 @@
   pv_current_offset.append(        str(pv_prefix)  + str("CurrOffset")           + str("-SP"))
   pv_voltage_offset.append(        str(pv_prefix)  + str("VoltOffset")           + str("-SP"))
   pv_current_setpoint.append(      str(pv_prefix)  + str("Current")              + str("-SP"))
-  pv_current_setpoint_raw.append(  str(pv_prefix)  + str("CurrentRaw")           + str("-SP"))
+  pv_current_setpoint_raw.append(  str(pv_prefix)  + str("TestHighLim")          + str("-SP"))
   pv_dac_data.append(              str(pv_prefix)  + str("DacData")              + str("-SP"))
   pv_amp_enable.append(            str(pv_prefix)  + str("PwrState")             + str("-Sel"))
   pv_pi_enable.append(             str(pv_prefix)  + str("CtrlLoop")             + str("-Sel"))
diff --git a/scripts/python/test_open_loop.py b/scripts/python/test_open_loop.py
index 051cc94..e0c481c 100644
--- a/scripts/python/test_open_loop.py
+++ b/scripts/python/test_open_loop.py
@@ -65,7 +65,7 @@
 pv_acq_trigger_rep        = str(prefix_fofb) + str("ACQTriggerRep-Sel")
 pv_acq_trigger_event      = str(prefix_fofb) + str("ACQTriggerEvent-Sel")
 pv_acq_samples_pre        = str(prefix_fofb) + str("ACQSamplesPre-SP")
-pv_current_setpoint_inf   = str(prefix_fofb) + str("TestCurrLowLim-SP")
+pv_current_setpoint_inf   = str(prefix_fofb) + str("TestLowLim-SP")
 pv_dac_cnt_max            = str(prefix_fofb) + str("TestPIDacCntMax-SP")
 pv_dac_data_wb            = str(prefix_fofb) + str("DacDataSrc-Sel")
 
@@ -99,7 +99,7 @@
   pv_voltage_gain.append(        str(pv_prefix) + str("VoltGain")   + str("-SP"))
   pv_current_offset.append(      str(pv_prefix) + str("CurrOffset") + str("-SP"))
   pv_voltage_offset.append(      str(pv_prefix) + str("VoltOffset") + str("-SP"))
-  pv_current_setpoint.append(    str(pv_prefix) + str("CurrentRaw") + str("-SP"))
+  pv_current_setpoint.append(    str(pv_prefix) + str("TestHighLim")+ str("-SP"))
   pv_amp_enable.append(          str(pv_prefix) + str("PwrState")   + str("-Sel"))
   pv_pi_enable.append(           str(pv_prefix) + str("CtrlLoop")   + str("-Sel"))
   pv_pi_kp.append(               str(pv_prefix) + str("CtrlLoopKp") + str("-SP"))