diff --git a/db/EMU_CALCUL.template b/db/EMU_CALCUL.template
index 35da5d57d77dc59e46a10ac6b0cae0afc0406f47..5d69af8499d8450fb194105f22cc17259b833a29 100644
--- a/db/EMU_CALCUL.template
+++ b/db/EMU_CALCUL.template
@@ -191,3 +191,103 @@ record(waveform, "$(DEVICE):CALC-ANGLEwf") {
 	field(FTVL, "FLOAT")
   	field(NELM, "$(NELM)") 
 }
+
+###########################################################################################
+########################## CALCUL PROJECTION  X et Y ######################################
+###########################################################################################
+
+## Function that calculate the projection X et Y
+record(aSub, "$(DEVICE):CALC-PROJXY") {
+######### INPUTS #########
+## Angle Waveform
+  	field(FTA, "FLOAT")
+	field(NOA,$(NELM))
+	field(INPA, "$(DEVICE):BUFF-ANGLE")
+
+## Current Waveform
+  	field(FTB, "FLOAT")
+	field(NOB,$(NELM))
+	field(INPB,  "$(DEVICE):BUFF-CURRENT")
+
+## Position Waveform
+  	field(FTC, "FLOAT")
+	field(NOC,$(NELM))
+	field(INPC,  "$(DEVICE):BUFF-MTR-POS")
+
+##  Nb angle total
+  	field(FTD, "LONG")
+	field(NOD, "1")
+	field(INPD, "$(DEVICE):$(SCAN_EF).NPTS")
+
+##  Nb position total
+  	field(FTE, "LONG")
+	field(NOE, "1")
+	field(INPE, "$(DEVICE):$(SCAN_SLIT).NPTS")
+
+######### OUTPUTS #########
+## PROJECTION X Waveform output
+  	field(FTVA, "FLOAT")
+	field(NOVA, "$(NELM)")
+	field(OUTA, "$(DEVICE):CALC-PROJ-Xwf PP")   
+
+## PROJECTION X  output
+	field(FTVB, "FLOAT")
+	field(NOVB, "1")
+	field(OUTB, "$(DEVICE):CALC-PROJ-X PP")
+
+## PROJECTION X  Waveform output (abcisse)
+	field(FTVC, "FLOAT")
+	field(NOVC, "$(NELM)")
+	field(OUTC, "$(DEVICE):CALC-PROJ-Xabsc PP") 
+
+## PROJECTION Y Waveform output
+  	field(FTVD, "FLOAT")
+	field(NOVD, "$(NELM)")
+	field(OUTD, "$(DEVICE):CALC-PROJ-Ywf PP")   
+
+## PROJECTION Y output
+	field(FTVE, "FLOAT")
+	field(NOVE, "1")
+	field(OUTE, "$(DEVICE):CALC-PROJ-Y PP")
+
+## PROJECTION Y Waveform output
+  	field(FTVD, "FLOAT")
+	field(NOVD, "$(NELM)")
+	field(OUTD, "$(DEVICE):CALC-Yabsc PP")  
+
+######### FUNCTION #######
+	field(SNAM, "CREATE_PROJXY")
+}
+
+################ RESULTATS ################## 
+####### PROJECTION X ##########
+record(ao, "$(DEVICE):CALC-PROJ-X") {
+}
+
+## WAVEFORM PROJECTION X
+record(waveform, "$(DEVICE):CALC-PROJ-Xwf") {
+	field(FTVL, "FLOAT")
+  	field(NELM, "$(NELM)") 
+}
+
+## WAVEFORM PROJECTION X ABCISSE
+record(waveform, "$(DEVICE):CALC-PROJ-Xabsc") {
+	field(FTVL, "FLOAT")
+  	field(NELM, "$(NELM)") 
+}
+
+####### PROJECTION Y ##########
+record(ao, "$(DEVICE):CALC-PROJ-Y") {
+}
+
+## WAVEFORM PROJECTION Y
+record(waveform, "$(DEVICE):CALC-PROJ-Ywf") {
+	field(FTVL, "FLOAT")
+  	field(NELM, "$(NELM)") 
+}
+
+## WAVEFORM PROJECTION Y ABCISSE
+record(waveform, "$(DEVICE):CALC-Yabsc") {
+	field(FTVL, "FLOAT")
+  	field(NELM, "$(NELM)") 
+}
diff --git a/opi/EMU.opi b/opi/EMU.opi
index 7f6f8d4ce196ca696ea8950b2003fd50d7626476..cf49e045ce6b10a21ee4054de90182d3882af127 100644
--- a/opi/EMU.opi
+++ b/opi/EMU.opi
@@ -210,7 +210,7 @@ $(pv_value)</tooltip>
         <active_tab>0</active_tab>
         <tooltip></tooltip>
         <tab_3_icon_path></tab_3_icon_path>
-        <height>273</height>
+        <height>295</height>
         <tab_2_icon_path></tab_2_icon_path>
         <border_width>1</border_width>
         <border_color>
@@ -300,7 +300,7 @@ $(pv_value)</tooltip>
           <transparent>true</transparent>
           <lock_children>false</lock_children>
           <scripts />
-          <height>241</height>
+          <height>263</height>
           <border_width>1</border_width>
           <scale_options>
             <width_scalable>true</width_scalable>
@@ -310,7 +310,7 @@ $(pv_value)</tooltip>
           <macros>
             <include_parent_macros>true</include_parent_macros>
           </macros>
-          <visible>false</visible>
+          <visible>true</visible>
           <border_color>
             <color red="0" green="128" blue="255" />
           </border_color>
@@ -637,7 +637,7 @@ $(pv_value)</tooltip>
             <pv_value />
             <scripts />
             <border_alarm_sensitive>false</border_alarm_sensitive>
-            <height>24</height>
+            <height>20</height>
             <border_width>1</border_width>
             <scale_options>
               <width_scalable>true</width_scalable>
@@ -677,7 +677,7 @@ $(pv_value)</tooltip>
           <transparent>true</transparent>
           <lock_children>false</lock_children>
           <scripts />
-          <height>241</height>
+          <height>263</height>
           <border_width>1</border_width>
           <scale_options>
             <width_scalable>true</width_scalable>
@@ -1253,7 +1253,7 @@ $(pv_value)</tooltip>
           <transparent>true</transparent>
           <lock_children>false</lock_children>
           <scripts />
-          <height>241</height>
+          <height>263</height>
           <border_width>1</border_width>
           <scale_options>
             <width_scalable>true</width_scalable>
@@ -1263,7 +1263,7 @@ $(pv_value)</tooltip>
           <macros>
             <include_parent_macros>true</include_parent_macros>
           </macros>
-          <visible>true</visible>
+          <visible>false</visible>
           <border_color>
             <color red="0" green="128" blue="255" />
           </border_color>
@@ -1630,7 +1630,7 @@ $(pv_value)</tooltip>
             <text>RESET</text>
             <scripts />
             <border_alarm_sensitive>true</border_alarm_sensitive>
-            <height>31</height>
+            <height>25</height>
             <border_width>2</border_width>
             <scale_options>
               <width_scalable>true</width_scalable>
@@ -1648,10 +1648,10 @@ $(pv_value)</tooltip>
             <background_color>
               <color name="Button Grey" red="180" green="180" blue="180" />
             </background_color>
-            <width>103</width>
-            <x>132</x>
+            <width>61</width>
+            <x>12</x>
             <name>Action Button Template</name>
-            <y>192</y>
+            <y>210</y>
             <style>0</style>
             <foreground_color>
               <color name="IO Foreground" red="0" green="0" blue="0" />
@@ -1735,7 +1735,7 @@ $(pv_value)</tooltip>
             <multiline_input>false</multiline_input>
             <border_width>1</border_width>
             <visible>true</visible>
-            <pv_name>PMAC:MTR1</pv_name>
+            <pv_name>PMAC:MTR1.VAL</pv_name>
             <selector_type>0</selector_type>
             <border_color>
               <color red="0" green="128" blue="255" />
@@ -1776,6 +1776,239 @@ $(pv_value)</tooltip>
               <fontdata fontName="Sans" height="10" style="1" />
             </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==0">
+                  <value>true</value>
+                </exp>
+                <exp bool_exp="pv0==1">
+                  <value>false</value>
+                </exp>
+                <pv trig="true">LNS-ISRC-010:PBI-EM:VER-BRAKE_SET</pv>
+              </rule>
+            </rules>
+            <enabled>true</enabled>
+            <wuid>-1168daa3:158859bc9c3:-8e0</wuid>
+            <pv_value />
+            <text>MOVE</text>
+            <scripts />
+            <border_alarm_sensitive>true</border_alarm_sensitive>
+            <height>25</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></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>73</width>
+            <x>180</x>
+            <name>Action Button Template_3</name>
+            <y>210</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>PMAC:MTR1.SPMG</pv_name>
+                <value>2</value>
+                <timeout>10</timeout>
+                <confirm_message></confirm_message>
+                <description></description>
+              </action>
+            </actions>
+            <font>
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</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 />
+            <enabled>true</enabled>
+            <wuid>-1168daa3:158859bc9c3:-3d9</wuid>
+            <pv_value />
+            <text>STOP</text>
+            <scripts />
+            <border_alarm_sensitive>true</border_alarm_sensitive>
+            <height>25</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></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="Major" red="255" green="0" blue="0" />
+            </background_color>
+            <width>73</width>
+            <x>90</x>
+            <name>Action Button Template_3</name>
+            <y>210</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>PMAC:MTR1.SPMG</pv_name>
+                <value>0</value>
+                <timeout>10</timeout>
+                <confirm_message></confirm_message>
+                <description></description>
+              </action>
+            </actions>
+            <font>
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+            </font>
+          </widget>
+          <widget typeId="org.csstudio.opibuilder.widgets.BoolSwitch" version="1.0.0">
+            <toggle_button>true</toggle_button>
+            <border_style>0</border_style>
+            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+            <alarm_pulsing>false</alarm_pulsing>
+            <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+            <push_action_index>0</push_action_index>
+            <rules />
+            <effect_3d>true</effect_3d>
+            <bit>-1</bit>
+            <enabled>true</enabled>
+            <wuid>-1168daa3:158859bc9c3:-380</wuid>
+            <on_color>
+              <color name="Major" red="255" green="0" blue="0" />
+            </on_color>
+            <show_confirm_dialog>0</show_confirm_dialog>
+            <password></password>
+            <pv_value />
+            <released_action_index>1</released_action_index>
+            <scripts />
+            <border_alarm_sensitive>true</border_alarm_sensitive>
+            <height>52</height>
+            <on_label>ON</on_label>
+            <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:VER-BRAKE_SET</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" />
+            </off_color>
+            <confirm_message>Are your sure you want to do this?</confirm_message>
+            <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+            <background_color>
+              <color red="240" green="240" blue="240" />
+            </background_color>
+            <boolean_label_position>0</boolean_label_position>
+            <width>49</width>
+            <x>271</x>
+            <name>Boolean Switch</name>
+            <data_type>0</data_type>
+            <y>204</y>
+            <foreground_color>
+              <color red="0" green="0" blue="0" />
+            </foreground_color>
+            <actions hook="false" hook_all="false">
+              <action type="WRITE_PV">
+                <pv_name>$(pv_name)</pv_name>
+                <value>1</value>
+                <timeout>10</timeout>
+                <confirm_message></confirm_message>
+                <description></description>
+              </action>
+              <action type="WRITE_PV">
+                <pv_name>$(pv_name)</pv_name>
+                <value>0</value>
+                <timeout>10</timeout>
+                <confirm_message></confirm_message>
+                <description></description>
+              </action>
+            </actions>
+            <show_boolean_label>false</show_boolean_label>
+            <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.Label" version="1.0.0">
+            <border_style>0</border_style>
+            <tooltip></tooltip>
+            <horizontal_alignment>1</horizontal_alignment>
+            <rules />
+            <enabled>true</enabled>
+            <wuid>-1168daa3:158859bc9c3:-227</wuid>
+            <transparent>true</transparent>
+            <auto_size>false</auto_size>
+            <text>brake</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>240</x>
+            <name>Label</name>
+            <y>185</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="0">Small</opifont.name>
+            </font>
+          </widget>
         </widget>
         <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
           <border_style>0</border_style>
@@ -1786,7 +2019,7 @@ $(pv_value)</tooltip>
           <transparent>true</transparent>
           <lock_children>false</lock_children>
           <scripts />
-          <height>241</height>
+          <height>263</height>
           <border_width>1</border_width>
           <scale_options>
             <width_scalable>true</width_scalable>
@@ -2282,11 +2515,11 @@ $(pv_value)</tooltip>
         <wuid>1e771979:1565068c2e3:-4a2d</wuid>
         <transparent>false</transparent>
         <points>
-          <point x="30" y="375" />
-          <point x="378" y="375" />
-          <point x="378" y="375" />
-          <point x="378" y="375" />
-          <point x="378" y="375" />
+          <point x="30" y="393" />
+          <point x="378" y="393" />
+          <point x="378" y="393" />
+          <point x="378" y="393" />
+          <point x="378" y="393" />
         </points>
         <fill_arrow>true</fill_arrow>
         <pv_value />
@@ -2317,7 +2550,7 @@ $(pv_value)</tooltip>
         <width>349</width>
         <x>30</x>
         <name>Polyline</name>
-        <y>375</y>
+        <y>393</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
@@ -2358,7 +2591,7 @@ $(pv_value)</tooltip>
         <width>229</width>
         <x>96</x>
         <name>Label_156</name>
-        <y>366</y>
+        <y>384</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
@@ -2398,7 +2631,7 @@ $(pv_value)</tooltip>
         <width>151</width>
         <x>42</x>
         <name>Label Orientation_7</name>
-        <y>402</y>
+        <y>420</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
@@ -2464,7 +2697,7 @@ $(pv_value)</tooltip>
         </background_color>
         <width>100</width>
         <x>228</x>
-        <y>396</y>
+        <y>414</y>
         <maximum>0.0</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
@@ -2505,7 +2738,7 @@ $(pv_value)</tooltip>
         <width>104</width>
         <x>71</x>
         <name>Label Orientation_7</name>
-        <y>444</y>
+        <y>462</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
@@ -2571,7 +2804,7 @@ $(pv_value)</tooltip>
         </background_color>
         <width>100</width>
         <x>228</x>
-        <y>438</y>
+        <y>456</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
@@ -2595,11 +2828,11 @@ $(pv_value)</tooltip>
         <wuid>1e771979:1565068c2e3:-33bf</wuid>
         <transparent>false</transparent>
         <points>
-          <point x="29" y="579" />
-          <point x="377" y="579" />
-          <point x="377" y="579" />
-          <point x="377" y="579" />
-          <point x="377" y="579" />
+          <point x="29" y="597" />
+          <point x="377" y="597" />
+          <point x="377" y="597" />
+          <point x="377" y="597" />
+          <point x="377" y="597" />
         </points>
         <fill_arrow>true</fill_arrow>
         <pv_value />
@@ -2630,7 +2863,7 @@ $(pv_value)</tooltip>
         <width>349</width>
         <x>29</x>
         <name>Polyline</name>
-        <y>579</y>
+        <y>597</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
@@ -2671,7 +2904,7 @@ $(pv_value)</tooltip>
         <width>229</width>
         <x>96</x>
         <name>Label_156</name>
-        <y>570</y>
+        <y>588</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
@@ -2711,7 +2944,7 @@ $(pv_value)</tooltip>
         <width>199</width>
         <x>30</x>
         <name>Label Orientation_7</name>
-        <y>484</y>
+        <y>502</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
@@ -2777,7 +3010,7 @@ $(pv_value)</tooltip>
         </background_color>
         <width>100</width>
         <x>228</x>
-        <y>478</y>
+        <y>496</y>
         <maximum>30.0</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
@@ -2818,7 +3051,7 @@ $(pv_value)</tooltip>
         <width>199</width>
         <x>30</x>
         <name>Label Orientation_7</name>
-        <y>529</y>
+        <y>547</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
@@ -2884,7 +3117,7 @@ $(pv_value)</tooltip>
         </background_color>
         <width>100</width>
         <x>228</x>
-        <y>523</y>
+        <y>541</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
@@ -2925,7 +3158,7 @@ $(pv_value)</tooltip>
         <width>84</width>
         <x>99</x>
         <name>Label Orientation_2</name>
-        <y>697</y>
+        <y>715</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
@@ -2991,7 +3224,7 @@ $(pv_value)</tooltip>
         </background_color>
         <width>100</width>
         <x>228</x>
-        <y>691</y>
+        <y>709</y>
         <maximum>30.0</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
@@ -3150,7 +3383,7 @@ $(pv_value)</tooltip>
         <width>101</width>
         <x>83</x>
         <name>Label Orientation_7</name>
-        <y>651</y>
+        <y>669</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
@@ -3216,7 +3449,7 @@ $(pv_value)</tooltip>
         </background_color>
         <width>100</width>
         <x>228</x>
-        <y>648</y>
+        <y>666</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
@@ -3257,7 +3490,7 @@ $(pv_value)</tooltip>
         <width>144</width>
         <x>60</x>
         <name>Label Orientation_2</name>
-        <y>738</y>
+        <y>756</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
@@ -3323,7 +3556,7 @@ $(pv_value)</tooltip>
         </background_color>
         <width>100</width>
         <x>228</x>
-        <y>732</y>
+        <y>750</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
@@ -3364,7 +3597,7 @@ $(pv_value)</tooltip>
         <width>99</width>
         <x>82</x>
         <name>Label Orientation_1</name>
-        <y>606</y>
+        <y>624</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
@@ -3430,7 +3663,7 @@ $(pv_value)</tooltip>
         </background_color>
         <width>100</width>
         <x>228</x>
-        <y>606</y>
+        <y>624</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
@@ -3487,7 +3720,7 @@ $(pv_value)</tooltip>
         <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>
+        <horizon_profile_x_pv_name>SCAN:CALC-PROJ-Xabsc</horizon_profile_x_pv_name>
         <height>986</height>
         <border_width>1</border_width>
         <graph_area_width>1517</graph_area_width>
@@ -3518,7 +3751,7 @@ $(pv_value)</tooltip>
         <border_alarm_sensitive>false</border_alarm_sensitive>
         <graph_area_height>926</graph_area_height>
         <x_axis_visible>true</x_axis_visible>
-        <vertical_profile_x_pv_name></vertical_profile_x_pv_name>
+        <vertical_profile_x_pv_name>SCAN:CALC-PROJ-Xwf</vertical_profile_x_pv_name>
         <pixel_info_pv_name></pixel_info_pv_name>
         <x_axis_axis_color>
           <color red="0" green="0" blue="0" />
@@ -3585,15 +3818,15 @@ $(pv_value)</tooltip>
         <color_map>
           <interpolate>true</interpolate>
           <autoscale>true</autoscale>
-          <map>1</map>
+          <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>
+        <horizon_profile_y_pv_name>SCAN:CALC-PROJ-Yabsc</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>
+        <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>
         <widget_type>Intensity Graph</widget_type>
@@ -5345,64 +5578,325 @@ $(pv_value)</tooltip>
               <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
             </font>
           </widget>
-        </widget>
-      </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:-3a7c</wuid>
-        <transparent>false</transparent>
-        <auto_size>false</auto_size>
-        <text>STATUS</text>
-        <scripts />
-        <height>32</height>
-        <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
-        <background_color>
-          <color name="SubPanel" red="176" green="218" blue="249" />
-        </background_color>
-        <width>319</width>
-        <x>2136</x>
-        <name>Label_15</name>
-        <y>39</y>
-        <foreground_color>
-          <color red="0" green="0" blue="0" />
-        </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
-        <font>
-          <fontdata fontName="Sans" height="10" style="1" />
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>5</line_width>
-        <horizontal_fill>true</horizontal_fill>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <arrows>0</arrows>
-        <rules />
-        <enabled>true</enabled>
-        <wuid>-16429ab9:1582e68df9a:-363a</wuid>
-        <transparent>false</transparent>
-        <points>
-          <point x="29" y="1038" />
+          <widget typeId="org.csstudio.opibuilder.widgets.xyGraph" version="1.0.0">
+            <axis_1_scale_format></axis_1_scale_format>
+            <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>
+            <border_width>1</border_width>
+            <border_style>0</border_style>
+            <axis_0_grid_color>
+              <color red="200" green="200" blue="200" />
+            </axis_0_grid_color>
+            <trace_0_name>$(trace_0_y_pv)</trace_0_name>
+            <trace_0_update_mode>0</trace_0_update_mode>
+            <wuid>-1168daa3:158859bc9c3:50e</wuid>
+            <transparent>false</transparent>
+            <axis_0_title_font>
+              <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+            </axis_0_title_font>
+            <background_color>
+              <color red="240" green="240" blue="240" />
+            </background_color>
+            <x>31</x>
+            <y>465</y>
+            <trace_0_x_axis_index>0</trace_0_x_axis_index>
+            <axis_count>2</axis_count>
+            <pv_value />
+            <trace_0_buffer_size>3</trace_0_buffer_size>
+            <axis_1_maximum>100.0</axis_1_maximum>
+            <axis_0_scale_font>
+              <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+            </axis_0_scale_font>
+            <trigger_pv></trigger_pv>
+            <widget_type>XY Graph</widget_type>
+            <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>true</trace_0_visible>
+            <show_legend>true</show_legend>
+            <axis_0_axis_title>Primary X Axis (0)</axis_0_axis_title>
+            <axis_0_axis_color>
+              <color red="0" green="0" blue="0" />
+            </axis_0_axis_color>
+            <axis_0_dash_grid_line>true</axis_0_dash_grid_line>
+            <trace_0_point_style>0</trace_0_point_style>
+            <trace_0_line_width>1</trace_0_line_width>
+            <axis_0_time_format>0</axis_0_time_format>
+            <trace_count>1</trace_count>
+            <axis_1_show_grid>true</axis_1_show_grid>
+            <axis_1_dash_grid_line>true</axis_1_dash_grid_line>
+            <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>false</keep_wh_ratio>
+            </scale_options>
+            <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+            <axis_0_maximum>100.0</axis_0_maximum>
+            <height>250</height>
+            <trigger_pv_value />
+            <axis_1_grid_color>
+              <color red="200" green="200" blue="200" />
+            </axis_1_grid_color>
+            <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>
+            <rules />
+            <axis_1_visible>true</axis_1_visible>
+            <trace_0_update_delay>10</trace_0_update_delay>
+            <pv_name>SCAN:CALC-PROJ-Xwf</pv_name>
+            <name>XY Graph</name>
+            <axis_0_auto_scale>true</axis_0_auto_scale>
+            <axis_0_minimum>0.0</axis_0_minimum>
+            <axis_1_axis_title>Primary Y Axis (1)</axis_1_axis_title>
+            <axis_1_auto_scale>true</axis_1_auto_scale>
+            <border_color>
+              <color red="0" green="128" blue="255" />
+            </border_color>
+            <trace_0_y_pv>SCAN:CALC-PROJ-Xwf</trace_0_y_pv>
+            <trace_0_plot_mode>0</trace_0_plot_mode>
+            <enabled>true</enabled>
+            <trace_0_x_pv>SCAN:CALC-PROJ-Xabsc</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>
+            <border_alarm_sensitive>true</border_alarm_sensitive>
+            <show_plot_area_border>false</show_plot_area_border>
+            <width>257</width>
+            <axis_1_minimum>0.0</axis_1_minimum>
+            <title_font>
+              <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+            </title_font>
+            <trace_0_y_pv_value />
+            <plot_area_background_color>
+              <color red="255" green="255" blue="255" />
+            </plot_area_background_color>
+            <axis_1_title_font>
+              <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+            </axis_1_title_font>
+            <visible>true</visible>
+            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+            <scripts />
+            <trace_0_point_size>4</trace_0_point_size>
+            <trace_0_trace_color>
+              <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>
+            <foreground_color>
+              <color red="0" green="0" blue="255" />
+            </foreground_color>
+          </widget>
+          <widget typeId="org.csstudio.opibuilder.widgets.xyGraph" version="1.0.0">
+            <axis_1_scale_format></axis_1_scale_format>
+            <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>
+            <border_width>1</border_width>
+            <trace_1_x_axis_index>0</trace_1_x_axis_index>
+            <border_style>0</border_style>
+            <axis_0_grid_color>
+              <color red="200" green="200" blue="200" />
+            </axis_0_grid_color>
+            <trace_0_name>$(trace_0_y_pv)</trace_0_name>
+            <trace_0_update_mode>0</trace_0_update_mode>
+            <trace_1_x_pv>SCAN:CALC-PROJ-Yabsc</trace_1_x_pv>
+            <wuid>-1168daa3:158859bc9c3:6e0</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>
+            <background_color>
+              <color red="240" green="240" blue="240" />
+            </background_color>
+            <x>31</x>
+            <y>738</y>
+            <trace_0_x_axis_index>0</trace_0_x_axis_index>
+            <axis_count>2</axis_count>
+            <trace_1_point_size>4</trace_1_point_size>
+            <trace_1_anti_alias>true</trace_1_anti_alias>
+            <pv_value />
+            <trace_0_buffer_size>3</trace_0_buffer_size>
+            <axis_1_maximum>100.0</axis_1_maximum>
+            <axis_0_scale_font>
+              <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+            </axis_0_scale_font>
+            <trigger_pv></trigger_pv>
+            <widget_type>XY Graph</widget_type>
+            <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>true</trace_0_visible>
+            <trace_1_name>$(trace_1_y_pv)</trace_1_name>
+            <trace_1_y_pv_value />
+            <show_legend>true</show_legend>
+            <axis_0_axis_title>Primary X Axis (0)</axis_0_axis_title>
+            <axis_0_axis_color>
+              <color red="0" green="0" blue="0" />
+            </axis_0_axis_color>
+            <axis_0_dash_grid_line>true</axis_0_dash_grid_line>
+            <trace_0_point_style>0</trace_0_point_style>
+            <trace_1_point_style>0</trace_1_point_style>
+            <trace_0_line_width>1</trace_0_line_width>
+            <axis_0_time_format>0</axis_0_time_format>
+            <trace_count>2</trace_count>
+            <axis_1_show_grid>true</axis_1_show_grid>
+            <axis_1_dash_grid_line>true</axis_1_dash_grid_line>
+            <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>false</keep_wh_ratio>
+            </scale_options>
+            <trace_1_y_pv>SCAN:CALC-PROJ-Ywf</trace_1_y_pv>
+            <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+            <axis_0_maximum>100.0</axis_0_maximum>
+            <trace_1_y_axis_index>1</trace_1_y_axis_index>
+            <height>223</height>
+            <trigger_pv_value />
+            <axis_1_grid_color>
+              <color red="200" green="200" blue="200" />
+            </axis_1_grid_color>
+            <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>
+            <rules />
+            <axis_1_visible>true</axis_1_visible>
+            <trace_0_update_delay>10</trace_0_update_delay>
+            <trace_1_concatenate_data>true</trace_1_concatenate_data>
+            <trace_1_trace_color>
+              <color red="242" green="26" blue="26" />
+            </trace_1_trace_color>
+            <pv_name>SCAN:CALC-PROJ-Xwf</pv_name>
+            <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>0.0</axis_0_minimum>
+            <trace_1_update_delay>100</trace_1_update_delay>
+            <axis_1_axis_title>Primary Y Axis (1)</axis_1_axis_title>
+            <axis_1_auto_scale>true</axis_1_auto_scale>
+            <trace_1_line_width>1</trace_1_line_width>
+            <trace_1_plot_mode>0</trace_1_plot_mode>
+            <border_color>
+              <color red="0" green="128" blue="255" />
+            </border_color>
+            <trace_0_y_pv>SCAN:CALC-PROJ-Xwf</trace_0_y_pv>
+            <trace_0_plot_mode>0</trace_0_plot_mode>
+            <enabled>true</enabled>
+            <trace_0_x_pv>SCAN:CALC-PROJ-Xabsc</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>
+            <border_alarm_sensitive>true</border_alarm_sensitive>
+            <show_plot_area_border>false</show_plot_area_border>
+            <width>257</width>
+            <trace_1_x_pv_value />
+            <axis_1_minimum>0.0</axis_1_minimum>
+            <title_font>
+              <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+            </title_font>
+            <trace_0_y_pv_value />
+            <trace_1_visible>true</trace_1_visible>
+            <plot_area_background_color>
+              <color red="255" green="255" blue="255" />
+            </plot_area_background_color>
+            <axis_1_title_font>
+              <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+            </axis_1_title_font>
+            <visible>true</visible>
+            <trace_1_buffer_size>100</trace_1_buffer_size>
+            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+            <scripts />
+            <trace_0_point_size>4</trace_0_point_size>
+            <trace_0_trace_color>
+              <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>
+            <foreground_color>
+              <color red="0" green="0" blue="255" />
+            </foreground_color>
+          </widget>
+        </widget>
+      </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:-3a7c</wuid>
+        <transparent>false</transparent>
+        <auto_size>false</auto_size>
+        <text>STATUS</text>
+        <scripts />
+        <height>32</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
+        <background_color>
+          <color name="SubPanel" red="176" green="218" blue="249" />
+        </background_color>
+        <width>319</width>
+        <x>2136</x>
+        <name>Label_15</name>
+        <y>39</y>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>5</line_width>
+        <horizontal_fill>true</horizontal_fill>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <arrows>0</arrows>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>-16429ab9:1582e68df9a:-363a</wuid>
+        <transparent>false</transparent>
+        <points>
+          <point x="29" y="1038" />
           <point x="377" y="1038" />
           <point x="377" y="1038" />
           <point x="377" y="1038" />
@@ -5595,18 +6089,26 @@ $(pv_value)</tooltip>
       <font>
         <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
       </font>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
         <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>0</line_width>
+        <horizontal_fill>true</horizontal_fill>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-38f7</wuid>
+        <wuid>-1168daa3:158859bc9c3:-eb7</wuid>
         <transparent>false</transparent>
-        <auto_size>false</auto_size>
-        <text>Fast Acquisition</text>
+        <pv_value />
+        <alpha>255</alpha>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
         <scripts />
-        <height>43</height>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>936</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -5614,27 +6116,36 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
+        <pv_name></pv_name>
+        <gradient>false</gradient>
         <border_color>
-          <color red="0" green="0" blue="0" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <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="IO Shape Fill" red="188" green="188" blue="188" />
+          <color name="Container Grey" red="200" green="200" blue="200" />
         </background_color>
-        <width>1303</width>
+        <width>1483</width>
         <x>0</x>
-        <name>Label_124</name>
-        <y>12</y>
+        <name>Rectangle</name>
+        <y>43</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color name="IO Label" red="0" green="0" blue="0" />
+          <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="Cantarell" height="13" style="1">Header 3</opifont.name>
+          <opifont.name fontName="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.TextUpdate" version="1.0.0">
         <border_style>0</border_style>
@@ -5773,7 +6284,7 @@ $(trace_0_y_pv_value)</tooltip>
         </axis_0_title_font>
         <trace_2_update_mode>0</trace_2_update_mode>
         <background_color>
-          <color red="186" green="189" blue="182" />
+          <color name="Field Background Grey" red="240" green="240" blue="240" />
         </background_color>
         <x>408</x>
         <y>120</y>
@@ -5802,6 +6313,7 @@ $(trace_0_y_pv_value)</tooltip>
         <title></title>
         <trace_0_visible>true</trace_0_visible>
         <trace_1_name>$(trace_1_y_pv)</trace_1_name>
+        <trace_1_y_pv_value />
         <axis_2_auto_scale>true</axis_2_auto_scale>
         <show_legend>false</show_legend>
         <axis_0_axis_title>ms</axis_0_axis_title>
@@ -5837,6 +6349,7 @@ $(trace_0_y_pv_value)</tooltip>
         <trace_1_y_pv>LNS-ISRC-010:PBI-EM-HV1:VoltR_Y</trace_1_y_pv>
         <trace_2_concatenate_data>false</trace_2_concatenate_data>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <trace_2_y_pv_value />
         <trace_2_anti_alias>false</trace_2_anti_alias>
         <axis_0_maximum>10.0</axis_0_maximum>
         <trace_1_y_axis_index>1</trace_1_y_axis_index>
@@ -5874,6 +6387,7 @@ $(trace_0_y_pv_value)</tooltip>
         <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_2_y_pv>LNS-ISRC-010:PBI-EM-HV2:VoltR_Y</trace_2_y_pv>
@@ -5899,6 +6413,7 @@ $(trace_0_y_pv_value)</tooltip>
         <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>-10.0</axis_1_minimum>
         <title_font>
           <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
@@ -5971,7 +6486,7 @@ $(pv_value)</tooltip>
         </fg_gradient_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color red="186" green="189" blue="182" />
+          <color name="Field Background Grey" red="240" green="240" blue="240" />
         </background_color>
         <width>349</width>
         <x>36</x>
@@ -5989,47 +6504,6 @@ $(pv_value)</tooltip>
           <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>-3d4af206:15877d6a498:-777e</wuid>
-        <transparent>false</transparent>
-        <auto_size>false</auto_size>
-        <text>Display interval</text>
-        <scripts />
-        <height>32</height>
-        <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
-        <background_color>
-          <color red="0" green="148" blue="202" />
-        </background_color>
-        <width>349</width>
-        <x>36</x>
-        <name>Label_15</name>
-        <y>121</y>
-        <foreground_color>
-          <color red="255" green="255" blue="255" />
-        </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
-        <font>
-          <opifont.name fontName="Cantarell" height="13" style="1">Header 3</opifont.name>
-        </font>
-      </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
@@ -6112,7 +6586,7 @@ $(pv_value)</tooltip>
         </fg_gradient_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color red="186" green="189" blue="182" />
+          <color name="Field Background Grey" red="240" green="240" blue="240" />
         </background_color>
         <width>349</width>
         <x>36</x>
@@ -6187,47 +6661,6 @@ $(pv_value)</tooltip>
           <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>-3d4af206:15877d6a498:-777a</wuid>
-        <transparent>false</transparent>
-        <auto_size>false</auto_size>
-        <text>Measure interval</text>
-        <scripts />
-        <height>32</height>
-        <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
-        <background_color>
-          <color red="0" green="148" blue="202" />
-        </background_color>
-        <width>349</width>
-        <x>36</x>
-        <name>Label_17</name>
-        <y>241</y>
-        <foreground_color>
-          <color red="255" green="255" blue="255" />
-        </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
-        <font>
-          <opifont.name fontName="Cantarell" height="13" style="1">Header 3</opifont.name>
-        </font>
-      </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
@@ -6762,7 +7195,7 @@ $(pv_value)</tooltip>
         <scripts />
         <buttons_on_left>false</buttons_on_left>
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>40</height>
+        <height>31</height>
         <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -6783,7 +7216,7 @@ $(pv_value)</tooltip>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color red="70" green="70" blue="70" />
         </background_color>
         <page_increment>10.0</page_increment>
         <width>115</width>
@@ -6792,12 +7225,12 @@ $(pv_value)</tooltip>
         <y>168</y>
         <maximum>100.0</maximum>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <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="19" style="0" />
+          <fontdata fontName="Open Sans" height="10" style="0" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.spinner" version="1.0.0">
@@ -6823,7 +7256,7 @@ $(pv_value)</tooltip>
         <scripts />
         <buttons_on_left>false</buttons_on_left>
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>40</height>
+        <height>31</height>
         <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -6844,7 +7277,7 @@ $(pv_value)</tooltip>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color red="70" green="70" blue="70" />
         </background_color>
         <page_increment>10.0</page_increment>
         <width>115</width>
@@ -6853,12 +7286,12 @@ $(pv_value)</tooltip>
         <y>168</y>
         <maximum>100.0</maximum>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <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="19" style="0" />
+          <fontdata fontName="Open Sans" height="10" style="0" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.spinner" version="1.0.0">
@@ -6884,7 +7317,7 @@ $(pv_value)</tooltip>
         <scripts />
         <buttons_on_left>false</buttons_on_left>
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>40</height>
+        <height>31</height>
         <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -6905,7 +7338,7 @@ $(pv_value)</tooltip>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color red="70" green="70" blue="70" />
         </background_color>
         <page_increment>10.0</page_increment>
         <width>115</width>
@@ -6914,12 +7347,12 @@ $(pv_value)</tooltip>
         <y>288</y>
         <maximum>100.0</maximum>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <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="19" style="0" />
+          <fontdata fontName="Open Sans" height="10" style="0" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.spinner" version="1.0.0">
@@ -6945,7 +7378,7 @@ $(pv_value)</tooltip>
         <scripts />
         <buttons_on_left>false</buttons_on_left>
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>40</height>
+        <height>31</height>
         <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -6966,7 +7399,7 @@ $(pv_value)</tooltip>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color red="70" green="70" blue="70" />
         </background_color>
         <page_increment>10.0</page_increment>
         <width>115</width>
@@ -6975,12 +7408,12 @@ $(pv_value)</tooltip>
         <y>288</y>
         <maximum>100.0</maximum>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <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="19" style="0" />
+          <fontdata fontName="Open Sans" height="10" style="0" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -7375,6 +7808,129 @@ $(pv_value)</tooltip>
           <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
         </font>
       </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>-1168daa3:158859bc9c3:-f67</wuid>
+        <transparent>false</transparent>
+        <auto_size>false</auto_size>
+        <text>Display interval</text>
+        <scripts />
+        <height>32</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
+        <background_color>
+          <color name="SubPanel" red="176" green="218" blue="249" />
+        </background_color>
+        <width>349</width>
+        <x>36</x>
+        <name>Label_15</name>
+        <y>126</y>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>-1168daa3:158859bc9c3:-f5d</wuid>
+        <transparent>false</transparent>
+        <auto_size>false</auto_size>
+        <text>Measure interval</text>
+        <scripts />
+        <height>32</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
+        <background_color>
+          <color name="SubPanel" red="176" green="218" blue="249" />
+        </background_color>
+        <width>349</width>
+        <x>36</x>
+        <name>Label_15</name>
+        <y>246</y>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>-1168daa3:158859bc9c3:-f53</wuid>
+        <transparent>false</transparent>
+        <auto_size>false</auto_size>
+        <text>FAST ACQUISITION</text>
+        <scripts />
+        <height>32</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
+        <background_color>
+          <color name="SubPanel" red="176" green="218" blue="249" />
+        </background_color>
+        <width>1483</width>
+        <x>0</x>
+        <name>Label_15</name>
+        <y>12</y>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
     </widget>
   </widget>
   <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
diff --git a/src/EMU_CALCULS.c b/src/EMU_CALCULS.c
index e4ee88a54ec65a368e070853ed12fc3bd1acc22a..8017617f7a9e7db7248b7c4b0c964e13699d4e8f 100644
--- a/src/EMU_CALCULS.c
+++ b/src/EMU_CALCULS.c
@@ -133,3 +133,105 @@ static int CREATE_TAB(aSubRecord *precord) {
 }
 /* Note the function must be registered at the end. */
 epicsRegisterFunction(CREATE_TAB);
+
+
+/*
+* This function allows to create the complete waveform for X et Y projection
+*/
+static int CREATE_PROJXY(aSubRecord *precord) {
+
+    /*inputs*/
+    float *ptr_angle;
+    ptr_angle = (float *)precord->a;   // waveform ANGLE
+    float *ptr_current;
+    ptr_current = (float *)precord->b;   // Waveform CURRENT
+    float *ptr_pos;
+    ptr_pos = (float *)precord->c;   // waveform POSITION
+    long nbAngle = *(long *)precord->d;   // Nb Angle
+    long nbPosition = *(long *)precord->e;  // Nb position
+
+    /*outputs*/
+    float *ptr_projX=(float*)(precord->vala);
+    float projX=*(float*)(precord->valb);
+    float *projXAbsc=(float*)(precord->valc);
+
+    float *ptr_projY=(float*)(precord->vald);
+    float projY=*(float*)(precord->vale);
+    float *projYAbsc=(float*)(precord->valf);
+
+    int nelmComp = precord->noa;
+    int nelm = precord->nob;
+
+    int i;
+    int u;
+    int cpt_for=0.0;
+    float sumTemp=0.0;
+    float projectionX=0.0;
+    float projectionY=0.0;
+    float sumCurrentTot=0.0;
+
+     /***** SUM of current  ******/
+     for (i = 0 ; i < nbPosition; i++)
+	{
+	sumTemp=0.0;
+        ptr_current = (float *)precord->b;
+	if(i!=0){ptr_current=ptr_current+i;}
+
+	for (u = 0 ; u < nbAngle; u++)
+		{
+		sumTemp=*ptr_current+sumTemp;
+		ptr_current=ptr_current+nbPosition;
+		}
+	*ptr_projX=sumTemp;
+	sumCurrentTot=sumCurrentTot+sumTemp;
+	printf("Current total = %f",sumCurrentTot);
+	ptr_projX++;
+	}
+
+     /***** X Projection  ******/
+     sumTemp=0.0;
+     for (i = 0 ; i < nbPosition; i++)
+	{
+        ptr_current = (float *)precord->b;
+	if(i!=0){ptr_current=ptr_current+i;}
+	printf("\nMTR=%f",*ptr_pos);
+	for (u = 0 ; u < nbAngle; u++)
+		{
+		sumTemp=((*ptr_current)* (*ptr_pos))+sumTemp;
+		printf("\nsumTemp=%f",sumTemp);
+		ptr_current=ptr_current+nbPosition;
+		}
+	projectionX=projectionX+sumTemp;
+	*projXAbsc=*ptr_pos;
+	ptr_pos++;
+	projXAbsc++;
+	}
+     projectionX=projectionX/sumCurrentTot;
+     projX=projectionX;
+     printf("\nprojectionX=%f",projectionX);
+
+     /***** Y Projection  ******/
+     sumTemp=0.0;
+     ptr_current = (float *)precord->b;
+     for (i = 0 ; i < nbAngle; i++)
+	{
+	printf("\nANGLE=%f",*ptr_angle);
+	for (u = 0 ; u < nbPosition; u++)
+		{
+		sumTemp=((*ptr_current)* (*ptr_angle))+sumTemp;
+		printf("\nsumTemp=%f",sumTemp);
+		ptr_current++;
+		}
+	projectionY=projectionY+sumTemp;
+	*projYAbsc=*ptr_angle;
+	ptr_angle++;
+	projYAbsc++;
+	}
+     projectionY=projectionY/sumCurrentTot;
+     projY=projectionY;
+     printf("\nprojectionX=%f",projectionX);
+     
+  return 0;
+}
+/* Note the function must be registered at the end. */
+epicsRegisterFunction(CREATE_PROJXY);