From d2247a8bdb82f7da0330576de99d5d8308394cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Denis?= <jfdenis@cea.fr>
Date: Mon, 21 Nov 2016 09:34:36 +0100
Subject: [PATCH] Change IFCDAQ module for FASTAQUISITION module

---
 db/EMU.substitutions |   44 +-
 opi/EMU.opi          | 1130 +++++++++++++++++++++++-------------------
 startup/EMU.cmd      |   54 +-
 3 files changed, 697 insertions(+), 531 deletions(-)

diff --git a/db/EMU.substitutions b/db/EMU.substitutions
index 2674513..8efbf5c 100644
--- a/db/EMU.substitutions
+++ b/db/EMU.substitutions
@@ -294,15 +294,15 @@ file "scanDAQDetTrig.template"
 
 		"3",
 
-		"$(DAQNDSPREFIX):AI-STAT",
+		"$(DAQNDSPREFIX):CARD0-STAT",
 		"ON",
 
-		"$(DAQNDSPREFIX):AI-STAT",
+		"$(DAQNDSPREFIX):CARD0-STAT",
 		"RUNNING",
 		
 		"$(DEVICE):$(SCAN_EF)-SAVE_TS",
 		
-		"$(DAQNDSPREFIX):AI-STAT-RB",
+		"$(DAQNDSPREFIX):CARD0-STAT-RB",
 		"4"
 	}
 }
@@ -335,7 +335,7 @@ file "scanDAQDet.template"
 		"55"
 		
 		"$(DAQBUFSIZE)",
-		"$(DAQNDSPREFIX):AI-TRGR-RB",
+		"$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
 		"$(DAQNDSPREFIX):$(DET1WF)",
 		"$(DAQNDSPREFIX):$(DET1WF).NORD"
 	}
@@ -368,7 +368,7 @@ file "scanDAQDet.template"
 		"55"
 		
 		"$(DAQBUFSIZE)",
-		"$(DAQNDSPREFIX):AI-TRGR-RB",
+		"$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
 		"$(DAQNDSPREFIX):$(DET2WF)",
 		"$(DAQNDSPREFIX):$(DET2WF).NORD"
 	}
@@ -401,12 +401,42 @@ file "scanDAQDet.template"
 		"55"
 		
 		"$(DAQBUFSIZE)",
-		"$(DAQNDSPREFIX):AI-TRGR-RB",
+		"$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
 		"$(DAQNDSPREFIX):$(DET3WF)",
 		"$(DAQNDSPREFIX):$(DET3WF).NORD"
 	}
 }
 
+##########################################################################
+################################ DTACQ  ##################################
+##########################################################################
+file DataAcquisitionChannel.template
+{
+pattern
+{ 	SECTION, SUBSECTION, DISC, DEVICE, SIGNAL,DESCRIPTION,		    EVENT_IN,NELM,SIZE,SAMPLING_RATE_PV}
+	{"LNS","ISRC-010","PBI-EM","FC","CurrR","Current FC",10,16000,520,LNS-ISRC-010:CARD0:SAMPLINGRATE-RB}
+	{"LNS","ISRC-010","PBI-EM","HV1","VoltR","Voltage HV1 FC",11,16000,520,LNS-ISRC-010:CARD0:SAMPLINGRATE-RB}
+	{"LNS","ISRC-010","PBI-EM","HV2","VoltR","Voltage HV2 FC",12,16000,520,LNS-ISRC-010:CARD0:SAMPLINGRATE-RB}
+}
+
+file FastAcquisition.template
+{
+pattern
+{ SECTION,       SUBSECTION, DISC, DEVICE, SIGNAL,NICKNAME,EVENT_OUT,CARD,CHANNEL,NELM }
+
+	{"LNS","ISRC-010","PBI-EM","FC","CurrR","CurrR",10,0,0,16000}
+	{"LNS","ISRC-010","PBI-EM","HV1","VoltR","HV1VoltR",11,0,1,16000}
+	{"LNS","ISRC-010","PBI-EM","HV2","VoltR","HV2VoltR",12,0,2,16000}
+}
+
+
+file FastAcquisitionInformation.template
+{
+	pattern
+	{ CARD,FMC,NELM,PREFIX}
+	{0,2,16000,"LNS-ISRC-010"}
+}
+
 ##########################################################################
 ################################ PROCESS  ################################
 ##########################################################################
@@ -422,7 +452,7 @@ pattern	{DEVICE, SCAN_EF}
 file EMU_CALCUL.template
 {
 pattern	{DEVICE,DAQPREFIX,DET2WF,DET3WF,DET2,DET3,NELM,SCAN_EF}
-	{"$(DEVICE)","$(DAQNDSPREFIX)","AI-CH1-DATA","AI-CH2-DATA","DET2","DET3","$(DAQBUFSIZE)","PS"}
+	{"$(DEVICE)","$(DAQNDSPREFIX)","PBI-EM-HV1:VoltR_Y","PBI-EM-HV2:VoltR_Y","DET2","DET3","$(DAQBUFSIZE)","PS"}
 }
 
 ##########################################################################
diff --git a/opi/EMU.opi b/opi/EMU.opi
index 4f5a85c..7b39a73 100644
--- a/opi/EMU.opi
+++ b/opi/EMU.opi
@@ -9,7 +9,7 @@
   <height>1600</height>
   <macros>
     <include_parent_macros>true</include_parent_macros>
-    <DTACQ-NAME>DACQ</DTACQ-NAME>
+    <DTACQ-NAME>LNS-ISRC-010</DTACQ-NAME>
     <SIGNAL_FC>CurR</SIGNAL_FC>
     <PREFIX_SIG>DACQ</PREFIX_SIG>
     <PREFIX_MTR>PMAC</PREFIX_MTR>
@@ -149,7 +149,7 @@
       <macros>
         <include_parent_macros>true</include_parent_macros>
       </macros>
-      <visible>true</visible>
+      <visible>false</visible>
       <border_color>
         <color red="0" green="128" blue="255" />
       </border_color>
@@ -5420,7 +5420,7 @@ $(pv_value)</tooltip>
       <macros>
         <include_parent_macros>true</include_parent_macros>
       </macros>
-      <visible>false</visible>
+      <visible>true</visible>
       <border_color>
         <color red="0" green="128" blue="255" />
       </border_color>
@@ -5441,6 +5441,99 @@ $(pv_value)</tooltip>
       <font>
         <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
       </font>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-38f7</wuid>
+        <transparent>false</transparent>
+        <auto_size>false</auto_size>
+        <text>Fast Acquisition</text>
+        <scripts />
+        <height>43</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="0" blue="0" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
+        <background_color>
+          <color name="IO Shape Fill" red="188" green="188" blue="188" />
+        </background_color>
+        <width>1357</width>
+        <x>0</x>
+        <name>Label_124</name>
+        <y>12</y>
+        <foreground_color>
+          <color name="IO Label" red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
+        <font>
+          <opifont.name fontName="Cantarell" height="13" style="1">Header 3</opifont.name>
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>1e771979:1565068c2e3:-483e</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text>######</text>
+        <rotation_angle>0.0</rotation_angle>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <show_units>true</show_units>
+        <height>20</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name>$(DTACQ-NAME)-STAT-RB</pv_name>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Update</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
+        <background_color>
+          <color red="0" green="0" blue="0" />
+        </background_color>
+        <width>148</width>
+        <x>1188</x>
+        <name>Text Update</name>
+        <y>24</y>
+        <foreground_color>
+          <color name="TextDynamic" red="0" green="244" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </font>
+      </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
@@ -5451,7 +5544,7 @@ $(pv_value)</tooltip>
 $(pv_value)</tooltip>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-663a</wuid>
+        <wuid>-3d4af206:15877d6a498:-7781</wuid>
         <transparent>false</transparent>
         <pv_value />
         <alpha>255</alpha>
@@ -5484,9 +5577,9 @@ $(pv_value)</tooltip>
           <color red="186" green="189" blue="182" />
         </background_color>
         <width>160</width>
-        <x>450</x>
+        <x>408</x>
         <name>Rectangle_2</name>
-        <y>690</y>
+        <y>639</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
@@ -5517,8 +5610,8 @@ $(trace_0_y_pv_value)</tooltip>
         <trace_0_name>$(trace_0_y_pv)</trace_0_name>
         <axis_2_minimum>0.0</axis_2_minimum>
         <trace_0_update_mode>0</trace_0_update_mode>
-        <trace_1_x_pv>$(PREFIX_SIG):$(SIGNAL_FC):RCURSOR_X</trace_1_x_pv>
-        <wuid>-3f6498d2:15645d229d4:-6639</wuid>
+        <trace_1_x_pv>LNS-ISRC-010:PBI-EM-HV1:VoltR_XMS</trace_1_x_pv>
+        <wuid>-3d4af206:15877d6a498:-7780</wuid>
         <transparent>false</transparent>
         <trace_1_update_mode>0</trace_1_update_mode>
         <axis_0_title_font>
@@ -5528,25 +5621,25 @@ $(trace_0_y_pv_value)</tooltip>
         <background_color>
           <color red="186" green="189" blue="182" />
         </background_color>
-        <x>450</x>
-        <y>84</y>
+        <x>408</x>
+        <y>120</y>
         <trace_0_x_axis_index>0</trace_0_x_axis_index>
         <axis_count>3</axis_count>
         <trace_1_point_size>4</trace_1_point_size>
-        <trace_1_anti_alias>true</trace_1_anti_alias>
+        <trace_1_anti_alias>false</trace_1_anti_alias>
         <pv_value />
         <axis_2_grid_color>
           <color red="200" green="200" blue="200" />
         </axis_2_grid_color>
         <trace_0_buffer_size>520</trace_0_buffer_size>
-        <trace_2_buffer_size>2</trace_2_buffer_size>
-        <axis_1_maximum>20.0</axis_1_maximum>
+        <trace_2_buffer_size>520</trace_2_buffer_size>
+        <axis_1_maximum>80.0</axis_1_maximum>
         <axis_0_scale_font>
           <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </axis_0_scale_font>
         <trigger_pv></trigger_pv>
         <widget_type>XY Graph</widget_type>
-        <trace_2_line_width>2</trace_2_line_width>
+        <trace_2_line_width>1</trace_2_line_width>
         <axis_1_axis_color>
           <color red="0" green="0" blue="0" />
         </axis_1_axis_color>
@@ -5555,7 +5648,6 @@ $(trace_0_y_pv_value)</tooltip>
         <title></title>
         <trace_0_visible>true</trace_0_visible>
         <trace_1_name>$(trace_1_y_pv)</trace_1_name>
-        <trace_1_y_pv_value />
         <axis_2_auto_scale>true</axis_2_auto_scale>
         <show_legend>false</show_legend>
         <axis_0_axis_title>ms</axis_0_axis_title>
@@ -5565,21 +5657,21 @@ $(trace_0_y_pv_value)</tooltip>
         <axis_2_scale_font>
           <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </axis_2_scale_font>
-        <trace_2_update_delay>100</trace_2_update_delay>
+        <trace_2_update_delay>1</trace_2_update_delay>
         <axis_0_dash_grid_line>false</axis_0_dash_grid_line>
         <trace_0_point_style>2</trace_0_point_style>
-        <trace_1_point_style>0</trace_1_point_style>
+        <trace_1_point_style>2</trace_1_point_style>
         <trace_0_line_width>1</trace_0_line_width>
         <axis_2_y_axis>false</axis_2_y_axis>
         <axis_0_time_format>0</axis_0_time_format>
         <trace_count>3</trace_count>
         <axis_1_show_grid>true</axis_1_show_grid>
         <trace_2_trace_color>
-          <color name="Major" red="255" green="0" blue="0" />
+          <color name="Primary Blue" red="0" green="148" blue="202" />
         </trace_2_trace_color>
         <axis_1_dash_grid_line>true</axis_1_dash_grid_line>
         <trace_2_trace_type>0</trace_2_trace_type>
-        <show_toolbar>false</show_toolbar>
+        <show_toolbar>true</show_toolbar>
         <axis_0_visible>true</axis_0_visible>
         <axis_0_show_grid>true</axis_0_show_grid>
         <trace_0_y_axis_index>1</trace_0_y_axis_index>
@@ -5588,15 +5680,14 @@ $(trace_0_y_pv_value)</tooltip>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>true</keep_wh_ratio>
         </scale_options>
-        <trace_1_y_pv>loc://val(-100,100)</trace_1_y_pv>
+        <trace_1_y_pv>LNS-ISRC-010:PBI-EM-HV1:VoltR_Y</trace_1_y_pv>
         <trace_2_concatenate_data>false</trace_2_concatenate_data>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <trace_2_y_pv_value />
-        <trace_2_anti_alias>true</trace_2_anti_alias>
+        <trace_2_anti_alias>false</trace_2_anti_alias>
         <axis_0_maximum>100.0</axis_0_maximum>
         <trace_1_y_axis_index>1</trace_1_y_axis_index>
         <trace_2_name>$(trace_2_y_pv)</trace_2_name>
-        <height>607</height>
+        <height>519</height>
         <trace_2_visible>true</trace_2_visible>
         <trigger_pv_value />
         <axis_1_grid_color>
@@ -5626,13 +5717,12 @@ $(trace_0_y_pv_value)</tooltip>
         <axis_0_auto_scale>true</axis_0_auto_scale>
         <axis_0_minimum>0.0</axis_0_minimum>
         <trace_2_y_axis_index>1</trace_2_y_axis_index>
-        <trace_1_update_delay>10</trace_1_update_delay>
+        <trace_1_update_delay>1</trace_1_update_delay>
         <axis_2_dash_grid_line>false</axis_2_dash_grid_line>
         <axis_1_axis_title>mA</axis_1_axis_title>
-        <trace_2_x_pv_value />
         <axis_1_auto_scale>false</axis_1_auto_scale>
-        <trace_1_line_width>2</trace_1_line_width>
-        <trace_2_y_pv>loc://val(-100,100)</trace_2_y_pv>
+        <trace_1_line_width>1</trace_1_line_width>
+        <trace_2_y_pv>LNS-ISRC-010:PBI-EM-HV2:VoltR_Y</trace_2_y_pv>
         <trace_1_plot_mode>0</trace_1_plot_mode>
         <border_color>
           <color red="0" green="128" blue="255" />
@@ -5640,11 +5730,11 @@ $(trace_0_y_pv_value)</tooltip>
         <axis_2_title_font>
           <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </axis_2_title_font>
-        <trace_0_y_pv>$(PREFIX_SIG):$(SIGNAL_FC)</trace_0_y_pv>
-        <trace_2_point_style>0</trace_2_point_style>
+        <trace_0_y_pv>LNS-ISRC-010:PBI-EM-FC:CurrR_Y</trace_0_y_pv>
+        <trace_2_point_style>2</trace_2_point_style>
         <trace_0_plot_mode>0</trace_0_plot_mode>
         <enabled>true</enabled>
-        <trace_0_x_pv>$(PREFIX_SIG):$(SIGNAL_FC)_XMS</trace_0_x_pv>
+        <trace_0_x_pv>LNS-ISRC-010:PBI-EM-FC:CurrR_XMS</trace_0_x_pv>
         <axis_1_scale_font>
           <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </axis_1_scale_font>
@@ -5654,8 +5744,7 @@ $(trace_0_y_pv_value)</tooltip>
         <border_alarm_sensitive>false</border_alarm_sensitive>
         <axis_2_maximum>22.0</axis_2_maximum>
         <show_plot_area_border>false</show_plot_area_border>
-        <width>853</width>
-        <trace_1_x_pv_value />
+        <width>607</width>
         <axis_1_minimum>-1.0</axis_1_minimum>
         <title_font>
           <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
@@ -5670,7 +5759,7 @@ $(trace_0_y_pv_value)</tooltip>
         </axis_1_title_font>
         <visible>true</visible>
         <axis_2_axis_title>ms</axis_2_axis_title>
-        <trace_1_buffer_size>2</trace_1_buffer_size>
+        <trace_1_buffer_size>520</trace_1_buffer_size>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <axis_2_scale_format></axis_2_scale_format>
         <scripts />
@@ -5678,10 +5767,10 @@ $(trace_0_y_pv_value)</tooltip>
         <trace_0_trace_color>
           <color red="0" green="255" blue="0" />
         </trace_0_trace_color>
-        <trace_0_anti_alias>true</trace_0_anti_alias>
+        <trace_0_anti_alias>false</trace_0_anti_alias>
         <axis_1_auto_scale_threshold>0.0</axis_1_auto_scale_threshold>
         <trace_2_plot_mode>0</trace_2_plot_mode>
-        <trace_2_x_pv>$(PREFIX_SIG):$(SIGNAL_FC):LCURSOR_X</trace_2_x_pv>
+        <trace_2_x_pv>LNS-ISRC-010:PBI-EM-HV2:VoltR_XMS</trace_2_x_pv>
         <foreground_color>
           <color red="0" green="0" blue="255" />
         </foreground_color>
@@ -5696,7 +5785,7 @@ $(trace_0_y_pv_value)</tooltip>
 $(pv_value)</tooltip>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6638</wuid>
+        <wuid>-3d4af206:15877d6a498:-777f</wuid>
         <transparent>false</transparent>
         <pv_value />
         <alpha>255</alpha>
@@ -5731,9 +5820,9 @@ $(pv_value)</tooltip>
           <color red="186" green="189" blue="182" />
         </background_color>
         <width>349</width>
-        <x>48</x>
+        <x>36</x>
         <name>Rounded Rectangle_4</name>
-        <y>90</y>
+        <y>126</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
@@ -5746,61 +5835,45 @@ $(pv_value)</tooltip>
           <color red="128" green="0" blue="255" />
         </line_color>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>false</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>$(DTACQ-NAME):TRIGGER:PRETRIGGER_ms</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>false</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6637</wuid>
+        <enabled>true</enabled>
+        <wuid>-3d4af206:15877d6a498:-777e</wuid>
         <transparent>false</transparent>
+        <auto_size>false</auto_size>
+        <text>Display interval</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>32</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color red="0" green="148" blue="202" />
         </background_color>
-        <width>85</width>
-        <x>66</x>
-        <y>136</y>
-        <maximum>1.7976931348623157E308</maximum>
+        <width>349</width>
+        <x>36</x>
+        <name>Label_15</name>
+        <y>121</y>
         <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+          <color red="255" green="255" blue="255" />
         </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
+        <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="13" style="1">Header 3</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -5809,12 +5882,12 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6636</wuid>
-        <transparent>false</transparent>
+        <wuid>-3d4af206:15877d6a498:-777d</wuid>
+        <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>Display interval</text>
+        <text>ms</text>
         <scripts />
-        <height>32</height>
+        <height>20</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -5827,79 +5900,81 @@ $(pv_value)</tooltip>
           <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="SubPanel" red="176" green="218" blue="249" />
+          <color red="255" green="255" blue="255" />
         </background_color>
-        <width>349</width>
-        <x>48</x>
-        <name>Label_15</name>
-        <y>85</y>
+        <width>40</width>
+        <x>328</x>
+        <name>Label_16</name>
+        <y>178</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>0</line_width>
+        <horizontal_fill>true</horizontal_fill>
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>2</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>false</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>$(DTACQ-NAME):NSAMPLES_ms</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>false</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input_15</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6635</wuid>
+        <wuid>-3d4af206:15877d6a498:-777c</wuid>
         <transparent>false</transparent>
+        <pv_value />
+        <alpha>255</alpha>
+        <corner_height>16</corner_height>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>97</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
+        <visible>true</visible>
+        <pv_name></pv_name>
+        <gradient>false</gradient>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <anti_alias>true</anti_alias>
+        <corner_width>16</corner_width>
+        <line_style>0</line_style>
+        <widget_type>Rounded Rectangle</widget_type>
+        <fg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color red="186" green="189" blue="182" />
         </background_color>
-        <width>85</width>
-        <x>216</x>
-        <y>136</y>
-        <maximum>1.7976931348623157E308</maximum>
+        <width>349</width>
+        <x>36</x>
+        <name>Rounded Rectangle_5</name>
+        <y>246</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+          <color red="255" green="0" blue="0" />
         </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
+        <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
+        <line_color>
+          <color red="128" green="0" blue="255" />
+        </line_color>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
         <border_style>0</border_style>
@@ -5912,12 +5987,12 @@ $(pv_value)</tooltip>
         <arrows>1</arrows>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6634</wuid>
+        <wuid>-3d4af206:15877d6a498:-777b</wuid>
         <transparent>false</transparent>
         <points>
-          <point x="214" y="144" />
-          <point x="157" y="144" />
-          <point x="157" y="144" />
+          <point x="213" y="180" />
+          <point x="156" y="180" />
+          <point x="156" y="180" />
         </points>
         <fill_arrow>true</fill_arrow>
         <pv_value />
@@ -5946,9 +6021,9 @@ $(pv_value)</tooltip>
           <color red="0" green="0" blue="0" />
         </background_color>
         <width>58</width>
-        <x>157</x>
+        <x>156</x>
         <name>Polyline_1</name>
-        <y>144</y>
+        <y>180</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
@@ -5964,12 +6039,12 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6633</wuid>
-        <transparent>true</transparent>
+        <wuid>-3d4af206:15877d6a498:-777a</wuid>
+        <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>ms</text>
+        <text>Measure interval</text>
         <scripts />
-        <height>20</height>
+        <height>32</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -5982,235 +6057,21 @@ $(pv_value)</tooltip>
           <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color red="0" green="148" blue="202" />
         </background_color>
-        <width>40</width>
-        <x>324</x>
-        <name>Label_16</name>
-        <y>142</y>
+        <width>349</width>
+        <x>36</x>
+        <name>Label_17</name>
+        <y>241</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
-        </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <font>
-          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>0</line_width>
-        <horizontal_fill>true</horizontal_fill>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6632</wuid>
-        <transparent>false</transparent>
-        <pv_value />
-        <alpha>255</alpha>
-        <corner_height>16</corner_height>
-        <bg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </bg_gradient_color>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>97</height>
-        <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <visible>true</visible>
-        <pv_name></pv_name>
-        <gradient>false</gradient>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <anti_alias>true</anti_alias>
-        <corner_width>16</corner_width>
-        <line_style>0</line_style>
-        <widget_type>Rounded Rectangle</widget_type>
-        <fg_gradient_color>
           <color red="255" green="255" blue="255" />
-        </fg_gradient_color>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <background_color>
-          <color red="186" green="189" blue="182" />
-        </background_color>
-        <width>349</width>
-        <x>48</x>
-        <name>Rounded Rectangle_5</name>
-        <y>228</y>
-        <fill_level>0.0</fill_level>
-        <foreground_color>
-          <color red="255" green="0" blue="0" />
-        </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <font>
-          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
-        </font>
-        <line_color>
-          <color red="128" green="0" blue="255" />
-        </line_color>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>2</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):LCURSOR_ms</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>false</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input_16</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6631</wuid>
-        <transparent>false</transparent>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
-        <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
-        </background_color>
-        <width>85</width>
-        <x>66</x>
-        <y>274</y>
-        <maximum>1.7976931348623157E308</maximum>
-        <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
-        </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
-        <font>
-          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6630</wuid>
-        <transparent>false</transparent>
-        <auto_size>false</auto_size>
-        <text>Measure interval</text>
-        <scripts />
-        <height>32</height>
-        <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
-        <background_color>
-          <color name="SubPanel" red="176" green="218" blue="249" />
-        </background_color>
-        <width>349</width>
-        <x>48</x>
-        <name>Label_17</name>
-        <y>223</y>
-        <foreground_color>
-          <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>2</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):RCURSOR_ms</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>false</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input_17</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662f</wuid>
-        <transparent>false</transparent>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
-        <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
-        </background_color>
-        <width>85</width>
-        <x>216</x>
-        <y>274</y>
-        <maximum>1.7976931348623157E308</maximum>
-        <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
-        </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
-        <font>
-          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="13" style="1">Header 3</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
@@ -6224,12 +6085,12 @@ $(pv_value)</tooltip>
         <arrows>1</arrows>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662e</wuid>
+        <wuid>-3d4af206:15877d6a498:-7779</wuid>
         <transparent>false</transparent>
         <points>
-          <point x="214" y="282" />
-          <point x="157" y="282" />
-          <point x="157" y="282" />
+          <point x="213" y="300" />
+          <point x="156" y="300" />
+          <point x="156" y="300" />
         </points>
         <fill_arrow>true</fill_arrow>
         <pv_value />
@@ -6258,9 +6119,9 @@ $(pv_value)</tooltip>
           <color red="0" green="0" blue="0" />
         </background_color>
         <width>58</width>
-        <x>157</x>
+        <x>156</x>
         <name>Polyline_2</name>
-        <y>282</y>
+        <y>300</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
@@ -6276,7 +6137,7 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662d</wuid>
+        <wuid>-3d4af206:15877d6a498:-7778</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
         <text>ms</text>
@@ -6299,15 +6160,15 @@ $(pv_value)</tooltip>
           <color red="255" green="255" blue="255" />
         </background_color>
         <width>40</width>
-        <x>324</x>
+        <x>328</x>
         <name>Label_18</name>
-        <y>280</y>
+        <y>298</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -6316,7 +6177,7 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662c</wuid>
+        <wuid>-3d4af206:15877d6a498:-7777</wuid>
         <transparent>false</transparent>
         <auto_size>false</auto_size>
         <text>FC Curr</text>
@@ -6339,15 +6200,15 @@ $(pv_value)</tooltip>
           <color red="0" green="0" blue="0" />
         </background_color>
         <width>160</width>
-        <x>450</x>
+        <x>408</x>
         <name>Label_11</name>
-        <y>710</y>
+        <y>659</y>
         <foreground_color>
           <color name="TextDynamic" red="0" green="244" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -6360,14 +6221,14 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662b</wuid>
+        <wuid>-3d4af206:15877d6a498:-7776</wuid>
         <transparent>false</transparent>
         <pv_value />
         <auto_size>false</auto_size>
         <text>######</text>
         <rotation_angle>0.0</rotation_angle>
         <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
         <show_units>true</show_units>
         <height>24</height>
         <border_width>1</border_width>
@@ -6377,7 +6238,7 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):AVG</pv_name>
+        <pv_name>LNS-ISRC-010:PBI-EM-FC:CurrR:AVG</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color red="0" green="128" blue="255" />
@@ -6391,15 +6252,15 @@ $(pv_value)</tooltip>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
         <width>150</width>
-        <x>609</x>
+        <x>567</x>
         <name>Text Update_3</name>
-        <y>710</y>
+        <y>659</y>
         <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
+          <color name="Minor" red="255" green="128" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -6412,14 +6273,14 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662a</wuid>
+        <wuid>-3d4af206:15877d6a498:-7775</wuid>
         <transparent>false</transparent>
         <pv_value />
         <auto_size>false</auto_size>
         <text>######</text>
         <rotation_angle>0.0</rotation_angle>
         <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
         <show_units>true</show_units>
         <height>24</height>
         <border_width>1</border_width>
@@ -6429,7 +6290,7 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):MAX</pv_name>
+        <pv_name>LNS-ISRC-010:PBI-EM-FC:CurrR:MAX</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color red="0" green="128" blue="255" />
@@ -6443,15 +6304,15 @@ $(pv_value)</tooltip>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
         <width>150</width>
-        <x>758</x>
+        <x>716</x>
         <name>Text Update_1</name>
-        <y>710</y>
+        <y>659</y>
         <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
+          <color red="114" green="159" blue="207" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -6464,14 +6325,14 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6629</wuid>
+        <wuid>-3d4af206:15877d6a498:-7774</wuid>
         <transparent>false</transparent>
         <pv_value />
         <auto_size>false</auto_size>
         <text>######</text>
         <rotation_angle>0.0</rotation_angle>
         <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
         <show_units>true</show_units>
         <height>24</height>
         <border_width>1</border_width>
@@ -6481,7 +6342,7 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):MIN</pv_name>
+        <pv_name>LNS-ISRC-010:PBI-EM-FC:CurrR:MIN</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color red="0" green="128" blue="255" />
@@ -6495,15 +6356,15 @@ $(pv_value)</tooltip>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
         <width>150</width>
-        <x>907</x>
+        <x>865</x>
         <name>Text Update_2</name>
-        <y>710</y>
+        <y>659</y>
         <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
+          <color red="252" green="233" blue="79" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
@@ -6516,7 +6377,7 @@ $(pv_value)</tooltip>
 $(pv_value)</tooltip>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6628</wuid>
+        <wuid>-3d4af206:15877d6a498:-7773</wuid>
         <transparent>false</transparent>
         <pv_value />
         <alpha>255</alpha>
@@ -6549,9 +6410,9 @@ $(pv_value)</tooltip>
           <color red="186" green="189" blue="182" />
         </background_color>
         <width>448</width>
-        <x>609</x>
+        <x>567</x>
         <name>Rectangle_1</name>
-        <y>689</y>
+        <y>638</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
@@ -6570,7 +6431,7 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6627</wuid>
+        <wuid>-3d4af206:15877d6a498:-7772</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
         <text>Max</text>
@@ -6593,9 +6454,9 @@ $(pv_value)</tooltip>
           <color red="255" green="255" blue="255" />
         </background_color>
         <width>150</width>
-        <x>758</x>
+        <x>716</x>
         <name>Label_5</name>
-        <y>690</y>
+        <y>639</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
@@ -6610,7 +6471,7 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6626</wuid>
+        <wuid>-3d4af206:15877d6a498:-7771</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
         <text>Min</text>
@@ -6633,9 +6494,9 @@ $(pv_value)</tooltip>
           <color red="255" green="255" blue="255" />
         </background_color>
         <width>150</width>
-        <x>907</x>
+        <x>865</x>
         <name>Label_22</name>
-        <y>690</y>
+        <y>639</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
@@ -6650,7 +6511,7 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6625</wuid>
+        <wuid>-3d4af206:15877d6a498:-7770</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
         <text>Average</text>
@@ -6673,9 +6534,9 @@ $(pv_value)</tooltip>
           <color red="255" green="255" blue="255" />
         </background_color>
         <width>150</width>
-        <x>609</x>
+        <x>567</x>
         <name>Label_21</name>
-        <y>690</y>
+        <y>639</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
@@ -6684,81 +6545,289 @@ $(pv_value)</tooltip>
           <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.BoolButton" version="1.0.0">
-        <toggle_button>true</toggle_button>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <push_action_index>1</push_action_index>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <effect_3d>true</effect_3d>
-        <bit>-1</bit>
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-3a0d</wuid>
-        <on_color>
-          <color red="0" green="255" blue="0" />
-        </on_color>
-        <show_confirm_dialog>0</show_confirm_dialog>
-        <password></password>
-        <pv_value />
-        <released_action_index>0</released_action_index>
-        <square_button>true</square_button>
-        <show_led>true</show_led>
+        <wuid>-3d4af206:15877d6a498:-776f</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>Main GRAPH</text>
         <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
-        <height>35</height>
-        <on_label>ON</on_label>
+        <height>20</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>true</keep_wh_ratio>
+          <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>SYS0-EVR0:FrontOut0-Ena-SP</pv_name>
+        <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Boolean Button</widget_type>
-        <off_color>
-          <color red="0" green="100" blue="0" />
-        </off_color>
-        <confirm_message>Are your sure you want to do this?</confirm_message>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color red="240" green="240" blue="240" />
+          <color red="255" green="255" blue="255" />
         </background_color>
-        <width>109</width>
-        <x>289</x>
-        <name>Boolean Button</name>
-        <data_type>0</data_type>
-        <y>370</y>
+        <width>115</width>
+        <x>678</x>
+        <name>Label_25</name>
+        <y>90</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <actions hook="false" hook_all="false">
-          <action type="WRITE_PV">
-            <pv_name>$(pv_name)</pv_name>
-            <value>0</value>
-            <timeout>10</timeout>
-            <confirm_message></confirm_message>
-            <description></description>
-          </action>
-          <action type="WRITE_PV">
-            <pv_name>$(pv_name)</pv_name>
-            <value>1</value>
-            <timeout>10</timeout>
-            <confirm_message></confirm_message>
-            <description></description>
-          </action>
-        </actions>
-        <show_boolean_label>true</show_boolean_label>
+        <actions hook="false" hook_all="false" />
         <font>
           <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
-        <off_label>OFF</off_label>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.spinner" version="1.0.0">
+        <border_style>6</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>3</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules>
+          <rule name="BorderRule" prop_id="border_style" out_exp="false">
+            <exp bool_exp="pv0==1">
+              <value>9</value>
+            </exp>
+            <pv trig="true">$(pv_name).SIMM</pv>
+          </rule>
+        </rules>
+        <enabled>false</enabled>
+        <wuid>-3d4af206:15877d6a498:-7769</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <scripts />
+        <buttons_on_left>false</buttons_on_left>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>40</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name>$(DTACQ-NAME):CARD0:TRIGGER:PRETRIGGER_ms</pv_name>
+        <vertical_alignment>1</vertical_alignment>
+        <format>0</format>
+        <horizontal_buttons_layout>false</horizontal_buttons_layout>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Spinner</widget_type>
+        <step_increment>1.0</step_increment>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color red="255" green="255" blue="255" />
+        </background_color>
+        <page_increment>10.0</page_increment>
+        <width>115</width>
+        <x>54</x>
+        <name>Spinner Template_10</name>
+        <y>168</y>
+        <maximum>100.0</maximum>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <minimum>-100.0</minimum>
+        <font>
+          <fontdata fontName="Open Sans" height="19" style="0" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.spinner" version="1.0.0">
+        <border_style>6</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>3</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules>
+          <rule name="BorderRule" prop_id="border_style" out_exp="false">
+            <exp bool_exp="pv0==1">
+              <value>9</value>
+            </exp>
+            <pv trig="true">$(pv_name).SIMM</pv>
+          </rule>
+        </rules>
+        <enabled>true</enabled>
+        <wuid>-3d4af206:15877d6a498:-7768</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <scripts />
+        <buttons_on_left>false</buttons_on_left>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>40</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name>$(DTACQ-NAME):CARD0:NSAMPLES_ms</pv_name>
+        <vertical_alignment>1</vertical_alignment>
+        <format>0</format>
+        <horizontal_buttons_layout>false</horizontal_buttons_layout>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Spinner</widget_type>
+        <step_increment>0.1</step_increment>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color red="255" green="255" blue="255" />
+        </background_color>
+        <page_increment>10.0</page_increment>
+        <width>115</width>
+        <x>214</x>
+        <name>Spinner Template_1</name>
+        <y>168</y>
+        <maximum>100.0</maximum>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <minimum>-100.0</minimum>
+        <font>
+          <fontdata fontName="Open Sans" height="19" style="0" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.spinner" version="1.0.0">
+        <border_style>6</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>3</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules>
+          <rule name="BorderRule" prop_id="border_style" out_exp="false">
+            <exp bool_exp="pv0==1">
+              <value>9</value>
+            </exp>
+            <pv trig="true">$(pv_name).SIMM</pv>
+          </rule>
+        </rules>
+        <enabled>true</enabled>
+        <wuid>-3d4af206:15877d6a498:-7767</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <scripts />
+        <buttons_on_left>false</buttons_on_left>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>40</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name>LNS-ISRC-010:PBI-EM-FC:CurrR:LCURSOR_ms</pv_name>
+        <vertical_alignment>1</vertical_alignment>
+        <format>0</format>
+        <horizontal_buttons_layout>false</horizontal_buttons_layout>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Spinner</widget_type>
+        <step_increment>1.0</step_increment>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color red="255" green="255" blue="255" />
+        </background_color>
+        <page_increment>10.0</page_increment>
+        <width>115</width>
+        <x>54</x>
+        <name>Spinner Template_2</name>
+        <y>288</y>
+        <maximum>100.0</maximum>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <minimum>-100.0</minimum>
+        <font>
+          <fontdata fontName="Open Sans" height="19" style="0" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.spinner" version="1.0.0">
+        <border_style>6</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>3</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules>
+          <rule name="BorderRule" prop_id="border_style" out_exp="false">
+            <exp bool_exp="pv0==1">
+              <value>9</value>
+            </exp>
+            <pv trig="true">$(pv_name).SIMM</pv>
+          </rule>
+        </rules>
+        <enabled>true</enabled>
+        <wuid>-3d4af206:15877d6a498:-7766</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <scripts />
+        <buttons_on_left>false</buttons_on_left>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>40</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name>LNS-ISRC-010:PBI-EM-FC:CurrR:RCURSOR_ms</pv_name>
+        <vertical_alignment>1</vertical_alignment>
+        <format>0</format>
+        <horizontal_buttons_layout>false</horizontal_buttons_layout>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Spinner</widget_type>
+        <step_increment>1.0</step_increment>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color red="255" green="255" blue="255" />
+        </background_color>
+        <page_increment>10.0</page_increment>
+        <width>115</width>
+        <x>214</x>
+        <name>Spinner Template_3</name>
+        <y>288</y>
+        <maximum>100.0</maximum>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <minimum>-100.0</minimum>
+        <font>
+          <fontdata fontName="Open Sans" height="19" style="0" />
+        </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
@@ -6766,12 +6835,12 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-38f7</wuid>
+        <wuid>-1168daa3:158859bc9c3:-751a</wuid>
         <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>Fast Acquisition</text>
+        <text>HV1 Volt</text>
         <scripts />
-        <height>43</height>
+        <height>24</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -6781,38 +6850,45 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="0" blue="0" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="IO Shape Fill" red="188" green="188" blue="188" />
+          <color red="0" green="0" blue="0" />
         </background_color>
-        <width>1357</width>
-        <x>0</x>
-        <name>Label_124</name>
-        <y>12</y>
+        <width>160</width>
+        <x>408</x>
+        <name>Label_11</name>
+        <y>682</y>
         <foreground_color>
-          <color name="IO Label" red="0" green="0" blue="0" />
+          <color name="Major" red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="Cantarell" height="13" style="1">Header 3</opifont.name>
+          <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
         <border_style>0</border_style>
-        <tooltip></tooltip>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>3</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-348a</wuid>
-        <transparent>true</transparent>
+        <wuid>-1168daa3:158859bc9c3:-7519</wuid>
+        <transparent>false</transparent>
+        <pv_value />
         <auto_size>false</auto_size>
-        <text>Activate timing System</text>
+        <text>######</text>
+        <rotation_angle>0.0</rotation_angle>
         <scripts />
-        <height>20</height>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <show_units>true</show_units>
+        <height>24</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -6820,38 +6896,42 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
+        <pv_name>LNS-ISRC-010:PBI-EM-HV1:VoltR:AVG</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Label</widget_type>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Text Update</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>199</width>
-        <x>54</x>
-        <name>Label_18</name>
-        <y>378</y>
+        <width>150</width>
+        <x>567</x>
+        <name>Text Update_3</name>
+        <y>682</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="Minor" red="255" green="128" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
+        <precision>3</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-483e</wuid>
+        <wuid>-1168daa3:158859bc9c3:-7518</wuid>
         <transparent>false</transparent>
         <pv_value />
         <auto_size>false</auto_size>
@@ -6860,7 +6940,7 @@ $(pv_value)</tooltip>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
         <show_units>true</show_units>
-        <height>20</height>
+        <height>24</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -6868,29 +6948,81 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>$(DTACQ-NAME)-STAT-RB</pv_name>
+        <pv_name>LNS-ISRC-010:PBI-EM-HV1:VoltR:MAX</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <precision_from_pv>true</precision_from_pv>
+        <precision_from_pv>false</precision_from_pv>
         <widget_type>Text Update</widget_type>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <wrap_words>false</wrap_words>
         <format_type>0</format_type>
         <background_color>
-          <color red="0" green="0" blue="0" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>148</width>
-        <x>1188</x>
-        <name>Text Update</name>
-        <y>24</y>
+        <width>150</width>
+        <x>716</x>
+        <name>Text Update_1</name>
+        <y>682</y>
         <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
+          <color red="114" green="159" blue="207" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>3</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>-1168daa3:158859bc9c3:-7517</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text>######</text>
+        <rotation_angle>0.0</rotation_angle>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <show_units>true</show_units>
+        <height>24</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name>LNS-ISRC-010:PBI-EM-HV1:VoltR:MIN</pv_name>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Text Update</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
+        <background_color>
+          <color name="TextBackground" red="70" green="70" blue="70" />
+        </background_color>
+        <width>150</width>
+        <x>865</x>
+        <name>Text Update_2</name>
+        <y>682</y>
+        <foreground_color>
+          <color red="252" green="233" blue="79" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
         </font>
       </widget>
     </widget>
diff --git a/startup/EMU.cmd b/startup/EMU.cmd
index 4ac030a..468cd76 100644
--- a/startup/EMU.cmd
+++ b/startup/EMU.cmd
@@ -1,10 +1,14 @@
 # Required modules ###
 require ifcdaq,0.2.0
-require singlemotion
-require mrfsample
-require pev
-require emu,jfdenis
+require singlemotion,1.4.6
+require mrfsample,1.1.1
+require pev,0.1.1
 require ecat2db,0.3.2
+require FastAcquisition,agaget
+require DataAcquisition,agaget
+require emu,jfdenis
+
+
 
 ### MACROS ###
 # PMAC common macros3       ) 
@@ -58,7 +62,7 @@ epicsEnvSet("EVR_PUL0_DELAY",   "$(EVR_EV14_OUT0_DELAY=0)")
 epicsEnvSet("EVR_PUL0_WIDTH",   "$(EVR_EV14_OUT0_WIDTH=1000)")
 
 #DAQ macros
-epicsEnvSet("DAQPREFIX",  "SCANNINGDAQ"  )
+epicsEnvSet("DAQPREFIX",  "LNS-ISRC-010"  )
 epicsEnvSet("DAQBUFSIZE", "1024"         )
 
 #Scanning macros
@@ -82,7 +86,7 @@ mrmEvgSetupVME($(EVG), $(EVG_VMESLOT), 0x100000, 1, 0x01)
 mrmEvrSetupPCI($(EVR), $(EVR_PCIDOMAIN), $(EVR_PCIBUS), $(EVR_PCIDEVICE), $(EVR_PCIFUNCTION))
 
 # Initialize daq
-ndsCreateDevice(ifcdaq, $(DAQPREFIX), card=0, fmc=2)
+ndsCreateDevice(ifcdaq, CARD0, card=0, fmc=2)
 
 ### LOAD RECORDS ###
 
@@ -95,10 +99,10 @@ dbLoadRecords("evr-softEvent.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PU
 dbLoadRecords("evr-pulserMap.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), PID=0, F=Trig, ID=0")
 
 ## Load ifcdaq instance
-dbLoadRecords(IFCDAQAIChannelGroup.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI")
-dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH0, NELM=$(DAQBUFSIZE)")
-dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH1, NELM=$(DAQBUFSIZE)")
-dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH2, NELM=$(DAQBUFSIZE)")
+#dbLoadRecords(IFCDAQAIChannelGroup.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI")
+#dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH0, NELM=$(DAQBUFSIZE)")
+#dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH1, NELM=$(DAQBUFSIZE)")
+#dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH2, NELM=$(DAQBUFSIZE)")
 
 #
 # Load Single motions records
@@ -122,7 +126,7 @@ dbLoadRecords("motorStatus.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_N
 
 dbLoadRecords("motorHoming.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1),ASYN_PORT=$(PMACPORT),AXIS_NO=$(AXIS_NO1),PREC=$(PREC),EGU=$(EGU)")
 
-dbLoadRecords("EMU.db", "DEVICE=$(SCANPREFIX), SCAN_SLIT=$(SCAN_SLIT), SCAN_EF=$(SCAN_EF),MTRREC=$(PMACPREFIX):$(MOTOR_NAME1), MAX_POINTS_EF=$(SCAN_POINTS_EF), MAX_POINTS_SLIT=$(SCAN_POINTS_SLIT), DAQNDSPREFIX=$(DAQPREFIX), DAQBUFSIZE=$(DAQBUFSIZE), DET1WF=AI-CH0-DATA, DET2WF=AI-CH1-DATA, DET3WF=AI-CH2-DATA, TR_TL=$(SYS)-$(EVR):Pul0-Ena-Sel, TR_TLTSEL=$(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME, PSU_SP=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU_RBV=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU2_SP=LNS-ISRC-010:PBI-EM:HVver-SP, PSU2_RBV=LNS-ISRC-010:PBI-EM:HVver-SP")
+dbLoadRecords("EMU.db", "DEVICE=$(SCANPREFIX), SCAN_SLIT=$(SCAN_SLIT), SCAN_EF=$(SCAN_EF),MTRREC=$(PMACPREFIX):$(MOTOR_NAME1), MAX_POINTS_EF=$(SCAN_POINTS_EF), MAX_POINTS_SLIT=$(SCAN_POINTS_SLIT), DAQNDSPREFIX=$(DAQPREFIX), DAQBUFSIZE=$(DAQBUFSIZE), DET1WF=PBI-EM-FC:CurrR_Y, DET2WF=PBI-EM-HV1:VoltR_Y, DET3WF=PBI-EM-HV2:VoltR_Y, TR_TL=$(SYS)-$(EVR):Pul0-Ena-Sel, TR_TLTSEL=$(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME, PSU_SP=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU_RBV=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU2_SP=LNS-ISRC-010:PBI-EM:HVver-SP, PSU2_RBV=LNS-ISRC-010:PBI-EM:HVver-SP")
 
 #
 # Init ETHERCAT module
@@ -143,21 +147,21 @@ seq RampCurrent "PREFIX_PS=LNS-ISRC-010:PBI-EM,CONS_PS2=HVhor-SP,DEVICE=SCAN,SCA
 
 # SET INTERFACE FROM IFCDAQ TO Allison scanner
 # Forward link wf record to Detector guard
-dbpf $(DAQPREFIX):AI-CH0-DATA.FLNK $(SCANPREFIX):DET1-GUARD
-dbpf $(DAQPREFIX):AI-CH1-DATA.FLNK $(SCANPREFIX):DET2-GUARD
-dbpf $(DAQPREFIX):AI-CH2-DATA.FLNK $(SCANPREFIX):DET3-GUARD
+dbpf $(DAQPREFIX):PBI-EM-FC:CurrR_Y.FLNK $(SCANPREFIX):DET1-GUARD
+dbpf $(DAQPREFIX):PBI-EM-HV1:VoltR_Y.FLNK $(SCANPREFIX):DET2-GUARD
+dbpf $(DAQPREFIX):PBI-EM-HV2:VoltR_Y.FLNK $(SCANPREFIX):DET3-GUARD
 # Forward link from state record to Detector trigger
-dbpf $(DAQPREFIX):AI-STAT-RB.FLNK $(SCANPREFIX):DAQTRG-DAQSTGUARD
+dbpf $(DAQPREFIX):CARD0-STAT-RB.FLNK $(SCANPREFIX):DAQTRG-DAQSTGUARD
 
 
 # Forward link number of samples rbv to compress N record, so that detetor know number of elements to average over.
-dbpf $(DAQPREFIX):AI-SMNM-RB.FLNK "$(SCANPREFIX):DET1-COMPRESSN"
+dbpf $(DAQPREFIX):CARD0:NSAMPLES-RB.FLNK "$(SCANPREFIX):DET1-COMPRESSN"
 
 
 # Set tsel on WF record to event record in EVR
-dbpf $(DAQPREFIX):AI-CH0-DATA.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
-dbpf $(DAQPREFIX):AI-CH1-DATA.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
-dbpf $(DAQPREFIX):AI-CH2-DATA.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
+dbpf $(DAQPREFIX):PBI-EM-FC:CurrR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
+dbpf $(DAQPREFIX):PBI-EM-HV1:VoltR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
+dbpf $(DAQPREFIX):PBI-EM-HV2:VoltR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
 
 ############################################################
 ################### Configuration Timing ###################
@@ -184,17 +188,17 @@ dbpf $(SYS)-$(EVR):FrontOut0-Ena-SP      "Enabled"
 
 ### Setup IFCDAQ PVs ###
 # Set the DAQ to on state
-#dbpf $(DAQPREFIX):AI-STAT "ON"
+#dbpf $(DAQPREFIX):CARD0-STAT "ON"
 # Set trigger repeat to 1
-dbpf $(DAQPREFIX):AI-TRGR 1
+dbpf $(DAQPREFIX):CARD0:TriggerRepeat 1
 # Set trigger source to external GPIO
-dbpf $(DAQPREFIX):AI-TRGS "EXT-GPIO"
+dbpf $(DAQPREFIX):CARD0:TRIGGERSOURCE "EXT-GPIO"
 sleep(1)
-dbpf $(DAQPREFIX):AI-STAT ON
+dbpf $(DAQPREFIX):CARD0-STAT ON
 sleep(3)
-dbpf $(DAQPREFIX):AI-STAT RUNNING
+dbpf $(DAQPREFIX):CARD0-STAT RUNNING
 sleep(1)
-dbpf $(DAQPREFIX):AI-STAT RUNNING
+dbpf $(DAQPREFIX):CARD0-STAT RUNNING
 
 
 ### Setup reasonable values for sscan record ###
-- 
GitLab