From 64891b18f282313fef59a5a3cf9b95d0dead9ee4 Mon Sep 17 00:00:00 2001
From: Gabriel Fedel <gabriel.fedel@esss.se>
Date: Wed, 20 Jan 2021 10:07:05 +0100
Subject: [PATCH] update opi
---
opi/evr-control.bob | 292 ++++++++++++++++++++++----------------------
1 file changed, 145 insertions(+), 147 deletions(-)
diff --git a/opi/evr-control.bob b/opi/evr-control.bob
index 69f093b..4b2cc4f 100644
--- a/opi/evr-control.bob
+++ b/opi/evr-control.bob
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>MRF Event Master Controller</name>
- <width>920</width>
+ <width>1920</width>
<height>900</height>
<widget type="rectangle" version="2.0.0">
<name>Titlebar</name>
@@ -42,7 +42,7 @@
<x>20</x>
<y>70</y>
<width>870</width>
- <height>230</height>
+ <height>280</height>
<style>3</style>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -51,7 +51,7 @@
<widget type="rectangle" version="2.0.0">
<name>MGGrey02-background</name>
<width>870</width>
- <height>230</height>
+ <height>280</height>
<line_width>2</line_width>
<line_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -99,25 +99,17 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update</name>
- <pv_name>$(EVRPREFIX)PS0-Rate-I</pv_name>
+ <pv_name>$(PREFIX)CycleFreq-RB</pv_name>
<x>270</x>
<y>50</y>
<width>90</width>
<height>30</height>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label_2</name>
- <text>RF Pulse Delay</text>
- <x>20</x>
- <y>90</y>
- <width>125</width>
- <height>30</height>
- </widget>
<widget type="label" version="2.0.0">
<name>Label_6</name>
<text>Cycle Count</text>
<x>20</x>
- <y>170</y>
+ <y>230</y>
<width>120</width>
<height>30</height>
</widget>
@@ -125,13 +117,13 @@
<name>Text Update_5</name>
<pv_name>$(PREFIX)Cycle-Cnt</pv_name>
<x>140</x>
- <y>170</y>
+ <y>230</y>
<width>90</width>
<height>30</height>
</widget>
<widget type="group" version="2.0.0">
<name>Operation Mode</name>
- <x>500</x>
+ <x>525</x>
<y>30</y>
<width>312</width>
<height>190</height>
@@ -239,37 +231,87 @@
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_33</name>
+ <text>Pre Pulse Delay</text>
+ <x>20</x>
+ <y>90</y>
+ <width>125</width>
+ <height>30</height>
+ </widget>
<widget type="textupdate" version="2.0.0">
- <name>Text Update_11</name>
- <pv_name>$(PREFIX)RFPulseDelay-RB</pv_name>
+ <name>Text Update_21</name>
+ <pv_name>$(PREFIX)PrePulseDly-RB</pv_name>
<x>140</x>
<y>90</y>
<width>90</width>
<height>30</height>
<precision>3</precision>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_29</name>
+ <text>RF Sync Delay</text>
+ <x>20</x>
+ <y>139</y>
+ <width>120</width>
+ <height>30</height>
+ </widget>
<widget type="textentry" version="3.0.0">
- <name>Text Entry</name>
- <pv_name>$(PREFIX)RFPulseLen-SP</pv_name>
+ <name>Text Entry_1</name>
+ <pv_name>$(PREFIX)RFSyncDly-SP</pv_name>
<x>140</x>
- <y>130</y>
+ <y>139</y>
<width>120</width>
<height>30</height>
<precision>3</precision>
</widget>
<widget type="label" version="2.0.0">
- <name>Label_1</name>
- <text>RF Pulse Length</text>
+ <name>Label_30</name>
+ <text>RF Sync Width</text>
<x>20</x>
- <y>130</y>
+ <y>179</y>
<width>120</width>
<height>30</height>
</widget>
+ <widget type="textentry" version="3.0.0">
+ <name>Text Entry_5</name>
+ <pv_name>$(PREFIX)RFSyncWdt-SP</pv_name>
+ <x>140</x>
+ <y>179</y>
+ <width>120</width>
+ <height>30</height>
+ <precision>3</precision>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_10</name>
+ <text>HV Sync Width</text>
+ <x>290</x>
+ <y>139</y>
+ <width>125</width>
+ <height>30</height>
+ </widget>
<widget type="textupdate" version="2.0.0">
- <name>Text Update_1</name>
- <pv_name>$(PREFIX)RFPulseLen-RB</pv_name>
- <x>270</x>
- <y>130</y>
+ <name>Text Update_18</name>
+ <pv_name>$(PREFIX)HVSyncWdt-RB</pv_name>
+ <x>410</x>
+ <y>139</y>
+ <width>90</width>
+ <height>30</height>
+ <precision>3</precision>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_25</name>
+ <text>Fim Delay Width</text>
+ <x>290</x>
+ <y>179</y>
+ <width>125</width>
+ <height>30</height>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_19</name>
+ <pv_name>$(PREFIX)FIMDly-RB</pv_name>
+ <x>410</x>
+ <y>179</y>
<width>90</width>
<height>30</height>
<precision>3</precision>
@@ -278,7 +320,7 @@
<widget type="group" version="2.0.0">
<name>MGGrey02_1</name>
<x>20</x>
- <y>310</y>
+ <y>390</y>
<width>420</width>
<height>190</height>
<style>3</style>
@@ -318,88 +360,44 @@
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textentry" version="3.0.0">
- <name>Text Entry_2</name>
- <pv_name>$(PREFIX)PBLen-SP</pv_name>
- <x>140</x>
- <y>120</y>
+ <name>Text Entry_13</name>
+ <pv_name>$(PREFIX)BeamPulseDly-SP</pv_name>
+ <x>220</x>
+ <y>60</y>
<width>120</width>
<height>30</height>
<precision>3</precision>
</widget>
<widget type="label" version="2.0.0">
- <name>Label_4</name>
- <text>PB Pulse Length</text>
- <x>20</x>
- <y>120</y>
+ <name>Label_34</name>
+ <text>Beam Pulse Delay</text>
+ <x>70</x>
+ <y>60</y>
<width>120</width>
<height>30</height>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_4</name>
- <pv_name>$(PREFIX)PBLen-RB</pv_name>
- <x>270</x>
- <y>120</y>
- <width>90</width>
- <height>30</height>
- <precision>3</precision>
- </widget>
- <widget type="textentry" version="3.0.0">
- <name>Text Entry_3</name>
- <pv_name>$(PREFIX)PBDelay-SP</pv_name>
- <x>140</x>
- <y>80</y>
- <width>120</width>
- <height>30</height>
- <precision>3</precision>
- </widget>
<widget type="label" version="2.0.0">
- <name>Label_5</name>
- <text>PB Pulse Delay</text>
- <x>20</x>
- <y>80</y>
- <width>120</width>
+ <name>Label_35</name>
+ <text>Beam Pulse Width</text>
+ <x>70</x>
+ <y>95</y>
+ <width>140</width>
<height>30</height>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_12</name>
- <pv_name>$(PREFIX)PBDelay-RB</pv_name>
- <x>270</x>
- <y>80</y>
- <width>90</width>
- <height>30</height>
- <precision>3</precision>
- </widget>
<widget type="textentry" version="3.0.0">
- <name>Text Entry_9</name>
- <pv_name>$(PREFIX)PulseCmDelay-SP</pv_name>
- <x>140</x>
- <y>40</y>
- <width>120</width>
- <height>30</height>
- <precision>3</precision>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_24</name>
- <text>Pulse Coming</text>
- <x>20</x>
- <y>40</y>
+ <name>Text Entry_14</name>
+ <pv_name>$(PREFIX)BeamPulseWdt-SP</pv_name>
+ <x>220</x>
+ <y>95</y>
<width>120</width>
<height>30</height>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_15</name>
- <pv_name>$(PREFIX)PulseCmDelay-RB</pv_name>
- <x>270</x>
- <y>40</y>
- <width>90</width>
- <height>30</height>
<precision>3</precision>
</widget>
</widget>
<widget type="group" version="2.0.0">
<name>MGGrey02_2</name>
<x>470</x>
- <y>310</y>
+ <y>390</y>
<width>420</width>
<height>190</height>
<style>3</style>
@@ -442,7 +440,7 @@
<name>Label_7</name>
<text>Timestamp</text>
<x>20</x>
- <y>30</y>
+ <y>50</y>
<width>120</width>
<height>30</height>
</widget>
@@ -450,7 +448,7 @@
<name>Text Update_6</name>
<pv_name>$(EVRPREFIX)Timestamp-RB</pv_name>
<x>150</x>
- <y>30</y>
+ <y>50</y>
<width>210</width>
<height>30</height>
</widget>
@@ -474,7 +472,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline</name>
<x>80</x>
- <y>582</y>
+ <y>662</y>
<width>1</width>
<height>210</height>
<points>
@@ -492,7 +490,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_1</name>
<x>40</x>
- <y>762</y>
+ <y>842</y>
<width>830</width>
<height>1</height>
<points>
@@ -510,7 +508,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_2</name>
<x>80</x>
- <y>582</y>
+ <y>662</y>
<width>10</width>
<height>10</height>
<points>
@@ -529,13 +527,13 @@
<name>Label_3</name>
<text>Events</text>
<x>30</x>
- <y>662</y>
+ <y>742</y>
<width>60</width>
</widget>
<widget type="polyline" version="2.0.0">
<name>Polyline_3</name>
<x>70</x>
- <y>582</y>
+ <y>662</y>
<width>10</width>
<height>10</height>
<points>
@@ -554,13 +552,13 @@
<name>Label_12</name>
<text>Time (us)</text>
<x>811</x>
- <y>772</y>
+ <y>852</y>
<width>80</width>
</widget>
<widget type="polyline" version="2.0.0">
<name>Polyline_6</name>
<x>120</x>
- <y>672</y>
+ <y>752</y>
<width>1</width>
<height>90</height>
<points>
@@ -576,7 +574,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_4</name>
<x>860</x>
- <y>752</y>
+ <y>832</y>
<width>10</width>
<height>10</height>
<points>
@@ -594,7 +592,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_5</name>
<x>860</x>
- <y>762</y>
+ <y>842</y>
<width>10</width>
<height>10</height>
<points>
@@ -612,7 +610,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_9</name>
<x>310</x>
- <y>652</y>
+ <y>732</y>
<width>1</width>
<height>110</height>
<points>
@@ -632,7 +630,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_12</name>
<x>730</x>
- <y>652</y>
+ <y>732</y>
<width>1</width>
<height>110</height>
<points>
@@ -652,7 +650,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_15</name>
<x>503</x>
- <y>672</y>
+ <y>752</y>
<width>1</width>
<height>90</height>
<points>
@@ -673,7 +671,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_18</name>
<x>625</x>
- <y>672</y>
+ <y>752</y>
<width>1</width>
<height>90</height>
<points>
@@ -695,7 +693,7 @@
<name>Label_13</name>
<text>Cycle Start (14)</text>
<x>90</x>
- <y>702</y>
+ <y>782</y>
<width>82</width>
<height>18</height>
<font>
@@ -709,7 +707,7 @@
<name>Label_14</name>
<text>RF Start (60)</text>
<x>280</x>
- <y>702</y>
+ <y>782</y>
<width>67</width>
<height>18</height>
<font>
@@ -723,7 +721,7 @@
<name>Label_15</name>
<text>RF End (61)</text>
<x>693</x>
- <y>702</y>
+ <y>782</y>
<width>61</width>
<height>18</height>
<font>
@@ -737,7 +735,7 @@
<name>Label_16</name>
<text>PB Pulse St. (12)</text>
<x>463</x>
- <y>702</y>
+ <y>782</y>
<width>88</width>
<height>18</height>
<font>
@@ -755,7 +753,7 @@
<name>Label_17</name>
<text>PB Pulse End (13)</text>
<x>583</x>
- <y>702</y>
+ <y>782</y>
<width>93</width>
<height>18</height>
<font>
@@ -772,7 +770,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_21</name>
<x>310</x>
- <y>569</y>
+ <y>649</y>
<width>420</width>
<height>1</height>
<points>
@@ -793,7 +791,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_22</name>
<x>120</x>
- <y>569</y>
+ <y>649</y>
<width>190</width>
<height>1</height>
<points>
@@ -814,7 +812,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_23</name>
<x>310</x>
- <y>580</y>
+ <y>660</y>
<width>1</width>
<height>62</height>
<points>
@@ -834,7 +832,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_24</name>
<x>730</x>
- <y>570</y>
+ <y>650</y>
<width>1</width>
<height>70</height>
<points>
@@ -854,7 +852,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_25</name>
<x>120</x>
- <y>570</y>
+ <y>650</y>
<width>1</width>
<height>90</height>
<points>
@@ -875,7 +873,7 @@
<name>Label_18</name>
<text>RF Pulse Delay</text>
<x>160</x>
- <y>519</y>
+ <y>599</y>
<width>86</width>
<height>21</height>
<font>
@@ -888,7 +886,7 @@
<name>Label_19</name>
<text>RF Pulse Length</text>
<x>441</x>
- <y>519</y>
+ <y>599</y>
<width>94</width>
<height>21</height>
<font>
@@ -901,7 +899,7 @@
<name>Text Entry_6</name>
<pv_name>$(PREFIX)RFPulseLen-SP</pv_name>
<x>441</x>
- <y>539</y>
+ <y>619</y>
<width>90</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
@@ -913,7 +911,7 @@
<name>Text Update_2</name>
<pv_name>$(PREFIX)RFPulseLen-RB</pv_name>
<x>545</x>
- <y>539</y>
+ <y>619</y>
<width>90</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
@@ -924,7 +922,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_26</name>
<x>800</x>
- <y>672</y>
+ <y>752</y>
<width>1</width>
<height>90</height>
<points>
@@ -941,7 +939,7 @@
<name>Label_20</name>
<text>Cycle Start (14)</text>
<x>770</x>
- <y>702</y>
+ <y>782</y>
<width>82</width>
<height>18</height>
<font>
@@ -954,7 +952,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_27</name>
<x>120</x>
- <y>880</y>
+ <y>960</y>
<width>680</width>
<height>2</height>
<points>
@@ -975,7 +973,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_28</name>
<x>120</x>
- <y>770</y>
+ <y>850</y>
<width>1</width>
<height>110</height>
<points>
@@ -995,7 +993,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_29</name>
<x>800</x>
- <y>782</y>
+ <y>862</y>
<width>1</width>
<height>98</height>
<points>
@@ -1016,7 +1014,7 @@
<name>Spinner_1</name>
<pv_name>$(PREFIX)CycleFreq-SP</pv_name>
<x>410</x>
- <y>852</y>
+ <y>932</y>
<width>120</width>
<precision>2</precision>
<increment>0.5</increment>
@@ -1025,7 +1023,7 @@
<name>Label_21</name>
<text>Cycle Frequency</text>
<x>300</x>
- <y>852</y>
+ <y>932</y>
<width>96</width>
<height>21</height>
<font>
@@ -1036,9 +1034,9 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_3</name>
- <pv_name>$(EVRPREFIX)PS0-Rate-I</pv_name>
+ <pv_name>$(PREFIX)CycleFreq-RB</pv_name>
<x>541</x>
- <y>852</y>
+ <y>932</y>
<width>89</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
@@ -1048,7 +1046,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_30</name>
<x>503</x>
- <y>783</y>
+ <y>863</y>
<width>120</width>
<height>1</height>
<points>
@@ -1069,7 +1067,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_31</name>
<x>310</x>
- <y>783</y>
+ <y>863</y>
<width>190</width>
<height>1</height>
<points>
@@ -1091,7 +1089,7 @@
<name>Label_22</name>
<text>PB Pulse Length</text>
<x>523</x>
- <y>788</y>
+ <y>868</y>
<width>95</width>
<height>21</height>
<font>
@@ -1104,7 +1102,7 @@
<name>Text Entry_7</name>
<pv_name>$(PREFIX)PBLen-SP</pv_name>
<x>523</x>
- <y>808</y>
+ <y>888</y>
<width>90</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
@@ -1116,7 +1114,7 @@
<name>Text Update_9</name>
<pv_name>$(PREFIX)PBLen-RB</pv_name>
<x>623</x>
- <y>808</y>
+ <y>888</y>
<width>90</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
@@ -1128,7 +1126,7 @@
<name>Label_23</name>
<text>PB Pulse Delay</text>
<x>307</x>
- <y>788</y>
+ <y>868</y>
<width>87</width>
<height>21</height>
<font>
@@ -1141,7 +1139,7 @@
<name>Text Entry_8</name>
<pv_name>$(PREFIX)PBDelay-SP</pv_name>
<x>307</x>
- <y>808</y>
+ <y>888</y>
<width>80</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
@@ -1153,7 +1151,7 @@
<name>Text Update_13</name>
<pv_name>$(PREFIX)PBDelay-RB</pv_name>
<x>394</x>
- <y>808</y>
+ <y>888</y>
<width>80</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
@@ -1165,7 +1163,7 @@
<name>Text Update_14</name>
<pv_name>$(PREFIX)RFPulseDelay-RB</pv_name>
<x>160</x>
- <y>540</y>
+ <y>620</y>
<width>77</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
@@ -1177,7 +1175,7 @@
<name>Label_26</name>
<text>Pulse Coming</text>
<x>318</x>
- <y>592</y>
+ <y>672</y>
<width>81</width>
<height>21</height>
<font>
@@ -1190,7 +1188,7 @@
<name>Text Entry_11</name>
<pv_name>$(PREFIX)PulseCmDelay-SP</pv_name>
<x>318</x>
- <y>612</y>
+ <y>692</y>
<width>80</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
@@ -1202,7 +1200,7 @@
<name>Text Update_17</name>
<pv_name>$(PREFIX)PulseCmDelay-RB</pv_name>
<x>410</x>
- <y>612</y>
+ <y>692</y>
<width>80</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
@@ -1213,7 +1211,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_33</name>
<x>395</x>
- <y>672</y>
+ <y>752</y>
<width>1</width>
<height>90</height>
<points>
@@ -1235,7 +1233,7 @@
<name>Label_27</name>
<text>Pulse Coming (15)</text>
<x>355</x>
- <y>702</y>
+ <y>782</y>
<width>96</width>
<height>18</height>
<font>
@@ -1252,7 +1250,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_34</name>
<x>313</x>
- <y>640</y>
+ <y>720</y>
<width>80</width>
<height>1</height>
<points>
@@ -1273,7 +1271,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_35</name>
<x>395</x>
- <y>642</y>
+ <y>722</y>
<width>1</width>
<points>
<point x="0.0" y="20.0">
@@ -1292,7 +1290,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_36</name>
<x>310</x>
- <y>759</y>
+ <y>839</y>
<width>1</width>
<points>
<point x="0.0" y="20.0">
@@ -1311,7 +1309,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_37</name>
<x>503</x>
- <y>762</y>
+ <y>842</y>
<width>1</width>
<points>
<point x="0.0" y="20.0">
@@ -1330,7 +1328,7 @@
<widget type="polyline" version="2.0.0">
<name>Polyline_38</name>
<x>625</x>
- <y>762</y>
+ <y>842</y>
<width>1</width>
<points>
<point x="0.0" y="20.0">
--
GitLab