Skip to content
Snippets Groups Projects
Commit 6f7af790 authored by Gabriel Fedel's avatar Gabriel Fedel :speech_balloon:
Browse files

opi: Fix PVs on adjust windows to use new ones 

Change LLRF:AI0-[MAG/ANG] -> LLRF:REFCOMP-CTRLIN-[MAG/ANG]
Change LLRF:AI1-[MAG/ANG] -> LLRF:REFCOMP-REF-[MAG/ANG]
parent ac812546
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
opi/adjust-loop-angle.bob
+ 9
− 13
View file @ 6f7af790
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<width>1100</width> <width>1100</width>
<scripts> <scripts>
<script file="scripts/callculateLoopDelay.js"> <script file="scripts/callculateLoopDelay.js">
<pv_name>$(SYSTEM):AI0-ANG</pv_name> <pv_name>$(SYSTEM):REFCOMP-CTRLIN-ANG</pv_name>
<pv_name>$(SYSTEM):AI1-ANG</pv_name> <pv_name>$(SYSTEM):REFCOMP-REF-ANG</pv_name>
<pv_name>$(SYSTEM):IQSMPL-ANGOFFSETVAL</pv_name> <pv_name>$(SYSTEM):IQSMPL-ANGOFFSETVAL</pv_name>
<pv_name>$(SYSTEM):IQSMPL-ANGOFFSETEN</pv_name> <pv_name>$(SYSTEM):IQSMPL-ANGOFFSETEN</pv_name>
<pv_name>$(SYSTEM):PI-FIXEDSPANG</pv_name> <pv_name>$(SYSTEM):PI-FIXEDSPANG</pv_name>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<x>1042</x> <x>1042</x>
<y>20</y> <y>20</y>
<width>40</width> <width>40</width>
<height>40</height> <height>41</height>
</widget> </widget>
<widget type="rectangle" version="2.0.0"> <widget type="rectangle" version="2.0.0">
<name>Rectangle</name> <name>Rectangle</name>
...@@ -91,11 +91,11 @@ ...@@ -91,11 +91,11 @@
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Display</name> <name>Display</name>
<file>embedded/fixed-point.bob</file>
<macros> <macros>
<CT>SP</CT> <CT>SP</CT>
<PI_TYPE>PI-I</PI_TYPE> <PI_TYPE>PI-I</PI_TYPE>
</macros> </macros>
<file>embedded/fixed-point.bob</file>
<x>270</x> <x>270</x>
<y>470</y> <y>470</y>
<width>460</width> <width>460</width>
...@@ -103,11 +103,11 @@ ...@@ -103,11 +103,11 @@
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Display_1</name> <name>Display_1</name>
<file>embedded/fixed-point.bob</file>
<macros> <macros>
<CT>SP</CT> <CT>SP</CT>
<PI_TYPE>PI-Q</PI_TYPE> <PI_TYPE>PI-Q</PI_TYPE>
</macros> </macros>
<file>embedded/fixed-point.bob</file>
<x>270</x> <x>270</x>
<y>510</y> <y>510</y>
<width>460</width> <width>460</width>
...@@ -140,12 +140,8 @@ ...@@ -140,12 +140,8 @@
<text>Value</text> <text>Value</text>
<y>33</y> <y>33</y>
<width>70</width> <width>70</width>
<foreground_color use_class="true"> <horizontal_alignment>2</horizontal_alignment>
<color name="Text" red="25" green="25" blue="25"> <vertical_alignment>1</vertical_alignment>
</color>
</foreground_color>
<horizontal_alignment use_class="true">2</horizontal_alignment>
<vertical_alignment use_class="true">1</vertical_alignment>
</widget> </widget>
<widget type="textentry" version="3.0.0"> <widget type="textentry" version="3.0.0">
<name>Text Entry</name> <name>Text Entry</name>
...@@ -198,7 +194,7 @@ ...@@ -198,7 +194,7 @@
</widget> </widget>
<widget type="textupdate" version="2.0.0"> <widget type="textupdate" version="2.0.0">
<name>Text Update_3</name> <name>Text Update_3</name>
<pv_name>$(SYSTEM):AI0-ANG</pv_name> <pv_name>$(SYSTEM):REFCOMP-CTRLIN-ANG</pv_name>
<x>785</x> <x>785</x>
<y>322</y> <y>322</y>
<width>110</width> <width>110</width>
...@@ -206,7 +202,7 @@ ...@@ -206,7 +202,7 @@
</widget> </widget>
<widget type="textupdate" version="2.0.0"> <widget type="textupdate" version="2.0.0">
<name>Text Update_4</name> <name>Text Update_4</name>
<pv_name>$(SYSTEM):AI1-ANG</pv_name> <pv_name>$(SYSTEM):REFCOMP-REF-ANG</pv_name>
<x>785</x> <x>785</x>
<y>410</y> <y>410</y>
<width>110</width> <width>110</width>
......
opi/adjust-loop-magnitude.bob
+ 18
− 22
View file @ 6f7af790
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<height>1100</height> <height>1100</height>
<scripts> <scripts>
<script file="scripts/callculateLoopGain.js"> <script file="scripts/callculateLoopGain.js">
<pv_name>$(SYSTEM):AI0-MAG</pv_name> <pv_name>$(SYSTEM):REFCOMP-CTRLIN-MAG</pv_name>
<pv_name>$(SYSTEM):PI-FIXEDSPMAG</pv_name> <pv_name>$(SYSTEM):PI-FIXEDSPMAG</pv_name>
<pv_name>$(SYSTEM):VM-MAGLIMVAL-RBV</pv_name> <pv_name>$(SYSTEM):VM-MAGLIMVAL-RBV</pv_name>
<pv_name>$(SYSTEM):VM-MAGLIMEN-RBV</pv_name> <pv_name>$(SYSTEM):VM-MAGLIMEN-RBV</pv_name>
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
</scripts> </scripts>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Attenuation Setup</name> <name>Attenuation Setup</name>
<file>embedded/att-setup-chan.bob</file>
<macros> <macros>
<CHAN_NAME>AI3</CHAN_NAME> <CHAN_NAME>AI3</CHAN_NAME>
<MAGTYPE>SMON-MAGMINMAX</MAGTYPE> <MAGTYPE>SMON-MAGMINMAX</MAGTYPE>
</macros> </macros>
<file>embedded/att-setup-chan.bob</file>
<x>50</x> <x>50</x>
<y>338</y> <y>338</y>
<width>150</width> <width>150</width>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<x>1390</x> <x>1390</x>
<y>269</y> <y>269</y>
<width>40</width> <width>40</width>
<height>40</height> <height>41</height>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>CAVITY H</name> <name>CAVITY H</name>
...@@ -209,11 +209,11 @@ Modulator</text> ...@@ -209,11 +209,11 @@ Modulator</text>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Monitor Channel</name> <name>Monitor Channel</name>
<file>embedded/monitor_chan.bob</file>
<macros> <macros>
<CHAN_NAME>AI9</CHAN_NAME> <CHAN_NAME>AI9</CHAN_NAME>
<MAGTYPE>SMON-MAGMINMAX</MAGTYPE> <MAGTYPE>SMON-MAGMINMAX</MAGTYPE>
</macros> </macros>
<file>embedded/monitor_chan.bob</file>
<x>250</x> <x>250</x>
<y>60</y> <y>60</y>
<width>150</width> <width>150</width>
...@@ -221,11 +221,11 @@ Modulator</text> ...@@ -221,11 +221,11 @@ Modulator</text>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Monitor Channel_1</name> <name>Monitor Channel_1</name>
<file>embedded/monitor_chan.bob</file>
<macros> <macros>
<CHAN_NAME>AI8</CHAN_NAME> <CHAN_NAME>AI8</CHAN_NAME>
<MAGTYPE>SMON-MAGMINMAX</MAGTYPE> <MAGTYPE>SMON-MAGMINMAX</MAGTYPE>
</macros> </macros>
<file>embedded/monitor_chan.bob</file>
<x>45</x> <x>45</x>
<y>60</y> <y>60</y>
<width>150</width> <width>150</width>
...@@ -233,11 +233,11 @@ Modulator</text> ...@@ -233,11 +233,11 @@ Modulator</text>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Attenuation Setup_1</name> <name>Attenuation Setup_1</name>
<file>embedded/att-setup-chan.bob</file>
<macros> <macros>
<CHAN_NAME>AI4</CHAN_NAME> <CHAN_NAME>AI4</CHAN_NAME>
<MAGTYPE>SMON-MAGMINMAX</MAGTYPE> <MAGTYPE>SMON-MAGMINMAX</MAGTYPE>
</macros> </macros>
<file>embedded/att-setup-chan.bob</file>
<x>300</x> <x>300</x>
<y>338</y> <y>338</y>
<width>150</width> <width>150</width>
...@@ -245,11 +245,11 @@ Modulator</text> ...@@ -245,11 +245,11 @@ Modulator</text>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Attenuation Setup_2</name> <name>Attenuation Setup_2</name>
<file>embedded/att-setup-chan.bob</file>
<macros> <macros>
<CHAN_NAME>AI5</CHAN_NAME> <CHAN_NAME>AI5</CHAN_NAME>
<MAGTYPE>SMON-MAGMINMAX</MAGTYPE> <MAGTYPE>SMON-MAGMINMAX</MAGTYPE>
</macros> </macros>
<file>embedded/att-setup-chan.bob</file>
<x>470</x> <x>470</x>
<y>338</y> <y>338</y>
<width>150</width> <width>150</width>
...@@ -257,11 +257,11 @@ Modulator</text> ...@@ -257,11 +257,11 @@ Modulator</text>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Attenuation Setup_3</name> <name>Attenuation Setup_3</name>
<file>embedded/att-setup-chan.bob</file>
<macros> <macros>
<CHAN_NAME>AI6</CHAN_NAME> <CHAN_NAME>AI6</CHAN_NAME>
<MAGTYPE>SMON-MAGMINMAX</MAGTYPE> <MAGTYPE>SMON-MAGMINMAX</MAGTYPE>
</macros> </macros>
<file>embedded/att-setup-chan.bob</file>
<x>730</x> <x>730</x>
<y>328</y> <y>328</y>
<width>150</width> <width>150</width>
...@@ -269,11 +269,11 @@ Modulator</text> ...@@ -269,11 +269,11 @@ Modulator</text>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Attenuation Setup_4</name> <name>Attenuation Setup_4</name>
<file>embedded/att-setup-chan.bob</file>
<macros> <macros>
<CHAN_NAME>AI7</CHAN_NAME> <CHAN_NAME>AI7</CHAN_NAME>
<MAGTYPE>SMON-MAGMINMAX</MAGTYPE> <MAGTYPE>SMON-MAGMINMAX</MAGTYPE>
</macros> </macros>
<file>embedded/att-setup-chan.bob</file>
<x>900</x> <x>900</x>
<y>328</y> <y>328</y>
<width>150</width> <width>150</width>
...@@ -281,11 +281,11 @@ Modulator</text> ...@@ -281,11 +281,11 @@ Modulator</text>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Attenuation Setup_5</name> <name>Attenuation Setup_5</name>
<file>embedded/att-setup-chan.bob</file>
<macros> <macros>
<CHAN_NAME>AI2</CHAN_NAME> <CHAN_NAME>AI2</CHAN_NAME>
<MAGTYPE>SMON-MAGMINMAX</MAGTYPE> <MAGTYPE>SMON-MAGMINMAX</MAGTYPE>
</macros> </macros>
<file>embedded/att-setup-chan.bob</file>
<x>50</x> <x>50</x>
<y>583</y> <y>583</y>
<width>150</width> <width>150</width>
...@@ -387,7 +387,7 @@ Attenuation</text> ...@@ -387,7 +387,7 @@ Attenuation</text>
</widget> </widget>
<widget type="textentry" version="3.0.0"> <widget type="textentry" version="3.0.0">
<name>Text Entry_2</name> <name>Text Entry_2</name>
<pv_name>$(SYSTEM):AI8-ATT</pv_name> <pv_name>$(SYSTEM):VMOUT-ATT</pv_name>
<x>15</x> <x>15</x>
<y>50</y> <y>50</y>
<width>140</width> <width>140</width>
...@@ -395,7 +395,7 @@ Attenuation</text> ...@@ -395,7 +395,7 @@ Attenuation</text>
</widget> </widget>
<widget type="textupdate" version="2.0.0"> <widget type="textupdate" version="2.0.0">
<name>Text Update_2</name> <name>Text Update_2</name>
<pv_name>$(SYSTEM):AI8-ATT-RBV</pv_name> <pv_name>$(SYSTEM):VMOUT-ATT-RBV</pv_name>
<x>15</x> <x>15</x>
<y>90</y> <y>90</y>
<width>140</width> <width>140</width>
...@@ -425,11 +425,11 @@ Attenuation</text> ...@@ -425,11 +425,11 @@ Attenuation</text>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Display</name> <name>Display</name>
<file>embedded/fixed-point.bob</file>
<macros> <macros>
<CT>SP</CT> <CT>SP</CT>
<PI_TYPE>PI-Q</PI_TYPE> <PI_TYPE>PI-Q</PI_TYPE>
</macros> </macros>
<file>embedded/fixed-point.bob</file>
<x>10</x> <x>10</x>
<y>30</y> <y>30</y>
<width>460</width> <width>460</width>
...@@ -437,11 +437,11 @@ Attenuation</text> ...@@ -437,11 +437,11 @@ Attenuation</text>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Display_1</name> <name>Display_1</name>
<file>embedded/fixed-point.bob</file>
<macros> <macros>
<CT>SP</CT> <CT>SP</CT>
<PI_TYPE>PI-I</PI_TYPE> <PI_TYPE>PI-I</PI_TYPE>
</macros> </macros>
<file>embedded/fixed-point.bob</file>
<x>10</x> <x>10</x>
<y>70</y> <y>70</y>
<width>460</width> <width>460</width>
...@@ -484,12 +484,8 @@ Attenuation</text> ...@@ -484,12 +484,8 @@ Attenuation</text>
<text>Value</text> <text>Value</text>
<y>33</y> <y>33</y>
<width>70</width> <width>70</width>
<foreground_color use_class="true"> <horizontal_alignment>2</horizontal_alignment>
<color name="Text" red="25" green="25" blue="25"> <vertical_alignment>1</vertical_alignment>
</color>
</foreground_color>
<horizontal_alignment use_class="true">2</horizontal_alignment>
<vertical_alignment use_class="true">1</vertical_alignment>
</widget> </widget>
<widget type="textentry" version="3.0.0"> <widget type="textentry" version="3.0.0">
<name>Text Entry_3</name> <name>Text Entry_3</name>
...@@ -607,7 +603,7 @@ Attenuation</text> ...@@ -607,7 +603,7 @@ Attenuation</text>
</widget> </widget>
<widget type="textupdate" version="2.0.0"> <widget type="textupdate" version="2.0.0">
<name>Text Update_5</name> <name>Text Update_5</name>
<pv_name>$(SYSTEM):AI0-MAG</pv_name> <pv_name>$(SYSTEM):REFCOMP-CTRLIN-MAG</pv_name>
<x>940</x> <x>940</x>
<y>763</y> <y>763</y>
<width>160</width> <width>160</width>
...@@ -615,7 +611,7 @@ Attenuation</text> ...@@ -615,7 +611,7 @@ Attenuation</text>
</widget> </widget>
<widget type="textupdate" version="2.0.0"> <widget type="textupdate" version="2.0.0">
<name>Text Update_6</name> <name>Text Update_6</name>
<pv_name>$(SYSTEM):AI1-MAG</pv_name> <pv_name>$(SYSTEM):REFCOMP-REF-MAG</pv_name>
<x>940</x> <x>940</x>
<y>904</y> <y>904</y>
<width>160</width> <width>160</width>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment