diff --git a/db/EMU.substitutions b/db/EMU.substitutions
index b94b62377345c3e5b65f16f00c3cc361946f1268..1ae43bb3d60ac741d6a8a71cd48321b6814b3157 100644
--- a/db/EMU.substitutions
+++ b/db/EMU.substitutions
@@ -293,15 +293,15 @@ file "scanDAQDetTrig.template"
"3",
- "$(DAQNDSPREFIX):CARD0-STAT",
+ "$(DAQNDSPREFIX):PBI-EM:CARD0-STAT",
"ON",
- "$(DAQNDSPREFIX):CARD0-STAT",
+ "$(DAQNDSPREFIX):PBI-EM:CARD0-STAT",
"RUNNING",
"$(DEVICE):$(SCAN_EF)-SAVE_TS",
- "$(DAQNDSPREFIX):CARD0-STAT-RB",
+ "$(DAQNDSPREFIX):PBI-EM:CARD0-STAT-RB",
"4"
}
}
@@ -334,7 +334,7 @@ file "scanDAQDet.template"
"55"
"$(DAQBUFSIZE)",
- "$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
+ "$(DAQNDSPREFIX):PBI-EM:CARD0:TriggerRepeat-RB",
"$(DAQNDSPREFIX):$(DET1WF)",
"$(DAQNDSPREFIX):$(DET1WF).NORD"
}
@@ -367,7 +367,7 @@ file "scanDAQDet.template"
"55"
"$(DAQBUFSIZE)",
- "$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
+ "$(DAQNDSPREFIX):PBI-EM:CARD0:TriggerRepeat-RB",
"$(DAQNDSPREFIX):$(DET2WF)",
"$(DAQNDSPREFIX):$(DET2WF).NORD"
}
@@ -400,7 +400,7 @@ file "scanDAQDet.template"
"55"
"$(DAQBUFSIZE)",
- "$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
+ "$(DAQNDSPREFIX):PBI-EM:CARD0:TriggerRepeat-RB",
"$(DAQNDSPREFIX):$(DET3WF)",
"$(DAQNDSPREFIX):$(DET3WF).NORD"
}
@@ -413,9 +413,9 @@ file DataAcquisitionChannel.template
{
pattern
{ SECTION, SUBSECTION, DISC, DEVICE, SIGNAL,DESCRIPTION, EVENT_IN,NELM,SIZE,SAMPLING_RATE_PV}
- {"LNS","ISRC-010","PBI-EM","FC","CurrR","Current FC",10,16000,520,LNS-ISRC-010:CARD0:SAMPLINGRATE-RB}
- {"LNS","ISRC-010","PBI-EM","HV1","VoltR","Voltage HV1 FC",11,16000,520,LNS-ISRC-010:CARD0:SAMPLINGRATE-RB}
- {"LNS","ISRC-010","PBI-EM","HV2","VoltR","Voltage HV2 FC",12,16000,520,LNS-ISRC-010:CARD0:SAMPLINGRATE-RB}
+ {"LNS","ISRC-010","PBI-EMV","FC","CurrR","Current FC",10,16000,520,LNS-ISRC-010:PBI-EM:CARD0:SAMPLINGRATE-RB}
+ {"LNS","ISRC-010","PBI-EM","HV1","VoltR","Voltage HV1 FC",11,16000,520,LNS-ISRC-010:PBI-EM:CARD0:SAMPLINGRATE-RB}
+ {"LNS","ISRC-010","PBI-EM","HV2","VoltR","Voltage HV2 FC",12,16000,520,LNS-ISRC-010:PBI-EM:CARD0:SAMPLINGRATE-RB}
}
file FastAcquisition.template
@@ -423,7 +423,7 @@ file FastAcquisition.template
pattern
{ SECTION,SUBSECTION, DISC, DEVICE, SIGNAL,NICKNAME,EVENT_OUT,CARD,CHANNEL,NELM }
- {"LNS","ISRC-010","PBI-EM","FC","CurrR","CurrR",10,0,3,16000}
+ {"LNS","ISRC-010","PBI-EMV","FC","CurrR","CurrR",10,0,3,16000}
{"LNS","ISRC-010","PBI-EM","HV1","VoltR","HV1VoltR",11,0,0,16000}
{"LNS","ISRC-010","PBI-EM","HV2","VoltR","HV2VoltR",12,0,1,16000}
}
@@ -433,7 +433,7 @@ file FastAcquisitionInformation.template
{
pattern
{ CARD,FMC,NELM,PREFIX}
- {0,2,16000,"LNS-ISRC-010"}
+ {0,2,16000,"LNS-ISRC-010:PBI-EM"}
}
@@ -467,8 +467,8 @@ pattern {DEVICE,DAQPREFIX,DET2WF,DET3WF,DET2,DET3,NELM,SCAN_EF}
file EMU_BUFF_CHAN.template
{
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)"}
+ {"$(DEVICE)","LNS-ISRC-010:PBI-EMV-FC:CurrR:AVG","DET1","CURRENT","$(BUFFERSIZE)","1000","$(SCAN_EF)","$(SCAN_SLIT)","$(MTRREC)"}
+ {"$(DEVICE)","LNS-ISRC-010:PBI-EMV:CALC-ANGLE","DET23","ANGLE","$(BUFFERSIZE)","1000","$(SCAN_EF)","$(SCAN_SLIT)","$(MTRREC)"}
}
file EMU_BUFF_POS.template
@@ -483,8 +483,8 @@ pattern {DEVICE,NELM_COMP,DET,SCAN_SLIT,MTRREC}
file ecat2el41xx.template
{
pattern {PREFIX,CH_ID, SLAVE_IDX,PDO_IDX, EOFF, ESLO, DRVL, DRVH}
- {"LNS-ISRC-010:PBI-EM","HVhor-SP", 3, 0, 0, 0.0003051850947599719, -10, 10}
- {"LNS-ISRC-010:PBI-EM","HVver-SP", 3, 2, 0, 0.0003051850947599719, -10, 10}
+ {"LNS-ISRC-010:PBI-EM","HVhor-SP", 3, 0, 0, 0.0003051850947599719, -10, 10}
+ {"LNS-ISRC-010:PBI-EM","HVver-SP", 3, 2, 0, 0.0003051850947599719, -10, 10}
{"LNS-ISRC-010:PBI-EM","BPS1-CurS", 2 ,0, 0, 0.0003051850947599719}
{"LNS-ISRC-010:PBI-EM","BPS1-VolS", 2 ,1, 0 , 0.0003051850947599719}
{"LNS-ISRC-010:PBI-EM","BPS2-CurS", 2 ,2, 0, 0.0003051850947599719}
@@ -516,19 +516,18 @@ file ecat2slave.template
file EMU_PMAC-CONSOLE.template
{
pattern {P, M, SPORT}
- {LNS-ISRC-010,PBI-EM,pmacLV}
+ {LNS-ISRC-010,PBI-EM,GEOBRICK_ASYN}
}
file EMU_PMAC-GETBO.template
{
pattern {P, M, NAME, DESC, EGU, VARIABLE, PREC, SCAN, SPORT}
- {LNS-ISRC-010,PBI-EM, VER-BRAKE, "0: brake on, 1: brake off", boolean,M33, 0, "1 second", pmacLV}
+ {LNS-ISRC-010,PBI-EM, VER-BRAKE, "0: brake on, 1: brake off", boolean,M33, 0, "1 second", GEOBRICK_ASYN}
}
file EMU_PMAC-SETBO.template
{
pattern {P, M, NAME, DESC, VAL, TIME, CALC, VARIABLE, SPORT}
- {LNS-ISRC-010,PBI-EM, VER-BRAKE, "brake", 0, 1, A, M33, pmacLV}
+ {LNS-ISRC-010,PBI-EM, VER-BRAKE, "brake", 0, 1, A, M33, GEOBRICK_ASYN}
}
-
diff --git a/db/EMU_DACQ_SYNC.template b/db/EMU_DACQ_SYNC.template
index 4fd57e9642544581f4793896cc54abd42b6b9772..ef587f1561ea5232e1baba79aa43a0c980bd0115 100644
--- a/db/EMU_DACQ_SYNC.template
+++ b/db/EMU_DACQ_SYNC.template
@@ -1,7 +1,7 @@
############################################
############### CURSOR RIGHT ###############
############################################
-record(ao, "$(PREFIX):$(DEVICE):RCURSOR_ms")
+record(ao, "$(PREFIX):$(DEVICE)V:RCURSOR_ms")
{
field(DESC,"Cursor right")
field(EGU, "ms")
@@ -10,14 +10,14 @@ record(ao, "$(PREFIX):$(DEVICE):RCURSOR_ms")
field(PREC, "2")
field(VAL, "1")
field(PINI,"YES")
- field(FLNK,"$(PREFIX):$(DEVICE):RCURSOR_FAN")
+ field(FLNK,"$(PREFIX):$(DEVICE)V:RCURSOR_FAN")
}
-record(dfanout, "$(PREFIX):$(DEVICE):RCURSOR_FAN")
+record(dfanout, "$(PREFIX):$(DEVICE)V:RCURSOR_FAN")
{
field(DESC,"Cursor right dfanout")
- field(DOL, "$(PREFIX):$(DEVICE):RCURSOR_ms")
- field(OUTA, "$(PREFIX):$(DEVICE)-$(SIGNAL1):RCURSOR_ms PP")
+ field(DOL, "$(PREFIX):$(DEVICE)V:RCURSOR_ms")
+ field(OUTA, "$(PREFIX):$(DEVICE)V-$(SIGNAL1):RCURSOR_ms PP")
field(OUTB, "$(PREFIX):$(DEVICE)-$(SIGNAL2):RCURSOR_ms PP")
field(OUTC, "$(PREFIX):$(DEVICE)-$(SIGNAL3):RCURSOR_ms PP")
field(OMSL,"closed_loop")
@@ -26,7 +26,7 @@ record(dfanout, "$(PREFIX):$(DEVICE):RCURSOR_FAN")
############################################
############### CURSOR LEFT ###############
############################################
-record(ao, "$(PREFIX):$(DEVICE):LCURSOR_ms")
+record(ao, "$(PREFIX):$(DEVICE)V:LCURSOR_ms")
{
field(DESC,"Cursor left")
field(EGU, "ms")
@@ -34,16 +34,15 @@ record(ao, "$(PREFIX):$(DEVICE):LCURSOR_ms")
field(DRVL, "0")
field(PREC, "2")
field(PREC, "2")
- field(FLNK,"$(PREFIX):$(DEVICE):LCURSOR_FAN")
+ field(FLNK,"$(PREFIX):$(DEVICE)V:LCURSOR_FAN")
}
-record(dfanout, "$(PREFIX):$(DEVICE):LCURSOR_FAN")
+record(dfanout, "$(PREFIX):$(DEVICE)V:LCURSOR_FAN")
{
field(DESC,"Cursor left dfanout")
- field(DOL, "$(PREFIX):$(DEVICE):LCURSOR_ms")
- field(OUTA, "$(PREFIX):$(DEVICE)-$(SIGNAL1):LCURSOR_ms PP")
+ field(DOL, "$(PREFIX):$(DEVICE)V:LCURSOR_ms")
+ field(OUTA, "$(PREFIX):$(DEVICE)V-$(SIGNAL1):LCURSOR_ms PP")
field(OUTB, "$(PREFIX):$(DEVICE)-$(SIGNAL2):LCURSOR_ms PP")
field(OUTC, "$(PREFIX):$(DEVICE)-$(SIGNAL3):LCURSOR_ms PP")
field(OMSL,"closed_loop")
}
-
diff --git a/opi/EMU.opi b/opi/EMU.opi
index a795ffeea2061fc66d5d35e256f860a032df8717..e22730d4d9a3faac3859ce7d06df3c47ddbd81b4 100644
--- a/opi/EMU.opi
+++ b/opi/EMU.opi
@@ -1,29 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<display typeId="org.csstudio.opibuilder.Display" version="1.0.0">
<show_close_button>true</show_close_button>
<rules />
<wuid>3f06f9b8:152877ca726:-7d52</wuid>
<show_grid>true</show_grid>
- <auto_zoom_to_fit_all>false</auto_zoom_to_fit_all>
+ <auto_zoom_to_fit_all>true</auto_zoom_to_fit_all>
<scripts />
<height>1600</height>
<macros>
<include_parent_macros>true</include_parent_macros>
- <DTACQ-NAME>LNS-ISRC-010</DTACQ-NAME>
- <DEVICE_FC>PBI-EM-FC</DEVICE_FC>
+ <DTACQ-NAME>LNS-ISRC-010:PBI-EM</DTACQ-NAME>
+ <DEVICE_FC>FC</DEVICE_FC>
<PREFIX_SIG>DACQ</PREFIX_SIG>
- <PREFIX_MTR>PMAC</PREFIX_MTR>
- <NAME_MTR>MTR1</NAME_MTR>
+ <PREFIX_MTR>LNS-ISRC-010:PBI-EM-PMAC</PREFIX_MTR>
+ <NAME_MTR>MTR</NAME_MTR>
+ <PMAC_MTR>MTR1</PMAC_MTR>
<NAME_PS>PS</NAME_PS>
<PREFIX_PS>LNS-ISRC-010:PBI-EM:HV</PREFIX_PS>
- <PREFIX_SCAN>SCAN</PREFIX_SCAN>
+ <PREFIX_SCAN>LNS-ISRC-010:PBI-EMV</PREFIX_SCAN>
<SCAN>MOTOR</SCAN>
<P>SOURCE</P>
<M>EMITTANCE-METTER</M>
<PROC>PROC</PROC>
<CALC>CALC</CALC>
- <DEVICE_HV1>PBI-EM-HV1</DEVICE_HV1>
- <DEVICE_HV2>PBI-EM-HV2</DEVICE_HV2>
+ <DEVICE_HV1>HV1</DEVICE_HV1>
+ <DEVICE_HV2>HV2</DEVICE_HV2>
</macros>
<boy_version>4.0.103.201506251634</boy_version>
<show_edit_range>true</show_edit_range>
@@ -36,7 +37,7 @@
<background_color>
<color red="240" green="240" blue="240" />
</background_color>
- <width>2510</width>
+ <width>2000</width>
<x>-1</x>
<name></name>
<grid_space>6</grid_space>
@@ -72,7 +73,7 @@
<color red="0" green="0" blue="0" />
</tab_2_foreground_color>
<tab_1_font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</tab_1_font>
<tab_2_enabled>true</tab_2_enabled>
<background_color>
@@ -92,13 +93,13 @@
</tab_0_background_color>
<widget_type>Tabbed Container</widget_type>
<tab_2_font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</tab_2_font>
<name></name>
<minimum_tab_height>10</minimum_tab_height>
<tab_2_title>PLC</tab_2_title>
<tab_0_font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</tab_0_font>
<tab_2_background_color>
<color red="255" green="255" blue="255" />
@@ -129,7 +130,7 @@
<transparent>true</transparent>
<lock_children>false</lock_children>
<scripts />
- <height>1130</height>
+ <height>1129</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -246,7 +247,7 @@ $(pv_value)</tooltip>
<color red="0" green="0" blue="0" />
</tab_2_foreground_color>
<tab_1_font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</tab_1_font>
<tab_3_title>BPS</tab_3_title>
<tab_2_enabled>true</tab_2_enabled>
@@ -259,7 +260,7 @@ $(pv_value)</tooltip>
<y>78</y>
<rules />
<tab_3_font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</tab_3_font>
<macros>
<include_parent_macros>true</include_parent_macros>
@@ -273,7 +274,7 @@ $(pv_value)</tooltip>
</tab_3_foreground_color>
<widget_type>Tabbed Container</widget_type>
<tab_2_font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</tab_2_font>
<tab_3_background_color>
<color name="Field Background Grey" red="240" green="240" blue="240" />
@@ -314,7 +315,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<lock_children>false</lock_children>
<scripts />
- <height>263</height>
+ <height>259</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -324,7 +325,7 @@ $(pv_value)</tooltip>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
- <visible>false</visible>
+ <visible>true</visible>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
@@ -374,15 +375,15 @@ $(pv_value)</tooltip>
<color name="IO Background" red="255" green="255" blue="205" />
</background_color>
<width>151</width>
- <x>19</x>
+ <x>49</x>
<name>Label Orientation_1</name>
- <y>48</y>
+ <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>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -411,7 +412,7 @@ $(pv_value)</tooltip>
<multiline_input>false</multiline_input>
<border_width>1</border_width>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM:LCURSOR_ms</pv_name>
+ <pv_name>$(DTACQ-NAME)V:LCURSOR_ms</pv_name>
<selector_type>0</selector_type>
<border_color>
<color red="0" green="128" blue="255" />
@@ -441,15 +442,15 @@ $(pv_value)</tooltip>
<color name="TextBackground" red="70" green="70" blue="70" />
</background_color>
<width>100</width>
- <x>138</x>
- <y>42</y>
+ <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" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -481,15 +482,15 @@ $(pv_value)</tooltip>
<color name="IO Background" red="255" green="255" blue="205" />
</background_color>
<width>174</width>
- <x>8</x>
+ <x>38</x>
<name>Label Orientation_2</name>
- <y>90</y>
+ <y>96</y>
<foreground_color>
<color name="IO Foreground" red="0" green="0" blue="0" />
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -501,7 +502,7 @@ $(pv_value)</tooltip>
<wuid>-1168daa3:158859bc9c3:-68d0</wuid>
<transparent>true</transparent>
<auto_size>false</auto_size>
- <text>Meaure interval</text>
+ <text>Measure interval</text>
<scripts />
<height>20</height>
<border_width>1</border_width>
@@ -520,16 +521,16 @@ $(pv_value)</tooltip>
<background_color>
<color red="255" green="255" blue="255" />
</background_color>
- <width>119</width>
- <x>128</x>
+ <width>151</width>
+ <x>142</x>
<name>Label</name>
- <y>12</y>
+ <y>18</y>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -560,16 +561,16 @@ $(pv_value)</tooltip>
<background_color>
<color red="255" green="255" blue="255" />
</background_color>
- <width>119</width>
- <x>8</x>
+ <width>151</width>
+ <x>6</x>
<name>Label_164</name>
- <y>146</y>
+ <y>138</y>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -599,7 +600,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:CARD0:MBBOSAMPLINGRATE-RB</pv_name>
+ <pv_name>LNS-ISRC-010:CARD0:SAMPLINGRATE-RB</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -613,15 +614,15 @@ $(pv_value)</tooltip>
<color red="70" green="70" blue="70" />
</background_color>
<width>100</width>
- <x>138</x>
+ <x>168</x>
<name>Text Update</name>
- <y>140</y>
+ <y>132</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>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -650,7 +651,7 @@ $(pv_value)</tooltip>
<multiline_input>false</multiline_input>
<border_width>1</border_width>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM:RCURSOR_ms</pv_name>
+ <pv_name>$(DTACQ-NAME)V:RCURSOR_ms</pv_name>
<selector_type>0</selector_type>
<border_color>
<color red="0" green="128" blue="255" />
@@ -680,15 +681,15 @@ $(pv_value)</tooltip>
<color name="TextBackground" red="70" green="70" blue="70" />
</background_color>
<width>100</width>
- <x>138</x>
- <y>84</y>
+ <x>168</x>
+ <y>90</y>
<maximum>1.7976931348623157E308</maximum>
<foreground_color>
<color name="KeyboardEntry" red="0" green="255" blue="255" />
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
</widget>
@@ -701,7 +702,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<lock_children>false</lock_children>
<scripts />
- <height>263</height>
+ <height>259</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -769,7 +770,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -826,7 +827,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -866,7 +867,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -923,7 +924,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -963,7 +964,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1020,7 +1021,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1077,7 +1078,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -1117,7 +1118,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -1157,7 +1158,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1214,7 +1215,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
</widget>
@@ -1227,7 +1228,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<lock_children>false</lock_children>
<scripts />
- <height>263</height>
+ <height>259</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -1295,7 +1296,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1324,7 +1325,7 @@ $(pv_value)</tooltip>
<multiline_input>false</multiline_input>
<border_width>1</border_width>
<visible>true</visible>
- <pv_name>PMAC:MTR1.VELO</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).VELO</pv_name>
<selector_type>0</selector_type>
<border_color>
<color red="0" green="128" blue="255" />
@@ -1362,7 +1363,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -1402,7 +1403,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1431,7 +1432,7 @@ $(pv_value)</tooltip>
<multiline_input>false</multiline_input>
<border_width>1</border_width>
<visible>true</visible>
- <pv_name>PMAC:MTR1.HVEL</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).HVEL</pv_name>
<selector_type>0</selector_type>
<border_color>
<color red="0" green="128" blue="255" />
@@ -1469,7 +1470,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -1509,7 +1510,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1538,7 +1539,7 @@ $(pv_value)</tooltip>
<multiline_input>false</multiline_input>
<border_width>1</border_width>
<visible>true</visible>
- <pv_name>PMAC:MTR1.ACCL</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).ACCL</pv_name>
<selector_type>0</selector_type>
<border_color>
<color red="0" green="128" blue="255" />
@@ -1576,7 +1577,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
@@ -1632,7 +1633,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false">
<action type="WRITE_PV">
- <pv_name>PMAC:MTR1-ACTMTR.PROC</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR)-ACTMTR.PROC</pv_name>
<value>1</value>
<timeout>10</timeout>
<confirm_message></confirm_message>
@@ -1640,7 +1641,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -1680,7 +1681,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1710,7 +1711,7 @@ $(pv_value)</tooltip>
<multiline_input>false</multiline_input>
<border_width>1</border_width>
<visible>true</visible>
- <pv_name>PMAC:MTR1.VAL</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).VAL</pv_name>
<selector_type>0</selector_type>
<border_color>
<color red="0" green="128" blue="255" />
@@ -1748,7 +1749,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
@@ -1804,7 +1805,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false">
<action type="WRITE_PV">
- <pv_name>PMAC:MTR1.SPMG</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).SPMG</pv_name>
<value>2</value>
<timeout>10</timeout>
<confirm_message></confirm_message>
@@ -1812,7 +1813,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
@@ -1858,7 +1859,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false">
<action type="WRITE_PV">
- <pv_name>PMAC:MTR1.SPMG</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).SPMG</pv_name>
<value>0</value>
<timeout>10</timeout>
<confirm_message></confirm_message>
@@ -1866,7 +1867,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.BoolSwitch" version="1.0.0">
@@ -1981,7 +1982,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="0">Small</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="0">Normal</opifont.name>
</font>
</widget>
</widget>
@@ -1994,7 +1995,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<lock_children>false</lock_children>
<scripts />
- <height>263</height>
+ <height>259</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -2004,7 +2005,7 @@ $(pv_value)</tooltip>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
- <visible>true</visible>
+ <visible>false</visible>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
@@ -2062,7 +2063,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -2102,7 +2103,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -2159,7 +2160,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -2199,7 +2200,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="0">Normal</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -2251,7 +2252,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -2303,7 +2304,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -2360,7 +2361,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
</widget>
@@ -2534,7 +2535,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
@@ -2721,7 +2722,7 @@ $(pv_value)</tooltip>
<auto_size>false</auto_size>
<text>Position</text>
<scripts />
- <height>20</height>
+ <height>25</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -2741,13 +2742,13 @@ $(pv_value)</tooltip>
<width>229</width>
<x>96</x>
<name>Label_156</name>
- <y>384</y>
+ <y>381</y>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -2787,7 +2788,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -2854,7 +2855,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-200.0</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -2894,7 +2895,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -2961,7 +2962,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
@@ -3034,7 +3035,7 @@ $(pv_value)</tooltip>
<auto_size>false</auto_size>
<text>Angle</text>
<scripts />
- <height>20</height>
+ <height>25</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -3054,13 +3055,13 @@ $(pv_value)</tooltip>
<width>229</width>
<x>96</x>
<name>Label_156</name>
- <y>588</y>
+ <y>585</y>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -3100,7 +3101,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -3167,7 +3168,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>0.0</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -3207,7 +3208,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -3274,7 +3275,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -3314,7 +3315,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -3381,7 +3382,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>0.0</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
@@ -3445,7 +3446,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
@@ -3506,7 +3507,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false">
<action type="WRITE_PV">
- <pv_name>${PREFIX_SCAN}:$(NAME_MTR).EXSC</pv_name>
+ <pv_name>${PREFIX_MTR}:$(NAME_MTR).EXSC</pv_name>
<value>1</value>
<timeout>10</timeout>
<confirm_message></confirm_message>
@@ -3514,7 +3515,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -3554,7 +3555,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -3621,7 +3622,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -3661,7 +3662,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -3728,7 +3729,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -3768,7 +3769,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -3835,7 +3836,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -3876,7 +3877,7 @@ $(pv_value)</tooltip>
<actions hook="false" hook_all="false" />
<show_scrollbar>false</show_scrollbar>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="15" style="1">Medium Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.intensityGraph" version="1.0.0">
@@ -3887,12 +3888,12 @@ $(pv_value)</tooltip>
<x_axis_show_minor_ticks>true</x_axis_show_minor_ticks>
<roi_0_w_pv_value />
<roi_0_visible>true</roi_0_visible>
- <horizon_profile_x_pv_name>SCAN:CALC-PROJ-Xabsc</horizon_profile_x_pv_name>
+ <horizon_profile_x_pv_name>$(PREFIX_SCAN):CALC-PROJ-Xabsc</horizon_profile_x_pv_name>
<height>794</height>
<border_width>1</border_width>
- <graph_area_width>1289</graph_area_width>
+ <graph_area_width>1281</graph_area_width>
<y_axis_scale_font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</y_axis_scale_font>
<roi_0_x_pv></roi_0_x_pv>
<border_color>
@@ -3911,7 +3912,7 @@ $(pv_value)</tooltip>
<crop_left>0</crop_left>
<roi_1_y_pv_value />
<x_axis_scale_font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</x_axis_scale_font>
<data_width>0</data_width>
<enabled>true</enabled>
@@ -3921,11 +3922,11 @@ $(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>734</graph_area_height>
+ <graph_area_height>733</graph_area_height>
<x_axis_visible>true</x_axis_visible>
<roi_0_y_pv_value />
<roi_1_h_pv_value />
- <vertical_profile_x_pv_name>SCAN:CALC-PROJ-Yabsc</vertical_profile_x_pv_name>
+ <vertical_profile_x_pv_name>$(PREFIX_SCAN):CALC-PROJ-Yabsc</vertical_profile_x_pv_name>
<pixel_info_pv_name></pixel_info_pv_name>
<roi_0_width_pv></roi_0_width_pv>
<x_axis_axis_color>
@@ -3940,16 +3941,16 @@ $(pv_value)</tooltip>
<width>1405</width>
<x>660</x>
<y>100</y>
- <maximum>3.0</maximum>
+ <maximum>1.0</maximum>
<data_height>0</data_height>
- <minimum>-1.0</minimum>
+ <minimum>-0.1</minimum>
<crop_right>0</crop_right>
<crop_top>0</crop_top>
<roi_color>
<color red="0" green="255" blue="255" />
</roi_color>
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
<roi_0_y_pv></roi_0_y_pv>
<rules>
@@ -4002,12 +4003,12 @@ $(pv_value)</tooltip>
</color_map>
<show_ramp>true</show_ramp>
<y_axis_axis_title>mrad</y_axis_axis_title>
- <horizon_profile_y_pv_name>SCAN:CALC-PROJ-Xwf</horizon_profile_y_pv_name>
+ <horizon_profile_y_pv_name>$(PREFIX_SCAN):CALC-PROJ-Xwf</horizon_profile_y_pv_name>
<single_line_profiling>false</single_line_profiling>
<y_axis_minimum>-80.0</y_axis_minimum>
<visible>true</visible>
<roi_1_w_pv_value />
- <vertical_profile_y_pv_name>SCAN:CALC-PROJ-Ywf</vertical_profile_y_pv_name>
+ <vertical_profile_y_pv_name>$(PREFIX_SCAN):CALC-PROJ-Ywf</vertical_profile_y_pv_name>
<x_axis_major_tick_step_hint>50</x_axis_major_tick_step_hint>
<pv_name>$(PREFIX_SCAN):BUFF-CURRENT</pv_name>
<roi_0_height_pv></roi_0_height_pv>
@@ -4158,7 +4159,7 @@ $(pv_value)</tooltip>
<actions hook="false" hook_all="false" />
<show_scrollbar>false</show_scrollbar>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="15" style="1">Medium Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
@@ -4463,7 +4464,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -4520,7 +4521,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -4560,7 +4561,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -4617,7 +4618,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -4629,7 +4630,7 @@ $(pv_value)</tooltip>
<wuid>79429b6c:157dd491a6d:-7dd7</wuid>
<transparent>true</transparent>
<auto_size>false</auto_size>
- <text>Angle STEP in course ...</text>
+ <text>Angle STEP ...</text>
<scripts />
<height>20</height>
<border_width>2</border_width>
@@ -4657,7 +4658,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -4714,7 +4715,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -4783,7 +4784,7 @@ $(pv_value)</tooltip>
<wuid>-16429ab9:1582e68df9a:-3c09</wuid>
<transparent>true</transparent>
<auto_size>false</auto_size>
- <text>Position STEP in course ...</text>
+ <text>Pos STEP ...</text>
<scripts />
<height>20</height>
<border_width>2</border_width>
@@ -4811,7 +4812,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
@@ -4840,7 +4841,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>PMAC:MTR1.MSTA</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).MSTA</pv_name>
<border_color>
<color name="IO Border" red="215" green="215" blue="215" />
</border_color>
@@ -4905,7 +4906,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -4936,7 +4937,7 @@ $(pv_value)</tooltip>
<background_color>
<color red="255" green="255" blue="255" />
</background_color>
- <width>83</width>
+ <width>93</width>
<x>52</x>
<name>Label_164</name>
<y>478</y>
@@ -4945,7 +4946,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
@@ -4974,7 +4975,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>PMAC:MTR1.MSTA</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).MSTA</pv_name>
<border_color>
<color name="IO Border" red="215" green="215" blue="215" />
</border_color>
@@ -5028,7 +5029,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>PMAC:MTR1.MOVN</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).MOVN</pv_name>
<border_color>
<color name="IO Border" red="215" green="215" blue="215" />
</border_color>
@@ -5084,8 +5085,8 @@ $(pv_value)</tooltip>
<background_color>
<color red="255" green="255" blue="255" />
</background_color>
- <width>133</width>
- <x>30</x>
+ <width>151</width>
+ <x>25</x>
<name>Label_164</name>
<y>334</y>
<foreground_color>
@@ -5093,7 +5094,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -5112,7 +5113,7 @@ $(pv_value)</tooltip>
<multiline_input>false</multiline_input>
<border_width>1</border_width>
<visible>true</visible>
- <pv_name>PMAC:MTR1.RBV</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).RBV</pv_name>
<selector_type>0</selector_type>
<border_color>
<color red="0" green="128" blue="255" />
@@ -5190,7 +5191,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
@@ -5219,7 +5220,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>PMAC:MTR1.MSTA</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).MSTA</pv_name>
<border_color>
<color name="IO Border" red="215" green="215" blue="215" />
</border_color>
@@ -5275,7 +5276,7 @@ $(pv_value)</tooltip>
<background_color>
<color red="255" green="255" blue="255" />
</background_color>
- <width>110</width>
+ <width>125</width>
<x>38</x>
<name>Label_164</name>
<y>370</y>
@@ -5284,7 +5285,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -5324,7 +5325,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
@@ -5477,7 +5478,7 @@ $(pv_value)</tooltip>
<background_color>
<color red="255" green="255" blue="255" />
</background_color>
- <width>110</width>
+ <width>125</width>
<x>38</x>
<name>Label_164</name>
<y>406</y>
@@ -5486,7 +5487,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
@@ -5515,7 +5516,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>PMAC:MTR1.MSTA</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).MSTA</pv_name>
<border_color>
<color name="IO Border" red="215" green="215" blue="215" />
</border_color>
@@ -5559,7 +5560,7 @@ $(pv_value)</tooltip>
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv trig="true">PMAC:MTR1.MOVN</pv>
+ <pv trig="true">$(PREFIX_MTR):$(PMAC_MTR).MOVN</pv>
</rule>
</rules>
<enabled>true</enabled>
@@ -5580,7 +5581,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>PMAC:MTR1.MOVN</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).MOVN</pv_name>
<gradient>false</gradient>
<border_color>
<color name="Major" red="255" green="0" blue="0" />
@@ -5648,7 +5649,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
@@ -5745,7 +5746,7 @@ $(pv_value)</tooltip>
<actions hook="false" hook_all="false" />
<show_scrollbar>false</show_scrollbar>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="15" style="1">Medium Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
@@ -5823,7 +5824,7 @@ $(pv_value)</tooltip>
<multiline_input>false</multiline_input>
<border_width>1</border_width>
<visible>true</visible>
- <pv_name>$(PREFIX_MTR):$(NAME_MTR).RBV</pv_name>
+ <pv_name>$(PREFIX_MTR):$(PMAC_MTR).RBV</pv_name>
<selector_type>0</selector_type>
<border_color>
<color red="0" green="128" blue="255" />
@@ -5853,7 +5854,7 @@ $(pv_value)</tooltip>
<color name="TextBackground" red="70" green="70" blue="70" />
</background_color>
<width>100</width>
- <x>1230</x>
+ <x>1205</x>
<y>876</y>
<maximum>1.7976931348623157E308</maximum>
<foreground_color>
@@ -5861,7 +5862,7 @@ $(pv_value)</tooltip>
</foreground_color>
<minimum>-1.7976931348623157E308</minimum>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -5876,7 +5877,7 @@ $(pv_value)</tooltip>
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv trig="true">PMAC:MTR1.MOVN</pv>
+ <pv trig="true">$(PREFIX_MTR):$(PMAC_MTR).MOVN</pv>
</rule>
</rules>
<enabled>false</enabled>
@@ -5903,7 +5904,7 @@ $(pv_value)</tooltip>
<color red="255" green="255" blue="255" />
</background_color>
<width>181</width>
- <x>1032</x>
+ <x>1020</x>
<name>Label</name>
<y>877</y>
<foreground_color>
@@ -5911,7 +5912,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.xyGraph" version="1.0.0">
@@ -5949,7 +5950,7 @@ $(trace_0_y_pv_value)</tooltip>
<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>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_0_scale_font>
<trigger_pv></trigger_pv>
<widget_type>XY Graph</widget_type>
@@ -6022,7 +6023,7 @@ $(trace_0_y_pv_value)</tooltip>
<enabled>true</enabled>
<trace_0_x_pv>$(PREFIX_SCAN):$(CALC)-PROJ-Xabsc</trace_0_x_pv>
<axis_1_scale_font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_1_scale_font>
<axis_1_time_format>0</axis_1_time_format>
<border_alarm_sensitive>false</border_alarm_sensitive>
@@ -6031,7 +6032,7 @@ $(trace_0_y_pv_value)</tooltip>
<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>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</title_font>
<trace_0_y_pv_value />
<trace_1_visible>true</trace_1_visible>
@@ -6085,7 +6086,7 @@ $(trace_0_y_pv_value)</tooltip>
<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>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_0_scale_font>
<trigger_pv></trigger_pv>
<widget_type>XY Graph</widget_type>
@@ -6145,7 +6146,7 @@ $(trace_0_y_pv_value)</tooltip>
<enabled>true</enabled>
<trace_0_x_pv>$(PREFIX_SCAN):$(CALC)-PROJ-Ywf</trace_0_x_pv>
<axis_1_scale_font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_1_scale_font>
<axis_1_time_format>0</axis_1_time_format>
<border_alarm_sensitive>false</border_alarm_sensitive>
@@ -6252,7 +6253,7 @@ $(trace_0_y_pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -6292,7 +6293,7 @@ $(trace_0_y_pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -6344,7 +6345,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -6384,7 +6385,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -6436,7 +6437,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -6488,7 +6489,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -6528,7 +6529,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -6580,7 +6581,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -6620,7 +6621,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -6660,7 +6661,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -6712,7 +6713,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -6752,7 +6753,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -6804,7 +6805,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.tab" version="1.0.0">
@@ -6841,7 +6842,7 @@ $(pv_value)</tooltip>
<name>Tabbed Container_2</name>
<minimum_tab_height>10</minimum_tab_height>
<tab_0_font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</tab_0_font>
<tab_0_title>PLC-STATUS</tab_0_title>
<scripts />
@@ -6865,7 +6866,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<lock_children>false</lock_children>
<scripts />
- <height>281</height>
+ <height>277</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -6991,7 +6992,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -7043,7 +7044,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
@@ -7095,7 +7096,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
@@ -7159,7 +7160,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
@@ -7329,7 +7330,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -7369,7 +7370,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
@@ -7463,7 +7464,7 @@ $(pv_value)</tooltip>
<value>false</value>
</exp>
<pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
- <pv trig="true">${PREFIX_SCAN}:$(PS).BUSY</pv>
+ <pv trig="true">${PREFIX_SCAN}:$(NAME_PS).BUSY</pv>
</rule>
</rules>
<enabled>true</enabled>
@@ -7476,11 +7477,11 @@ $(pv_value)</tooltip>
<pv trig="false">${PREFIX_SCAN}:$(NAME_PS).NPTS</pv>
<pv trig="false">${PREFIX_SCAN}:$(NAME_MTR).NPTS</pv>
<pv trig="false">${PREFIX_SCAN}:${CALC}-Energy-SP</pv>
- <pv trig="false">LNS-ISRC-010:CARD0:MBBOSAMPLINGRATE-RB</pv>
+ <pv trig="false">$(DTACQ-NAME):CARD0:SAMPLINGRATE-RB</pv>
<pv trig="false">${PREFIX_SCAN}:$(NAME_MTR).P4SI</pv>
<pv trig="false">$(PREFIX_SCAN):BUFF-CURRENT</pv>
<pv trig="false">$(PREFIX_SCAN):BUFF-ANGLE</pv>
- <pv trig="false">$(PREFIX_SCAN):BUFF-POS</pv>
+ <pv trig="false">$(PREFIX_SCAN):BUFF-MTR-POS</pv>
</path>
</scripts>
<border_alarm_sensitive>false</border_alarm_sensitive>
@@ -7520,7 +7521,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
</widget>
@@ -7533,7 +7534,7 @@ $(pv_value)</tooltip>
<transparent>true</transparent>
<lock_children>false</lock_children>
<scripts />
- <height>1130</height>
+ <height>1129</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -7752,12 +7753,12 @@ $(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>$(DTACQ-NAME):$(DEVICE_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>
<axis_0_title_font>
- <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_0_title_font>
<trace_2_update_mode>0</trace_2_update_mode>
<background_color>
@@ -7770,7 +7771,7 @@ $(trace_0_y_pv_value)</tooltip>
<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_4_x_pv>$(DTACQ-NAME)-$(DEVICE_HV1):VoltR:RCURSOR_X</trace_4_x_pv>
<trace_3_y_pv_value />
<trace_1_point_size>4</trace_1_point_size>
<trace_1_anti_alias>false</trace_1_anti_alias>
@@ -7782,7 +7783,7 @@ $(trace_0_y_pv_value)</tooltip>
<trace_2_buffer_size>520</trace_2_buffer_size>
<axis_1_maximum>10.0</axis_1_maximum>
<axis_0_scale_font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_0_scale_font>
<trigger_pv></trigger_pv>
<trace_4_update_delay>1</trace_4_update_delay>
@@ -7827,7 +7828,7 @@ $(trace_0_y_pv_value)</tooltip>
<axis_0_time_format>0</axis_0_time_format>
<trace_count>5</trace_count>
<axis_1_show_grid>true</axis_1_show_grid>
- <trace_3_x_pv>$(DTACQ-NAME):$(DEVICE_HV1):VoltR:LCURSOR_X</trace_3_x_pv>
+ <trace_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>
@@ -7845,7 +7846,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>$(DTACQ-NAME):$(DEVICE_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 />
@@ -7896,7 +7897,7 @@ $(trace_0_y_pv_value)</tooltip>
<axis_1_auto_scale>false</axis_1_auto_scale>
<trace_1_line_width>1</trace_1_line_width>
<trace_3_trace_type>1</trace_3_trace_type>
- <trace_2_y_pv>$(DTACQ-NAME):$(DEVICE_HV2):VoltR_Y</trace_2_y_pv>
+ <trace_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" />
@@ -7905,14 +7906,14 @@ $(trace_0_y_pv_value)</tooltip>
<opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
</axis_2_title_font>
<trace_3_point_style>0</trace_3_point_style>
- <trace_0_y_pv>$(DTACQ-NAME):$(DEVICE_FC):CurrR_Y</trace_0_y_pv>
+ <trace_0_y_pv>$(DTACQ-NAME)V-$(DEVICE_FC):CurrR_Y</trace_0_y_pv>
<trace_2_point_style>2</trace_2_point_style>
<trace_0_plot_mode>0</trace_0_plot_mode>
<trace_4_trace_type>1</trace_4_trace_type>
<enabled>true</enabled>
- <trace_0_x_pv>$(DTACQ-NAME):$(DEVICE_FC):CurrR_XMS</trace_0_x_pv>
+ <trace_0_x_pv>$(DTACQ-NAME)V-$(DEVICE_FC):CurrR_XMS</trace_0_x_pv>
<axis_1_scale_font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_1_scale_font>
<axis_1_time_format>0</axis_1_time_format>
<axis_2_time_format>0</axis_2_time_format>
@@ -7925,7 +7926,7 @@ $(trace_0_y_pv_value)</tooltip>
<trace_1_x_pv_value />
<axis_1_minimum>-10.0</axis_1_minimum>
<title_font>
- <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</title_font>
<trace_4_anti_alias>false</trace_4_anti_alias>
<trace_0_y_pv_value />
@@ -7935,7 +7936,7 @@ $(trace_0_y_pv_value)</tooltip>
</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>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_1_title_font>
<visible>true</visible>
<axis_2_axis_title>ms</axis_2_axis_title>
@@ -7956,7 +7957,7 @@ $(trace_0_y_pv_value)</tooltip>
<axis_1_auto_scale_threshold>0.0</axis_1_auto_scale_threshold>
<trace_4_y_axis_index>1</trace_4_y_axis_index>
<trace_2_plot_mode>0</trace_2_plot_mode>
- <trace_2_x_pv>$(DTACQ-NAME):$(DEVICE_HV2):VoltR_XMS</trace_2_x_pv>
+ <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>
@@ -8342,7 +8343,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>$(DTACQ-NAME):$(DEVICE_FC):CurrR:AVG</pv_name>
+ <pv_name>$(DTACQ-NAME)V-$(DEVICE_FC):CurrR:AVG</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -8385,7 +8386,7 @@ $(pv_value)</tooltip>
<rotation_angle>0.0</rotation_angle>
<scripts />
<border_alarm_sensitive>false</border_alarm_sensitive>
- <show_units>true</show_units>
+ <show_units>false</show_units>
<height>24</height>
<border_width>1</border_width>
<scale_options>
@@ -8394,7 +8395,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>$(DTACQ-NAME):$(DEVICE_FC):CurrR:MAX</pv_name>
+ <pv_name>$(DTACQ-NAME)V-$(DEVICE_FC):CurrR:MAX</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -8437,7 +8438,7 @@ $(pv_value)</tooltip>
<rotation_angle>0.0</rotation_angle>
<scripts />
<border_alarm_sensitive>false</border_alarm_sensitive>
- <show_units>true</show_units>
+ <show_units>false</show_units>
<height>24</height>
<border_width>1</border_width>
<scale_options>
@@ -8446,7 +8447,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>$(DTACQ-NAME):$(DEVICE_FC):CurrR:MIN</pv_name>
+ <pv_name>$(DTACQ-NAME)V-$(DEVICE_FC):CurrR:MIN</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -8566,7 +8567,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -8606,7 +8607,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -8646,7 +8647,7 @@ $(pv_value)</tooltip>
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
- <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -8747,7 +8748,7 @@ $(pv_value)</tooltip>
<actions hook="false" hook_all="false" />
<minimum>0.0</minimum>
<font>
- <fontdata fontName="Open Sans" height="10" style="0" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.spinner" version="1.0.0">
@@ -8808,7 +8809,7 @@ $(pv_value)</tooltip>
<actions hook="false" hook_all="false" />
<minimum>1.0</minimum>
<font>
- <fontdata fontName="Open Sans" height="10" style="0" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.spinner" version="1.0.0">
@@ -8842,7 +8843,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM:RCURSOR_ms</pv_name>
+ <pv_name>$(DTACQ-NAME)V:RCURSOR_ms</pv_name>
<vertical_alignment>1</vertical_alignment>
<format>0</format>
<horizontal_buttons_layout>false</horizontal_buttons_layout>
@@ -8869,7 +8870,7 @@ $(pv_value)</tooltip>
<actions hook="false" hook_all="false" />
<minimum>-100.0</minimum>
<font>
- <fontdata fontName="Open Sans" height="10" style="0" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -8939,7 +8940,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>$(DTACQ-NAME):$(DEVICE_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" />
@@ -8991,7 +8992,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>$(DTACQ-NAME):$(DEVICE_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" />
@@ -9043,7 +9044,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>$(DTACQ-NAME):$(DEVICE_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" />
@@ -9135,7 +9136,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>$(DTACQ-NAME):$(DEVICE_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" />
@@ -9187,7 +9188,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>$(DTACQ-NAME):$(DEVICE_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" />
@@ -9239,7 +9240,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>$(DTACQ-NAME):$(DEVICE_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" />
@@ -9302,7 +9303,7 @@ $(pv_value)</tooltip>
<actions hook="false" hook_all="false" />
<show_scrollbar>false</show_scrollbar>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="15" style="1">Medium Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -9343,7 +9344,7 @@ $(pv_value)</tooltip>
<actions hook="false" hook_all="false" />
<show_scrollbar>false</show_scrollbar>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="15" style="1">Medium Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -9384,7 +9385,7 @@ $(pv_value)</tooltip>
<actions hook="false" hook_all="false" />
<show_scrollbar>false</show_scrollbar>
<font>
- <fontdata fontName="Sans" height="10" style="1" />
+ <opifont.name fontName="OpenSans" height="15" style="1">Medium Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.spinner" version="1.0.0">
@@ -9418,7 +9419,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>LNS-ISRC-010:PBI-EM:LCURSOR_ms</pv_name>
+ <pv_name>$(DTACQ-NAME)V:LCURSOR_ms</pv_name>
<vertical_alignment>1</vertical_alignment>
<format>0</format>
<horizontal_buttons_layout>false</horizontal_buttons_layout>
@@ -9445,7 +9446,7 @@ $(pv_value)</tooltip>
<actions hook="false" hook_all="false" />
<minimum>-100.0</minimum>
<font>
- <fontdata fontName="Open Sans" height="10" style="0" />
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.xyGraph" version="1.0.0">
@@ -9468,12 +9469,12 @@ $(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>$(DTACQ-NAME):$(DEVICE_HV1):VoltR_XMS</trace_1_x_pv>
+ <trace_1_x_pv>$(DTACQ-NAME)-$(DEVICE_HV1):VoltR_XMS</trace_1_x_pv>
<wuid>-61dcfd6b:158bac54bbd:-7d05</wuid>
<transparent>false</transparent>
<trace_1_update_mode>0</trace_1_update_mode>
<axis_0_title_font>
- <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_0_title_font>
<trace_2_update_mode>0</trace_2_update_mode>
<background_color>
@@ -9486,7 +9487,7 @@ $(trace_0_y_pv_value)</tooltip>
<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_4_x_pv>$(DTACQ-NAME)-$(DEVICE_HV1):VoltR:RCURSOR_X</trace_4_x_pv>
<trace_3_y_pv_value />
<trace_1_point_size>4</trace_1_point_size>
<trace_1_anti_alias>false</trace_1_anti_alias>
@@ -9498,7 +9499,7 @@ $(trace_0_y_pv_value)</tooltip>
<trace_2_buffer_size>520</trace_2_buffer_size>
<axis_1_maximum>8.0</axis_1_maximum>
<axis_0_scale_font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_0_scale_font>
<trigger_pv></trigger_pv>
<trace_4_update_delay>1</trace_4_update_delay>
@@ -9543,7 +9544,7 @@ $(trace_0_y_pv_value)</tooltip>
<axis_0_time_format>0</axis_0_time_format>
<trace_count>5</trace_count>
<axis_1_show_grid>true</axis_1_show_grid>
- <trace_3_x_pv>$(DTACQ-NAME):$(DEVICE_HV1):VoltR:LCURSOR_X</trace_3_x_pv>
+ <trace_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>
@@ -9561,7 +9562,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>$(DTACQ-NAME):$(DEVICE_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 />
@@ -9612,7 +9613,7 @@ $(trace_0_y_pv_value)</tooltip>
<axis_1_auto_scale>false</axis_1_auto_scale>
<trace_1_line_width>1</trace_1_line_width>
<trace_3_trace_type>1</trace_3_trace_type>
- <trace_2_y_pv>$(DTACQ-NAME):$(DEVICE_HV2):VoltR_Y</trace_2_y_pv>
+ <trace_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" />
@@ -9621,14 +9622,14 @@ $(trace_0_y_pv_value)</tooltip>
<opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
</axis_2_title_font>
<trace_3_point_style>0</trace_3_point_style>
- <trace_0_y_pv>$(DTACQ-NAME):$(DEVICE_FC):CurrR_Y</trace_0_y_pv>
+ <trace_0_y_pv>$(DTACQ-NAME)V-$(DEVICE_FC):CurrR_Y</trace_0_y_pv>
<trace_2_point_style>2</trace_2_point_style>
<trace_0_plot_mode>0</trace_0_plot_mode>
<trace_4_trace_type>1</trace_4_trace_type>
<enabled>true</enabled>
- <trace_0_x_pv>$(DTACQ-NAME):$(DEVICE_FC):CurrR_XMS</trace_0_x_pv>
+ <trace_0_x_pv>$(DTACQ-NAME)V-$(DEVICE_FC):CurrR_XMS</trace_0_x_pv>
<axis_1_scale_font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_1_scale_font>
<axis_1_time_format>0</axis_1_time_format>
<axis_2_time_format>0</axis_2_time_format>
@@ -9651,7 +9652,7 @@ $(trace_0_y_pv_value)</tooltip>
</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>
+ <opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</axis_1_title_font>
<visible>true</visible>
<axis_2_axis_title>ms</axis_2_axis_title>
@@ -9672,7 +9673,7 @@ $(trace_0_y_pv_value)</tooltip>
<axis_1_auto_scale_threshold>0.0</axis_1_auto_scale_threshold>
<trace_4_y_axis_index>1</trace_4_y_axis_index>
<trace_2_plot_mode>0</trace_2_plot_mode>
- <trace_2_x_pv>$(DTACQ-NAME):$(DEVICE_HV2):VoltR_XMS</trace_2_x_pv>
+ <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>
@@ -9687,7 +9688,7 @@ $(trace_0_y_pv_value)</tooltip>
<transparent>true</transparent>
<lock_children>false</lock_children>
<scripts />
- <height>1130</height>
+ <height>1129</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
@@ -9803,7 +9804,7 @@ $(trace_0_y_pv_value)</tooltip>
<widget_type>Action Button</widget_type>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
<background_color>
- <color red="211" green="215" blue="207" />
+ <color name="Container Border Grey" red="150" green="150" blue="150" />
</background_color>
<width>360</width>
<x>12</x>
@@ -9823,7 +9824,7 @@ $(trace_0_y_pv_value)</tooltip>
</action>
</actions>
<font>
- <fontdata fontName="Monospace" height="19" style="1" />
+ <opifont.name fontName="OpenSans" height="15" style="1">Medium Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
@@ -9866,7 +9867,7 @@ $(trace_0_y_pv_value)</tooltip>
<widget_type>Action Button</widget_type>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
<background_color>
- <color red="211" green="215" blue="207" />
+ <color name="Container Border Grey" red="150" green="150" blue="150" />
</background_color>
<width>360</width>
<x>12</x>
@@ -9886,7 +9887,7 @@ $(trace_0_y_pv_value)</tooltip>
</action>
</actions>
<font>
- <fontdata fontName="Monospace" height="18" style="1" />
+ <opifont.name fontName="OpenSans" height="15" style="1">Medium Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
@@ -9919,7 +9920,7 @@ $(trace_0_y_pv_value)</tooltip>
<widget_type>Action Button</widget_type>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
<background_color>
- <color red="211" green="215" blue="207" />
+ <color name="Container Border Grey" red="150" green="150" blue="150" />
</background_color>
<width>360</width>
<x>12</x>
@@ -9939,7 +9940,7 @@ $(trace_0_y_pv_value)</tooltip>
</action>
</actions>
<font>
- <fontdata fontName="Monospace" height="18" style="1" />
+ <opifont.name fontName="OpenSans" height="15" style="1">Medium Bold</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
@@ -9972,7 +9973,7 @@ $(trace_0_y_pv_value)</tooltip>
<widget_type>Action Button</widget_type>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
<background_color>
- <color red="211" green="215" blue="207" />
+ <color name="Container Border Grey" red="150" green="150" blue="150" />
</background_color>
<width>360</width>
<x>12</x>
@@ -9992,7 +9993,7 @@ $(trace_0_y_pv_value)</tooltip>
</action>
</actions>
<font>
- <fontdata fontName="Monospace" height="18" style="1" />
+ <opifont.name fontName="OpenSans" height="15" style="1">Medium Bold</opifont.name>
</font>
</widget>
</widget>
diff --git a/opi/ExtracData.py b/opi/ExtracData.py
index 33f0015507948701798826e30302393e4a2329cc..73e4649136e7bb01ebb7f1565b8b55c05d88d54d 100644
--- a/opi/ExtracData.py
+++ b/opi/ExtracData.py
@@ -47,7 +47,7 @@ tabPos=PVUtil.getDoubleArray(pvs[8])
###################################################################################
#### OPEN FILE
-PlotFile = open('C:\\temp/'+NameFile, 'w+')
+PlotFile = open('/home/catane/data/'+NameFile, 'w+')
PlotFile.write("fichier emittance: X\n")
PlotFile.write("HT ion (kV) : %d\n"%(Energie))
PlotFile.write("frequence (Hz) : %d\n"%(Frequence))
@@ -90,20 +90,21 @@ PlotFile.close()
###################################################################################
#### OPEN FILE
-PlotFile = open('C:\\temp/'+NameFile+"-avg.txt", 'w+')
+#PlotFile = open('/home/catane/data/'+NameFile+"-avg.txt", 'w+')
## POSITION/ANGLE/INTENSITY
-indTab=NbPos-1
-indPos=NbPos-1
+#indTab=NbPos-1
+#indPos=NbPos-1
-for valuePos in tabPos:
- for valueAngle in range(0,NbAngle):
+##for valuePos in tabPos:
+# for valueAngle in range(0,NbAngle):
#PlotFile.write("0\t%d\t%d\t%d\n" %(valuePos[indPos],valueAngle[indAngle],tabCurr[indCurrent]));
- PlotFile.write("%d\t%d\t%d\n" %(valuePos,tabAng[indTab],tabCurr[indTab]));
+# PlotFile.write("%d\t%d\t%d\n" %(valuePos,tabAng[indTab],tabCurr[indTab]));
+
#indCurrent=indCurrent+NbPos
- indTab=indTab+NbPos
- indPos=indPos-1
+## indTab=indTab+NbPos
+# indPos=indPos-1
#indCurrent=indPos
- indTab=indPos
+# indTab=indPos
-PlotFile.close()
+#PlotFile.close()
\ No newline at end of file
diff --git a/startup/EMU.cmd b/startup/EMU.cmd
index 4ea58b22532aa641db50e70b7d8f7b052da91a9e..d40f46f6e8796cc83b4a064cb4295d10ac896286 100644
--- a/startup/EMU.cmd
+++ b/startup/EMU.cmd
@@ -13,8 +13,8 @@ require tpmac,3.11.2
### MACROS ###
# PMAC common macros3 )
-epicsEnvSet("PMACPREFIX", "PMAC")
-epicsEnvSet("PMACPORT", "pmacLV")
+epicsEnvSet("PMACPREFIX", "LNS-ISRC-010:PBI-EM-PMAC")
+epicsEnvSet("PMACPORT", "GEOBRICK_ASYN")
epicsEnvSet("MOTOR_PORT", "pmac1" )
epicsEnvSet("NB_AXES", "1" )
@@ -25,7 +25,7 @@ epicsEnvSet("MRES", "0.000249515")
epicsEnvSet("PREC", "4" )
epicsEnvSet("DHLM", "4" )
epicsEnvSet("DLLM", "-200" )
-epicsEnvSet("VELO", "3" )
+epicsEnvSet("VELO", "1.5" )
epicsEnvSet("HVEL", "2" )
epicsEnvSet("VBAS", "0.1" )
epicsEnvSet("VMAX", "7" )
@@ -69,7 +69,7 @@ epicsEnvSet("DAQBUFSIZE", "1024" )
epicsEnvSet("BUFFERSIZE", "20000" )
#Scanning macros
-epicsEnvSet("SCANPREFIX", "SCAN" )
+epicsEnvSet("SCANPREFIX", "LNS-ISRC-010:PBI-EMV" )
epicsEnvSet("SCAN_SLIT", "MTR" )
epicsEnvSet("SCAN_EF", "PS" )
epicsEnvSet("SCAN_POINTS_EF", "1000" )
@@ -112,6 +112,10 @@ dbLoadRecords("evr-pulserMap.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PU
dbLoadRecords("motor.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1),MOTOR_PORT=$(MOTOR_PORT),AXIS_NO=$(AXIS_NO1),EGU=$(EGU),DIR=$(DIR),MRES=$(MRES),PREC=$(PREC),DHLM=$(DHLM),DLLM=$(DLLM),HVEL=$(HVEL),VELO=$(VELO),VBAS=$(VBAS),VMAX=$(VMAX),ACCL=$(ACCL),BDST=$(BDST),INIT=$(INIT),OFF=$(OFF)")
+#dbLoadRecords("get_value_pmac.db")
+#dbLoadRecords("set_value_pmac.db")
+#dbLoadRecords("console.db")
+
#
# Motor status
#
@@ -124,7 +128,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,BUFFERSIZE=$(BUFFERSIZE)")
+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-EMV-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
@@ -147,21 +151,22 @@ seq homeMtrAuto "PMACPREFIX=$(PMACPREFIX),MOTOR_NAME1=$(MOTOR_NAME1),DEVICE=$(SC
# SET INTERFACE FROM IFCDAQ TO Allison scanner
# Forward link wf record to Detector guard
-dbpf $(DAQPREFIX):PBI-EM-FC:CurrR_Y.FLNK $(SCANPREFIX):DET1-GUARD
+dbpf $(DAQPREFIX):PBI-EMV-FC:CurrR_Y.FLNK $(SCANPREFIX):DET1-GUARD
dbpf $(DAQPREFIX):PBI-EM-HV1:VoltR_Y.FLNK $(SCANPREFIX):DET2-GUARD
dbpf $(DAQPREFIX):PBI-EM-HV2:VoltR_Y.FLNK $(SCANPREFIX):DET3-GUARD
# Forward link from state record to Detector trigger
-dbpf $(DAQPREFIX):CARD0-STAT-RB.FLNK $(SCANPREFIX):DAQTRG-DAQSTGUARD
+dbpf $(DAQPREFIX):PBI-EM:CARD0-STAT-RB.FLNK $(SCANPREFIX):DAQTRG-DAQSTGUARD
# Forward link number of samples rbv to compress N record, so that detetor know number of elements to average over.
-dbpf $(DAQPREFIX):CARD0:NSAMPLES-RB.FLNK "$(SCANPREFIX):DET1-COMPRESSN"
+dbpf $(DAQPREFIX):PBI-EM:CARD0:NSAMPLES-RB.FLNK "$(SCANPREFIX):DET1-COMPRESSN"
# Set tsel on WF record to event record in EVR
-dbpf $(DAQPREFIX):PBI-EM-FC:CurrR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
+dbpf $(DAQPREFIX):PBI-EMV-FC:CurrR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
dbpf $(DAQPREFIX):PBI-EM-HV1:VoltR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
dbpf $(DAQPREFIX):PBI-EM-HV2:VoltR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
+dbpf $(SYS)-$(EVR):Time-I.TSE -2
############################################################
################### Configuration Timing ###################
@@ -176,6 +181,8 @@ dbpf $(DAQPREFIX):PBI-EM-HV2:VoltR_Y.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-
### Setup EVR
##set the pulser 0 to trigger on output 0
########## TIMING RECEIVER: setup OUT0 ##############
+
+dbpf $(SYS)-$(EVR):Link-Clk-SP 88.0519
dbpf $(SYS)-$(EVR):FrontOut0-Src-SP 0
dbpf $(SYS)-$(EVR):Pul0-Evt-Trig0-SP $(EVR_PUL0_EVENT)
dbpf $(SYS)-$(EVR):Pul0-Width-SP 20000
@@ -191,21 +198,19 @@ dbpf $(SYS)-$(EVR):FrontOut0-Ena-SP "Enabled"
#####NOT NEEDED AT CATANIA dbpf $(SYS)-$(EVR):Pul1-Delay-SP 0
#####NOT NEEDED AT CATANIA dbpf $(SYS)-$(EVR):FrontOut1-Ena-SP "Enabled"
-#dbpf $(SYS)-$(EVR):Time-I.TSE -2
-
### Setup IFCDAQ PVs ###
# Set trigger repeat to 1
-dbpf $(DAQPREFIX):CARD0:TriggerRepeat 1
+dbpf $(DAQPREFIX):PBI-EM:CARD0:TriggerRepeat 1
# Set trigger source to external GPIO
-dbpf $(DAQPREFIX):CARD0:TRIGGERSOURCE "EXT-GPIO"
+dbpf $(DAQPREFIX):PBI-EM:CARD0:TRIGGERSOURCE "EXT-GPIO"
sleep(1)
-dbpf $(DAQPREFIX):CARD0-STAT ON
+dbpf $(DAQPREFIX):PBI-EM:CARD0-STAT ON
sleep(3)
-dbpf $(DAQPREFIX):CARD0-STAT RUNNING
+dbpf $(DAQPREFIX):PBI-EM:CARD0-STAT RUNNING
sleep(1)
-dbpf $(DAQPREFIX):CARD0-STAT RUNNING
+dbpf $(DAQPREFIX):PBI-EM:CARD0-STAT RUNNING
# Set the Frequency to 1MHz
-dbpf $(DAQPREFIX):CARD0:SAMPLINGRATE 1000000
+dbpf $(DAQPREFIX):PBI-EM:CARD0:SAMPLINGRATE 1000000
### Setup reasonable values for sscan record ###
# Initialize Motor positioners
@@ -218,14 +223,13 @@ dbpf $(SCANPREFIX):$(SCAN_SLIT).P1EP 4
dbpf $(SCANPREFIX):$(SCAN_SLIT).NPTS 11
# Initialize Power supply positioners
-dbpf SCAN:PROC-AngleMax-SP 80
-dbpf SCAN:PROC-AngleMin-SP -80
+dbpf $(SCANPREFIX):PROC-AngleMax-SP 80
+dbpf $(SCANPREFIX):PROC-AngleMin-SP -80
dbpf $(SCANPREFIX):$(SCAN_EF).NPTS 200
dbpf $(SCANPREFIX):$(SCAN_EF).PDLY 0.02
dbpf $(SCANPREFIX):$(SCAN_EF).DDLY 0.01
-dbpf $(DAQPREFIX):CARD0:TriggerEdge 1
-dbpf $(DAQPREFIX):CARD0:NSAMPLES_ms 7
-dbpf $(DAQPREFIX):PBI-EM:LCURSOR_ms 2
-dbpf $(DAQPREFIX):PBI-EM:RCURSOR_ms 6
-
+dbpf $(DAQPREFIX):PBI-EM:CARD0:TriggerEdge 1
+dbpf $(DAQPREFIX):PBI-EM:CARD0:NSAMPLES_ms 7
+dbpf $(DAQPREFIX):PBI-EMV:LCURSOR_ms 2
+dbpf $(DAQPREFIX):PBI-EMV:RCURSOR_ms 6
\ No newline at end of file