diff --git a/db/EMU.substitutions b/db/EMU.substitutions
index cf4bb5c316359a843544965594aa3a854e56ee74..ff1b7b6a286e30fb8da8ebe689c22e23422db59d 100644
--- a/db/EMU.substitutions
+++ b/db/EMU.substitutions
@@ -101,23 +101,23 @@ file "scanBase.db"
# Before scan step by step links
- "SCAN:BUFF-DET1-RES-WF PP",
- "LNS-ISRC-010:PBI-EM:VER-BRAKE_SET PP",
- "1",
+ "LNS-ISRC-010:PBI-EM:VER-BRAKE_SET PP",
+ "$(DEVICE):BUFF-POS-RES PP",
"0",
+ "1",
"",
# After scan step by step links
"$(DEVICE):PROC-AUTO-HOME PP",
- "",
+ "$(DEVICE):CALC-PROJXY.PROC PP",
+ "1",
"1",
- "",
"",
# Abort scan step by step links
- "SCAN:BUFF-DET1-RES-WF PP",
+ "",
+ "",
"",
- "1",
"",
"$(DEVICE):$(SCAN_EF)-ABORT"
}
@@ -209,9 +209,9 @@ file "scanBase.db"
"$(DEVICE):DAQTRG-TRG",
# INTERFACE: Detectors
- "$(DEVICE):DET1-COMP",
- "$(DEVICE):DET2-COMP",
- "$(DEVICE):DET3-COMP",
+ "$(DEVICE):BUFF-DET1",
+ "$(DEVICE):BUFF-DET23",
+ "",
# INTERFACE: BEFORE, AFTER and ABORT scan links
@@ -458,7 +458,7 @@ pattern {DEVICE, SCAN_EF}
file EMU_CALCUL.template
{
pattern {DEVICE,DAQPREFIX,DET2WF,DET3WF,DET2,DET3,NELM,SCAN_EF}
- {"$(DEVICE)","$(DAQNDSPREFIX)","PBI-EM-HV1:VoltR_Y","PBI-EM-HV2:VoltR_Y","DET2","DET3","$(DAQBUFSIZE)","PS"}
+ {"$(DEVICE)","$(DAQNDSPREFIX)","PBI-EM-HV1:VoltR_Y","PBI-EM-HV2:VoltR_Y","DET2","DET3","$(BUFFERSIZE)","PS"}
}
##########################################################################
@@ -466,15 +466,15 @@ pattern {DEVICE,DAQPREFIX,DET2WF,DET3WF,DET2,DET3,NELM,SCAN_EF}
##########################################################################
file EMU_BUFF_CHAN.template
{
-pattern {DEVICE,SIGNAL,DET,SIGNAL2,NELM,NELM_COMP,SCAN_EF,SCAN_SLIT,MTRREC}
- {"$(DEVICE)","DET1-COMP","DET1","CURRENT","900","80","$(SCAN_EF)","$(SCAN_SLIT)","$(MTRREC)"}
- {"$(DEVICE)","CALC-ANGLE","DET23","ANGLE","900","80","$(SCAN_EF)","$(SCAN_SLIT)","$(MTRREC)"}
+pattern {DEVICE,SIGNAL_IN,DET,SIGNAL2,NELM,NELM_COMP,SCAN_EF,SCAN_SLIT,MTRREC}
+ {"$(DEVICE)","LNS-ISRC-010:PBI-EM-FC:CurrR:AVG","DET1","CURRENT","$(BUFFERSIZE)","1000","$(SCAN_EF)","$(SCAN_SLIT)","$(MTRREC)"}
+ {"$(DEVICE)","SCAN:CALC-ANGLE","DET23","ANGLE","$(BUFFERSIZE)","1000","$(SCAN_EF)","$(SCAN_SLIT)","$(MTRREC)"}
}
file EMU_BUFF_POS.template
{
pattern {DEVICE,NELM_COMP,DET,SCAN_SLIT,MTRREC}
- {"$(DEVICE)","80","DET1","$(SCAN_SLIT)","$(MTRREC)"}
+ {"$(DEVICE)","1000","DET1","$(SCAN_SLIT)","$(MTRREC)"}
}
##########################################################################
diff --git a/db/EMU_BUFF_CHAN.template b/db/EMU_BUFF_CHAN.template
index f23a3804c1abeb441f463de70635e4201310ef42..03f99f153a70e89b88afee08d5005bc2c6723fd4 100644
--- a/db/EMU_BUFF_CHAN.template
+++ b/db/EMU_BUFF_CHAN.template
@@ -1,14 +1,15 @@
## COMPRESS SCALARE VALUE
-record(compress, "$(DEVICE):BUFF-$(SIGNAL)") {
+record(compress, "$(DEVICE):BUFF-$(DET)") {
field(NSAM, "$(NELM_COMP)")
field(ALG,"Circular Buffer")
- field(INP,"$(DEVICE):$(SIGNAL) CPP")
+ field(INP,"$(SIGNAL_IN) CP")
}
-## Reset
-record(bo,$(DEVICE):BUFF-$(DET)-RES-WF){
+record(bo,"$(DEVICE):BUFF-$(DET)-RES"){
+field(OUT,"$(DEVICE):BUFF-$(DET).RES")
}
+
## WAVEFORM FINAL
record(waveform, "$(DEVICE):BUFF-$(SIGNAL2)") {
field(FTVL, "FLOAT")
@@ -25,7 +26,7 @@ record(aSub, "$(DEVICE):BUFF-$(DET)-FUNC") {
## Waveform data
field(FTA, "FLOAT")
field(NOA,$(NELM_COMP))
- field(INPA, "$(DEVICE):BUFF-$(SIGNAL)")
+ field(INPA, "$(DEVICE):BUFF-$(DET)")
## Waveform data reentrance
field(FTB, "FLOAT")
@@ -46,11 +47,6 @@ 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)-RES-WF CPP")
######### OUTPUTS #########
## Waveform (to save)
@@ -58,16 +54,6 @@ record(aSub, "$(DEVICE):BUFF-$(DET)-FUNC") {
field(NOVA, "$(NELM)")
field(OUTA, "$(DEVICE):BUFF-$(SIGNAL2) PP")
-## RESET Compress
- field(FTVB, "LONG")
- field(NOVB, "1")
- field(OUTB, "$(DEVICE):BUFF-$(SIGNAL).RES PP")
-
-## RESET buttom
- field(FTVC, "LONG")
- field(NOVC, "1")
- field(OUTC, "$(DEVICE):BUFF-$(DET)-RES-WF PP")
-
######### FUNCTION #######
field(SNAM, "CREATE_TAB")
}
@@ -82,7 +68,7 @@ record(aSub, "$(DEVICE):BUFF-$(DET)-FUNC") {
## Reset
# field(FTA, "LONG")
# field(NOA, "1")
-# field(INPA, "$(DEVICE):BUFF-$(DET)-RES-WF CPP")
+# field(INPA, "$(DEVICE):BUFF-$(DET)-RES-WF CP")
######### OUTPUTS #########
## Waveform (to save)
@@ -93,7 +79,7 @@ record(aSub, "$(DEVICE):BUFF-$(DET)-FUNC") {
## RESET Compress
# field(FTVB, "LONG")
# field(NOVB, "1")
-# field(OUTB, "$(DEVICE):BUFF-$(SIGNAL).RES PP")
+# field(OUTB, "$(DEVICE):BUFF-$(DET).RES PP")
## RESET buttom
# field(FTVC, "LONG")
diff --git a/db/EMU_BUFF_POS.template b/db/EMU_BUFF_POS.template
index 76334e267f77477a96bc8613a166f6af1f372a8c..caa48504b68a08d35f557389aec8cf453dff4541 100644
--- a/db/EMU_BUFF_POS.template
+++ b/db/EMU_BUFF_POS.template
@@ -2,11 +2,11 @@
record(compress, "$(DEVICE):BUFF-MTR-POS") {
field(NSAM, "$(NELM_COMP)")
field(ALG,"Circular Buffer")
- field(INP,"$(MTRREC).VAL CPP")
+ field(INP,"$(MTRREC).VAL CP")
}
## Reset COMPRESS
record(bo,$(DEVICE):BUFF-POS-RES){
- field(DOL,"$(DEVICE):BUFF-$(DET)-RES-WF CPP")
field(OUT,"$(DEVICE):BUFF-MTR-POS.RES")
}
+
diff --git a/db/EMU_CALCUL.template b/db/EMU_CALCUL.template
index 5d69af8499d8450fb194105f22cc17259b833a29..9c5a87b7b4927ed676cebe33f7d5c87491c9c0e1 100644
--- a/db/EMU_CALCUL.template
+++ b/db/EMU_CALCUL.template
@@ -164,7 +164,7 @@ record(aSub, "$(DEVICE):CALC-BLDWFAngle") {
## Counter detector (cpt det)
field(FTE, "LONG")
field(NOE, "1")
- field(INPE, "$(DEVICE):$(SCAN_EF)-NORD_POS CPP")
+ field(INPE, "$(DEVICE):$(SCAN_EF)-NORD_POS CP")
######### OUTPUTS #########
## ANGLE Waveform converted in MRAD (to save)
@@ -225,35 +225,16 @@ record(aSub, "$(DEVICE):CALC-PROJXY") {
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")
+ field(FTVA, "FLOAT")
+ field(NOVA, "1")
+ field(OUTA, "$(DEVICE):CALC-PROJ-X 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")
+ field(FTVB, "FLOAT")
+ field(NOVB, "1")
+ field(OUTB, "$(DEVICE):CALC-PROJ-Y PP")
######### FUNCTION #######
field(SNAM, "CREATE_PROJXY")
@@ -267,7 +248,7 @@ record(ao, "$(DEVICE):CALC-PROJ-X") {
## WAVEFORM PROJECTION X
record(waveform, "$(DEVICE):CALC-PROJ-Xwf") {
field(FTVL, "FLOAT")
- field(NELM, "$(NELM)")
+ field(NELM, "$(NELM)")
}
## WAVEFORM PROJECTION X ABCISSE
@@ -287,7 +268,8 @@ record(waveform, "$(DEVICE):CALC-PROJ-Ywf") {
}
## WAVEFORM PROJECTION Y ABCISSE
-record(waveform, "$(DEVICE):CALC-Yabsc") {
+record(waveform, "$(DEVICE):CALC-PROJ-Yabsc") {
field(FTVL, "FLOAT")
field(NELM, "$(NELM)")
}
+
diff --git a/db/EMU_DACQ_SYNC.template b/db/EMU_DACQ_SYNC.template
index 725b10400d163eefcfc84fa1c446e0014c0b72b8..4fd57e9642544581f4793896cc54abd42b6b9772 100644
--- a/db/EMU_DACQ_SYNC.template
+++ b/db/EMU_DACQ_SYNC.template
@@ -33,6 +33,7 @@ record(ao, "$(PREFIX):$(DEVICE):LCURSOR_ms")
field(DRVH, "20")
field(DRVL, "0")
field(PREC, "2")
+ field(PREC, "2")
field(FLNK,"$(PREFIX):$(DEVICE):LCURSOR_FAN")
}
diff --git a/db/EMU_PROCESS.template b/db/EMU_PROCESS.template
index 676bf3f689697d096eab8fd3b99221a2a71327ce..6ea2168e32d00e0a00a341b2a94bef6c047acd21 100644
--- a/db/EMU_PROCESS.template
+++ b/db/EMU_PROCESS.template
@@ -53,9 +53,9 @@ record(dfanout,"$(DEVICE):PROC-VoltMin-SP"){
#############################################
record(calcout, "$(DEVICE):PROC-StepAngle") {
- field(INPA,"$(DEVICE):PROC-AngleMax-SP CPP")
- field(INPB,"$(DEVICE):PROC-AngleMin-SP CPP")
- field(INPC,"$(DEVICE):$(SCAN_EF).NPTS CPP")
+ field(INPA,"$(DEVICE):PROC-AngleMax-SP CP")
+ field(INPB,"$(DEVICE):PROC-AngleMin-SP CP")
+ field(INPC,"$(DEVICE):$(SCAN_EF).NPTS CP")
field(CALC,"(A-B)/C")
field(EGU, "mrad")
field(PREC, "3")
@@ -67,15 +67,23 @@ 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(LNK2,"$(DEVICE):BUFF-DET1-RES PP")
+ field(DO2,"1")
+ field(LNK3,"$(DEVICE):BUFF-DET23-RES PP")
+ field(DO3,"1")
}
record(seq,"$(DEVICE):PROC-PS-AF"){
- field(LNK1,"$(DEVICE):BUFF-DET1-FUNC.PROC PP")
- field(DO1,"1")
- field(LNK2,"$(DEVICE):BUFF-DET23-FUNC.PROC PP")
- field(DO2,"2")
- field(LNK3,"LNS-ISRC-010:PBI-EM:VER-BRAKE_SET PP")
- field(DO3,"0")
+ field(LNK1,"LNS-ISRC-010:PBI-EM:VER-BRAKE_SET PP")
+ field(DO1,"0")
+ 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-AF"){
+
}
#############################################
############ RETOUR HOME AUTO ###############
diff --git a/opi/EMU.opi b/opi/EMU.opi
index cf49e045ce6b10a21ee4054de90182d3882af127..a79989e6fbebd77d19ce970148d2f3fdc8506892 100644
--- a/opi/EMU.opi
+++ b/opi/EMU.opi
@@ -10,7 +10,7 @@
<macros>
<include_parent_macros>true</include_parent_macros>
<DTACQ-NAME>LNS-ISRC-010</DTACQ-NAME>
- <SIGNAL_FC>CurR</SIGNAL_FC>
+ <DEVICE_FC>PBI-EM-FC</DEVICE_FC>
<PREFIX_SIG>DACQ</PREFIX_SIG>
<PREFIX_MTR>PMAC</PREFIX_MTR>
<NAME_MTR>MTR</NAME_MTR>
@@ -22,6 +22,8 @@
<M>EMITTANCE-METTER</M>
<PROC>PROC</PROC>
<CALC>CALC</CALC>
+ <DEVICE_HV1>PBI-EM-HV1</DEVICE_HV1>
+ <DEVICE_HV2>PBI-EM-HV2</DEVICE_HV2>
</macros>
<boy_version>4.0.103.201506251634</boy_version>
<show_edit_range>true</show_edit_range>
@@ -379,12 +381,12 @@ $(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>
+ <exp bool_exp="pv0==1">
+ <value>false</value>
+ </exp>
<pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
</rule>
</rules>
@@ -478,73 +480,6 @@ $(pv_value)</tooltip>
<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>
- <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>
- <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:RCURSOR_ms</pv_name>
- <selector_type>0</selector_type>
- <border_color>
- <color red="0" green="128" blue="255" />
- </border_color>
- <precision_from_pv>false</precision_from_pv>
- <widget_type>Text Input</widget_type>
- <confirm_message></confirm_message>
- <name>Text Input_2</name>
- <style>0</style>
- <actions hook="false" hook_all="false" />
- <border_style>3</border_style>
- <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
- <enabled>false</enabled>
- <wuid>-1168daa3:158859bc9c3:-691a</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>100</width>
- <x>138</x>
- <y>84</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>
@@ -614,9 +549,9 @@ $(pv_value)</tooltip>
<color red="255" green="255" blue="255" />
</background_color>
<width>119</width>
- <x>19</x>
+ <x>8</x>
<name>Label_164</name>
- <y>140</y>
+ <y>146</y>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
@@ -625,46 +560,123 @@ $(pv_value)</tooltip>
<opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
</font>
</widget>
- <widget typeId="org.csstudio.opibuilder.widgets.combo" version="1.0.0">
+ <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>-1168daa3:158859bc9c3:-6326</wuid>
+ <wuid>-6047e935:1589bd389ef:-608e</wuid>
+ <transparent>false</transparent>
<pv_value />
+ <auto_size>false</auto_size>
+ <text>######</text>
+ <rotation_angle>0.0</rotation_angle>
<scripts />
- <border_alarm_sensitive>false</border_alarm_sensitive>
- <height>20</height>
+ <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>false</height_scalable>
+ <height_scalable>true</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
- <items_from_pv>true</items_from_pv>
<visible>true</visible>
<pv_name>LNS-ISRC-010:CARD0:MBBOSAMPLINGRATE</pv_name>
+ <vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
- <widget_type>Combo</widget_type>
+ <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" />
+ <color red="70" green="70" blue="70" />
</background_color>
- <width>132</width>
- <x>145</x>
- <name>Combo</name>
- <y>138</y>
+ <width>100</width>
+ <x>138</x>
+ <name>Text Update</name>
+ <y>140</y>
<foreground_color>
- <color red="0" green="0" blue="0" />
+ <color name="Green On" red="0" green="255" blue="0" />
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <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>
+ <rule name="Disable" 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">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
+ </rule>
+ </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:RCURSOR_ms</pv_name>
+ <selector_type>0</selector_type>
+ <border_color>
+ <color red="0" green="128" blue="255" />
+ </border_color>
+ <precision_from_pv>true</precision_from_pv>
+ <widget_type>Text Input</widget_type>
+ <confirm_message></confirm_message>
+ <name>Text Input</name>
+ <style>0</style>
+ <actions hook="false" hook_all="false" />
+ <border_style>3</border_style>
+ <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+ <enabled>false</enabled>
+ <wuid>-6047e935:1589bd389ef:-5e00</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>100</width>
+ <x>138</x>
+ <y>84</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>
@@ -1717,13 +1729,14 @@ $(pv_value)</tooltip>
<horizontal_alignment>1</horizontal_alignment>
<rules>
<rule name="Disable" prop_id="enabled" out_exp="false">
- <exp bool_exp="pv0==1">
+ <exp bool_exp="pv0==1 || pv1==1">
<value>false</value>
</exp>
- <exp bool_exp="pv0==0">
+ <exp bool_exp="pv0==0 || pv0==0">
<value>true</value>
</exp>
<pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
+ <pv trig="true">LNS-ISRC-010:PBI-EM:VER-BRAKE_SET</pv>
</rule>
</rules>
<pv_value />
@@ -1915,7 +1928,7 @@ $(pv_value)</tooltip>
<pv_value />
<released_action_index>1</released_action_index>
<scripts />
- <border_alarm_sensitive>true</border_alarm_sensitive>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
<height>52</height>
<on_label>ON</on_label>
<border_width>1</border_width>
@@ -2050,112 +2063,139 @@ $(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>false</enabled>
- <wuid>-1ab698cd:1586d27a42e:-5cc6</wuid>
- <transparent>true</transparent>
- <auto_size>false</auto_size>
- <text>Frequency</text>
+ <enabled>true</enabled>
+ <wuid>-6047e935:1589bd389ef:-7d2a</wuid>
+ <transparent>false</transparent>
+ <pv_value />
+ <alpha>255</alpha>
+ <bg_gradient_color>
+ <color red="255" green="255" blue="255" />
+ </bg_gradient_color>
<scripts />
- <height>20</height>
- <border_width>2</border_width>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ <height>145</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>
+ <pv_name></pv_name>
+ <gradient>false</gradient>
<border_color>
- <color name="IO Border" red="215" green="215" blue="215" />
+ <color red="0" green="128" blue="255" />
</border_color>
- <widget_type>Label</widget_type>
- <wrap_words>false</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 Background" red="255" green="255" blue="205" />
+ <color red="30" green="144" blue="255" />
</background_color>
- <width>151</width>
- <x>13</x>
- <name>Label Orientation_1</name>
- <y>30</y>
+ <width>300</width>
+ <x>12</x>
+ <name>Rectangle</name>
+ <y>36</y>
+ <fill_level>0.0</fill_level>
<foreground_color>
- <color name="IO Foreground" red="0" green="0" blue="0" />
+ <color red="255" 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>
+ <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
</font>
+ <line_color>
+ <color red="128" green="0" blue="255" />
+ </line_color>
</widget>
- <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+ <widget typeId="org.csstudio.opibuilder.widgets.BoolButton" 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>
- <precision>0</precision>
<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>
+ <push_action_index>0</push_action_index>
+ <rules />
+ <effect_3d>true</effect_3d>
+ <bit>-1</bit>
+ <enabled>true</enabled>
+ <wuid>-1ab698cd:1586d27a42e:-5c63</wuid>
+ <on_color>
+ <color red="0" green="255" blue="0" />
+ </on_color>
+ <show_confirm_dialog>0</show_confirm_dialog>
+ <password></password>
<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>SYS0-EVG0:Mxc1-Frequency-SP</pv_name>
- <selector_type>0</selector_type>
- <border_color>
- <color red="0" green="128" blue="255" />
- </border_color>
- <precision_from_pv>true</precision_from_pv>
- <widget_type>Text Input</widget_type>
- <confirm_message></confirm_message>
- <name>Text Input</name>
- <style>0</style>
- <actions hook="false" hook_all="false" />
- <border_style>3</border_style>
- <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
- <enabled>true</enabled>
- <wuid>-1ab698cd:1586d27a42e:-5cc5</wuid>
- <transparent>false</transparent>
+ <released_action_index>1</released_action_index>
+ <square_button>true</square_button>
+ <show_led>true</show_led>
<scripts />
- <border_alarm_sensitive>false</border_alarm_sensitive>
+ <border_alarm_sensitive>true</border_alarm_sensitive>
+ <height>38</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>
+ <keep_wh_ratio>true</keep_wh_ratio>
</scale_options>
+ <visible>true</visible>
+ <pv_name>SYS0-EVR0:FrontOut1-Ena-SP</pv_name>
+ <border_color>
+ <color red="0" green="128" blue="255" />
+ </border_color>
+ <widget_type>Boolean Button</widget_type>
+ <off_color>
+ <color red="0" green="100" blue="0" />
+ </off_color>
+ <confirm_message>Are your sure you want to do this?</confirm_message>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
- <format_type>0</format_type>
- <limits_from_pv>false</limits_from_pv>
<background_color>
- <color name="TextBackground" red="70" green="70" blue="70" />
+ <color name="Button Grey" red="180" green="180" blue="180" />
</background_color>
<width>100</width>
- <x>198</x>
- <y>24</y>
- <maximum>1.7976931348623157E308</maximum>
+ <x>191</x>
+ <name>Boolean Button</name>
+ <data_type>0</data_type>
+ <y>132</y>
<foreground_color>
- <color name="KeyboardEntry" red="0" green="255" blue="255" />
+ <color red="0" green="0" blue="0" />
</foreground_color>
- <minimum>-1.7976931348623157E308</minimum>
+ <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>true</show_boolean_label>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</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>
@@ -2163,7 +2203,7 @@ $(pv_value)</tooltip>
<horizontal_alignment>1</horizontal_alignment>
<rules />
<enabled>false</enabled>
- <wuid>-1ab698cd:1586d27a42e:-5cc4</wuid>
+ <wuid>-6047e935:1589bd389ef:-7d7a</wuid>
<transparent>true</transparent>
<auto_size>false</auto_size>
<text>Width pulse</text>
@@ -2185,10 +2225,10 @@ $(pv_value)</tooltip>
<background_color>
<color name="IO Background" red="255" green="255" blue="205" />
</background_color>
- <width>174</width>
- <x>2</x>
+ <width>163</width>
+ <x>6</x>
<name>Label Orientation_2</name>
- <y>72</y>
+ <y>96</y>
<foreground_color>
<color name="IO Foreground" red="0" green="0" blue="0" />
</foreground_color>
@@ -2223,7 +2263,7 @@ $(pv_value)</tooltip>
<multiline_input>false</multiline_input>
<border_width>1</border_width>
<visible>true</visible>
- <pv_name>SYS0-EVR0:Pul0-Width-SP</pv_name>
+ <pv_name>SYS0-EVR0:Pul1-Width-SP</pv_name>
<selector_type>0</selector_type>
<border_color>
<color red="0" green="128" blue="255" />
@@ -2237,7 +2277,7 @@ $(pv_value)</tooltip>
<border_style>3</border_style>
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
<enabled>true</enabled>
- <wuid>-1ab698cd:1586d27a42e:-5cc3</wuid>
+ <wuid>-6047e935:1589bd389ef:-7d79</wuid>
<transparent>false</transparent>
<scripts />
<border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2252,9 +2292,9 @@ $(pv_value)</tooltip>
<background_color>
<color name="TextBackground" red="70" green="70" blue="70" />
</background_color>
- <width>100</width>
- <x>198</x>
- <y>66</y>
+ <width>123</width>
+ <x>168</x>
+ <y>90</y>
<maximum>1.7976931348623157E308</maximum>
<foreground_color>
<color name="KeyboardEntry" red="0" green="255" blue="255" />
@@ -2264,66 +2304,152 @@ $(pv_value)</tooltip>
<fontdata fontName="Sans" height="10" style="1" />
</font>
</widget>
- <widget typeId="org.csstudio.opibuilder.widgets.BoolButton" version="1.0.0">
- <toggle_button>true</toggle_button>
+ <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
<border_style>0</border_style>
- <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
- <alarm_pulsing>false</alarm_pulsing>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- <push_action_index>0</push_action_index>
+ <tooltip></tooltip>
+ <horizontal_alignment>1</horizontal_alignment>
<rules />
- <effect_3d>true</effect_3d>
- <bit>-1</bit>
<enabled>true</enabled>
- <wuid>-1ab698cd:1586d27a42e:-5c63</wuid>
- <on_color>
- <color red="0" green="255" blue="0" />
- </on_color>
- <show_confirm_dialog>0</show_confirm_dialog>
- <password></password>
- <pv_value />
- <released_action_index>0</released_action_index>
- <square_button>true</square_button>
- <show_led>true</show_led>
+ <wuid>-6047e935:1589bd389ef:-7d0d</wuid>
+ <transparent>true</transparent>
+ <auto_size>false</auto_size>
+ <text>MAGNETRON</text>
<scripts />
- <border_alarm_sensitive>true</border_alarm_sensitive>
- <height>38</height>
- <on_label>ON</on_label>
+ <height>20</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
<height_scalable>true</height_scalable>
- <keep_wh_ratio>true</keep_wh_ratio>
+ <keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name></pv_name>
+ <vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
- <widget_type>Boolean Button</widget_type>
- <off_color>
- <color red="0" green="100" blue="0" />
- </off_color>
- <confirm_message>Are your sure you want to do this?</confirm_message>
- <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+ <widget_type>Label</widget_type>
+ <wrap_words>false</wrap_words>
<background_color>
- <color name="Button Grey" red="180" green="180" blue="180" />
+ <color red="255" green="255" blue="255" />
</background_color>
- <width>100</width>
+ <width>95</width>
<x>114</x>
- <name>Boolean Button</name>
- <data_type>0</data_type>
- <y>132</y>
+ <name>Label</name>
+ <y>12</y>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<actions hook="false" hook_all="false" />
- <show_boolean_label>true</show_boolean_label>
+ <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>-6047e935:1589bd389ef:-7c5c</wuid>
+ <transparent>true</transparent>
+ <auto_size>false</auto_size>
+ <text>Frequency</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>116</width>
+ <x>30</x>
+ <name>Label Orientation_2</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>
- <off_label>OFF</off_label>
+ </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>
+ <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>
+ <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>SYS0-EVG0:Mxc1-Frequency-SP</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_2</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>-6047e935:1589bd389ef:-7c5b</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>123</width>
+ <x>168</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>
</widget>
@@ -2337,7 +2463,7 @@ $(pv_value)</tooltip>
$(pv_value)</tooltip>
<rules />
<enabled>true</enabled>
- <wuid>-16429ab9:158444d4181:-7ba7</wuid>
+ <wuid>-16429ab9:1582e68df9a:-4223</wuid>
<transparent>false</transparent>
<pv_value />
<alpha>255</alpha>
@@ -2347,7 +2473,7 @@ $(pv_value)</tooltip>
</bg_gradient_color>
<scripts />
<border_alarm_sensitive>false</border_alarm_sensitive>
- <height>79</height>
+ <height>1099</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -2369,12 +2495,12 @@ $(pv_value)</tooltip>
</fg_gradient_color>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
<background_color>
- <color name="Container Border Grey" red="150" green="150" blue="150" />
+ <color name="Container Grey" red="200" green="200" blue="200" />
</background_color>
- <width>350</width>
- <x>29</x>
- <name>Rounded Rectangle</name>
- <y>1038</y>
+ <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" />
@@ -2397,7 +2523,7 @@ $(pv_value)</tooltip>
$(pv_value)</tooltip>
<rules />
<enabled>true</enabled>
- <wuid>-16429ab9:1582e68df9a:-4223</wuid>
+ <wuid>-47901338:158955bc5eb:-344b</wuid>
<transparent>false</transparent>
<pv_value />
<alpha>255</alpha>
@@ -2407,7 +2533,7 @@ $(pv_value)</tooltip>
</bg_gradient_color>
<scripts />
<border_alarm_sensitive>false</border_alarm_sensitive>
- <height>1099</height>
+ <height>208</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -2429,12 +2555,12 @@ $(pv_value)</tooltip>
</fg_gradient_color>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
<background_color>
- <color name="Container Grey" red="200" green="200" blue="200" />
+ <color name="Black" red="0" green="0" blue="0" />
</background_color>
- <width>1681</width>
- <x>414</x>
- <name>Rounded Rectangle_5</name>
- <y>18</y>
+ <width>229</width>
+ <x>432</x>
+ <name>Rounded Rectangle_7</name>
+ <y>894</y>
<fill_level>0.0</fill_level>
<foreground_color>
<color red="255" green="0" blue="0" />
@@ -2447,7 +2573,119 @@ $(pv_value)</tooltip>
<color red="128" green="0" blue="255" />
</line_color>
</widget>
- <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
+ <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>-47901338:158955bc5eb:-31fa</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-PROJ-X</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>552</x>
+ <name>Text Update</name>
+ <y>930</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.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>-16429ab9:158444d4181:-7ba7</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>79</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 Border Grey" red="150" green="150" blue="150" />
+ </background_color>
+ <width>350</width>
+ <x>29</x>
+ <name>Rounded Rectangle</name>
+ <y>1038</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.LED" version="1.0.0">
<alarm_pulsing>false</alarm_pulsing>
<tooltip>$(pv_name)
$(pv_value)</tooltip>
@@ -3306,7 +3544,17 @@ $(pv_value)</tooltip>
<tooltip>$(pv_name)
$(pv_value)</tooltip>
<push_action_index>0</push_action_index>
- <rules />
+ <rules>
+ <rule name="Enable" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pv0 >= 200">
+ <value>false</value>
+ </exp>
+ <exp bool_exp="pv0<=200">
+ <value>true</value>
+ </exp>
+ <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).P4SI</pv>
+ </rule>
+ </rules>
<enabled>true</enabled>
<wuid>1e771979:1565068c2e3:-2a01</wuid>
<pv_value />
@@ -3721,9 +3969,9 @@ $(pv_value)</tooltip>
<tooltip>$(pv_name)</tooltip>
<x_axis_show_minor_ticks>true</x_axis_show_minor_ticks>
<horizon_profile_x_pv_name>SCAN:CALC-PROJ-Xabsc</horizon_profile_x_pv_name>
- <height>986</height>
+ <height>397</height>
<border_width>1</border_width>
- <graph_area_width>1517</graph_area_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>
@@ -3749,9 +3997,9 @@ $(pv_value)</tooltip>
<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>926</graph_area_height>
+ <graph_area_height>337</graph_area_height>
<x_axis_visible>true</x_axis_visible>
- <vertical_profile_x_pv_name>SCAN:CALC-PROJ-Xwf</vertical_profile_x_pv_name>
+ <vertical_profile_x_pv_name>SCAN:CALC-PROJ-Yabsc</vertical_profile_x_pv_name>
<pixel_info_pv_name></pixel_info_pv_name>
<x_axis_axis_color>
<color red="0" green="0" blue="0" />
@@ -3760,8 +4008,8 @@ $(pv_value)</tooltip>
<color red="240" green="240" blue="240" />
</background_color>
<x_axis_axis_title>mm</x_axis_axis_title>
- <width>1633</width>
- <x>432</x>
+ <width>1405</width>
+ <x>660</x>
<y>100</y>
<maximum>8.0</maximum>
<data_height>0</data_height>
@@ -3822,7 +4070,7 @@ $(pv_value)</tooltip>
</color_map>
<show_ramp>true</show_ramp>
<y_axis_axis_title>Deg</y_axis_axis_title>
- <horizon_profile_y_pv_name>SCAN:CALC-PROJ-Yabsc</horizon_profile_y_pv_name>
+ <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>
@@ -5578,267 +5826,6 @@ $(pv_value)</tooltip>
<opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
</font>
</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>
- <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">
@@ -5984,69 +5971,641 @@ $(pv_value)</tooltip>
<format_type>0</format_type>
<limits_from_pv>false</limits_from_pv>
<background_color>
- <color name="TextBackground" red="70" green="70" blue="70" />
+ <color name="TextBackground" red="70" green="70" blue="70" />
+ </background_color>
+ <width>100</width>
+ <x>1242</x>
+ <y>880</y>
+ <maximum>1.7976931348623157E308</maximum>
+ <foreground_color>
+ <color name="Green On" red="0" green="255" blue="0" />
+ </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>
+ <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">PMAC:MTR1.MOVN</pv>
+ </rule>
+ </rules>
+ <enabled>false</enabled>
+ <wuid>59fc39f9:158487e5950:-4c5d</wuid>
+ <transparent>true</transparent>
+ <auto_size>false</auto_size>
+ <text>MOTOR IS MOVING ...</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>181</width>
+ <x>1062</x>
+ <name>Label</name>
+ <y>881</y>
+ <foreground_color>
+ <color name="Major" red="255" green="0" blue="0" />
+ </foreground_color>
+ <actions hook="false" hook_all="false" />
+ <font>
+ <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+ </font>
+ </widget>
+ <widget typeId="org.csstudio.opibuilder.widgets.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-Xabsc</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 name="Container Grey" red="200" green="200" blue="200" />
+ </background_color>
+ <x>660</x>
+ <y>912</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>500</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>false</trace_0_visible>
+ <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_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>false</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-Xwf</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>181</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>false</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>-100.0</axis_0_minimum>
+ <trace_1_update_delay>1</trace_1_update_delay>
+ <axis_1_axis_title></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>false</border_alarm_sensitive>
+ <show_plot_area_border>true</show_plot_area_border>
+ <width>1363</width>
+ <trace_1_x_pv_value />
+ <axis_1_minimum>-100.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 name="Field Background Grey" red="240" green="240" blue="240" />
+ </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 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 name="Container Grey" red="200" green="200" blue="200" />
+ </background_color>
+ <x>432</x>
+ <y>100</y>
+ <trace_0_x_axis_index>0</trace_0_x_axis_index>
+ <axis_count>2</axis_count>
+ <pv_value />
+ <trace_0_buffer_size>500</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>false</show_legend>
+ <axis_0_axis_title></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>false</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>795</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>-100.0</axis_0_minimum>
+ <axis_1_axis_title></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-Yabsc</trace_0_y_pv>
+ <trace_0_plot_mode>0</trace_0_plot_mode>
+ <enabled>true</enabled>
+ <trace_0_x_pv>SCAN:CALC-PROJ-Ywf</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>false</border_alarm_sensitive>
+ <show_plot_area_border>true</show_plot_area_border>
+ <width>217</width>
+ <axis_1_minimum>-100.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.Label" version="1.0.0">
+ <border_style>0</border_style>
+ <tooltip></tooltip>
+ <horizontal_alignment>1</horizontal_alignment>
+ <rules />
+ <enabled>false</enabled>
+ <wuid>-47901338:158955bc5eb:-330f</wuid>
+ <transparent>true</transparent>
+ <auto_size>false</auto_size>
+ <text></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>144</width>
+ <x>150</x>
+ <name>Label Orientation_2</name>
+ <y>822</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>-47901338:158955bc5eb:-3243</wuid>
+ <transparent>true</transparent>
+ <auto_size>false</auto_size>
+ <text>Projection 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>432</x>
+ <name>Label Orientation_2</name>
+ <y>930</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>-47901338:158955bc5eb:-3235</wuid>
+ <transparent>true</transparent>
+ <auto_size>false</auto_size>
+ <text>Projection Y</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>432</x>
+ <name>Label Orientation_2</name>
+ <y>972</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>-47901338:158955bc5eb:-31f2</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-PROJ-Y</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>552</x>
+ <name>Text Update</name>
+ <y>972</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.intensityGraph" version="1.0.0">
+ <vertial_profile_y_pv_value />
+ <y_axis_show_minor_ticks>true</y_axis_show_minor_ticks>
+ <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>
+ <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>
+ <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 />
+ <actions hook="false" hook_all="false" />
+ <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>
+ <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>
- <width>100</width>
- <x>1104</x>
- <y>1067</y>
- <maximum>1.7976931348623157E308</maximum>
- <foreground_color>
- <color name="Green On" red="0" green="255" blue="0" />
- </foreground_color>
- <minimum>-1.7976931348623157E308</minimum>
+ <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>
- <fontdata fontName="Sans" height="10" style="1" />
+ <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>
- <rule name="Visible" prop_id="visible" out_exp="false">
- <exp bool_exp="pv0==1">
- <value>true</value>
+ <rule name="DataHeight" prop_id="data_height" out_exp="true">
+ <exp bool_exp="pv0>0">
+ <value>pv0</value>
</exp>
- <exp bool_exp="pv0==0">
- <value>false</value>
+ <pv trig="true">${PREFIX_SCAN}:$(NAME_PS).NPTS</pv>
+ </rule>
+ <rule name="DataWidth" prop_id="data_width" out_exp="true">
+ <exp bool_exp="pv0>0">
+ <value>pv0</value>
</exp>
- <pv trig="true">PMAC:MTR1.MOVN</pv>
+ <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>
- <enabled>false</enabled>
- <wuid>59fc39f9:158487e5950:-4c5d</wuid>
- <transparent>true</transparent>
- <auto_size>false</auto_size>
- <text>MOTOR IS MOVING ...</text>
+ <horizon_profile_y_pv_value />
+ <roi_count>0</roi_count>
+ <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>
<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>
+ <keep_wh_ratio>true</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>181</width>
- <x>918</x>
- <name>Label</name>
- <y>1068</y>
+ <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>
+ <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+ <horizon_profile_x_pv_value />
<foreground_color>
- <color name="Major" red="255" green="0" blue="0" />
+ <color red="0" green="0" blue="0" />
</foreground_color>
- <actions hook="false" hook_all="false" />
- <font>
- <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
- </font>
</widget>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
@@ -6265,7 +6824,9 @@ $(pv_value)</tooltip>
$(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>
@@ -6275,7 +6836,7 @@ $(trace_0_y_pv_value)</tooltip>
<trace_0_name>$(trace_0_y_pv)</trace_0_name>
<axis_2_minimum>0.0</axis_2_minimum>
<trace_0_update_mode>0</trace_0_update_mode>
- <trace_1_x_pv>LNS-ISRC-010:PBI-EM-HV1:VoltR_XMS</trace_1_x_pv>
+ <trace_1_x_pv>$(DTACQ-NAME):$(DEVICE_HV1):VoltR_XMS</trace_1_x_pv>
<wuid>-3d4af206:15877d6a498:-7780</wuid>
<transparent>false</transparent>
<trace_1_update_mode>0</trace_1_update_mode>
@@ -6286,10 +6847,14 @@ $(trace_0_y_pv_value)</tooltip>
<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>120</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_1_point_size>4</trace_1_point_size>
<trace_1_anti_alias>false</trace_1_anti_alias>
<pv_value />
@@ -6303,8 +6868,11 @@ $(trace_0_y_pv_value)</tooltip>
<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>
<axis_1_axis_color>
<color red="0" green="0" blue="0" />
</axis_1_axis_color>
@@ -6312,10 +6880,16 @@ $(trace_0_y_pv_value)</tooltip>
<axis_1_log_scale>false</axis_1_log_scale>
<title></title>
<trace_0_visible>true</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" />
@@ -6323,20 +6897,26 @@ $(trace_0_y_pv_value)</tooltip>
<axis_2_scale_font>
<opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
</axis_2_scale_font>
+ <trace_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>
<axis_0_time_format>0</axis_0_time_format>
- <trace_count>3</trace_count>
+ <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>
@@ -6346,7 +6926,7 @@ $(trace_0_y_pv_value)</tooltip>
<height_scalable>true</height_scalable>
<keep_wh_ratio>true</keep_wh_ratio>
</scale_options>
- <trace_1_y_pv>LNS-ISRC-010:PBI-EM-HV1:VoltR_Y</trace_1_y_pv>
+ <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 />
@@ -6357,11 +6937,13 @@ $(trace_0_y_pv_value)</tooltip>
<height>730</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>
@@ -6371,11 +6953,15 @@ $(trace_0_y_pv_value)</tooltip>
<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>
@@ -6390,7 +6976,8 @@ $(trace_0_y_pv_value)</tooltip>
<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>
+ <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 red="0" green="128" blue="255" />
@@ -6398,17 +6985,20 @@ $(trace_0_y_pv_value)</tooltip>
<axis_2_title_font>
<opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
</axis_2_title_font>
- <trace_0_y_pv>LNS-ISRC-010:PBI-EM-FC:CurrR_Y</trace_0_y_pv>
+ <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>LNS-ISRC-010:PBI-EM-FC:CurrR_XMS</trace_0_x_pv>
+ <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>
@@ -6418,16 +7008,21 @@ $(trace_0_y_pv_value)</tooltip>
<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>
@@ -6437,9 +7032,11 @@ $(trace_0_y_pv_value)</tooltip>
<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>LNS-ISRC-010:PBI-EM-HV2:VoltR_XMS</trace_2_x_pv>
+ <trace_2_x_pv>$(DTACQ-NAME):$(DEVICE_HV2):VoltR_XMS</trace_2_x_pv>
<foreground_color>
<color red="0" green="0" blue="255" />
</foreground_color>
@@ -6825,7 +7422,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM-FC:CurrR:AVG</pv_name>
+ <pv_name>$(DTACQ-NAME):$(DEVICE_FC):CurrR:AVG</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -6877,7 +7474,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM-FC:CurrR:MAX</pv_name>
+ <pv_name>$(DTACQ-NAME):$(DEVICE_FC):CurrR:MAX</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -6929,7 +7526,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM-FC:CurrR:MIN</pv_name>
+ <pv_name>$(DTACQ-NAME):$(DEVICE_FC):CurrR:MIN</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -7214,7 +7811,7 @@ $(pv_value)</tooltip>
<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>
+ <limits_from_pv>true</limits_from_pv>
<background_color>
<color red="70" green="70" blue="70" />
</background_color>
@@ -7223,12 +7820,12 @@ $(pv_value)</tooltip>
<x>54</x>
<name>Spinner Template_10</name>
<y>168</y>
- <maximum>100.0</maximum>
+ <maximum>10.0</maximum>
<foreground_color>
<color red="0" green="255" blue="255" />
</foreground_color>
<actions hook="false" hook_all="false" />
- <minimum>-100.0</minimum>
+ <minimum>0.0</minimum>
<font>
<fontdata fontName="Open Sans" height="10" style="0" />
</font>
@@ -7284,73 +7881,12 @@ $(pv_value)</tooltip>
<x>214</x>
<name>Spinner Template_1</name>
<y>168</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.spinner" version="1.0.0">
- <border_style>6</border_style>
- <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
- <alarm_pulsing>false</alarm_pulsing>
- <precision>3</precision>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- <horizontal_alignment>1</horizontal_alignment>
- <rules>
- <rule name="BorderRule" prop_id="border_style" out_exp="false">
- <exp bool_exp="pv0==1">
- <value>9</value>
- </exp>
- <pv trig="true">$(pv_name).SIMM</pv>
- </rule>
- </rules>
- <enabled>true</enabled>
- <wuid>-3d4af206:15877d6a498:-7767</wuid>
- <transparent>false</transparent>
- <pv_value />
- <scripts />
- <buttons_on_left>false</buttons_on_left>
- <border_alarm_sensitive>false</border_alarm_sensitive>
- <height>31</height>
- <border_width>2</border_width>
- <scale_options>
- <width_scalable>true</width_scalable>
- <height_scalable>true</height_scalable>
- <keep_wh_ratio>false</keep_wh_ratio>
- </scale_options>
- <visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM: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_2</name>
- <y>288</y>
- <maximum>100.0</maximum>
+ <maximum>10.0</maximum>
<foreground_color>
<color red="0" green="255" blue="255" />
</foreground_color>
<actions hook="false" hook_all="false" />
- <minimum>-100.0</minimum>
+ <minimum>1.0</minimum>
<font>
<fontdata fontName="Open Sans" height="10" style="0" />
</font>
@@ -7483,7 +8019,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM-HV1:VoltR:AVG</pv_name>
+ <pv_name>$(DTACQ-NAME):$(DEVICE_HV1):VoltR:AVG</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -7535,7 +8071,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM-HV1:VoltR:MAX</pv_name>
+ <pv_name>$(DTACQ-NAME):$(DEVICE_HV1):VoltR:MAX</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -7587,7 +8123,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM-HV1:VoltR:MIN</pv_name>
+ <pv_name>$(DTACQ-NAME):$(DEVICE_HV1):VoltR:MIN</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -7679,7 +8215,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM-HV2:VoltR:AVG</pv_name>
+ <pv_name>$(DTACQ-NAME):$(DEVICE_HV2):VoltR:AVG</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -7731,7 +8267,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM-HV2:VoltR:MAX</pv_name>
+ <pv_name>$(DTACQ-NAME):$(DEVICE_HV2):VoltR:MAX</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -7783,7 +8319,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM-HV2:VoltR:MIN</pv_name>
+ <pv_name>$(DTACQ-NAME):$(DEVICE_HV2):VoltR:MIN</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -7931,6 +8467,67 @@ $(pv_value)</tooltip>
<fontdata fontName="Sans" height="10" style="1" />
</font>
</widget>
+ <widget typeId="org.csstudio.opibuilder.widgets.spinner" version="1.0.0">
+ <border_style>6</border_style>
+ <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+ <alarm_pulsing>false</alarm_pulsing>
+ <precision>3</precision>
+ <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+ <horizontal_alignment>1</horizontal_alignment>
+ <rules>
+ <rule name="BorderRule" prop_id="border_style" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>9</value>
+ </exp>
+ <pv trig="true">$(pv_name).SIMM</pv>
+ </rule>
+ </rules>
+ <enabled>true</enabled>
+ <wuid>-6047e935:1589bd389ef:-66ec</wuid>
+ <transparent>false</transparent>
+ <pv_value />
+ <scripts />
+ <buttons_on_left>false</buttons_on_left>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ <height>31</height>
+ <border_width>2</border_width>
+ <scale_options>
+ <width_scalable>true</width_scalable>
+ <height_scalable>true</height_scalable>
+ <keep_wh_ratio>false</keep_wh_ratio>
+ </scale_options>
+ <visible>true</visible>
+ <pv_name>LNS-ISRC-010:PBI-EM: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>
</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 8017617f7a9e7db7248b7c4b0c964e13699d4e8f..516d0042a6e9f9eb4777b1d64a209197dca0b6be 100644
--- a/src/EMU_CALCULS.c
+++ b/src/EMU_CALCULS.c
@@ -74,29 +74,14 @@ static int CREATE_TAB(aSubRecord *precord) {
long mtr_cpt = *(long *)precord->c; //Motor compter
long nbAngle = *(long *)precord->d; // Nb Angle
long nbPosition = *(long *)precord->e; // Nb position
- long reset = *(long *)precord->f; // Reset
int nelmComp = precord->noa;
int nelm = precord->nob;
float *ptr_WF_OUT=(float*)(precord->vala);
- long resetComp=*(long*)(precord->valb);
- long resetButt=*(long*)(precord->valc);
+
int i;
int cpt_for=0.0;
- /***** RESET DATA ******/
- if(reset==1)
- {
- resetComp=1;
- resetButt=0;
- for (i = 0 ; i < nelm; ++i)
- {
- *ptr_WF_OUT=0.0;
- ptr_WF_OUT++;
- }
- return 0;
- }
-
/***** REFILL old DATA ******/
if(mtr_cpt>0)
{
@@ -113,21 +98,19 @@ static int CREATE_TAB(aSubRecord *precord) {
/***** FILL new DATA ******/
if(mtr_cpt>=0)
{
- cpt_for=(nbPosition-mtr_cpt-1);
+ cpt_for=nbPosition-mtr_cpt-1;
ptr_WF_OUT=(float*)(precord->vala);
ptr_WF_OUT=ptr_WF_OUT+cpt_for;
ptr_WF = (float *)precord->a;
/*DATA from the COMPRESS waveform */
- for (i = 0 ; i < nbAngle; ++i)
+ for (i = 0 ; i <= nbAngle; ++i)
{
- if(i==0){*ptr_WF++;}
*ptr_WF_OUT=*ptr_WF;
ptr_WF_OUT=ptr_WF_OUT+nbPosition;
ptr_WF++;
}
- resetComp=1;
}
return 0;
}
@@ -139,7 +122,6 @@ 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
@@ -151,13 +133,8 @@ static int CREATE_PROJXY(aSubRecord *precord) {
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);
+ float projX=*(float*)(precord->vala);
+ float projY=*(float*)(precord->valb);
int nelmComp = precord->noa;
int nelm = precord->nob;
@@ -166,6 +143,7 @@ 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;
@@ -182,55 +160,44 @@ static int CREATE_PROJXY(aSubRecord *precord) {
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;
+ ptr_pos=ptr_pos+nbPosition-1;
for (i = 0 ; i < nbPosition; i++)
{
ptr_current = (float *)precord->b;
+ sumTemp=0.0;
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++;
+ ptr_pos--;
}
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);
+ sumTemp=0.0;
+ sumAngleTemp=0.0;
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++;
+ ptr_angle=ptr_angle+nbPosition;
}
projectionY=projectionY/sumCurrentTot;
projY=projectionY;
- printf("\nprojectionX=%f",projectionX);
-
+
return 0;
}
/* Note the function must be registered at the end. */
diff --git a/src/EMU_RAMP-CURRENT.st b/src/EMU_RAMP-CURRENT.st
index ed1c683f82bd6f6e7c91be102593286d473832c9..2e8fc87f6643178de378293995b4a862684f5fdc 100644
--- a/src/EMU_RAMP-CURRENT.st
+++ b/src/EMU_RAMP-CURRENT.st
@@ -55,9 +55,9 @@ ss ss1
{
when(efTestAndClear(PS2_Cons_flag))
{
- if((PS2_Cons<limitCurr) && (PS2_Cons>-limitCurr)){FCCurr_Cons= 5+(rand() * 0.000000001);;}
+ if((PS2_Cons<limitCurr) && (PS2_Cons>-limitCurr) && (simulation==1)){FCCurr_Cons= 5+(rand() * 0.000000001);;}
else{
- %%FCCurr_Cons= PS2_Cons;
+ %%FCCurr_Cons= 0.0;
}
pvPut(FCCurr_Cons);
}state ramp
diff --git a/startup/EMU.cmd b/startup/EMU.cmd
index 553679dcb8356b12a2ff058293372865f707208c..656aec2e471eef8db28fdaab68a4e8b9311a4b9d 100644
--- a/startup/EMU.cmd
+++ b/startup/EMU.cmd
@@ -1,7 +1,7 @@
# Required modules ###
require ifcdaq,0.2.0
require singlemotion,1.4.6
-require mrfsample,1.1.1
+require mrfioc2,2.7.13
require pev,0.1.1
require ecat2db,0.3.1
require FastAcquisition,1.1.0
@@ -65,6 +65,7 @@ epicsEnvSet("EVR_PUL0_WIDTH", "$(EVR_EV14_OUT0_WIDTH=1000)")
#DAQ macros
epicsEnvSet("DAQPREFIX", "LNS-ISRC-010" )
epicsEnvSet("DAQBUFSIZE", "1024" )
+epicsEnvSet("BUFFERSIZE", "1000" )
#Scanning macros
epicsEnvSet("SCANPREFIX", "SCAN" )
@@ -98,12 +99,7 @@ dbLoadRecords("evg-vme-230.db", "DEVICE=$(EVG), SYS=$(SYS)")
dbLoadRecords("evr-pmc-230.db", "DEVICE=$(EVR), SYS=$(SYS)")
dbLoadRecords("evr-softEvent.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), CODE=$(EVR_PUL0_EVENT)")
dbLoadRecords("evr-pulserMap.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), PID=0, F=Trig, ID=0")
-
-## Load ifcdaq instance
-#dbLoadRecords(IFCDAQAIChannelGroup.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI")
-#dbLoadRecords(IFCDAQAIChannel.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH0, NELM=$(DAQBUFSIZE)")
-#dbLoadRecords(IFCDAQAIChannel.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH1, NELM=$(DAQBUFSIZE)")
-#dbLoadRecords(IFCDAQAIChannel.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH2, NELM=$(DAQBUFSIZE)")
+dbLoadRecords("evr-pulserMap.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), PID=1, F=Trig, ID=1")
#
# Load Single motions records
@@ -127,7 +123,7 @@ dbLoadRecords("motorStatus.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_N
dbLoadRecords("motorHoming.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1),ASYN_PORT=$(PMACPORT),AXIS_NO=$(AXIS_NO1),PREC=$(PREC),EGU=$(EGU)")
-dbLoadRecords("EMU.db", "DEVICE=$(SCANPREFIX), SCAN_SLIT=$(SCAN_SLIT), SCAN_EF=$(SCAN_EF),MTRREC=$(PMACPREFIX):$(MOTOR_NAME1), MAX_POINTS_EF=$(SCAN_POINTS_EF), MAX_POINTS_SLIT=$(SCAN_POINTS_SLIT), DAQNDSPREFIX=$(DAQPREFIX), DAQBUFSIZE=$(DAQBUFSIZE), DET1WF=PBI-EM-FC:CurrR_Y, DET2WF=PBI-EM-HV1:VoltR_Y, DET3WF=PBI-EM-HV2:VoltR_Y, TR_TL=$(SYS)-$(EVR):Pul0-Ena-Sel, TR_TLTSEL=$(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME, PSU_SP=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU_RBV=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU2_SP=LNS-ISRC-010:PBI-EM:HVver-SP, PSU2_RBV=LNS-ISRC-010:PBI-EM:HVver-SP")
+dbLoadRecords("EMU.db", "DEVICE=$(SCANPREFIX), SCAN_SLIT=$(SCAN_SLIT), SCAN_EF=$(SCAN_EF),MTRREC=$(PMACPREFIX):$(MOTOR_NAME1), MAX_POINTS_EF=$(SCAN_POINTS_EF), MAX_POINTS_SLIT=$(SCAN_POINTS_SLIT), DAQNDSPREFIX=$(DAQPREFIX), DAQBUFSIZE=$(DAQBUFSIZE), DET1WF=PBI-EM-FC:CurrR_Y, DET2WF=PBI-EM-HV1:VoltR_Y, DET3WF=PBI-EM-HV2:VoltR_Y, TR_TL=$(SYS)-$(EVR):Pul0-Ena-Sel, TR_TLTSEL=$(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME, PSU_SP=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU_RBV=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU2_SP=LNS-ISRC-010:PBI-EM:HVver-SP, PSU2_RBV=LNS-ISRC-010:PBI-EM:HVver-SP,BUFFERSIZE=$(BUFFERSIZE)")
#
# Init ETHERCAT module
@@ -190,6 +186,15 @@ dbpf $(SYS)-$(EVR):Pul0-Width-SP 20000
dbpf $(SYS)-$(EVR):Pul0-Delay-SP 0
dbpf $(SYS)-$(EVR):FrontOut0-Ena-SP "Enabled"
+### Setup EVR
+##set the pulser 1 to trigger on output 1 for BETSI
+########## TIMING RECEIVER: setup OUT0 ##############
+dbpf $(SYS)-$(EVR):FrontOut1-Src-SP 1
+dbpf $(SYS)-$(EVR):Pul1-Evt-Trig1-SP $(EVR_PUL0_EVENT)
+dbpf $(SYS)-$(EVR):Pul1-Width-SP 20000
+dbpf $(SYS)-$(EVR):Pul1-Delay-SP 0
+dbpf $(SYS)-$(EVR):FrontOut1-Ena-SP "Enabled"
+
#dbpf $(SYS)-$(EVR):Time-I.TSE -2
### Setup IFCDAQ PVs ###