diff --git a/Makefile b/Makefile
index 1aa8a501e50c65e64d6bce5f4c5b3f3642c9d63d..d09c90ae273451da18372db42f1d97f2e1737a91 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
 include $(EPICS_ENV_PATH)/module.Makefile
 
 STARTUPS += startup/EMU.cmd
-#STARTUPS += startup/EMU_testMRF.cmd
+MISCS =misc/ExtractDataTOTracePlot.py
+MISCS +=protocol/pmacVariables.proto
 DOC = doc/README.md
 
 USR_DEPENDENCIES = FastAcquisition,1.1.0
 USR_DEPENDENCIES += DataAcquisition,1.0.1
 USR_DEPENDENCIES = ecat2db,0.3.1
 USR_DEPENDENCIES += DataAcquisition,1.0.1
+
+vpath % ../../misc
diff --git a/db/EMU.substitutions b/db/EMU.substitutions
index ff1b7b6a286e30fb8da8ebe689c22e23422db59d..b94b62377345c3e5b65f16f00c3cc361946f1268 100644
--- a/db/EMU.substitutions
+++ b/db/EMU.substitutions
@@ -101,23 +101,23 @@ file "scanBase.db"
 
 
 # Before scan step by step links
-  	      	"LNS-ISRC-010:PBI-EM:VER-BRAKE_SET PP",
-		"$(DEVICE):BUFF-POS-RES PP",
-		"0",
+		"$(DEVICE):PROC-SLIT-BF.PROC PP",
+  	      	"",
 		"1",
 		"",
+		"",
 
 # After scan step by step links
-  	      	"$(DEVICE):PROC-AUTO-HOME PP",
-		"$(DEVICE):CALC-PROJXY.PROC PP",
-		"1",
+  	      	"$(DEVICE):PROC-SLIT-AF.PROC PP",
+		"",
 		"1",
 		"",
+		"",
 
 # Abort scan step by step links
-  	      	"",
-		"",
+  	      	"$(DEVICE):PROC-SLIT-AB.PROC PP",
 		"",
+		"1",
 		"",
 		"$(DEVICE):$(SCAN_EF)-ABORT"
 		}
@@ -423,9 +423,9 @@ 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}
+	{"LNS","ISRC-010","PBI-EM","FC","CurrR","CurrR",10,0,3,16000}
+	{"LNS","ISRC-010","PBI-EM","HV1","VoltR","HV1VoltR",11,0,0,16000}
+	{"LNS","ISRC-010","PBI-EM","HV2","VoltR","HV2VoltR",12,0,1,16000}
 }
 
 
@@ -483,17 +483,32 @@ pattern	{DEVICE,NELM_COMP,DET,SCAN_SLIT,MTRREC}
 file ecat2el41xx.template
 {
 	pattern {PREFIX,CH_ID, SLAVE_IDX,PDO_IDX, EOFF, ESLO, DRVL, DRVH}
-		{"LNS-ISRC-010:PBI-EM","HVhor-SP", 1,1, 0, 0.0003051850947599719, -10, 10}
-		{"LNS-ISRC-010:PBI-EM","HVver-SP", 1,2, 0, 0.0003051850947599719, -10, 10}
-		{"SIMU","CURRENT-SP", 1,3, 0, 0.0003051850947599719, -10, 10}
+		{"LNS-ISRC-010:PBI-EM","HVhor-SP",  3, 0, 0, 0.0003051850947599719, -10, 10}
+		{"LNS-ISRC-010:PBI-EM","HVver-SP",  3, 2, 0, 0.0003051850947599719, -10, 10}
+       		{"LNS-ISRC-010:PBI-EM","BPS1-CurS", 2 ,0, 0, 0.0003051850947599719}
+        	{"LNS-ISRC-010:PBI-EM","BPS1-VolS", 2 ,1, 0 , 0.0003051850947599719}
+        	{"LNS-ISRC-010:PBI-EM","BPS2-CurS", 2 ,2, 0, 0.0003051850947599719}
+        	{"LNS-ISRC-010:PBI-EM","BPS2-VolS", 2 ,3, 0 , 0.0003051850947599719}
+}
+
+file ecat2el316x.template
+{
+	pattern {PREFIX,CH_ID, SLAVE_IDX, PDO_IDX}
+       		{"LNS-ISRC-010:PBI-EM","BPS1-CurR",1 ,0, 0, 0.0003051850947599719}
+        	{"LNS-ISRC-010:PBI-EM","BPS1-VolR",1 ,1, 0, 0.0003051850947599719}
+        	{"LNS-ISRC-010:PBI-EM","BPS2-CurR",1 ,2, 0, 0.0003051850947599719}
+        	{"LNS-ISRC-010:PBI-EM","BPS2-VolR",1 ,3, 0, 0.0003051850947599719}
 }
 
 file ecat2slave.template
 {
 	pattern {PREFIX,DTYP,MOD_ID,SLAVE_IDX}
-		{"LNS-ISRC-010:PBI-EM","EL4134","EL4134",1}
+		{"LNS-ISRC-010:PBI-EM","ES4134","ES4134",3}
+		{"LNS-ISRC-010:PBI-EM","EL4104","EL4104",2}
+		{"LNS-ISRC-010:PBI-EM","ES3164","ES3164",1}
 }
 
+
 ##########################################################################
 ################################ GEOBRICK - TEST #########################
 ##########################################################################
diff --git a/db/EMU_BUFF_CHAN.template b/db/EMU_BUFF_CHAN.template
index 03f99f153a70e89b88afee08d5005bc2c6723fd4..529e3607adbcf98843bcdfc9d989a51a4403712f 100644
--- a/db/EMU_BUFF_CHAN.template
+++ b/db/EMU_BUFF_CHAN.template
@@ -47,6 +47,11 @@ record(aSub, "$(DEVICE):BUFF-$(DET)-FUNC") {
   	field(FTE, "LONG")
 	field(NOE, "1")
 	field(INPE, "$(DEVICE):$(SCAN_SLIT).NPTS")
+
+##  Reset
+  	field(FTF, "LONG")
+	field(NOF, "1")
+	field(INPF, "$(DEVICE):BUFF-$(DET)-DEL CP")
 	
 ######### OUTPUTS #########
 ## Waveform (to save)
@@ -54,6 +59,11 @@ record(aSub, "$(DEVICE):BUFF-$(DET)-FUNC") {
 	field(NOVA, "$(NELM)")
 	field(OUTA, "$(DEVICE):BUFF-$(SIGNAL2) PP")
 
+## RESET (to save)
+  	field(FTVB, "LONG")
+	field(NOVB, "1")
+	field(OUTB, "$(DEVICE):BUFF-$(DET)-DEL PP")
+
 ######### FUNCTION #######
 	field(SNAM, "CREATE_TAB")
 }
@@ -62,31 +72,7 @@ record(aSub, "$(DEVICE):BUFF-$(DET)-FUNC") {
 ########################## DELETE THE WAVEFORM ###############
 ####################################################################
 
-## Function that compute the coefficient between MRAD and VOLTAGE
-#record(aSub, "$(DEVICE):BUFF-$(DET)-DEL") {
-######### INPUTS #########
-##  Reset
-#  	field(FTA, "LONG")
-# 	field(NOA, "1")
-# 	field(INPA, "$(DEVICE):BUFF-$(DET)-RES-WF CP")
-	
-######### OUTPUTS #########
-## Waveform (to save)
-#   	field(FTVA, "FLOAT")
-# # 	field(NOVA, "$(NELM)")
-# 	field(OUTA, "$(DEVICE):BUFF-$(SIGNAL2) PP")
-
-## RESET Compress
-#   	field(FTVB, "LONG")
-# 	field(NOVB, "1")
-# 	field(OUTB, "$(DEVICE):BUFF-$(DET).RES PP")
-
-## RESET buttom
-#  	field(FTVC, "LONG")
-#	field(NOVC, "1")
-#	field(OUTC, "$(DEVICE):BUFF-$(DET)-RES-WF PP")
+record(bo, "$(DEVICE):BUFF-$(DET)-DEL")
+	{
+	}
 
-######### FUNCTION #######
-# # 	field(SNAM, "INIT_TAB")
-# 	field(ELFG,"ALWAYS")
-# }
diff --git a/db/EMU_CALCUL.template b/db/EMU_CALCUL.template
index 9c5a87b7b4927ed676cebe33f7d5c87491c9c0e1..3076149166523d0c6b12ce2b3d888cf9e41d660c 100644
--- a/db/EMU_CALCUL.template
+++ b/db/EMU_CALCUL.template
@@ -7,7 +7,7 @@ record(ao, "$(DEVICE):CALC-Energy-SP")
     field(EGU, "eV")
     field(DRVH, "100000")
     field(DRVL, "0")
-    field(VAL,"95000")
+    field(VAL,"75000")
     field(PINI,"YES")
     field(FLNK,"$(DEVICE):CALC-FuncCalcConv")
 }
@@ -20,7 +20,7 @@ record(ao, "$(DEVICE):CALC-DistP-SP")
     field(EGU, "mm")
     field(DRVH, "100")
     field(DRVL, "0")
-    field(VAL,"9")
+    field(VAL,"7")
     field(PINI,"YES")
     field(FLNK,"$(DEVICE):CALC-FuncCalcConv")
 }
@@ -33,7 +33,7 @@ record(ao, "$(DEVICE):CALC-LenghP-SP")
     field(EGU, "mm")
     field(DRVH, "100")
     field(DRVL, "0")
-    field(VAL,"90")
+    field(VAL,"70")
     field(PINI,"YES")
     field(FLNK,"$(DEVICE):CALC-FuncCalcConv")
 }
@@ -61,7 +61,7 @@ record(ao, "$(DEVICE):CALC-RearLenghP-SP")
     field(EGU, "mm")
     field(DRVH, "100")
     field(DRVL, "0")
-    field(VAL,"2")
+    field(VAL,"11")
     field(PINI,"YES")
     field(FLNK,"$(DEVICE):CALC-FuncCalcConv")
 }
@@ -236,6 +236,26 @@ record(aSub, "$(DEVICE):CALC-PROJXY") {
 	field(NOVB, "1")
 	field(OUTB, "$(DEVICE):CALC-PROJ-Y PP")
 
+## RMS SIZE output
+	field(FTVC, "FLOAT")
+	field(NOVC, "1")
+	field(OUTC, "$(DEVICE):CALC-RMS-SIZE PP")
+
+## RMS ANGLE output
+	field(FTVD, "FLOAT")
+	field(NOVD, "1")
+	field(OUTD, "$(DEVICE):CALC-RMS-ANGLE PP")
+
+## RMS CORREL output
+	field(FTVE, "FLOAT")
+	field(NOVE, "1")
+	field(OUTE, "$(DEVICE):CALC-RMS-CORREL PP")
+
+## SIGMA output
+	field(FTVF, "FLOAT")
+	field(NOVF, "1")
+	field(OUTF, "$(DEVICE):CALC-SIGMA PP")
+
 ######### FUNCTION #######
 	field(SNAM, "CREATE_PROJXY")
 }
@@ -243,6 +263,7 @@ record(aSub, "$(DEVICE):CALC-PROJXY") {
 ################ RESULTATS ################## 
 ####### PROJECTION X ##########
 record(ao, "$(DEVICE):CALC-PROJ-X") {
+	field(PREC, "4")
 }
 
 ## WAVEFORM PROJECTION X
@@ -259,6 +280,7 @@ record(waveform, "$(DEVICE):CALC-PROJ-Xabsc") {
 
 ####### PROJECTION Y ##########
 record(ao, "$(DEVICE):CALC-PROJ-Y") {
+	field(PREC, "4")
 }
 
 ## WAVEFORM PROJECTION Y
@@ -273,3 +295,21 @@ record(waveform, "$(DEVICE):CALC-PROJ-Yabsc") {
   	field(NELM, "$(NELM)") 
 }
 
+####### RMS ##########
+record(ao, "$(DEVICE):CALC-RMS-SIZE") {
+	field(PREC, "4")
+}
+
+record(ao, "$(DEVICE):CALC-RMS-ANGLE") {
+	field(PREC, "4")
+}
+
+record(ao, "$(DEVICE):CALC-RMS-CORREL") {
+	field(PREC, "4")
+}
+
+####### SIGMA ##########
+record(ao, "$(DEVICE):CALC-SIGMA") {
+	field(PREC, "4")
+}
+
diff --git a/db/EMU_PROCESS.template b/db/EMU_PROCESS.template
index 6ea2168e32d00e0a00a341b2a94bef6c047acd21..a8bc33f83aff4d877fefe99257071f2e444b28c9 100644
--- a/db/EMU_PROCESS.template
+++ b/db/EMU_PROCESS.template
@@ -66,7 +66,7 @@ record(calcout, "$(DEVICE):PROC-StepAngle") {
 #############################################
 record(seq,"$(DEVICE):PROC-PS-BF"){
   field(LNK1,"LNS-ISRC-010:PBI-EM:VER-BRAKE_SET PP")
-  field(DO1,"1")
+  field(DO1,"0")
   field(LNK2,"$(DEVICE):BUFF-DET1-RES PP")
   field(DO2,"1")
   field(LNK3,"$(DEVICE):BUFF-DET23-RES PP")
@@ -75,16 +75,70 @@ record(seq,"$(DEVICE):PROC-PS-BF"){
 
 record(seq,"$(DEVICE):PROC-PS-AF"){
   field(LNK1,"LNS-ISRC-010:PBI-EM:VER-BRAKE_SET PP")
-  field(DO1,"0")
+  field(DO1,"1")
   field(LNK2,"$(DEVICE):BUFF-DET1-FUNC.PROC PP")
   field(DO2,"1")
   field(LNK3,"$(DEVICE):BUFF-DET23-FUNC.PROC PP")
   field(DO3,"1")
 }
 
+record(seq,"$(DEVICE):PROC-SLIT-BF"){
+  field(LNK1,"LNS-ISRC-010:PBI-EM:VER-BRAKE_SET PP")
+  field(DO1,"1")
+  field(LNK2,"$(DEVICE):BUFF-POS-RES PP")
+  field(DO2,"1")
+  field(LNK3,"$(DEVICE):BUFF-DET1-RES PP")
+  field(DO3,"1")
+  field(LNK4,"$(DEVICE):BUFF-DET23-RES PP")
+  field(DO4,"1")
+  field(LNK5,"$(DEVICE):BUFF-DET1-DEL PP")
+  field(DO5,"1")
+  field(LNK6,"$(DEVICE):BUFF-DET23-DEL PP")
+  field(DO6,"1")
+  field(LNK7,"$(DEVICE):PROC-INIT-CALC.PROC PP")
+  field(DO7,"1")
+}
+
 record(seq,"$(DEVICE):PROC-SLIT-AF"){
+  field(LNK1,"$(DEVICE):PROC-AUTO-HOME PP")
+  field(DO1,"1")
+  field(LNK2,"$(DEVICE):CALC-PROJXY.PROC PP")
+  field(DO2,"1")
+  field(LNK3,"LNS-ISRC-010:PBI-EM:HVhor-SP PP")
+  field(DO3,"0")
+  field(LNK4,"LNS-ISRC-010:PBI-EM:HVver-SP PP")
+  field(DO4,"0")
+}
 
+record(seq,"$(DEVICE):PROC-SLIT-AB"){
+  field(LNK1,"$(DEVICE):PROC-AUTO-HOME PP")
+  field(DO1,"1")
+  field(LNK2,"LNS-ISRC-010:PBI-EM:HVhor-SP PP")
+  field(DO2,"0")
+  field(LNK3,"LNS-ISRC-010:PBI-EM:HVver-SP PP")
+  field(DO3,"0")
+  field(LNK4,"$(DEVICE):PROC-INIT-CALC.PROC PP")
+  field(DO4,"1")
 }
+
+#############################################
+################## INIT #####################
+#############################################
+record(seq,"$(DEVICE):PROC-INIT-CALC"){
+  field(LNK1,"$(DEVICE):CALC-RMS-SIZE PP")
+  field(DO1,"0")
+  field(LNK2,"$(DEVICE):CALC-RMS-ANGLE PP")
+  field(DO2,"0")
+  field(LNK3,"$(DEVICE):CALC-RMS-CORREL PP")
+  field(DO3,"0")
+  field(LNK4,"$(DEVICE):CALC-SIGMA PP")
+  field(DO4,"0")
+  field(LNK5,"$(DEVICE):CALC-PROJ-Y PP")
+  field(DO5,"0")
+  field(LNK6,"$(DEVICE):CALC-PROJ-X PP")
+  field(DO6,"0")
+}
+
 #############################################
 ############ RETOUR HOME AUTO ###############
 #############################################
@@ -99,3 +153,25 @@ field(ZNAM,"HARD")
 field(ONAM,"SIMU")
 }
 
+#############################################
+############ REPORT FILE #####################
+#############################################
+
+## Function that create a report of the EMIT
+#record(aSub, "$(DEVICE):PROC-REPORT") {
+######### INPUTS #########
+## Energie
+#  	field(FTA, "FLOAT")
+#	field(NOA,1)
+#	field(INPA,"$(DEVICE):CALC-Energy-SP")
+
+## TIMESTAMP START
+#  	field(FTB, "FLOAT")
+#	field(NOB,1)
+#	field(INPB,  "$(DEVICE):BUFF-CURRENT")
+
+######### FUNCTION #######
+#	field(SNAM, "CREATE_REPORT")
+#}
+
+
diff --git a/opi/EMU.opi b/opi/EMU.opi
index a79989e6fbebd77d19ce970148d2f3fdc8506892..9af59a942a8340900a2bfb7e3903ce0e6a208f75 100644
--- a/opi/EMU.opi
+++ b/opi/EMU.opi
@@ -212,6 +212,7 @@ $(pv_value)</tooltip>
         <active_tab>0</active_tab>
         <tooltip></tooltip>
         <tab_3_icon_path></tab_3_icon_path>
+        <tab_4_enabled>true</tab_4_enabled>
         <height>295</height>
         <tab_2_icon_path></tab_2_icon_path>
         <border_width>1</border_width>
@@ -224,6 +225,7 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <tab_1_enabled>true</tab_1_enabled>
         <border_style>0</border_style>
+        <tab_4_title>BPS</tab_4_title>
         <enabled>true</enabled>
         <wuid>-1ab698cd:1586d27a42e:-6643</wuid>
         <tab_1_background_color>
@@ -237,6 +239,10 @@ $(pv_value)</tooltip>
           <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </tab_1_font>
         <tab_3_title>Timing</tab_3_title>
+        <tab_4_background_color>
+          <color name="Field Background Grey" red="240" green="240" blue="240" />
+        </tab_4_background_color>
+        <tab_4_icon_path></tab_4_icon_path>
         <tab_2_enabled>true</tab_2_enabled>
         <background_color>
           <color name="Container Grey" red="200" green="200" blue="200" />
@@ -249,6 +255,9 @@ $(pv_value)</tooltip>
         <tab_3_font>
           <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </tab_3_font>
+        <tab_4_font>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+        </tab_4_font>
         <macros>
           <include_parent_macros>true</include_parent_macros>
         </macros>
@@ -282,7 +291,7 @@ $(pv_value)</tooltip>
         </tab_1_foreground_color>
         <tab_1_title>Dimension</tab_1_title>
         <scripts />
-        <tab_count>4</tab_count>
+        <tab_count>5</tab_count>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -293,6 +302,9 @@ $(pv_value)</tooltip>
         <foreground_color>
           <color name="Container Grey" red="200" green="200" blue="200" />
         </foreground_color>
+        <tab_4_foreground_color>
+          <color red="0" green="0" blue="0" />
+        </tab_4_foreground_color>
         <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
           <border_style>0</border_style>
           <tooltip></tooltip>
@@ -766,17 +778,7 @@ $(pv_value)</tooltip>
             <tooltip>$(pv_name)
 $(pv_value)</tooltip>
             <horizontal_alignment>1</horizontal_alignment>
-            <rules>
-              <rule name="Disable" prop_id="enabled" out_exp="false">
-                <exp bool_exp="pv0==1">
-                  <value>false</value>
-                </exp>
-                <exp bool_exp="pv0==0">
-                  <value>true</value>
-                </exp>
-                <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
-              </rule>
-            </rules>
+            <rules />
             <pv_value />
             <auto_size>false</auto_size>
             <text></text>
@@ -799,7 +801,7 @@ $(pv_value)</tooltip>
             <actions hook="false" hook_all="false" />
             <border_style>3</border_style>
             <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-            <enabled>true</enabled>
+            <enabled>false</enabled>
             <wuid>-20a75393:15809f6e4ee:-6fea</wuid>
             <transparent>false</transparent>
             <scripts />
@@ -873,17 +875,7 @@ $(pv_value)</tooltip>
             <tooltip>$(pv_name)
 $(pv_value)</tooltip>
             <horizontal_alignment>1</horizontal_alignment>
-            <rules>
-              <rule name="Disable" prop_id="enabled" out_exp="false">
-                <exp bool_exp="pv0==1">
-                  <value>false</value>
-                </exp>
-                <exp bool_exp="pv0==0">
-                  <value>true</value>
-                </exp>
-                <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
-              </rule>
-            </rules>
+            <rules />
             <pv_value />
             <auto_size>false</auto_size>
             <text></text>
@@ -906,7 +898,7 @@ $(pv_value)</tooltip>
             <actions hook="false" hook_all="false" />
             <border_style>3</border_style>
             <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-            <enabled>true</enabled>
+            <enabled>false</enabled>
             <wuid>-20a75393:15809f6e4ee:-6fe8</wuid>
             <transparent>false</transparent>
             <scripts />
@@ -980,17 +972,7 @@ $(pv_value)</tooltip>
             <tooltip>$(pv_name)
 $(pv_value)</tooltip>
             <horizontal_alignment>1</horizontal_alignment>
-            <rules>
-              <rule name="Disable" prop_id="enabled" out_exp="false">
-                <exp bool_exp="pv0==1">
-                  <value>false</value>
-                </exp>
-                <exp bool_exp="pv0==0">
-                  <value>true</value>
-                </exp>
-                <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
-              </rule>
-            </rules>
+            <rules />
             <pv_value />
             <auto_size>false</auto_size>
             <text></text>
@@ -1013,7 +995,7 @@ $(pv_value)</tooltip>
             <actions hook="false" hook_all="false" />
             <border_style>3</border_style>
             <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-            <enabled>true</enabled>
+            <enabled>false</enabled>
             <wuid>-20a75393:15809f6e4ee:-6fe6</wuid>
             <transparent>false</transparent>
             <scripts />
@@ -1047,17 +1029,7 @@ $(pv_value)</tooltip>
             <tooltip>$(pv_name)
 $(pv_value)</tooltip>
             <horizontal_alignment>1</horizontal_alignment>
-            <rules>
-              <rule name="Disable" prop_id="enabled" out_exp="false">
-                <exp bool_exp="pv0==1">
-                  <value>false</value>
-                </exp>
-                <exp bool_exp="pv0==0">
-                  <value>true</value>
-                </exp>
-                <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
-              </rule>
-            </rules>
+            <rules />
             <pv_value />
             <auto_size>false</auto_size>
             <text></text>
@@ -1080,7 +1052,7 @@ $(pv_value)</tooltip>
             <actions hook="false" hook_all="false" />
             <border_style>3</border_style>
             <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-            <enabled>true</enabled>
+            <enabled>false</enabled>
             <wuid>-20a75393:15809f6e4ee:-6fe4</wuid>
             <transparent>false</transparent>
             <scripts />
@@ -1194,17 +1166,7 @@ $(pv_value)</tooltip>
             <tooltip>$(pv_name)
 $(pv_value)</tooltip>
             <horizontal_alignment>1</horizontal_alignment>
-            <rules>
-              <rule name="Disable" prop_id="enabled" out_exp="false">
-                <exp bool_exp="pv0==1">
-                  <value>false</value>
-                </exp>
-                <exp bool_exp="pv0==0">
-                  <value>true</value>
-                </exp>
-                <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
-              </rule>
-            </rules>
+            <rules />
             <pv_value />
             <auto_size>false</auto_size>
             <text></text>
@@ -1227,7 +1189,7 @@ $(pv_value)</tooltip>
             <actions hook="false" hook_all="false" />
             <border_style>3</border_style>
             <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-            <enabled>true</enabled>
+            <enabled>false</enabled>
             <wuid>-20a75393:15809f6e4ee:-6fa2</wuid>
             <transparent>false</transparent>
             <scripts />
@@ -1394,7 +1356,7 @@ $(pv_value)</tooltip>
             <width>130</width>
             <x>168</x>
             <y>24</y>
-            <maximum>1.7976931348623157E308</maximum>
+            <maximum>7.0</maximum>
             <foreground_color>
               <color name="KeyboardEntry" red="0" green="255" blue="255" />
             </foreground_color>
@@ -1501,7 +1463,7 @@ $(pv_value)</tooltip>
             <width>130</width>
             <x>168</x>
             <y>66</y>
-            <maximum>1.7976931348623157E308</maximum>
+            <maximum>7.0</maximum>
             <foreground_color>
               <color name="KeyboardEntry" red="0" green="255" blue="255" />
             </foreground_color>
@@ -1729,10 +1691,10 @@ $(pv_value)</tooltip>
             <horizontal_alignment>1</horizontal_alignment>
             <rules>
               <rule name="Disable" prop_id="enabled" out_exp="false">
-                <exp bool_exp="pv0==1 || pv1==1">
+                <exp bool_exp="pv0==1 || pv1==0">
                   <value>false</value>
                 </exp>
-                <exp bool_exp="pv0==0 || pv0==0">
+                <exp bool_exp="pv0==0 &amp;&amp; pv1==1">
                   <value>true</value>
                 </exp>
                 <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
@@ -1799,10 +1761,10 @@ $(pv_value)</tooltip>
             <push_action_index>0</push_action_index>
             <rules>
               <rule name="Enable" prop_id="enabled" out_exp="false">
-                <exp bool_exp="pv0==0">
+                <exp bool_exp="pv0==1">
                   <value>true</value>
                 </exp>
-                <exp bool_exp="pv0==1">
+                <exp bool_exp="pv0==0">
                   <value>false</value>
                 </exp>
                 <pv trig="true">LNS-ISRC-010:PBI-EM:VER-BRAKE_SET</pv>
@@ -1921,7 +1883,7 @@ $(pv_value)</tooltip>
             <enabled>true</enabled>
             <wuid>-1168daa3:158859bc9c3:-380</wuid>
             <on_color>
-              <color name="Major" red="255" green="0" blue="0" />
+              <color name="Green Off" red="0" green="30" blue="0" />
             </on_color>
             <show_confirm_dialog>0</show_confirm_dialog>
             <password></password>
@@ -1930,7 +1892,7 @@ $(pv_value)</tooltip>
             <scripts />
             <border_alarm_sensitive>false</border_alarm_sensitive>
             <height>52</height>
-            <on_label>ON</on_label>
+            <on_label>OFF</on_label>
             <border_width>1</border_width>
             <scale_options>
               <width_scalable>true</width_scalable>
@@ -1938,13 +1900,13 @@ $(pv_value)</tooltip>
               <keep_wh_ratio>false</keep_wh_ratio>
             </scale_options>
             <visible>true</visible>
-            <pv_name>LNS-ISRC-010:PBI-EM:VER-BRAKE_SET</pv_name>
+            <pv_name>LNS-ISRC-010:PBI-EM:VER-BRAKE_GET</pv_name>
             <border_color>
               <color red="0" green="128" blue="255" />
             </border_color>
             <widget_type>Boolean Switch</widget_type>
             <off_color>
-              <color red="0" green="100" blue="0" />
+              <color name="Major" red="255" green="0" blue="0" />
             </off_color>
             <confirm_message>Are your sure you want to do this?</confirm_message>
             <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
@@ -1962,14 +1924,14 @@ $(pv_value)</tooltip>
             </foreground_color>
             <actions hook="false" hook_all="false">
               <action type="WRITE_PV">
-                <pv_name>$(pv_name)</pv_name>
+                <pv_name>LNS-ISRC-010:PBI-EM:VER-BRAKE_SET</pv_name>
                 <value>1</value>
                 <timeout>10</timeout>
                 <confirm_message></confirm_message>
                 <description></description>
               </action>
               <action type="WRITE_PV">
-                <pv_name>$(pv_name)</pv_name>
+                <pv_name>LNS-ISRC-010:PBI-EM:VER-BRAKE_SET</pv_name>
                 <value>0</value>
                 <timeout>10</timeout>
                 <confirm_message></confirm_message>
@@ -1980,7 +1942,7 @@ $(pv_value)</tooltip>
             <font>
               <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
             </font>
-            <off_label>OFF</off_label>
+            <off_label>ON</off_label>
           </widget>
           <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
             <border_style>0</border_style>
@@ -2452,66 +2414,385 @@ $(pv_value)</tooltip>
             </font>
           </widget>
         </widget>
-      </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)
+        <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
+          <border_style>0</border_style>
+          <tooltip></tooltip>
+          <rules />
+          <enabled>true</enabled>
+          <wuid>4b16a64d:158af4f8f37:-7f5c</wuid>
+          <transparent>true</transparent>
+          <lock_children>false</lock_children>
+          <scripts />
+          <height>263</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>
+          <macros>
+            <include_parent_macros>true</include_parent_macros>
+          </macros>
+          <visible>false</visible>
+          <border_color>
+            <color red="0" green="128" blue="255" />
+          </border_color>
+          <widget_type>Grouping Container</widget_type>
+          <background_color>
+            <color red="240" green="240" blue="240" />
+          </background_color>
+          <width>324</width>
+          <x>1</x>
+          <name>BPS</name>
+          <y>1</y>
+          <foreground_color>
+            <color red="192" green="192" blue="192" />
+          </foreground_color>
+          <actions hook="false" hook_all="false" />
+          <fc>false</fc>
+          <show_scrollbar>true</show_scrollbar>
+          <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>false</enabled>
+            <wuid>4b16a64d:158af4f8f37:-7f46</wuid>
+            <transparent>true</transparent>
+            <auto_size>false</auto_size>
+            <text>Voltage</text>
+            <scripts />
+            <height>20</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>
+            <vertical_alignment>1</vertical_alignment>
+            <border_color>
+              <color name="IO Border" red="215" green="215" blue="215" />
+            </border_color>
+            <widget_type>Label</widget_type>
+            <wrap_words>false</wrap_words>
+            <background_color>
+              <color name="IO Background" red="255" green="255" blue="205" />
+            </background_color>
+            <width>67</width>
+            <x>12</x>
+            <name>Label Orientation_2</name>
+            <y>96</y>
+            <foreground_color>
+              <color name="IO Foreground" red="0" green="0" blue="0" />
+            </foreground_color>
+            <actions hook="false" hook_all="false" />
+            <font>
+              <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">
+            <border_style>0</border_style>
+            <tooltip></tooltip>
+            <horizontal_alignment>1</horizontal_alignment>
+            <rules />
+            <enabled>false</enabled>
+            <wuid>4b16a64d:158af4f8f37:-7f44</wuid>
+            <transparent>true</transparent>
+            <auto_size>false</auto_size>
+            <text>Current</text>
+            <scripts />
+            <height>20</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>
+            <vertical_alignment>1</vertical_alignment>
+            <border_color>
+              <color name="IO Border" red="215" green="215" blue="215" />
+            </border_color>
+            <widget_type>Label</widget_type>
+            <wrap_words>false</wrap_words>
+            <background_color>
+              <color name="IO Background" red="255" green="255" blue="205" />
+            </background_color>
+            <width>73</width>
+            <x>6</x>
+            <name>Label Orientation_3</name>
+            <y>54</y>
+            <foreground_color>
+              <color name="IO Foreground" red="0" green="0" blue="0" />
+            </foreground_color>
+            <actions hook="false" hook_all="false" />
+            <font>
+              <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">
+            <alarm_pulsing>false</alarm_pulsing>
+            <precision>0</precision>
+            <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <rules />
-        <enabled>true</enabled>
-        <wuid>-16429ab9:1582e68df9a:-4223</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>1099</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 name="Container Grey" red="200" green="200" blue="200" />
-        </background_color>
-        <width>1681</width>
-        <x>414</x>
-        <name>Rounded Rectangle_5</name>
-        <y>18</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>
+            <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>LNS-ISRC-010:PBI-EM:BPS1-CurS</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_3</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>4b16a64d:158af4f8f37:-7f43</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>91</width>
+            <x>90</x>
+            <y>48</y>
+            <maximum>1.7976931348623157E308</maximum>
+            <foreground_color>
+              <color name="KeyboardEntry" red="0" green="255" blue="255" />
+            </foreground_color>
+            <minimum>-1.7976931348623157E308</minimum>
+            <font>
+              <fontdata fontName="Sans" height="10" style="1" />
+            </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>4b16a64d:158af4f8f37:-7f3b</wuid>
+            <transparent>true</transparent>
+            <auto_size>false</auto_size>
+            <text>VERTICAL</text>
+            <scripts />
+            <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>
+            <vertical_alignment>1</vertical_alignment>
+            <border_color>
+              <color red="0" green="128" blue="255" />
+            </border_color>
+            <widget_type>Label</widget_type>
+            <wrap_words>false</wrap_words>
+            <background_color>
+              <color red="255" green="255" blue="255" />
+            </background_color>
+            <width>199</width>
+            <x>66</x>
+            <name>Label_164</name>
+            <y>12</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="0">Default</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>1</horizontal_alignment>
+            <rules />
+            <enabled>true</enabled>
+            <wuid>4b16a64d:158af4f8f37:-7f27</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>
+            <show_units>true</show_units>
+            <height>31</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:BPS1-CurR</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="70" green="70" blue="70" />
+            </background_color>
+            <width>100</width>
+            <x>198</x>
+            <name>Text Update</name>
+            <y>48</y>
+            <foreground_color>
+              <color name="Green On" red="0" green="255" 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.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>1</horizontal_alignment>
+            <rules />
+            <enabled>true</enabled>
+            <wuid>4b16a64d:158af4f8f37:-7f1b</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>
+            <show_units>true</show_units>
+            <height>31</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:BPS1-VolR</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="70" green="70" blue="70" />
+            </background_color>
+            <width>100</width>
+            <x>198</x>
+            <name>Text Update</name>
+            <y>90</y>
+            <foreground_color>
+              <color name="Green On" red="0" green="255" 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.TextInput" version="2.0.0">
+            <alarm_pulsing>false</alarm_pulsing>
+            <precision>0</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>LNS-ISRC-010:PBI-EM:BPS1-VolS</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_3</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>4b16a64d:158af4f8f37:-6180</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>91</width>
+            <x>90</x>
+            <y>90</y>
+            <maximum>1.7976931348623157E308</maximum>
+            <foreground_color>
+              <color name="KeyboardEntry" red="0" green="255" blue="255" />
+            </foreground_color>
+            <minimum>-1.7976931348623157E308</minimum>
+            <font>
+              <fontdata fontName="Sans" height="10" style="1" />
+            </font>
+          </widget>
+        </widget>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
         <border_style>0</border_style>
@@ -2523,7 +2804,7 @@ $(pv_value)</tooltip>
 $(pv_value)</tooltip>
         <rules />
         <enabled>true</enabled>
-        <wuid>-47901338:158955bc5eb:-344b</wuid>
+        <wuid>-16429ab9:1582e68df9a:-4223</wuid>
         <transparent>false</transparent>
         <pv_value />
         <alpha>255</alpha>
@@ -2533,7 +2814,7 @@ $(pv_value)</tooltip>
         </bg_gradient_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>208</height>
+        <height>1099</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -2555,10 +2836,70 @@ $(pv_value)</tooltip>
         </fg_gradient_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color name="Black" red="0" green="0" blue="0" />
+          <color name="Container Grey" red="200" green="200" blue="200" />
         </background_color>
-        <width>229</width>
-        <x>432</x>
+        <width>1681</width>
+        <x>414</x>
+        <name>Rounded Rectangle_5</name>
+        <y>18</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.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>-47901338:158955bc5eb:-344b</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>208</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 name="Black" red="0" green="0" blue="0" />
+        </background_color>
+        <width>205</width>
+        <x>420</x>
         <name>Rounded Rectangle_7</name>
         <y>894</y>
         <fill_level>0.0</fill_level>
@@ -2614,9 +2955,9 @@ $(pv_value)</tooltip>
           <color red="255" green="255" blue="255" />
         </background_color>
         <width>100</width>
-        <x>552</x>
+        <x>540</x>
         <name>Text Update</name>
-        <y>930</y>
+        <y>912</y>
         <foreground_color>
           <color name="Green On" red="0" green="255" blue="0" />
         </foreground_color>
@@ -2933,7 +3274,7 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>100</width>
+        <width>121</width>
         <x>228</x>
         <y>414</y>
         <maximum>0.0</maximum>
@@ -3040,7 +3381,7 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>100</width>
+        <width>121</width>
         <x>228</x>
         <y>456</y>
         <maximum>1.7976931348623157E308</maximum>
@@ -3246,10 +3587,10 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>100</width>
+        <width>121</width>
         <x>228</x>
         <y>496</y>
-        <maximum>30.0</maximum>
+        <maximum>100.0</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
@@ -3353,7 +3694,7 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>100</width>
+        <width>121</width>
         <x>228</x>
         <y>541</y>
         <maximum>1.7976931348623157E308</maximum>
@@ -3460,10 +3801,10 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>100</width>
+        <width>121</width>
         <x>228</x>
         <y>709</y>
-        <maximum>30.0</maximum>
+        <maximum>200.0</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
@@ -3552,7 +3893,14 @@ $(pv_value)</tooltip>
             <exp bool_exp="pv0&lt;=200">
               <value>true</value>
             </exp>
+            <exp bool_exp="pv1==0">
+              <value>true</value>
+            </exp>
+            <exp bool_exp="pv1==1">
+              <value>false</value>
+            </exp>
             <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).P4SI</pv>
+            <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
           </rule>
         </rules>
         <enabled>true</enabled>
@@ -3695,7 +4043,7 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>100</width>
+        <width>121</width>
         <x>228</x>
         <y>666</y>
         <maximum>1.7976931348623157E308</maximum>
@@ -3802,7 +4150,7 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>100</width>
+        <width>121</width>
         <x>228</x>
         <y>750</y>
         <maximum>1.7976931348623157E308</maximum>
@@ -3909,7 +4257,7 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>100</width>
+        <width>121</width>
         <x>228</x>
         <y>624</y>
         <maximum>1.7976931348623157E308</maximum>
@@ -3968,13 +4316,16 @@ $(pv_value)</tooltip>
         <alarm_pulsing>false</alarm_pulsing>
         <tooltip>$(pv_name)</tooltip>
         <x_axis_show_minor_ticks>true</x_axis_show_minor_ticks>
+        <roi_0_w_pv_value />
+        <roi_0_visible>true</roi_0_visible>
         <horizon_profile_x_pv_name>SCAN:CALC-PROJ-Xabsc</horizon_profile_x_pv_name>
-        <height>397</height>
+        <height>794</height>
         <border_width>1</border_width>
-        <graph_area_width>1302</graph_area_width>
+        <graph_area_width>1289</graph_area_width>
         <y_axis_scale_font>
           <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </y_axis_scale_font>
+        <roi_0_x_pv></roi_0_x_pv>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
@@ -3983,27 +4334,36 @@ $(pv_value)</tooltip>
         <pixel_info_pv_value />
         <x_axis_maximum>-100.0</x_axis_maximum>
         <vertial_profile_x_pv_value />
+        <roi_0_title>ROI 0</roi_0_title>
         <actions hook="false" hook_all="false" />
         <border_style>0</border_style>
         <rgb_mode>false</rgb_mode>
+        <roi_1_title>ROI 1</roi_1_title>
         <crop_left>0</crop_left>
+        <roi_1_y_pv_value />
         <x_axis_scale_font>
           <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </x_axis_scale_font>
         <data_width>0</data_width>
         <enabled>true</enabled>
         <wuid>-16429ab9:1582e68df9a:-6ffb</wuid>
+        <roi_1_visible>true</roi_1_visible>
         <y_axis_title_font>
           <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </y_axis_title_font>
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <graph_area_height>337</graph_area_height>
+        <graph_area_height>734</graph_area_height>
         <x_axis_visible>true</x_axis_visible>
+        <roi_0_y_pv_value />
+        <roi_1_h_pv_value />
         <vertical_profile_x_pv_name>SCAN:CALC-PROJ-Yabsc</vertical_profile_x_pv_name>
         <pixel_info_pv_name></pixel_info_pv_name>
+        <roi_0_width_pv></roi_0_width_pv>
         <x_axis_axis_color>
           <color red="0" green="0" blue="0" />
         </x_axis_axis_color>
+        <roi_0_h_pv_value />
+        <roi_1_x_pv></roi_1_x_pv>
         <background_color>
           <color red="240" green="240" blue="240" />
         </background_color>
@@ -4011,9 +4371,9 @@ $(pv_value)</tooltip>
         <width>1405</width>
         <x>660</x>
         <y>100</y>
-        <maximum>8.0</maximum>
+        <maximum>3.0</maximum>
         <data_height>0</data_height>
-        <minimum>-4.0</minimum>
+        <minimum>-1.0</minimum>
         <crop_right>0</crop_right>
         <crop_top>0</crop_top>
         <roi_color>
@@ -4022,6 +4382,7 @@ $(pv_value)</tooltip>
         <font>
           <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
+        <roi_0_y_pv></roi_0_y_pv>
         <rules>
           <rule name="DataHeight" prop_id="data_height" out_exp="true">
             <exp bool_exp="pv0&gt;0">
@@ -4061,7 +4422,9 @@ $(pv_value)</tooltip>
           </rule>
         </rules>
         <horizon_profile_y_pv_value />
-        <roi_count>0</roi_count>
+        <roi_1_x_pv_value />
+        <roi_count>2</roi_count>
+        <roi_1_y_pv></roi_1_y_pv>
         <pv_value />
         <color_map>
           <interpolate>true</interpolate>
@@ -4069,20 +4432,24 @@ $(pv_value)</tooltip>
           <map>2</map>
         </color_map>
         <show_ramp>true</show_ramp>
-        <y_axis_axis_title>Deg</y_axis_axis_title>
+        <y_axis_axis_title>mrad</y_axis_axis_title>
         <horizon_profile_y_pv_name>SCAN:CALC-PROJ-Xwf</horizon_profile_y_pv_name>
         <single_line_profiling>false</single_line_profiling>
         <y_axis_minimum>-80.0</y_axis_minimum>
         <visible>true</visible>
+        <roi_1_w_pv_value />
         <vertical_profile_y_pv_name>SCAN:CALC-PROJ-Ywf</vertical_profile_y_pv_name>
         <x_axis_major_tick_step_hint>50</x_axis_major_tick_step_hint>
         <pv_name>$(PREFIX_SCAN):BUFF-CURRENT</pv_name>
+        <roi_0_height_pv></roi_0_height_pv>
         <widget_type>Intensity Graph</widget_type>
         <name>Intensity Graph</name>
         <y_axis_axis_color>
           <color red="0" green="0" blue="0" />
         </y_axis_axis_color>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <roi_1_height_pv></roi_1_height_pv>
+        <roi_1_width_pv></roi_1_width_pv>
         <y_axis_major_tick_step_hint>50</y_axis_major_tick_step_hint>
         <scripts />
         <scale_options>
@@ -4097,6 +4464,7 @@ $(pv_value)</tooltip>
         <y_axis_visible>true</y_axis_visible>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <horizon_profile_x_pv_value />
+        <roi_0_x_pv_value />
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
@@ -4287,7 +4655,7 @@ $(pv_value)</tooltip>
       <widget typeId="org.csstudio.opibuilder.widgets.tab" version="1.0.0">
         <active_tab>0</active_tab>
         <tooltip></tooltip>
-        <height>1029</height>
+        <height>597</height>
         <border_width>1</border_width>
         <border_color>
           <color red="0" green="128" blue="255" />
@@ -4342,7 +4710,7 @@ $(pv_value)</tooltip>
           <transparent>true</transparent>
           <lock_children>false</lock_children>
           <scripts />
-          <height>997</height>
+          <height>565</height>
           <border_width>1</border_width>
           <scale_options>
             <width_scalable>true</width_scalable>
@@ -5674,64 +6042,6 @@ $(pv_value)</tooltip>
               <color name="Major" red="255" green="0" blue="0" />
             </line_color>
           </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" 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>-16429ab9:1582e68df9a:-3742</wuid>
-            <transparent>false</transparent>
-            <pv_value />
-            <alpha>255</alpha>
-            <bg_gradient_color>
-              <color red="255" green="255" blue="255" />
-            </bg_gradient_color>
-            <scripts />
-            <border_alarm_sensitive>false</border_alarm_sensitive>
-            <height>415</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>
-            <line_style>0</line_style>
-            <widget_type>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 name="Container Border Grey" red="150" green="150" blue="150" />
-            </background_color>
-            <width>295</width>
-            <x>12</x>
-            <name>Rectangle</name>
-            <y>576</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.Label" version="1.0.0">
             <border_style>0</border_style>
             <tooltip></tooltip>
@@ -5781,15 +6091,15 @@ $(pv_value)</tooltip>
             <rules />
             <effect_3d>true</effect_3d>
             <enabled>true</enabled>
-            <wuid>-1168daa3:158859bc9c3:-6027</wuid>
+            <wuid>60f6e55b:158baae9c78:-79b8</wuid>
             <on_color>
-              <color name="Major" red="255" green="0" blue="0" />
+              <color name="Field Background Grey" red="240" green="240" blue="240" />
             </on_color>
             <horizontal>false</horizontal>
             <pv_value />
             <numBits>1</numBits>
             <scripts />
-            <border_alarm_sensitive>false</border_alarm_sensitive>
+            <border_alarm_sensitive>true</border_alarm_sensitive>
             <height>28</height>
             <border_width>0</border_width>
             <scale_options>
@@ -5806,7 +6116,7 @@ $(pv_value)</tooltip>
             <label />
             <widget_type>Byte Monitor</widget_type>
             <off_color>
-              <color name="IO Grid" red="215" green="215" blue="215" />
+              <color name="Major" red="255" green="0" blue="0" />
             </off_color>
             <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
             <background_color>
@@ -5974,8 +6284,8 @@ $(pv_value)</tooltip>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
         <width>100</width>
-        <x>1242</x>
-        <y>880</y>
+        <x>1230</x>
+        <y>876</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
           <color name="Green On" red="0" green="255" blue="0" />
@@ -6024,9 +6334,9 @@ $(pv_value)</tooltip>
           <color red="255" green="255" blue="255" />
         </background_color>
         <width>181</width>
-        <x>1062</x>
+        <x>1032</x>
         <name>Label</name>
-        <y>881</y>
+        <y>877</y>
         <foreground_color>
           <color name="Major" red="255" green="0" blue="0" />
         </foreground_color>
@@ -6060,7 +6370,7 @@ $(trace_0_y_pv_value)</tooltip>
         <background_color>
           <color name="Container Grey" red="200" green="200" blue="200" />
         </background_color>
-        <x>660</x>
+        <x>639</x>
         <y>912</y>
         <trace_0_x_axis_index>0</trace_0_x_axis_index>
         <axis_count>2</axis_count>
@@ -6084,7 +6394,7 @@ $(trace_0_y_pv_value)</tooltip>
         <trace_1_name>$(trace_1_y_pv)</trace_1_name>
         <trace_1_y_pv_value />
         <show_legend>false</show_legend>
-        <axis_0_axis_title>Profile</axis_0_axis_title>
+        <axis_0_axis_title>mm</axis_0_axis_title>
         <axis_0_axis_color>
           <color red="0" green="0" blue="0" />
         </axis_0_axis_color>
@@ -6148,7 +6458,7 @@ $(trace_0_y_pv_value)</tooltip>
         <axis_1_time_format>0</axis_1_time_format>
         <border_alarm_sensitive>false</border_alarm_sensitive>
         <show_plot_area_border>true</show_plot_area_border>
-        <width>1363</width>
+        <width>1384</width>
         <trace_1_x_pv_value />
         <axis_1_minimum>-100.0</axis_1_minimum>
         <title_font>
@@ -6171,7 +6481,7 @@ $(trace_0_y_pv_value)</tooltip>
           <color red="21" green="21" blue="196" />
         </trace_0_trace_color>
         <trace_0_anti_alias>false</trace_0_anti_alias>
-        <axis_1_auto_scale_threshold>0.0</axis_1_auto_scale_threshold>
+        <axis_1_auto_scale_threshold>0.1</axis_1_auto_scale_threshold>
         <foreground_color>
           <color red="0" green="0" blue="255" />
         </foreground_color>
@@ -6248,7 +6558,7 @@ $(trace_0_y_pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <axis_0_log_scale>false</axis_0_log_scale>
         <trace_0_x_pv_value />
-        <axis_0_auto_scale_threshold>0.0</axis_0_auto_scale_threshold>
+        <axis_0_auto_scale_threshold>0.1</axis_0_auto_scale_threshold>
         <rules />
         <axis_1_visible>true</axis_1_visible>
         <trace_0_update_delay>10</trace_0_update_delay>
@@ -6256,7 +6566,7 @@ $(trace_0_y_pv_value)</tooltip>
         <name>XY Graph</name>
         <axis_0_auto_scale>true</axis_0_auto_scale>
         <axis_0_minimum>-100.0</axis_0_minimum>
-        <axis_1_axis_title></axis_1_axis_title>
+        <axis_1_axis_title>mrad</axis_1_axis_title>
         <axis_1_auto_scale>true</axis_1_auto_scale>
         <border_color>
           <color red="0" green="128" blue="255" />
@@ -6345,7 +6655,7 @@ $(trace_0_y_pv_value)</tooltip>
         <wuid>-47901338:158955bc5eb:-3243</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>Projection X</text>
+        <text>X Mean</text>
         <scripts />
         <height>20</height>
         <border_width>2</border_width>
@@ -6365,9 +6675,9 @@ $(trace_0_y_pv_value)</tooltip>
           <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
         <width>121</width>
-        <x>432</x>
+        <x>420</x>
         <name>Label Orientation_2</name>
-        <y>930</y>
+        <y>912</y>
         <foreground_color>
           <color name="White" red="255" green="255" blue="255" />
         </foreground_color>
@@ -6385,7 +6695,7 @@ $(trace_0_y_pv_value)</tooltip>
         <wuid>-47901338:158955bc5eb:-3235</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>Projection Y</text>
+        <text>X' Mean</text>
         <scripts />
         <height>20</height>
         <border_width>2</border_width>
@@ -6405,9 +6715,9 @@ $(trace_0_y_pv_value)</tooltip>
           <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
         <width>121</width>
-        <x>432</x>
+        <x>420</x>
         <name>Label Orientation_2</name>
-        <y>972</y>
+        <y>942</y>
         <foreground_color>
           <color name="White" red="255" green="255" blue="255" />
         </foreground_color>
@@ -6457,9 +6767,9 @@ $(pv_value)</tooltip>
           <color red="255" green="255" blue="255" />
         </background_color>
         <width>100</width>
-        <x>552</x>
+        <x>540</x>
         <name>Text Update</name>
-        <y>972</y>
+        <y>942</y>
         <foreground_color>
           <color name="Green On" red="0" green="255" blue="0" />
         </foreground_color>
@@ -6468,144 +6778,1086 @@ $(pv_value)</tooltip>
           <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.intensityGraph" version="1.0.0">
-        <vertial_profile_y_pv_value />
-        <y_axis_show_minor_ticks>true</y_axis_show_minor_ticks>
+      <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>false</enabled>
+        <wuid>4b16a64d:158af4f8f37:-7b9f</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>TENSION MAX</text>
+        <scripts />
+        <height>20</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>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>115</width>
+        <x>36</x>
+        <name>Label Orientation_3</name>
+        <y>857</y>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small 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>
-        <tooltip>$(pv_name)</tooltip>
-        <x_axis_show_minor_ticks>true</x_axis_show_minor_ticks>
-        <horizon_profile_x_pv_name></horizon_profile_x_pv_name>
-        <height>397</height>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>4b16a64d:158af4f8f37:-7b9e</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>
+        <show_units>true</show_units>
+        <height>31</height>
         <border_width>1</border_width>
-        <graph_area_width>1302</graph_area_width>
-        <y_axis_scale_font>
-          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
-        </y_axis_scale_font>
+        <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>SCAN:PROC-VoltMax</pv_name>
+        <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <x_axis_minimum>0.0</x_axis_minimum>
-        <y_axis_maximum>80.0</y_axis_maximum>
-        <pixel_info_pv_value />
-        <x_axis_maximum>-100.0</x_axis_maximum>
-        <vertial_profile_x_pv_value />
+        <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="70" green="70" blue="70" />
+        </background_color>
+        <width>160</width>
+        <x>168</x>
+        <name>Text Update</name>
+        <y>851</y>
+        <foreground_color>
+          <color name="Green On" red="0" green="255" 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.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>1</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>4b16a64d:158af4f8f37:-7b9d</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>
+        <show_units>true</show_units>
+        <height>31</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>SCAN:PROC-VoltMin</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="70" green="70" blue="70" />
+        </background_color>
+        <width>160</width>
+        <x>168</x>
+        <name>Text Update_1</name>
+        <y>893</y>
+        <foreground_color>
+          <color name="Green On" red="0" green="255" 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.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>4b16a64d:158af4f8f37:-7ae3</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>TENSION MIN</text>
+        <scripts />
+        <height>20</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>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>115</width>
+        <x>36</x>
+        <name>Label Orientation_3</name>
+        <y>899</y>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small 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>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>82148ce:158b4de09bc:-7db2</wuid>
+        <transparent>true</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>SCAN:CALC-RMS-SIZE</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="255" green="255" blue="255" />
+        </background_color>
+        <width>100</width>
+        <x>540</x>
+        <name>Text Update</name>
+        <y>978</y>
+        <foreground_color>
+          <color name="Green On" red="0" green="255" 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.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>82148ce:158b4de09bc:-7db1</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>SIGMA X</text>
+        <scripts />
+        <height>20</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>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>121</width>
+        <x>420</x>
+        <name>Label Orientation_2</name>
+        <y>978</y>
+        <foreground_color>
+          <color name="White" red="255" green="255" blue="255" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <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">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>82148ce:158b4de09bc:-7db0</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>SIGMA X'</text>
+        <scripts />
+        <height>20</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>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>121</width>
+        <x>420</x>
+        <name>Label Orientation_3</name>
+        <y>1012</y>
+        <foreground_color>
+          <color name="White" red="255" green="255" blue="255" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small 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>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>82148ce:158b4de09bc:-7daf</wuid>
+        <transparent>true</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>SCAN:CALC-RMS-ANGLE</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="255" green="255" blue="255" />
+        </background_color>
+        <width>100</width>
+        <x>540</x>
+        <name>Text Update_1</name>
+        <y>1012</y>
+        <foreground_color>
+          <color name="Green On" red="0" green="255" 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.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>-254931a3:158b5a49183:-7dd1</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>SIGMA XX'</text>
+        <scripts />
+        <height>20</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>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>121</width>
+        <x>420</x>
+        <name>Label Orientation_3</name>
+        <y>1047</y>
+        <foreground_color>
+          <color name="White" red="255" green="255" blue="255" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small 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>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>-254931a3:158b5a49183:-7dd0</wuid>
+        <transparent>true</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>SCAN:CALC-SIGMA</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="255" green="255" blue="255" />
+        </background_color>
+        <width>100</width>
+        <x>540</x>
+        <name>Text Update_1</name>
+        <y>1047</y>
+        <foreground_color>
+          <color name="Green On" red="0" green="255" 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.tab" version="1.0.0">
+        <active_tab>0</active_tab>
+        <tooltip></tooltip>
+        <height>313</height>
+        <border_width>1</border_width>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <tab_0_foreground_color>
+          <color red="0" green="0" blue="0" />
+        </tab_0_foreground_color>
+        <actions hook="false" hook_all="false" />
+        <border_style>0</border_style>
+        <enabled>true</enabled>
+        <wuid>60f6e55b:158baae9c78:-7f2b</wuid>
+        <background_color>
+          <color red="240" green="240" blue="240" />
+        </background_color>
+        <width>319</width>
+        <x>2136</x>
+        <horizontal_tabs>true</horizontal_tabs>
+        <y>678</y>
+        <rules />
+        <macros>
+          <include_parent_macros>true</include_parent_macros>
+        </macros>
+        <visible>true</visible>
+        <tab_0_background_color>
+          <color red="183" green="189" blue="182" />
+        </tab_0_background_color>
+        <widget_type>Tabbed Container</widget_type>
+        <name>Tabbed Container_2</name>
+        <minimum_tab_height>10</minimum_tab_height>
+        <tab_0_font>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+        </tab_0_font>
+        <tab_0_title>PLC-STATUS</tab_0_title>
+        <scripts />
+        <tab_count>1</tab_count>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <tab_0_icon_path></tab_0_icon_path>
+        <tab_0_enabled>true</tab_0_enabled>
+        <foreground_color>
+          <color red="192" green="192" blue="192" />
+        </foreground_color>
+        <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
+          <border_style>0</border_style>
+          <tooltip></tooltip>
+          <rules />
+          <enabled>true</enabled>
+          <wuid>60f6e55b:158baae9c78:-7f2a</wuid>
+          <transparent>true</transparent>
+          <lock_children>false</lock_children>
+          <scripts />
+          <height>281</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>
+          <macros>
+            <include_parent_macros>true</include_parent_macros>
+          </macros>
+          <visible>true</visible>
+          <border_color>
+            <color red="0" green="128" blue="255" />
+          </border_color>
+          <widget_type>Grouping Container</widget_type>
+          <background_color>
+            <color red="240" green="240" blue="240" />
+          </background_color>
+          <width>317</width>
+          <x>1</x>
+          <name>PLC-STATUS</name>
+          <y>1</y>
+          <foreground_color>
+            <color red="192" green="192" blue="192" />
+          </foreground_color>
+          <actions hook="false" hook_all="false" />
+          <fc>false</fc>
+          <show_scrollbar>true</show_scrollbar>
+          <font>
+            <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+          </font>
+          <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" 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>60f6e55b:158baae9c78:-7f15</wuid>
+            <transparent>false</transparent>
+            <pv_value />
+            <alpha>255</alpha>
+            <bg_gradient_color>
+              <color red="255" green="255" blue="255" />
+            </bg_gradient_color>
+            <scripts />
+            <border_alarm_sensitive>false</border_alarm_sensitive>
+            <height>265</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>
+            <line_style>0</line_style>
+            <widget_type>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="136" green="138" blue="133" />
+            </background_color>
+            <width>295</width>
+            <x>12</x>
+            <name>Rectangle</name>
+            <y>6</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.Label" version="1.0.0">
+            <border_style>0</border_style>
+            <tooltip></tooltip>
+            <horizontal_alignment>1</horizontal_alignment>
+            <rules />
+            <enabled>true</enabled>
+            <wuid>60f6e55b:158baae9c78:-7f14</wuid>
+            <transparent>true</transparent>
+            <auto_size>false</auto_size>
+            <text>Temp BEAM Stop</text>
+            <scripts />
+            <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>
+            <vertical_alignment>1</vertical_alignment>
+            <border_color>
+              <color red="0" green="128" blue="255" />
+            </border_color>
+            <widget_type>Label</widget_type>
+            <wrap_words>false</wrap_words>
+            <background_color>
+              <color red="255" green="255" blue="255" />
+            </background_color>
+            <width>134</width>
+            <x>28</x>
+            <name>Label_164</name>
+            <y>30</y>
+            <foreground_color>
+              <color red="0" green="0" blue="0" />
+            </foreground_color>
+            <actions hook="false" hook_all="false" />
+            <font>
+              <opifont.name fontName="OpenSans" height="10" style="1">Small 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>2</precision>
+            <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+            <horizontal_alignment>1</horizontal_alignment>
+            <rules />
+            <enabled>true</enabled>
+            <wuid>60f6e55b:158baae9c78:-7f13</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>
+            <show_units>true</show_units>
+            <height>31</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>INFN-SRC:INTK-VBS:TEMP</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 red="70" green="70" blue="70" />
+            </background_color>
+            <width>112</width>
+            <x>174</x>
+            <name>Text Update</name>
+            <y>24</y>
+            <foreground_color>
+              <color name="Green On" red="0" green="255" 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.TextUpdate" version="1.0.0">
+            <border_style>0</border_style>
+            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+            <alarm_pulsing>false</alarm_pulsing>
+            <precision>2</precision>
+            <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+            <horizontal_alignment>1</horizontal_alignment>
+            <rules />
+            <enabled>true</enabled>
+            <wuid>60f6e55b:158baae9c78:-7f12</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>
+            <show_units>true</show_units>
+            <height>31</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>INFN-SRC:INTK-VS:TEMP</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 red="70" green="70" blue="70" />
+            </background_color>
+            <width>112</width>
+            <x>174</x>
+            <name>Text Update_1</name>
+            <y>66</y>
+            <foreground_color>
+              <color name="Green On" red="0" green="255" 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.ActionButton" version="2.0.0">
+            <toggle_button>false</toggle_button>
+            <border_style>6</border_style>
+            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+            <alarm_pulsing>false</alarm_pulsing>
+            <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+            <push_action_index>0</push_action_index>
+            <rules>
+              <rule name="Enable" prop_id="enabled" out_exp="false">
+                <exp bool_exp="pv0 &gt;= 200">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0&lt;=200">
+                  <value>true</value>
+                </exp>
+                <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).P4SI</pv>
+              </rule>
+            </rules>
+            <enabled>true</enabled>
+            <wuid>60f6e55b:158baae9c78:-7f11</wuid>
+            <pv_value />
+            <text>HORIZONTAL</text>
+            <scripts />
+            <border_alarm_sensitive>false</border_alarm_sensitive>
+            <height>55</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>
+            <image></image>
+            <visible>true</visible>
+            <pv_name>INFN-SRC:INTK-HMI:VH_SELECT</pv_name>
+            <border_color>
+              <color name="IO Border" red="215" green="215" blue="215" />
+            </border_color>
+            <widget_type>Action Button</widget_type>
+            <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+            <background_color>
+              <color name="IO Button" red="178" green="178" blue="178" />
+            </background_color>
+            <width>133</width>
+            <x>46</x>
+            <name>Start Scan</name>
+            <y>126</y>
+            <style>0</style>
+            <foreground_color>
+              <color name="IO Foreground" red="0" green="0" blue="0" />
+            </foreground_color>
+            <actions hook="false" hook_all="false">
+              <action type="WRITE_PV">
+                <pv_name>INFN-SRC:INTK-HMI:VH_SELECT</pv_name>
+                <value>1</value>
+                <timeout>10</timeout>
+                <confirm_message></confirm_message>
+                <description>Select HORIZONTAL</description>
+              </action>
+            </actions>
+            <font>
+              <fontdata fontName="Sans" height="10" style="1" />
+            </font>
+          </widget>
+          <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
+            <alarm_pulsing>false</alarm_pulsing>
+            <tooltip>$(pv_name)</tooltip>
+            <rules />
+            <effect_3d>true</effect_3d>
+            <bit>-1</bit>
+            <pv_value />
+            <height>23</height>
+            <border_width>1</border_width>
+            <visible>true</visible>
+            <pv_name>INFN-SRC:INTK-HMI:VH_SELECT</pv_name>
+            <border_color>
+              <color name="Blue" red="0" green="128" blue="255" />
+            </border_color>
+            <widget_type>LED</widget_type>
+            <name>LED</name>
+            <actions hook="false" hook_all="false" />
+            <show_boolean_label>false</show_boolean_label>
+            <border_style>0</border_style>
+            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+            <enabled>true</enabled>
+            <wuid>60f6e55b:158baae9c78:-7f10</wuid>
+            <on_color>
+              <color name="Green On" red="0" green="255" blue="0" />
+            </on_color>
+            <scripts />
+            <border_alarm_sensitive>false</border_alarm_sensitive>
+            <on_label>ON</on_label>
+            <scale_options>
+              <width_scalable>true</width_scalable>
+              <height_scalable>true</height_scalable>
+              <keep_wh_ratio>true</keep_wh_ratio>
+            </scale_options>
+            <off_color>
+              <color name="Field Background Grey" red="240" green="240" blue="240" />
+            </off_color>
+            <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+            <background_color>
+              <color name="Field Background Grey" red="240" green="240" blue="240" />
+            </background_color>
+            <square_led>false</square_led>
+            <width>23</width>
+            <x>234</x>
+            <data_type>0</data_type>
+            <y>142</y>
+            <foreground_color>
+              <color name="Button Grey" red="180" green="180" blue="180" />
+            </foreground_color>
+            <font>
+              <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+            </font>
+            <off_label>OFF</off_label>
+          </widget>
+          <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
+            <alarm_pulsing>false</alarm_pulsing>
+            <tooltip>$(pv_name)</tooltip>
+            <rules />
+            <effect_3d>true</effect_3d>
+            <bit>-1</bit>
+            <pv_value />
+            <height>23</height>
+            <border_width>1</border_width>
+            <visible>true</visible>
+            <pv_name>INFN-SRC:INTK-HMI:VH_SELECT</pv_name>
+            <border_color>
+              <color name="Blue" red="0" green="128" blue="255" />
+            </border_color>
+            <widget_type>LED</widget_type>
+            <name>LED_1</name>
+            <actions hook="false" hook_all="false" />
+            <show_boolean_label>false</show_boolean_label>
+            <border_style>0</border_style>
+            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+            <enabled>true</enabled>
+            <wuid>60f6e55b:158baae9c78:-7f0f</wuid>
+            <on_color>
+              <color name="Field Background Grey" red="240" green="240" blue="240" />
+            </on_color>
+            <scripts />
+            <border_alarm_sensitive>false</border_alarm_sensitive>
+            <on_label>ON</on_label>
+            <scale_options>
+              <width_scalable>true</width_scalable>
+              <height_scalable>true</height_scalable>
+              <keep_wh_ratio>true</keep_wh_ratio>
+            </scale_options>
+            <off_color>
+              <color name="Green On" red="0" green="255" blue="0" />
+            </off_color>
+            <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+            <background_color>
+              <color name="Field Background Grey" red="240" green="240" blue="240" />
+            </background_color>
+            <square_led>false</square_led>
+            <width>23</width>
+            <x>234</x>
+            <data_type>0</data_type>
+            <y>208</y>
+            <foreground_color>
+              <color name="Button Grey" red="180" green="180" blue="180" />
+            </foreground_color>
+            <font>
+              <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+            </font>
+            <off_label>OFF</off_label>
+          </widget>
+          <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
+            <toggle_button>false</toggle_button>
+            <border_style>6</border_style>
+            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+            <alarm_pulsing>false</alarm_pulsing>
+            <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+            <push_action_index>0</push_action_index>
+            <rules>
+              <rule name="Enable" prop_id="enabled" out_exp="false">
+                <exp bool_exp="pv0 &gt;= 200">
+                  <value>false</value>
+                </exp>
+                <exp bool_exp="pv0&lt;=200">
+                  <value>true</value>
+                </exp>
+                <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).P4SI</pv>
+              </rule>
+            </rules>
+            <enabled>true</enabled>
+            <wuid>60f6e55b:158baae9c78:-7f0e</wuid>
+            <pv_value />
+            <text>VERTICAL</text>
+            <scripts />
+            <border_alarm_sensitive>false</border_alarm_sensitive>
+            <height>55</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>
+            <image></image>
+            <visible>true</visible>
+            <pv_name>INFN-SRC:INTK-HMI:VH_SELECT</pv_name>
+            <border_color>
+              <color name="IO Border" red="215" green="215" blue="215" />
+            </border_color>
+            <widget_type>Action Button</widget_type>
+            <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+            <background_color>
+              <color name="IO Button" red="178" green="178" blue="178" />
+            </background_color>
+            <width>133</width>
+            <x>46</x>
+            <name>Start Scan_1</name>
+            <y>192</y>
+            <style>0</style>
+            <foreground_color>
+              <color name="IO Foreground" red="0" green="0" blue="0" />
+            </foreground_color>
+            <actions hook="false" hook_all="false">
+              <action type="WRITE_PV">
+                <pv_name>INFN-SRC:INTK-HMI:VH_SELECT</pv_name>
+                <value>1</value>
+                <timeout>10</timeout>
+                <confirm_message></confirm_message>
+                <description>Select VERTICAL</description>
+              </action>
+            </actions>
+            <font>
+              <fontdata fontName="Sans" height="10" style="1" />
+            </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>60f6e55b:158baae9c78:-7f0d</wuid>
+            <transparent>true</transparent>
+            <auto_size>false</auto_size>
+            <text>Temp SLIT</text>
+            <scripts />
+            <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>
+            <vertical_alignment>1</vertical_alignment>
+            <border_color>
+              <color red="0" green="128" blue="255" />
+            </border_color>
+            <widget_type>Label</widget_type>
+            <wrap_words>false</wrap_words>
+            <background_color>
+              <color red="255" green="255" blue="255" />
+            </background_color>
+            <width>134</width>
+            <x>24</x>
+            <name>Label_165</name>
+            <y>72</y>
+            <foreground_color>
+              <color red="0" green="0" blue="0" />
+            </foreground_color>
+            <actions hook="false" hook_all="false" />
+            <font>
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+            </font>
+          </widget>
+        </widget>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
+        <toggle_button>false</toggle_button>
         <border_style>0</border_style>
-        <rgb_mode>false</rgb_mode>
-        <crop_left>0</crop_left>
-        <x_axis_scale_font>
-          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
-        </x_axis_scale_font>
-        <data_width>0</data_width>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <push_action_index>0</push_action_index>
+        <rules />
         <enabled>true</enabled>
-        <wuid>-6047e935:1589bd389ef:-591f</wuid>
-        <y_axis_title_font>
-          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
-        </y_axis_title_font>
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <graph_area_height>337</graph_area_height>
-        <x_axis_visible>true</x_axis_visible>
-        <vertical_profile_x_pv_name></vertical_profile_x_pv_name>
-        <pixel_info_pv_name></pixel_info_pv_name>
-        <x_axis_axis_color>
-          <color red="0" green="0" blue="0" />
-        </x_axis_axis_color>
-        <background_color>
-          <color red="240" green="240" blue="240" />
-        </background_color>
-        <x_axis_axis_title>mm</x_axis_axis_title>
-        <width>1405</width>
-        <x>636</x>
-        <y>516</y>
-        <maximum>8.0</maximum>
-        <data_height>0</data_height>
-        <minimum>-4.0</minimum>
-        <crop_right>0</crop_right>
-        <crop_top>0</crop_top>
-        <roi_color>
-          <color red="0" green="255" blue="255" />
-        </roi_color>
-        <font>
-          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
-        </font>
-        <rules>
-          <rule name="DataHeight" prop_id="data_height" out_exp="true">
-            <exp bool_exp="pv0&gt;0">
-              <value>pv0</value>
-            </exp>
-            <pv trig="true">${PREFIX_SCAN}:$(NAME_PS).NPTS</pv>
-          </rule>
-          <rule name="DataWidth" prop_id="data_width" out_exp="true">
-            <exp bool_exp="pv0&gt;0">
-              <value>pv0</value>
-            </exp>
-            <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).NPTS</pv>
-          </rule>
-          <rule name="XMax" prop_id="x_axis_maximum" out_exp="true">
-            <exp bool_exp="pv0!=0">
-              <value>pv0</value>
-            </exp>
-            <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).P4SP</pv>
-          </rule>
-          <rule name="XMin" prop_id="x_axis_minimum" out_exp="true">
-            <exp bool_exp="pv0!=0">
-              <value>pv0</value>
-            </exp>
-            <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).P4EP</pv>
-          </rule>
-          <rule name="YMax" prop_id="y_axis_maximum" out_exp="true">
-            <exp bool_exp="pv0!=0">
-              <value>pv0</value>
-            </exp>
-            <pv trig="true">${PREFIX_SCAN}:$(PROC)-AngleMax-SP</pv>
-          </rule>
-          <rule name="YMin" prop_id="y_axis_minimum" out_exp="true">
-            <exp bool_exp="pv0!=0">
-              <value>pv0</value>
-            </exp>
-            <pv trig="true">${PREFIX_SCAN}:$(PROC)-AngleMin-SP</pv>
-          </rule>
-        </rules>
-        <horizon_profile_y_pv_value />
-        <roi_count>0</roi_count>
+        <wuid>-61dcfd6b:158bac54bbd:-7a9a</wuid>
         <pv_value />
-        <color_map>
-          <interpolate>true</interpolate>
-          <autoscale>true</autoscale>
-          <map>2</map>
-        </color_map>
-        <show_ramp>true</show_ramp>
-        <y_axis_axis_title>Deg</y_axis_axis_title>
-        <horizon_profile_y_pv_name></horizon_profile_y_pv_name>
-        <single_line_profiling>false</single_line_profiling>
-        <y_axis_minimum>-80.0</y_axis_minimum>
-        <visible>true</visible>
-        <vertical_profile_y_pv_name></vertical_profile_y_pv_name>
-        <x_axis_major_tick_step_hint>50</x_axis_major_tick_step_hint>
-        <pv_name>$(PREFIX_SCAN):BUFF-ANGLE</pv_name>
-        <widget_type>Intensity Graph</widget_type>
-        <name>Intensity Graph</name>
-        <y_axis_axis_color>
-          <color red="0" green="0" blue="0" />
-        </y_axis_axis_color>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <y_axis_major_tick_step_hint>50</y_axis_major_tick_step_hint>
+        <text>Extract DATA</text>
         <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>57</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>
-        <x_axis_title_font>
-          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
-        </x_axis_title_font>
-        <crop_bottom>0</crop_bottom>
-        <y_axis_visible>true</y_axis_visible>
+        <image></image>
+        <visible>true</visible>
+        <pv_name></pv_name>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <widget_type>Action Button</widget_type>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <horizon_profile_x_pv_value />
+        <background_color>
+          <color name="Button Grey" red="180" green="180" blue="180" />
+        </background_color>
+        <width>166</width>
+        <x>2235</x>
+        <name>Action Button</name>
+        <y>1024</y>
+        <style>0</style>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
+        <actions hook="false" hook_all="false">
+          <action type="EXECUTE_PYTHONSCRIPT">
+            <path>CSS-ExtractDataTOTracePlot.py</path>
+            <scriptText><![CDATA[from org.csstudio.opibuilder.scriptUtil import PVUtil
+]]></scriptText>
+            <embedded>false</embedded>
+            <description></description>
+          </action>
+        </actions>
+        <font>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+        </font>
       </widget>
     </widget>
     <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
@@ -6855,6 +8107,7 @@ $(trace_0_y_pv_value)</tooltip>
         <trace_0_x_axis_index>0</trace_0_x_axis_index>
         <axis_count>3</axis_count>
         <trace_4_x_pv>$(DTACQ-NAME):$(DEVICE_HV1):VoltR:RCURSOR_X</trace_4_x_pv>
+        <trace_3_y_pv_value />
         <trace_1_point_size>4</trace_1_point_size>
         <trace_1_anti_alias>false</trace_1_anti_alias>
         <pv_value />
@@ -6873,6 +8126,7 @@ $(trace_0_y_pv_value)</tooltip>
         <trace_2_line_width>1</trace_2_line_width>
         <trace_4_plot_mode>0</trace_4_plot_mode>
         <trace_3_concatenate_data>false</trace_3_concatenate_data>
+        <trace_4_x_pv_value />
         <axis_1_axis_color>
           <color red="0" green="0" blue="0" />
         </axis_1_axis_color>
@@ -6905,6 +8159,7 @@ $(trace_0_y_pv_value)</tooltip>
         <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>
+        <trace_3_x_pv_value />
         <axis_0_time_format>0</axis_0_time_format>
         <trace_count>5</trace_count>
         <axis_1_show_grid>true</axis_1_show_grid>
@@ -6931,11 +8186,11 @@ $(trace_0_y_pv_value)</tooltip>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <trace_2_y_pv_value />
         <trace_2_anti_alias>false</trace_2_anti_alias>
-        <axis_0_maximum>10.0</axis_0_maximum>
+        <axis_0_maximum>6.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>730</height>
-        <trace_2_visible>true</trace_2_visible>
+        <height>451</height>
+        <trace_2_visible>false</trace_2_visible>
         <trigger_pv_value />
         <trace_3_y_pv>loc://val(-100,100)</trace_3_y_pv>
         <axis_1_grid_color>
@@ -6968,7 +8223,7 @@ $(trace_0_y_pv_value)</tooltip>
         <name>XY Graph</name>
         <trace_1_trace_type>0</trace_1_trace_type>
         <axis_0_auto_scale>true</axis_0_auto_scale>
-        <axis_0_minimum>-10.0</axis_0_minimum>
+        <axis_0_minimum>-6.0</axis_0_minimum>
         <trace_2_y_axis_index>1</trace_2_y_axis_index>
         <trace_1_update_delay>1</trace_1_update_delay>
         <axis_2_dash_grid_line>false</axis_2_dash_grid_line>
@@ -7010,7 +8265,7 @@ $(trace_0_y_pv_value)</tooltip>
         </title_font>
         <trace_4_anti_alias>false</trace_4_anti_alias>
         <trace_0_y_pv_value />
-        <trace_1_visible>true</trace_1_visible>
+        <trace_1_visible>false</trace_1_visible>
         <plot_area_background_color>
           <color red="0" green="0" blue="0" />
         </plot_area_background_color>
@@ -7026,6 +8281,7 @@ $(trace_0_y_pv_value)</tooltip>
         <trace_1_buffer_size>520</trace_1_buffer_size>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <axis_2_scale_format></axis_2_scale_format>
+        <trace_4_y_pv_value />
         <scripts />
         <trace_0_point_size>3</trace_0_point_size>
         <trace_0_trace_color>
@@ -7413,7 +8669,7 @@ $(pv_value)</tooltip>
         <rotation_angle>0.0</rotation_angle>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <show_units>true</show_units>
+        <show_units>false</show_units>
         <height>24</height>
         <border_width>1</border_width>
         <scale_options>
@@ -7427,7 +8683,7 @@ $(pv_value)</tooltip>
         <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>
@@ -8495,38 +9751,267 @@ $(pv_value)</tooltip>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name>LNS-ISRC-010:PBI-EM: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="70" green="70" blue="70" />
+        </background_color>
+        <page_increment>10.0</page_increment>
+        <width>115</width>
+        <x>54</x>
+        <name>Spinner Template_3</name>
+        <y>288</y>
+        <maximum>100.0</maximum>
+        <foreground_color>
+          <color red="0" green="255" blue="255" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <minimum>-100.0</minimum>
+        <font>
+          <fontdata fontName="Open Sans" height="10" style="0" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.xyGraph" version="1.0.0">
+        <axis_1_scale_format></axis_1_scale_format>
+        <trace_2_x_axis_index>0</trace_2_x_axis_index>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(trace_0_y_pv)
+$(trace_0_y_pv_value)</tooltip>
+        <trace_0_concatenate_data>false</trace_0_concatenate_data>
+        <trace_0_trace_type>0</trace_0_trace_type>
+        <trace_4_line_width>3</trace_4_line_width>
+        <border_width>1</border_width>
+        <trace_3_point_size>4</trace_3_point_size>
+        <trace_1_x_axis_index>0</trace_1_x_axis_index>
+        <border_style>0</border_style>
+        <axis_0_grid_color>
+          <color red="78" green="154" blue="6" />
+        </axis_0_grid_color>
+        <axis_2_visible>false</axis_2_visible>
+        <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>$(DTACQ-NAME):$(DEVICE_HV1):VoltR_XMS</trace_1_x_pv>
+        <wuid>-61dcfd6b:158bac54bbd:-7d05</wuid>
+        <transparent>false</transparent>
+        <trace_1_update_mode>0</trace_1_update_mode>
+        <axis_0_title_font>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+        </axis_0_title_font>
+        <trace_2_update_mode>0</trace_2_update_mode>
+        <background_color>
+          <color name="Field Background Grey" red="240" green="240" blue="240" />
+        </background_color>
+        <trace_3_update_mode>0</trace_3_update_mode>
+        <x>408</x>
+        <y>582</y>
+        <trace_4_update_mode>0</trace_4_update_mode>
+        <trace_3_x_axis_index>0</trace_3_x_axis_index>
+        <trace_0_x_axis_index>0</trace_0_x_axis_index>
+        <axis_count>3</axis_count>
+        <trace_4_x_pv>$(DTACQ-NAME):$(DEVICE_HV1):VoltR:RCURSOR_X</trace_4_x_pv>
+        <trace_3_y_pv_value />
+        <trace_1_point_size>4</trace_1_point_size>
+        <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>520</trace_2_buffer_size>
+        <axis_1_maximum>8.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>
+        <trace_4_update_delay>1</trace_4_update_delay>
+        <widget_type>XY Graph</widget_type>
+        <trace_2_line_width>1</trace_2_line_width>
+        <trace_4_plot_mode>0</trace_4_plot_mode>
+        <trace_3_concatenate_data>false</trace_3_concatenate_data>
+        <trace_4_x_pv_value />
+        <axis_1_axis_color>
+          <color red="0" green="0" blue="0" />
+        </axis_1_axis_color>
+        <axis_0_scale_format></axis_0_scale_format>
+        <axis_1_log_scale>false</axis_1_log_scale>
+        <title></title>
+        <trace_0_visible>false</trace_0_visible>
+        <trace_4_buffer_size>2</trace_4_buffer_size>
+        <trace_1_name>$(trace_1_y_pv)</trace_1_name>
+        <trace_3_anti_alias>false</trace_3_anti_alias>
+        <trace_1_y_pv_value />
+        <axis_2_auto_scale>true</axis_2_auto_scale>
+        <trace_4_y_pv>loc://val(-100,100)</trace_4_y_pv>
+        <show_legend>false</show_legend>
+        <trace_3_visible>true</trace_3_visible>
+        <trace_4_x_axis_index>0</trace_4_x_axis_index>
+        <trace_3_name>$(trace_3_y_pv)</trace_3_name>
+        <axis_0_axis_title>ms</axis_0_axis_title>
+        <axis_0_axis_color>
+          <color red="0" green="0" blue="0" />
+        </axis_0_axis_color>
+        <axis_2_scale_font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </axis_2_scale_font>
+        <trace_3_update_delay>1</trace_3_update_delay>
+        <trace_2_update_delay>1</trace_2_update_delay>
+        <trace_4_point_style>0</trace_4_point_style>
+        <axis_0_dash_grid_line>false</axis_0_dash_grid_line>
+        <trace_0_point_style>2</trace_0_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>
+        <trace_3_x_pv_value />
+        <axis_0_time_format>0</axis_0_time_format>
+        <trace_count>5</trace_count>
+        <axis_1_show_grid>true</axis_1_show_grid>
+        <trace_3_x_pv>$(DTACQ-NAME):$(DEVICE_HV1):VoltR:LCURSOR_X</trace_3_x_pv>
+        <trace_2_trace_color>
+          <color name="Primary Blue" red="0" green="148" blue="202" />
+        </trace_2_trace_color>
+        <trace_4_visible>true</trace_4_visible>
+        <axis_1_dash_grid_line>true</axis_1_dash_grid_line>
+        <trace_3_buffer_size>2</trace_3_buffer_size>
+        <trace_2_trace_type>0</trace_2_trace_type>
+        <trace_3_line_width>3</trace_3_line_width>
+        <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>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>true</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <pv_name>LNS-ISRC-010:PBI-EM:LCURSOR_ms</pv_name>
-        <vertical_alignment>1</vertical_alignment>
-        <format>0</format>
-        <horizontal_buttons_layout>false</horizontal_buttons_layout>
+        <trace_1_y_pv>$(DTACQ-NAME):$(DEVICE_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>false</trace_2_anti_alias>
+        <axis_0_maximum>6.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>247</height>
+        <trace_2_visible>true</trace_2_visible>
+        <trigger_pv_value />
+        <trace_3_y_pv>loc://val(-100,100)</trace_3_y_pv>
+        <axis_1_grid_color>
+          <color red="78" green="154" blue="6" />
+        </axis_1_grid_color>
+        <actions hook="false" hook_all="false" />
+        <trace_2_point_size>4</trace_2_point_size>
+        <trace_4_concatenate_data>false</trace_4_concatenate_data>
+        <axis_2_axis_color>
+          <color red="0" green="0" blue="0" />
+        </axis_2_axis_color>
+        <axis_0_log_scale>false</axis_0_log_scale>
+        <trace_0_x_pv_value />
+        <axis_0_auto_scale_threshold>0.0</axis_0_auto_scale_threshold>
+        <rules />
+        <axis_1_visible>true</axis_1_visible>
+        <axis_2_show_grid>false</axis_2_show_grid>
+        <trace_3_y_axis_index>1</trace_3_y_axis_index>
+        <trace_0_update_delay>1</trace_0_update_delay>
+        <trace_1_concatenate_data>false</trace_1_concatenate_data>
+        <trace_1_trace_color>
+          <color red="242" green="26" blue="26" />
+        </trace_1_trace_color>
+        <trace_3_trace_color>
+          <color name="Major" red="255" green="0" blue="0" />
+        </trace_3_trace_color>
+        <pv_name></pv_name>
+        <axis_2_log_scale>false</axis_2_log_scale>
+        <axis_2_auto_scale_threshold>0.0</axis_2_auto_scale_threshold>
+        <name>XY Graph</name>
+        <trace_1_trace_type>0</trace_1_trace_type>
+        <axis_0_auto_scale>true</axis_0_auto_scale>
+        <axis_0_minimum>-6.0</axis_0_minimum>
+        <trace_2_y_axis_index>1</trace_2_y_axis_index>
+        <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>1</trace_1_line_width>
+        <trace_3_trace_type>1</trace_3_trace_type>
+        <trace_2_y_pv>$(DTACQ-NAME):$(DEVICE_HV2):VoltR_Y</trace_2_y_pv>
+        <trace_1_plot_mode>0</trace_1_plot_mode>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </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="70" green="70" blue="70" />
-        </background_color>
-        <page_increment>10.0</page_increment>
-        <width>115</width>
-        <x>54</x>
-        <name>Spinner Template_3</name>
-        <y>288</y>
-        <maximum>100.0</maximum>
+        <axis_2_title_font>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+        </axis_2_title_font>
+        <trace_3_point_style>0</trace_3_point_style>
+        <trace_0_y_pv>$(DTACQ-NAME):$(DEVICE_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>
+        <trace_4_trace_type>1</trace_4_trace_type>
+        <enabled>true</enabled>
+        <trace_0_x_pv>$(DTACQ-NAME):$(DEVICE_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>
+        <axis_1_time_format>0</axis_1_time_format>
+        <axis_2_time_format>0</axis_2_time_format>
+        <axis_2_left_bottom_side>false</axis_2_left_bottom_side>
+        <trace_3_plot_mode>0</trace_3_plot_mode>
+        <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>895</width>
+        <trace_1_x_pv_value />
+        <axis_1_minimum>-8.0</axis_1_minimum>
+        <title_font>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+        </title_font>
+        <trace_4_anti_alias>false</trace_4_anti_alias>
+        <trace_0_y_pv_value />
+        <trace_1_visible>true</trace_1_visible>
+        <plot_area_background_color>
+          <color red="0" green="0" blue="0" />
+        </plot_area_background_color>
+        <trace_4_point_size>4</trace_4_point_size>
+        <axis_1_title_font>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+        </axis_1_title_font>
+        <visible>true</visible>
+        <axis_2_axis_title>ms</axis_2_axis_title>
+        <trace_4_trace_color>
+          <color name="Major" red="255" green="0" blue="0" />
+        </trace_4_trace_color>
+        <trace_1_buffer_size>520</trace_1_buffer_size>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <axis_2_scale_format></axis_2_scale_format>
+        <trace_4_y_pv_value />
+        <scripts />
+        <trace_0_point_size>3</trace_0_point_size>
+        <trace_0_trace_color>
+          <color red="0" green="255" blue="0" />
+        </trace_0_trace_color>
+        <trace_0_anti_alias>false</trace_0_anti_alias>
+        <trace_4_name>$(trace_4_y_pv)</trace_4_name>
+        <axis_1_auto_scale_threshold>0.0</axis_1_auto_scale_threshold>
+        <trace_4_y_axis_index>1</trace_4_y_axis_index>
+        <trace_2_plot_mode>0</trace_2_plot_mode>
+        <trace_2_x_pv>$(DTACQ-NAME):$(DEVICE_HV2):VoltR_XMS</trace_2_x_pv>
         <foreground_color>
-          <color red="0" green="255" blue="255" />
+          <color red="0" green="0" blue="255" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <minimum>-100.0</minimum>
-        <font>
-          <fontdata fontName="Open Sans" height="10" style="0" />
-        </font>
       </widget>
     </widget>
   </widget>
@@ -8726,141 +10211,4 @@ $(pv_value)</tooltip>
       <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
     </font>
   </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.checkbox" 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>
-    <rules />
-    <bit>0</bit>
-    <enabled>true</enabled>
-    <wuid>-16429ab9:1582e68df9a:-6254</wuid>
-    <selected_color>
-      <color red="77" green="77" blue="77" />
-    </selected_color>
-    <pv_value />
-    <auto_size>false</auto_size>
-    <scripts />
-    <border_alarm_sensitive>true</border_alarm_sensitive>
-    <height>20</height>
-    <border_width>1</border_width>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>false</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <visible>true</visible>
-    <pv_name>${PREFIX_SCAN}:PROC-SIMU</pv_name>
-    <border_color>
-      <color red="0" green="128" blue="255" />
-    </border_color>
-    <label></label>
-    <widget_type>Check Box</widget_type>
-    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-    <background_color>
-      <color red="240" green="240" blue="240" />
-    </background_color>
-    <width>33</width>
-    <x>1156</x>
-    <name>Check Box</name>
-    <y>30</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="0">Default</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>-16429ab9:1582e68df9a:-6258</wuid>
-    <transparent>true</transparent>
-    <auto_size>false</auto_size>
-    <text>Simulation</text>
-    <scripts />
-    <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>
-    <vertical_alignment>1</vertical_alignment>
-    <border_color>
-      <color red="0" green="128" blue="255" />
-    </border_color>
-    <widget_type>Label</widget_type>
-    <wrap_words>false</wrap_words>
-    <background_color>
-      <color red="255" green="255" blue="255" />
-    </background_color>
-    <width>80</width>
-    <x>1188</x>
-    <name>Label</name>
-    <y>30</y>
-    <foreground_color>
-      <color red="0" green="0" blue="0" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <font>
-      <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">
-    <border_style>0</border_style>
-    <tooltip></tooltip>
-    <horizontal_alignment>1</horizontal_alignment>
-    <rules>
-      <rule name="Visible" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0==1">
-          <value>true</value>
-        </exp>
-        <exp bool_exp="pv0==0">
-          <value>false</value>
-        </exp>
-        <pv trig="true">${PREFIX_SCAN}:PROC-SIMU</pv>
-      </rule>
-    </rules>
-    <enabled>true</enabled>
-    <wuid>-16429ab9:158444d4181:-7960</wuid>
-    <transparent>true</transparent>
-    <auto_size>false</auto_size>
-    <text>SIMULATION</text>
-    <scripts />
-    <height>45</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>false</wrap_words>
-    <background_color>
-      <color red="255" green="255" blue="255" />
-    </background_color>
-    <width>411</width>
-    <x>1200</x>
-    <name>Label_163</name>
-    <y>88</y>
-    <foreground_color>
-      <color name="Major" red="255" green="0" blue="0" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <font>
-      <fontdata fontName="Cantarell" height="26" style="1" />
-    </font>
-  </widget>
 </display>
\ No newline at end of file
diff --git a/src/EMU_CALCULS.c b/src/EMU_CALCULS.c
index 516d0042a6e9f9eb4777b1d64a209197dca0b6be..e3e0817e998c1c12f68b8224c045905d4eda4764 100644
--- a/src/EMU_CALCULS.c
+++ b/src/EMU_CALCULS.c
@@ -69,19 +69,41 @@ epicsRegisterFunction(ANGLE_CALCUL);
 */
 static int CREATE_TAB(aSubRecord *precord) {
 
-    float *ptr_WF = (float *)precord->a;   // datas to add
-    float *ptr_WF_REENT = (float *)precord->b;   // Waveform reentrance
+    float *ptr_WF;
+    ptr_WF = (float *)precord->a;   // datas to add
+
+    float *ptr_WF_REENT;
+    ptr_WF_REENT = (float *)precord->b;   // Waveform reentrance
+
     long mtr_cpt = *(long *)precord->c;   //Motor compter
     long nbAngle = *(long *)precord->d;   // Nb Angle
     long nbPosition = *(long *)precord->e;  // Nb position
+    long resetBT = *(long *)precord->f;  // BT RESET
 
     int nelmComp = precord->noa;
     int nelm = precord->nob;
-    float *ptr_WF_OUT=(float*)(precord->vala);
+
+    float *ptr_WF_OUT;
+    ptr_WF_OUT = (float*)(precord->vala);
 
     int i;
     int cpt_for=0.0;
 
+    /***** RESET DATA ******/
+    if(resetBT==1)
+    {	
+    ptr_WF_OUT = (float*)(precord->vala);
+      for (i = 0 ; i < nelm; ++i)
+        {
+        *ptr_WF_OUT=-1.0;
+        ptr_WF_OUT++;
+	*ptr_WF_REENT=-1.0;
+	ptr_WF_REENT++;
+        }
+    *(long*)(precord->valb)=0;
+    return 0;
+    }
+
     /***** REFILL old DATA ******/
     if(mtr_cpt>0)
     {
@@ -118,6 +140,28 @@ static int CREATE_TAB(aSubRecord *precord) {
 epicsRegisterFunction(CREATE_TAB);
 
 
+/*
+* This function allows to initiliaze the waveform for X' (ANGLE) and Y(CURRENT)
+*/
+
+static int INIT_TAB(aSubRecord *precord) {
+
+     int nelm = precord->nova;
+     float *ptr_WF_OUT=(float*)(precord->vala);
+
+    int i;
+
+    for (i = 0 ; i < nelm; ++i)
+        {
+        *ptr_WF_OUT=-1.0;
+        ptr_WF_OUT++;
+        }
+  return 0;
+}
+
+/* Note the function must be registered at the end. */
+epicsRegisterFunction(INIT_TAB);
+
 /*
 * This function allows to create the complete waveform for X et Y projection
 */
@@ -132,10 +176,6 @@ static int CREATE_PROJXY(aSubRecord *precord) {
     long nbAngle = *(long *)precord->d;   // Nb Angle
     long nbPosition = *(long *)precord->e;  // Nb position
 
-    /*outputs*/
-    float projX=*(float*)(precord->vala);
-    float projY=*(float*)(precord->valb);
-
     int nelmComp = precord->noa;
     int nelm = precord->nob;
 
@@ -143,10 +183,13 @@ static int CREATE_PROJXY(aSubRecord *precord) {
     int u;
     int cpt_for=0.0;
     float sumTemp=0.0;
-    float sumAngleTemp=0.0;
     float projectionX=0.0;
     float projectionY=0.0;
     float sumCurrentTot=0.0;
+    float rms_size=0.0;
+    float rms_angle=0.0;
+    float rms_correl=0.0;
+    float sigma=0.0;
 
      /***** SUM of current  ******/
      for (i = 0 ; i < nbPosition; i++)
@@ -179,14 +222,13 @@ static int CREATE_PROJXY(aSubRecord *precord) {
 	ptr_pos--;
 	}
      projectionX=projectionX/sumCurrentTot;
-     projX=projectionX;
+     *(float*)(precord->vala)=projectionX;
 
      /***** Y Projection  ******/
      ptr_current = (float *)precord->b;
      for (i = 0 ; i < nbAngle; i++)
 	{
         sumTemp=0.0;
-        sumAngleTemp=0.0;
 	for (u = 0 ; u < nbPosition; u++)
 		{
 		sumTemp=((*ptr_current)* (*ptr_angle))+sumTemp;
@@ -196,8 +238,67 @@ static int CREATE_PROJXY(aSubRecord *precord) {
 	ptr_angle=ptr_angle+nbPosition;
 	}
      projectionY=projectionY/sumCurrentTot;
-     projY=projectionY;
+     *(float*)(precord->valb)=projectionY;
+
+     /***** RMS SIZE  ******/
+     ptr_current = (float *)precord->b;
+     ptr_pos = (float *)precord->c;
+     ptr_pos=ptr_pos+nbPosition-1;
+     for (i = 0 ; i < nbPosition; i++)
+	{
+        sumTemp=0.0;
+	ptr_current = (float *)precord->b;
+	ptr_current=ptr_current+i;
+	for (u = 0 ; u < nbAngle; u++)
+		{
+		sumTemp=(((*ptr_pos-projectionX)*(*ptr_pos-projectionX))*(*ptr_current))+sumTemp;
+		ptr_current=ptr_current+nbPosition;
+		}
+	rms_size=rms_size+sumTemp;
+	ptr_pos--;
+	}
+     rms_size=sqrt(rms_size/sumCurrentTot);
+     *(float*)(precord->valc)=rms_size;
+
+     /***** RMS ANGLE  ******/
+     ptr_angle = (float *)precord->a; 
+     ptr_current = (float *)precord->b;
+     for (i = 0 ; i < nbAngle; i++)
+	{
+        sumTemp=0.0;
+	for (u = 0 ; u < nbPosition; u++)
+		{
+		sumTemp=(((*ptr_angle-projectionY)*(*ptr_angle-projectionY))*(*ptr_current))+sumTemp;
+		ptr_current++;
+		}
+	rms_angle=rms_angle+sumTemp;
+	ptr_angle=ptr_angle+nbPosition;
+	}
+     rms_angle=sqrt(rms_angle/sumCurrentTot);
+     *(float*)(precord->vald)=rms_angle;
+
+     /***** RMS CORREL  ******/
+     ptr_angle = (float *)precord->a; 
+     ptr_current = (float *)precord->b;
+     ptr_pos = (float *)precord->c;
+     for (i = 0 ; i < nbAngle; i++)
+	{
+        sumTemp=0.0;
+	for (u = 0 ; u < nbPosition; u++)
+		{
+		sumTemp=(((*ptr_angle-projectionY)*(*ptr_pos-projectionX))*(*ptr_current))+sumTemp;
+		ptr_current++;
+		}
+	rms_correl=rms_correl+sumTemp;
+	ptr_angle=ptr_angle+nbPosition;
+	ptr_pos--;
+	}
+     rms_correl=rms_correl/sumCurrentTot;
+     *(float*)(precord->vale)=rms_correl;
 
+     /***** SIGMA  ******/
+     sigma=fabs(sqrt((rms_size*rms_angle)-(rms_correl*rms_correl)));
+     *(float*)(precord->valf)=sigma;
   return 0;
 }
 /* Note the function must be registered at the end. */
diff --git a/src/EMU_MTR-HOME_AUTO.st b/src/EMU_MTR-HOME_AUTO.st
index 436679b117c630a2cbc7b1bafb78904dab0095c2..7bd0ca169e2d270664a401015f41118705762133 100644
--- a/src/EMU_MTR-HOME_AUTO.st
+++ b/src/EMU_MTR-HOME_AUTO.st
@@ -14,10 +14,24 @@ short HOMCPTFLAG;
 assign HOMCPTFLAG to "{PMACPREFIX}:{MOTOR_NAME1}-HOMCPTFLAG";
 monitor HOMCPTFLAG;
 
+short mtrPlaced;
+assign mtrPlaced to "{PMACPREFIX}:{MOTOR_NAME1}-AXISSTS";
+monitor mtrPlaced;
+evflag mtrPlacedEvent;
+sync mtrPlaced mtrPlacedEvent;
+
+short mtrStop;
+assign mtrStop to "{PMACPREFIX}:{MOTOR_NAME1}.SPMG";
+monitor mtrStop;
+
 short homeCMD;
 assign homeCMD to "{PMACPREFIX}:{MOTOR_NAME1}-HOMCMD";
 monitor homeCMD;
 
+short mtrPosCons;
+assign mtrPosCons to "{PMACPREFIX}:{MOTOR_NAME1}";
+monitor mtrPosCons;
+
 short brakeMtrCMD;
 assign brakeMtrCMD to "{PREFIX}:PBI-EM:VER-BRAKE_SET";
 monitor brakeMtrCMD;
@@ -28,6 +42,11 @@ monitor brakeMtrGET;
 evflag brakeMtrGETEvent;
 sync brakeMtrGET brakeMtrGETEvent;
 
+/**** PS PV ******/
+short scanPS_Sts;
+assign scanPS_Sts to "{DEVICE}:PS.BUSY";
+monitor scanPS_Sts;
+
 /**** PV to start procedure ******/
 short homeSTART;
 assign homeSTART to "{DEVICE}:PROC-AUTO-HOME";
@@ -37,7 +56,7 @@ sync homeSTART homeSTARTEvent;
 
 /**** PV to read the PLIM status ******/
 short plimSTATUS;
-assign plimSTATUS to "{PMACPREFIX}:{MOTOR_NAME1}.HLS";
+assign plimSTATUS to "{PMACPREFIX}:{MOTOR_NAME1}-PENDLSTS";
 monitor plimSTATUS;
 evflag plimSTATUSEvent;
 sync plimSTATUS plimSTATUSEvent;
@@ -49,26 +68,42 @@ ss ss1
 					{
 					homeSTART=0;
 				        pvPut(homeSTART);
+					printf("\nINIT\n");
 					} state start
 		   }
 	
 	state start
 		   {
-			when(efTestAndClear(homeSTARTEvent)&&(homeSTART==1))
-				{
-				brakeMtrCMD=0;
-				pvPut(brakeMtrCMD);
-				HOMCPTFLAG=1; // PLIM
-				pvPut(HOMCPTFLAG);
-				homeCMD=1;
-				pvPut(homeCMD);
-				}state home
+		      when(efTestAndClear(homeSTARTEvent)&&(homeSTART==1))
+			{
+			pvPut(mtrStop);	
+			mtrStop=0;
+			printf("\nSTOP MTR\n");
+			}state stopMTR
 		    }
 
+
+	state stopMTR
+		 {	
+			when((efTestAndClear(mtrPlacedEvent) && (mtrPlaced ==1) && (scanPS_Sts==0)) || ((mtrPlaced ==1)&&(scanPS_Sts==0)))
+			{
+			printf("\nSTART HOME\n");
+			brakeMtrCMD=1;
+			pvPut(brakeMtrCMD);
+			delay(1);
+			HOMCPTFLAG=1; // PLIM
+			pvPut(HOMCPTFLAG);
+			delay(1);
+			homeCMD=1;
+			pvPut(homeCMD);
+			}state home
+		 }
+
 	state home
 		   {
 			when(efTestAndClear(plimSTATUSEvent)&&(plimSTATUS==1))
 				{
+				printf("\nSTART INIT\n");
 				HOMCPTFLAG=0; // HOME
 				pvPut(HOMCPTFLAG);
 				}state stop
@@ -76,15 +111,16 @@ ss ss1
 
 	state stop
 		   {
-			when(delay(2))
+			when((mtrPlaced ==1)&& delay(2.0))
 				{
+				printf("\nBRAKE ON\n");
 				homeCMD=1;
 				pvPut(homeCMD);
 				homeSTART=0;
 				pvPut(homeSTART);
-				brakeMtrCMD=1;
+				brakeMtrCMD=0;
 				pvPut(brakeMtrCMD);
-				}state start
+				}state init
                    }
 
 }
diff --git a/src/EMU_RAMP-CURRENT.st b/src/EMU_RAMP-CURRENT.st
deleted file mode 100644
index 2e8fc87f6643178de378293995b4a862684f5fdc..0000000000000000000000000000000000000000
--- a/src/EMU_RAMP-CURRENT.st
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-#  C.E.A. IRFU/SIS/LDISC
-#
-*/
-
-program RampCurrent
-
-%%#include <stdio.h>
-%%#include <string.h>
-%%#include <stdlib.h>
-
-/**** PLATES PS ******/
-float PS2_Cons;
-assign PS2_Cons to "{PREFIX_PS}:{CONS_PS2}";
-monitor PS2_Cons;
-evflag PS2_Cons_flag;
-sync PS2_Cons PS2_Cons_flag;
-
-/**** FC CURRENT ******/
-float FCCurr_Cons;
-assign FCCurr_Cons to "SIMU:CURRENT-SP";
-monitor FCCurr_Cons;
-
-short start;
-assign start to "SCAN:MTR.EXSC";
-monitor start;
-
-short simulation;
-assign simulation to "SCAN:PROC-SIMU";
-monitor simulation;
-
-/**** variables *****/
-float limitCurr=0.6;
-
-ss ss1
-{
-	state init {
-	    	      when (delay(1.0) && (pvConnectCount() == pvChannelCount())) 
-					{
-					start=0;
-					simulation=0;
-					} state start
-		   }
-	
-	state start
-		   {
-			when ((start==1) && (simulation==1))
-				{
-				FCCurr_Cons=0;
-				pvPut(FCCurr_Cons);
-				}state ramp
-		    }
-
-	state ramp
-		   {
-			when(efTestAndClear(PS2_Cons_flag))
-				{
-				if((PS2_Cons<limitCurr) && (PS2_Cons>-limitCurr) && (simulation==1)){FCCurr_Cons= 5+(rand() * 0.000000001);;}
-				else{
-					%%FCCurr_Cons= 0.0;
-			            }
-				pvPut(FCCurr_Cons);
-				}state ramp
-		    
-			when (start==0)
-				{
-				FCCurr_Cons=0;
-				pvPut(FCCurr_Cons);
-				}state start
-		    }
-
-}
-
diff --git a/src/EMU_REPORT_FILE.c b/src/EMU_REPORT_FILE.c
new file mode 100644
index 0000000000000000000000000000000000000000..7c02cacacf6bb5db9d8ee0b834fd556748d7ca74
--- /dev/null
+++ b/src/EMU_REPORT_FILE.c
@@ -0,0 +1,71 @@
+#include <aSubRecord.h>
+#include <registryFunction.h>
+#include <epicsExport.h>
+#include <math.h>
+#include <string.h>
+#include <time.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+ 
+static int CREATE_REPORT(aSubRecord *precord) {
+
+    float energie=*(float *)precord->a;
+   // epicsTimeStamp TimeStampStart=*(float *)precord->b;  
+   // epicsTimeStamp TimeStampStop;
+
+    epicsTimeStamp ts;
+    struct tm etm;
+    unsigned long nano;
+    char str1[60];
+    char str2[60];
+   
+
+    epicsTimeGetCurrent (&ts);
+    epicsTimeToGMTM (&etm, &nano, &ts);
+    strftime (str1, 59, "%y-%m-%d %H:%M:%S", &etm);
+    unsigned long msec=ts.nsec / 1000000;
+        char date[21];
+    sprintf (date,"%s.%lu", str1,msec );
+
+
+  /* FILE* fichier = NULL;
+   char* filePath="/homenfs/jfdenis/data/emittance/report/";
+
+   if (fichier != NULL)
+            {   
+            fprintf(fichier, "%f\n",energie;
+            fclose(fichier);
+            }*/
+
+    //printf("write %e %e\n",acquisition,truncated);   
+   /* if (acquisition==true ){
+       
+   
+    epicsTimeGetCurrent (&ts);
+    epicsTimeToGMTM (&etm, &nano, &ts);
+    strftime (str1, 59, "%y-%m-%d %H:%M:%S", &etm);
+    unsigned long msec=ts.nsec / 1000000;
+        char date[21];
+    sprintf (date,"%s.%lu", str1,msec );
+        char pathF[64];
+        char ext[5];
+        strcpy(pathF,Path);
+        strcpy(ext,".txt");
+        strcat(pathF,nickname);
+        strcat(pathF,ext);
+
+
+        fichier = fopen(pathF, "a+");
+        if (fichier != NULL)
+            {   
+            fprintf(fichier, "%f\t%s\t704MHz\t%e\t%e\t%e\t%e\t%e\n",Pulse,date,Integral,MAX,AVG,MIN,largeur);
+            fclose(fichier);
+            }
+    }*/
+    return 0;
+}
+
+
+/* Note the function must be registered at the end. */
+epicsRegisterFunction(CREATE_REPORT);
diff --git a/src/ExtractDataTOTracePlot.py b/src/ExtractDataTOTracePlot.py
new file mode 100755
index 0000000000000000000000000000000000000000..0a41b185ac21d1cc117f96f9796b42b9341985b1
--- /dev/null
+++ b/src/ExtractDataTOTracePlot.py
@@ -0,0 +1,116 @@
+#! /usr/bin/env python
+#from org.csstudio.opibuilder.scriptUtil import PVUtil
+import struct
+#import matplotlib.pyplot as plt
+#import urllib2
+import json
+from random import betavariate
+import math
+import array
+import epics
+import numpy
+import datetime
+import time
+
+localtime=time.localtime(time.time())
+ 
+##### VARS #########
+NameFile="emittance"
+NameFile=NameFile+"_"+str(localtime.tm_year)+"-"+str(localtime.tm_mon)+"-"+str(localtime.tm_mday)+"_"+str(localtime.tm_hour)+"-"+str(localtime.tm_min)+".dat"
+
+NbAngle = 0
+NbAng=epics.PV('SCAN:PS.NPTS')
+NbAngle=NbAng.get()
+
+NbPos = 0
+NbP=epics.PV('SCAN:MTR.NPTS')
+NbPos=NbP.get()
+ 
+Energie = 0
+NRJ=epics.PV('SCAN:CALC-Energy-SP')
+Energie=NRJ.get()
+
+Frequence = 0
+Freq=epics.PV('SYS0-EVG0:Mxc1-Frequency-SP')
+Frequence=Freq.get()
+
+PasMM = 0
+PasMtr=epics.PV('SCAN:MTR.P4SI')
+PasMM=PasMtr.get()
+
+tabAng=0
+MatAngle=epics.PV('SCAN:BUFF-ANGLE')
+tabAng=MatAngle.get()
+
+tabPos=0
+MatPos=epics.PV('SCAN:BUFF-MTR-POS')
+tabPos=MatPos.get()
+
+tabCurr=0
+MatCurr=epics.PV('SCAN:BUFF-CURRENT')
+tabCurr=MatCurr.get()
+
+###################################################################################
+############################### PLOTWIN ###########################################
+###################################################################################
+
+#### OPEN FILE
+PlotFile = open('/home/ess-user/data/tracePlot/'+NameFile, 'w+')
+PlotFile.write("fichier  emittance: X\n")
+PlotFile.write("HT ion (kV) : %i\n"%(Energie))
+PlotFile.write("frequence (Hz) : %f\n"%(Frequence))
+PlotFile.write("N points temps : 1\n")
+PlotFile.write("pas de position (mm) : %f\n"%(PasMM))
+PlotFile.write("N points  position (mm) : %i\n"%(NbPos))
+PlotFile.write("N points angle (mrad) : %i\n"%(NbAngle))
+ 
+## POSITION
+PlotFile.write("vecteur positions (mm) : ")
+for value in range(0,NbPos):
+     PlotFile.write("%f "%tabPos[value]);
+
+
+## ANGLES
+PlotFile.write("\nvecteur angles (mrad) : ")
+indAngle=0
+for value in range(0,NbAngle):
+    PlotFile.write("%f "%tabAng[indAngle]);
+    indAngle=indAngle+NbPos
+
+PlotFile.write("\ntype d'ion : PROTON...")      
+PlotFile.write("\ncolonnes de 1 a 4 : indice de temps / indice position / indice angle / I [Volt] :\n")
+ 
+## POSITION/ANGLE/INTENSITY
+indCurrent=NbPos-1
+indPos=NbPos-1
+for valuePos in range(0,NbPos):
+	for valueAngle in range(0,NbAngle):
+    		PlotFile.write("0\t%i\t%i\t%f\n" %(valuePos,valueAngle,tabCurr[indCurrent]));
+		indCurrent=indCurrent+NbPos
+	indPos=indPos-1
+	indCurrent=indPos
+
+PlotFile.close()
+
+###################################################################################
+############################### PLOTWIN ###########################################
+###################################################################################
+
+#### OPEN FILE
+PlotFile = open('/home/ess-user/data/rawData/'+NameFile+"-raw.txt", 'w+')
+
+## POSITION/ANGLE/INTENSITY
+indCurrent=0
+indAngle=0
+indPos=0
+
+for valuePos in tabPos:
+	for valueAngle in tabAng:
+    		PlotFile.write("0\t%f\t%f\t%f\n" %(valuePos[indPos],valueAngle[indAngle],tabCurr[indCurrent]));
+		indCurrent=indCurrent+NbPos
+		indAngle=indAngle+1
+	indPos=indPos+1
+	indCurrent=indPos
+
+PlotFile.close()
+
diff --git a/startup/EMU.cmd b/startup/EMU.cmd
index 656aec2e471eef8db28fdaab68a4e8b9311a4b9d..1793ab5c176147346140b041215faaa9609a3bfc 100644
--- a/startup/EMU.cmd
+++ b/startup/EMU.cmd
@@ -24,11 +24,11 @@ epicsEnvSet("MRES",      "0.000249515")
 epicsEnvSet("PREC",      "4"    )
 epicsEnvSet("DHLM",      "4"   )
 epicsEnvSet("DLLM",      "-200"  )
-epicsEnvSet("VELO",      "2"    )
+epicsEnvSet("VELO",      "3"    )
 epicsEnvSet("HVEL",      "2"    )
 epicsEnvSet("VBAS",      "0.1"  )
-epicsEnvSet("VMAX",      "2"    )
-epicsEnvSet("ACCL",      "0.1"  )
+epicsEnvSet("VMAX",      "7"    )
+epicsEnvSet("ACCL",      "10"  )
 epicsEnvSet("BDST",      "0"    )
 epicsEnvSet("INIT",      ""     )
 epicsEnvSet("OFF",       "0"    )
@@ -50,7 +50,7 @@ epicsEnvSet("MOTOR_ERROR4", "0"       )
 # EVG Macros 
 epicsEnvSet("SYS"             "SYS0")
 epicsEnvSet("EVG"             "EVG0")
-epicsEnvSet("EVG_VMESLOT"     "7")
+epicsEnvSet("EVG_VMESLOT"     "8")
 
 # EVR Macros
 epicsEnvSet("EVR_PCIDOMAIN",    "0000")
@@ -65,7 +65,7 @@ epicsEnvSet("EVR_PUL0_WIDTH",   "$(EVR_EV14_OUT0_WIDTH=1000)")
 #DAQ macros
 epicsEnvSet("DAQPREFIX",  "LNS-ISRC-010"  )
 epicsEnvSet("DAQBUFSIZE", "1024"         )
-epicsEnvSet("BUFFERSIZE", "1000"         )
+epicsEnvSet("BUFFERSIZE", "20000"         )
 
 #Scanning macros
 epicsEnvSet("SCANPREFIX", "SCAN"     )
@@ -74,7 +74,7 @@ epicsEnvSet("SCAN_EF", "PS"              )
 epicsEnvSet("SCAN_POINTS_EF", "1000"     )
 epicsEnvSet("SCAN_POINTS_SLIT", "100"    )
 
-epicsEnvSet(EPICS_CA_MAX_ARRAY_BYTES, 400000000)
+epicsEnvSet(EPICS_CA_MAX_ARRAY_BYTES, 4000000)
 
 # Connection to PMAC and setup for $(NUM_MOTORS) motors
 pmacAsynIPConfigure($(PMACPORT), "10.2.139.237:1025")
@@ -137,14 +137,11 @@ iocInit
 
 #### Motor homing
 seq motorHoming "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1)"
-
-
-
 seq homeMtrAuto "PMACPREFIX=$(PMACPREFIX),MOTOR_NAME1=$(MOTOR_NAME1),DEVICE=$(SCANPREFIX),PREFIX=LNS-ISRC-010"
 
 
 #### Simulation of a current with ES4134 from Beckoff
-seq RampCurrent "PREFIX_PS=LNS-ISRC-010:PBI-EM,CONS_PS2=HVhor-SP,DEVICE=SCAN,SCAN_SLIT=$(SCAN_SLIT)"
+#seq RampCurrent "PREFIX_PS=LNS-ISRC-010:PBI-EM,CONS_PS2=HVhor-SP,DEVICE=SCAN,SCAN_SLIT=$(SCAN_SLIT)"
 
 
 # SET INTERFACE FROM IFCDAQ TO Allison scanner
@@ -172,7 +169,7 @@ dbpf $(DAQPREFIX):PBI-EM-HV2:VoltR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-
 ########## TIMING GENERATOR: setup TrgSrc0 to EVENT 14 ######
 ## Internal trigger from Mxc1 - TrgSrc0
 dbpf $(SYS)-$(EVG):TrigEvt0-EvtCode-SP 	 $(EVR_PUL0_EVENT)
-dbpf $(SYS)-$(EVG):Mxc1-Frequency-SP	 1
+dbpf $(SYS)-$(EVG):Mxc1-Frequency-SP	 14
 dbpf $(SYS)-$(EVG):Mxc1-TrigSrc0-SP 	 "Set"
 #dbpf $(SYS)-$(EVG):ResetMxc-Cmd		 1
 #dbpf $(SYS)-$(EVG):SoftEvt-Enable-Sel    1
@@ -213,16 +210,23 @@ dbpf $(DAQPREFIX):CARD0:SAMPLINGRATE 1000000
 
 ### Setup reasonable values for sscan record ###
 # Initialize Motor positioners
-dbpf $(SCANPREFIX):$(SCAN_SLIT).P4SP -10
-dbpf $(SCANPREFIX):$(SCAN_SLIT).P4EP -20
-dbpf $(SCANPREFIX):$(SCAN_SLIT).P2SP 1
-dbpf $(SCANPREFIX):$(SCAN_SLIT).P2EP 1
+dbpf $(SCANPREFIX):$(SCAN_SLIT).P4SP -120
+dbpf $(SCANPREFIX):$(SCAN_SLIT).P4EP -180
+dbpf $(SCANPREFIX):$(SCAN_SLIT).P2SP 1.5
+dbpf $(SCANPREFIX):$(SCAN_SLIT).P2EP 1.5
+dbpf $(SCANPREFIX):$(SCAN_SLIT).P1SP 4
+dbpf $(SCANPREFIX):$(SCAN_SLIT).P1EP 4
 dbpf $(SCANPREFIX):$(SCAN_SLIT).NPTS 11
 
 # Initialize Power supply positioners
 dbpf SCAN:PROC-AngleMax-SP 80
 dbpf SCAN:PROC-AngleMin-SP -80
-dbpf $(SCANPREFIX):$(SCAN_EF).NPTS 11
-dbpf $(SCANPREFIX):$(SCAN_EF).PDLY 0.5
+dbpf $(SCANPREFIX):$(SCAN_EF).NPTS 200
+dbpf $(SCANPREFIX):$(SCAN_EF).PDLY 0.02
+dbpf $(SCANPREFIX):$(SCAN_EF).DDLY 0.01
+
+dbpf $(DAQPREFIX):CARD0:TriggerEdge 1
+dbpf $(DAQPREFIX):CARD0:NSAMPLES_ms 7
+dbpf $(DAQPREFIX):PBI-EM:LCURSOR_ms 2
+dbpf $(DAQPREFIX):PBI-EM:RCURSOR_ms 6
 
-dbpf SCAN:PROC-SIMU 1