diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
index bf72b3e15affbb0a7d9f8317b7d67e25a7344dd8..09caece8978d5328d75f65ffb2439f4ef8bd0956 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
@@ -94,11 +94,6 @@
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
- </color>
- </background_color>
- <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -144,11 +139,10 @@ Actual Machine State read-back</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -231,11 +225,10 @@ Actual Machine State read-back</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -309,7 +302,7 @@ Actual Machine State read-back</tooltip>
<widget type="label" version="2.0.0">
<name>MGGrey03-title_12</name>
<class>HEADER3</class>
- <text>Lab</text>
+ <text>RFQ (lab)</text>
<x>20</x>
<y>330</y>
<width>220</width>
@@ -318,11 +311,10 @@ Actual Machine State read-back</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -383,11 +375,6 @@ Actual Machine State read-back</tooltip>
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
- </color>
- </background_color>
- <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -430,11 +417,6 @@ Actual Machine State read-back</tooltip>
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
- </color>
- </background_color>
- <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -477,13 +459,94 @@ Actual Machine State read-back</tooltip>
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
- <background_color use_class="true">
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>RF_11</name>
+ <x>480</x>
+ <y>60</y>
+ <width>220</width>
+ <height>115</height>
+ <line_width>0</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
<color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
- <transparent use_class="true">true</transparent>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_194</name>
+ <pv_name>LAB-010RFC:RFS01:CPU-ACTSTATE-RB</pv_name>
+ <x>590</x>
+ <y>97</y>
+ <width>80</width>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <tooltip>$(pv_name)
+$(pv_value)
+Actual Machine State read-back</tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_355</name>
+ <class>SECTION</class>
+ <text>Set State:</text>
+ <x>510</x>
+ <y>95</y>
+ <width>70</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>MGGrey03-title_14</name>
+ <class>HEADER3</class>
+ <text>Lab</text>
+ <x>480</x>
+ <y>60</y>
+ <width>220</width>
+ <height>30</height>
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions>
+ <action type="open_display">
+ <file>01_mainLAB.bob</file>
+ <macros>
+ <PREFIX>LAB-010RFC:RFS01</PREFIX>
+ </macros>
+ <target>replace</target>
+ <description>Open Display</description>
+ </action>
+ </actions>
+ <text>Open UI</text>
+ <x>510</x>
+ <y>130</y>
+ <width>160</width>
+ <tooltip>$(actions)</tooltip>
</widget>
</widget>
</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB.bob
new file mode 100644
index 0000000000000000000000000000000000000000..23ca2e6facb0b7a06fa259756a6f73d0d85e10aa
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB.bob
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>01_main_LAB</name>
+ <macros>
+ <DEVICE>FIM-110</DEVICE>
+ </macros>
+ <width>2300</width>
+ <height>1270</height>
+ <actions>
+ </actions>
+ <grid_visible>false</grid_visible>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
+ <width>2300</width>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <background_color use_class="true">
+ <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_94</name>
+ <class>TITLE</class>
+ <text>RF Local Protection System</text>
+ <x use_class="true">20</x>
+ <y use_class="true">0</y>
+ <width>1240</width>
+ <height use_class="true">50</height>
+ <font use_class="true">
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+ </font>
+ </font>
+ <foreground_color use_class="true">
+ <color name="HEADER-TEXT" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <transparent use_class="true">true</transparent>
+ <horizontal_alignment use_class="true">0</horizontal_alignment>
+ <vertical_alignment use_class="true">1</vertical_alignment>
+ <wrap_words use_class="true">false</wrap_words>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Linking Container</name>
+ <file>rflpsMainLAB.bob</file>
+ <x>20</x>
+ <y>70</y>
+ <width>2280</width>
+ <height>1200</height>
+ <actions>
+ </actions>
+ <scripts>
+ <script file="scripts/fim_macros_lab_01.py" check_connections="false">
+ </script>
+ </scripts>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>rflpsAF2warnings_v03</name>
+ <file>support/01_main_warnings_v02.bob</file>
+ <x>1839</x>
+ <width>451</width>
+ <height>50</height>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions>
+ <action type="open_display">
+ <file>00_main_4klystrons.bob</file>
+ <target>replace</target>
+ <description>Back to Main</description>
+ </action>
+ </actions>
+ <text>Back to main</text>
+ <x>1710</x>
+ <y>11</y>
+ <width>125</width>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainLAB.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainLAB.bob
new file mode 100644
index 0000000000000000000000000000000000000000..03731fc0b914608f061f964cd1576154281b84a0
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainLAB.bob
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>rflpsMainLAB</name>
+ <macros>
+ <DEVICE>FIM-110</DEVICE>
+ </macros>
+ <width>2280</width>
+ <height>1200</height>
+ <background_color>
+ <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+ </color>
+ </background_color>
+ <actions>
+ </actions>
+ <widget type="rectangle" version="2.0.0">
+ <name>MGGrey03-background_3</name>
+ <x>1500</x>
+ <width>410</width>
+ <height>60</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>MGGrey03-background_5</name>
+ <x>1930</x>
+ <width>344</width>
+ <height>60</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="tabs" version="2.0.0">
+ <name>Tabbed Container</name>
+ <tabs>
+ <tab>
+ <name> System Overview</name>
+ <children>
+ <widget type="embedded" version="2.0.0">
+ <name>Linking Container_1</name>
+ <file>support/overviewRFQ.bob</file>
+ <width>1965</width>
+ <height>1085</height>
+ <actions>
+ </actions>
+ <border_color>
+ <color name="TEXT" red="25" green="25" blue="25">
+ </color>
+ </border_color>
+ </widget>
+ </children>
+ </tab>
+ <tab>
+ <name> SIM Transitions</name>
+ <children>
+ <widget type="embedded" version="2.0.0">
+ <name>Embedded Display</name>
+ <file>support/transitionsRFQ.bob</file>
+ <y>2</y>
+ <width>1965</width>
+ <height>1085</height>
+ </widget>
+ </children>
+ </tab>
+ <tab>
+ <name> FIM Transitions</name>
+ <children>
+ <widget type="embedded" version="2.0.0">
+ <name>transitions_fim_v02</name>
+ <file>support/transitions_fim_v02.bob</file>
+ <y>2</y>
+ <width>1965</width>
+ <height>1085</height>
+ </widget>
+ </children>
+ </tab>
+ <tab>
+ <name> Diagnostics</name>
+ <children>
+ <widget type="embedded" version="2.0.0">
+ <name>Embedded Display_1</name>
+ <file>support/rflpsDiagnosticsRFQ.bob</file>
+ <y>2</y>
+ <width>1965</width>
+ <height>1085</height>
+ </widget>
+ </children>
+ </tab>
+ </tabs>
+ <x>304</x>
+ <y>59</y>
+ <width>1970</width>
+ <height>1121</height>
+ <font>
+ <font family="Source Sans Pro" style="BOLD" size="21.0">
+ </font>
+ </font>
+ <tab_height>10</tab_height>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>MGGrey03-background_4</name>
+ <x>1040</x>
+ <width>440</width>
+ <height>60</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LGGrey02-title</name>
+ <text>SIM OP Mode:</text>
+ <x>1060</x>
+ <y>15</y>
+ <width>99</width>
+ <height>30</height>
+ <font>
+ <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <background_color>
+ <color name="RED-BORDER" red="150" green="8" blue="16">
+ </color>
+ </background_color>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="combo" version="2.0.0">
+ <name>Device prefix combo_4</name>
+ <pv_name>$(PREFIX):CPU-OPMODE</pv_name>
+ <x>1170</x>
+ <y>15</y>
+ <width>160</width>
+ <actions>
+ </actions>
+ <tooltip>$(pv_name)
+$(pv_value)
+Change the Operation mode of the Amplifier</tooltip>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_36</name>
+ <pv_name>$(PREFIX):CPU-OPMODE-RB</pv_name>
+ <x>1340</x>
+ <y>15</y>
+ <width>120</width>
+ <height>30</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <rules>
+ <rule name="opRuleColor" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pv0<>2">
+ <value>
+ <color name="MINOR" red="252" green="242" blue="17">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pv0==2">
+ <value>
+ <color name="OK" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <tooltip>$(pv_name)
+$(pv_value)
+Operation Mode read-back</tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_310</name>
+ <text>Actual State:</text>
+ <x>1510</x>
+ <y>15</y>
+ <height>30</height>
+ <font>
+ <font family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_311</name>
+ <class>SECTION</class>
+ <text>SIM:</text>
+ <x>1620</x>
+ <y>15</y>
+ <width>40</width>
+ <height>30</height>
+ <font>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_123</name>
+ <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+ <x>1671</x>
+ <y>15</y>
+ <width>80</width>
+ <height>30</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <tooltip>$(pv_name)
+$(pv_value)
+Actual Machine State read-back</tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_312</name>
+ <class>SECTION</class>
+ <text>FIM:</text>
+ <x>1760</x>
+ <y>15</y>
+ <width>40</width>
+ <height>30</height>
+ <font>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_124</name>
+ <pv_name>$(PREFIX):$(DEVICE):INTS-RB</pv_name>
+ <x>1810</x>
+ <y>15</y>
+ <width>80</width>
+ <height>30</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <tooltip>$(pv_name)
+$(pv_value)
+Actual Machine State read-back</tooltip>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_128</name>
+ <pv_name>$(PREFIX):CPU-WRNACKREQ-RB</pv_name>
+ <x>2054</x>
+ <y>15</y>
+ <width>90</width>
+ <height>30</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="alarmRule" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>
+ <color name="MINOR" red="252" green="242" blue="17">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pv0==0">
+ <value>
+ <color name="OK" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <tooltip>$(pv_name)
+$(pv_value)
+One or more signals are being interlocked or may require an acknowledge.</tooltip>
+ </widget>
+ <widget type="bool_button" version="2.0.0">
+ <name>RESET_BUTTON_4</name>
+ <pv_name>$(PREFIX):CPU-RST</pv_name>
+ <x>2155</x>
+ <y>15</y>
+ <off_label>PLC Reset</off_label>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
+ <on_label>Reseting...</on_label>
+ <on_color>
+ <color name="On" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ <show_led>false</show_led>
+ <background_color>
+ <color red="240" green="240" blue="240">
+ </color>
+ </background_color>
+ <actions>
+ </actions>
+ <tooltip>$(pv_name)
+$(pv_value)
+Reset all non-active interlocks</tooltip>
+ <confirm_message>This will reset all non-active interlocks</confirm_message>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_319</name>
+ <text>PLC Warning:</text>
+ <x>1944</x>
+ <y>15</y>
+ <height>30</height>
+ <font>
+ <font family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>EmbeddedMachineControl</name>
+ <file>support/machineStateControl.bob</file>
+ <width>300</width>
+ <height>1180</height>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>MGGrey03-background_6</name>
+ <x>800</x>
+ <width>220</width>
+ <height>60</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_320</name>
+ <text>FIM Reset:</text>
+ <x>810</x>
+ <y>15</y>
+ <width>74</width>
+ <height>30</height>
+ <font>
+ <font family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions>
+ <action type="write_pv">
+ <pv_name>$(pv_name)</pv_name>
+ <value>1</value>
+ <description>Write PV</description>
+ </action>
+ </actions>
+ <pv_name>$(PREFIX):$(DEVICE):resetFIM</pv_name>
+ <text>FIM Reset</text>
+ <x>900</x>
+ <y>15</y>
+ </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_01.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_01.py
index 4836fe124c5ca6703eebef24f955ba9e9364c1a5..218ec7fd89a8e3c8255ae456603e2b810e4e447d 100755
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_01.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_01.py
@@ -35,16 +35,17 @@ ai06_ = "FIM-110:AI6"
ai07_ = "FIM-110:AI7"
ai08_ = "FIM-110:AI8"
ai09_ = "FIM-110:AI9"
-ai10_ = "DirC-110:DaPwrFwdDA"
-ai11_ = "DirC-110:PwrFwdKly"
-ai12_ = "DirC-110:PwrFwdLoad"
-ai13_ = "DirC-110:PwrRefKly"
-ai14_ = "FIM-110:AI14"
-ai15_ = "FIM-110:AI15"
-ai16_ = "FIM-110:AI16"
-ai17_ = "DirC-110:PwrRefLoad"
-ai18_ = "FIM-110:AI18"
-ai19_ = "FIM-110:AI19"
+
+ai10_ = "DirC-110:PwrFwdDA"
+ai11_ = "DirC-110:PwrFwdPA"
+ai12_ = "DirC-110:PwrFwdL2"
+ai13_ = "DirC-110:PwrRflctPA"
+ai14_ = "DirC-110:PwrFwdC1"
+ai15_ = "DirC-110:PwrFwdC2"
+ai16_ = "DirC-110:PwrFwdL1"
+ai17_ = "DirC-110:PwrRflctL2"
+ai18_ = "DirC-110:PwrRflctC1"
+ai19_ = "DirC-110:PwrRflctC2"
di00_ = "SIM-110:HvEnaCmd"
di01_ = "SIM-110:RfEnaCmd"
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_01.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_01.py
index 4665676d7012fc00d5cbef3580477013a2b951aa..5e4957a05c6b1262e61df20619f75d0b8f61ef5f 100755
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_01.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_01.py
@@ -51,8 +51,8 @@ di01_ = "SIM-110:RfEnaCmd"
di02_ = "SIM-110:PCconnect"
di03_ = "Mod-110:Fault"
di04_ = "VacPS-110:I-SP"
-di05_ = "VacPS-110:I-SP"
-di06_ = "VacPS-120:I-SP"
+di05_ = "VacPS-120:I-SP"
+di06_ = "ADR-110:ItlckStat"
di07_ = "FIM-110:DI7"
di08_ = "ADR-201001:ItckStat"
di09_ = "ADR-201002:ItckStat"
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_02.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_02.py
index aed491f9e6e88574806e461a18a1fe02dcf7c58b..a864ee606621c8ef824d42b5ff7331537b53758a 100755
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_02.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_ts2_02.py
@@ -51,8 +51,8 @@ di01_ = "SIM-110:RfEnaCmd"
di02_ = "SIM-110:PCconnect"
di03_ = "Mod-110:Fault"
di04_ = "VacPS-110:I-SP"
-di05_ = "VacPS-110:I-SP"
-di06_ = "VacPS-120:I-SP"
+di05_ = "VacPS-120:I-SP"
+di06_ = "ADR-110:ItlckStat"
di07_ = "FIM-110:DI7"
di08_ = "ADR-201001:ItckStat"
di09_ = "ADR-201002:ItckStat"
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob
index f8f151386b39f03dc5ddb7dfcfc8fb7bb81dbb0f..4e7499daa6ff34ff74a8c2a4524755ad45b71ee5 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob
@@ -9,6 +9,24 @@
<actions>
</actions>
<grid_visible>false</grid_visible>
+ <widget type="rectangle" version="2.0.0">
+ <name>BGGrey01-titlebar_44</name>
+ <x>1335</x>
+ <y>533</y>
+ <width>328</width>
+ <height>136</height>
+ <line_width>0</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey01-titlebar_33</name>
<x>1676</x>
@@ -1022,124 +1040,6 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
<width>44</width>
<horizontal_alignment>2</horizontal_alignment>
</widget>
- <widget type="rectangle" version="2.0.0">
- <name>BGGrey01-titlebar_14</name>
- <x>1332</x>
- <y>646</y>
- <width>260</width>
- <height>136</height>
- <line_width>0</line_width>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <background_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </background_color>
- <corner_width>10</corner_width>
- <corner_height>10</corner_height>
- </widget>
- <widget type="picture" version="2.0.0">
- <name>gradient</name>
- <file>images/gradient_v03.png</file>
- <x>1294</x>
- <y>650</y>
- <width>63</width>
- <height>127</height>
- <stretch_image>true</stretch_image>
- </widget>
- <widget type="rectangle" version="2.0.0">
- <name>BGGrey01-titlebar_8</name>
- <x>1329</x>
- <y>650</y>
- <width>259</width>
- <height>127</height>
- <line_width>0</line_width>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <background_color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </background_color>
- <corner_width>10</corner_width>
- <corner_height>10</corner_height>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Title Klystron Input Power Detectors</name>
- <text>Cavity</text>
- <x>1329</x>
- <y>658</y>
- <width>250</width>
- <height>28</height>
- <font>
- <font family="Source Sans Pro" style="BOLD" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="rectangle" version="2.0.0">
- <name>BGGrey01-titlebar_17</name>
- <x>1315</x>
- <y>240</y>
- <width>277</width>
- <height>152</height>
- <line_width>0</line_width>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <background_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </background_color>
- <corner_width>10</corner_width>
- <corner_height>10</corner_height>
- </widget>
- <widget type="rectangle" version="2.0.0">
- <name>BGGrey01-titlebar_16</name>
- <x>1317</x>
- <y>244</y>
- <width>271</width>
- <height>144</height>
- <line_width>0</line_width>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <background_color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </background_color>
- <corner_width>10</corner_width>
- <corner_height>10</corner_height>
- </widget>
- <widget type="picture" version="2.0.0">
- <name>gradient</name>
- <file>images/gradient_v03.png</file>
- <x>1282</x>
- <y>244</y>
- <width>49</width>
- <height>144</height>
- <stretch_image>true</stretch_image>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Title Cavity Power Detectors</name>
- <text>Cavity Power Detectors</text>
- <x>1337</x>
- <y>244</y>
- <width>241</width>
- <height>40</height>
- <font>
- <font family="Source Sans Pro" style="BOLD" size="18.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey01-titlebar_19</name>
<x>18</x>
@@ -1545,96 +1445,6 @@ HV Output Enable</tooltip>
<actions>
</actions>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_211</name>
- <pv_name>$(PREFIX):DirC-110:PwrRefLoad.DESC</pv_name>
- <x>464</x>
- <y>165</y>
- <width>225</width>
- <background_color>
- <color name="Background" red="220" green="225" blue="221">
- </color>
- </background_color>
- <transparent>true</transparent>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <rules>
- <rule name="alarmRule" prop_id="background_color" out_exp="false">
- <exp bool_exp="pv0==1">
- <value>
- <color name="GREEN" red="61" green="216" blue="61">
- </color>
- </value>
- </exp>
- <exp bool_exp="pv0==0">
- <value>
- <color name="OFF" red="90" green="110" blue="90">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <border_alarm_sensitive>false</border_alarm_sensitive>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_212</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdLoad.DESC</pv_name>
- <x>464</x>
- <y>132</y>
- <width>225</width>
- <background_color>
- <color name="Background" red="220" green="225" blue="221">
- </color>
- </background_color>
- <transparent>true</transparent>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <rules>
- <rule name="alarmRule" prop_id="background_color" out_exp="false">
- <exp bool_exp="pv0==1">
- <value>
- <color name="GREEN" red="61" green="216" blue="61">
- </color>
- </value>
- </exp>
- <exp bool_exp="pv0==0">
- <value>
- <color name="OFF" red="90" green="110" blue="90">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <border_alarm_sensitive>false</border_alarm_sensitive>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_213</name>
- <pv_name>$(PREFIX):DirC-110:PwrRefLoad:WaveHigh</pv_name>
- <x>694</x>
- <y>165</y>
- <width>80</width>
- <precision>2</precision>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- <actions>
- </actions>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_214</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdLoad:WaveHigh</pv_name>
- <x>694</x>
- <y>132</y>
- <width>80</width>
- <precision>2</precision>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- <actions>
- </actions>
- </widget>
<widget type="label" version="2.0.0">
<name>Title Rejected LOAD Power Detectors</name>
<text>CIRC - LOAD</text>
@@ -1843,7 +1653,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="led" version="2.0.0">
<name>LED_3</name>
- <pv_name>$(PREFIX):KLY-001:GreenLight</pv_name>
+ <pv_name>$(PREFIX):SiC-001:GreenLight</pv_name>
<x>1725</x>
<y>125</y>
<height>30</height>
@@ -1859,7 +1669,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="led" version="2.0.0">
<name>LED_2</name>
- <pv_name>$(PREFIX):KLY-001:YellowLight</pv_name>
+ <pv_name>$(PREFIX):SiC-001:YellowLight</pv_name>
<x>1725</x>
<y>95</y>
<height>30</height>
@@ -1875,7 +1685,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="led" version="2.0.0">
<name>LED</name>
- <pv_name>$(PREFIX):KLY-001:RedLight</pv_name>
+ <pv_name>$(PREFIX):SiC-001:RedLight</pv_name>
<x>1725</x>
<y>65</y>
<height>30</height>
@@ -2167,51 +1977,6 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_223</name>
- <pv_name>$(PREFIX):DirC-110:DaPwrFwdDA.DESC</pv_name>
- <x>1691</x>
- <y>400</y>
- <width>146</width>
- <background_color>
- <color name="Background" red="220" green="225" blue="221">
- </color>
- </background_color>
- <transparent>true</transparent>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <rules>
- <rule name="alarmRule" prop_id="background_color" out_exp="false">
- <exp bool_exp="pv0==1">
- <value>
- <color name="GREEN" red="61" green="216" blue="61">
- </color>
- </value>
- </exp>
- <exp bool_exp="pv0==0">
- <value>
- <color name="OFF" red="90" green="110" blue="90">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <border_alarm_sensitive>false</border_alarm_sensitive>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_224</name>
- <pv_name>$(PREFIX):DirC-110:DaPwrFwdDA:WaveHigh</pv_name>
- <x>1849</x>
- <y>400</y>
- <width>80</width>
- <precision>2</precision>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- <actions>
- </actions>
- </widget>
<widget type="label" version="2.0.0">
<name>Title ION-Pump_1</name>
<text>IP</text>
@@ -2488,7 +2253,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_231</name>
- <pv_name>$(PREFIX):KLY-001:RedLight.DESC</pv_name>
+ <pv_name>$(PREFIX):SiC-001:RedLight.DESC</pv_name>
<x>1760</x>
<y>70</y>
<width>165</width>
@@ -2498,7 +2263,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_232</name>
- <pv_name>$(PREFIX):KLY-001:YellowLight.DESC</pv_name>
+ <pv_name>$(PREFIX):SiC-001:YellowLight.DESC</pv_name>
<x>1760</x>
<y>100</y>
<width>165</width>
@@ -2508,7 +2273,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_233</name>
- <pv_name>$(PREFIX):KLY-001:GreenLight.DESC</pv_name>
+ <pv_name>$(PREFIX):SiC-001:GreenLight.DESC</pv_name>
<x>1760</x>
<y>130</y>
<width>165</width>
@@ -2821,8 +2586,8 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_184</name>
<pv_name>$(PREFIX):SS01-PIN1-RB</pv_name>
- <x>1282</x>
- <y>23</y>
+ <x>1186</x>
+ <y>63</y>
<width>90</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -2859,8 +2624,8 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_185</name>
<pv_name>$(PREFIX):SS01-PIN3-RB</pv_name>
- <x>1282</x>
- <y>63</y>
+ <x>1186</x>
+ <y>93</y>
<width>90</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -2897,8 +2662,8 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_186</name>
<pv_name>$(PREFIX):SS01-PIN7-RB</pv_name>
- <x>1282</x>
- <y>98</y>
+ <x>1186</x>
+ <y>123</y>
<width>90</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -2935,8 +2700,8 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_187</name>
<pv_name>$(PREFIX):SS01-PIN9-RB</pv_name>
- <x>1282</x>
- <y>132</y>
+ <x>1186</x>
+ <y>153</y>
<width>90</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -2973,8 +2738,8 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_188</name>
<pv_name>$(PREFIX):SS02-PIN1-RB</pv_name>
- <x>1400</x>
- <y>23</y>
+ <x>1304</x>
+ <y>63</y>
<width>90</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -3011,8 +2776,8 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_189</name>
<pv_name>$(PREFIX):SS02-PIN3-RB</pv_name>
- <x>1400</x>
- <y>63</y>
+ <x>1304</x>
+ <y>93</y>
<width>90</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -3049,8 +2814,8 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_190</name>
<pv_name>$(PREFIX):SS02-PIN7-RB</pv_name>
- <x>1400</x>
- <y>98</y>
+ <x>1304</x>
+ <y>123</y>
<width>90</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -3087,8 +2852,8 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_191</name>
<pv_name>$(PREFIX):SS02-PIN9-RB</pv_name>
- <x>1400</x>
- <y>132</y>
+ <x>1304</x>
+ <y>153</y>
<width>90</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -3173,4 +2938,491 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</actions>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_214</name>
+ <pv_name>$(PREFIX):DirC-110:PwrFwdL1.DESC</pv_name>
+ <x>463</x>
+ <y>136</y>
+ <width>225</width>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent>true</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="alarmRule" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pv0==0">
+ <value>
+ <color name="OFF" red="90" green="110" blue="90">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_215</name>
+ <pv_name>$(PREFIX):DirC-110:PwrFwdL1:WaveHigh</pv_name>
+ <x>693</x>
+ <y>136</y>
+ <width>80</width>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_216</name>
+ <pv_name>$(PREFIX):DirC-110:PwrRflctL2.DESC</pv_name>
+ <x>849</x>
+ <y>367</y>
+ <width>225</width>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent>true</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="alarmRule" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pv0==0">
+ <value>
+ <color name="OFF" red="90" green="110" blue="90">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_217</name>
+ <pv_name>$(PREFIX):DirC-110:PwrRflctL2:WaveHigh</pv_name>
+ <x>1079</x>
+ <y>367</y>
+ <width>80</width>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_2</name>
+ <text>AD Rej. Load</text>
+ <x>894</x>
+ <y>401</y>
+ <width>261</width>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>LED_75</name>
+ <pv_name>$(PREFIX):ADR-201004:ItckStat:FastIntStat</pv_name>
+ <x>865</x>
+ <y>401</y>
+ <off_color>
+ <color name="MAJOR" red="252" green="13" blue="27">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="OK" red="61" green="216" blue="61">
+ </color>
+ </on_color>
+ <foreground_color>
+ <color red="192" green="192" blue="192">
+ </color>
+ </foreground_color>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_218</name>
+ <pv_name>$(PREFIX):DirC-110:PwrFwdL2.DESC</pv_name>
+ <x>849</x>
+ <y>333</y>
+ <width>225</width>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent>true</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="alarmRule" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pv0==0">
+ <value>
+ <color name="OFF" red="90" green="110" blue="90">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_221</name>
+ <pv_name>$(PREFIX):DirC-110:PwrFwdL2:WaveHigh</pv_name>
+ <x>1079</x>
+ <y>333</y>
+ <width>80</width>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>BGGrey01-titlebar_37</name>
+ <x>1338</x>
+ <y>682</y>
+ <width>328</width>
+ <height>136</height>
+ <line_width>0</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="picture" version="2.0.0">
+ <name>gradient_4</name>
+ <file>images/gradient_v03.png</file>
+ <x>1300</x>
+ <y>686</y>
+ <width>63</width>
+ <height>127</height>
+ <stretch_image>true</stretch_image>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>BGGrey01-titlebar_38</name>
+ <x>1336</x>
+ <y>686</y>
+ <width>325</width>
+ <height>127</height>
+ <line_width>0</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_251</name>
+ <pv_name>$(PREFIX):DirC-110:PwrFwdC2:WaveHigh</pv_name>
+ <x>1571</x>
+ <y>739</y>
+ <width>80</width>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_252</name>
+ <pv_name>$(PREFIX):DirC-110:PwrRflctC2.DESC</pv_name>
+ <x>1338</x>
+ <y>773</y>
+ <width>225</width>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent>true</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="alarmRule" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pv0==0">
+ <value>
+ <color name="OFF" red="90" green="110" blue="90">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_253</name>
+ <pv_name>$(PREFIX):DirC-110:PwrRflctC2:WaveHigh</pv_name>
+ <x>1571</x>
+ <y>773</y>
+ <width>80</width>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_254</name>
+ <pv_name>$(PREFIX):DirC-110:PwrFwdC2.DESC</pv_name>
+ <x>1338</x>
+ <y>739</y>
+ <width>225</width>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent>true</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="alarmRule" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pv0==0">
+ <value>
+ <color name="OFF" red="90" green="110" blue="90">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Title Klystron Input Power Detectors_5</name>
+ <text>Cavity 2</text>
+ <x>1335</x>
+ <y>695</y>
+ <width>326</width>
+ <height>28</height>
+ <font>
+ <font family="Source Sans Pro" style="BOLD" size="18.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>BGGrey01-titlebar_43</name>
+ <x>1333</x>
+ <y>537</y>
+ <width>325</width>
+ <height>127</height>
+ <line_width>0</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="picture" version="2.0.0">
+ <name>gradient_7</name>
+ <file>images/gradient_v03.png</file>
+ <x>1297</x>
+ <y>537</y>
+ <width>63</width>
+ <height>127</height>
+ <stretch_image>true</stretch_image>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Title Klystron Input Power Detectors_7</name>
+ <text>Cavity 1</text>
+ <x>1330</x>
+ <y>550</y>
+ <width>326</width>
+ <height>28</height>
+ <font>
+ <font family="Source Sans Pro" style="BOLD" size="18.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_255</name>
+ <pv_name>$(PREFIX):DirC-110:PwrFwdC1:WaveHigh</pv_name>
+ <x>1568</x>
+ <y>589</y>
+ <width>80</width>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_256</name>
+ <pv_name>$(PREFIX):DirC-110:PwrRflctC1.DESC</pv_name>
+ <x>1336</x>
+ <y>623</y>
+ <width>225</width>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent>true</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="alarmRule" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pv0==0">
+ <value>
+ <color name="OFF" red="90" green="110" blue="90">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_257</name>
+ <pv_name>$(PREFIX):DirC-110:PwrRflctC1:WaveHigh</pv_name>
+ <x>1568</x>
+ <y>623</y>
+ <width>80</width>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_258</name>
+ <pv_name>$(PREFIX):DirC-110:PwrFwdC1.DESC</pv_name>
+ <x>1336</x>
+ <y>589</y>
+ <width>225</width>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent>true</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="alarmRule" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pv0==0">
+ <value>
+ <color name="OFF" red="90" green="110" blue="90">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_260</name>
+ <pv_name>$(PREFIX):DirC-110:PwrFwdDA.DESC</pv_name>
+ <x>1691</x>
+ <y>398</y>
+ <width>146</width>
+ <background_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent>true</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="alarmRule" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pv0==0">
+ <value>
+ <color name="OFF" red="90" green="110" blue="90">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_261</name>
+ <pv_name>$(PREFIX):DirC-110:PwrFwdDA:WaveHigh</pv_name>
+ <x>1849</x>
+ <y>398</y>
+ <width>80</width>
+ <precision>2</precision>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ </widget>
</display>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob
index 455d656b8a18f42558bfbb8e7c67aef248ca2225..db6a6a500901b6619ffac2e0ca69b6c91d48fd46 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob
@@ -471,7 +471,7 @@ Reset all non-active interlocks</tooltip>
<widget type="bool_button" version="2.0.0">
<name>Boolean Button_3</name>
<pv_name>$(PREFIX):CPU-TEST-ALL-ADS</pv_name>
- <x>195</x>
+ <x>362</x>
<y>137</y>
<width>150</width>
<off_label>AD Test</off_label>
@@ -502,22 +502,6 @@ Reset all non-active interlocks</tooltip>
<show_confirm_dialog>2</show_confirm_dialog>
<confirm_message>This will test the arc detectors and will generate interlocks</confirm_message>
</widget>
- <widget type="action_button" version="3.0.0">
- <name>Action Button_19</name>
- <actions execute_as_one="true">
- <action type="write_pv">
- <pv_name>$(pv_name)</pv_name>
- <value>1</value>
- <description>Set amplifier OFF</description>
- </action>
- </actions>
- <pv_name>$(PREFIX):CPU-OFF</pv_name>
- <text>OFF</text>
- <x>360</x>
- <y>137</y>
- <width>152</width>
- <tooltip>$(actions)</tooltip>
- </widget>
</widget>
<widget type="group" version="2.0.0">
<name> FIM - History Buffer Management 1</name>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsSystem01.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsSystem01.bob
index fa4dc4f79ecf6b4693b0eb734ec0e1fbf3609d0b..238440516c2c022f4da22c0f0c7525ddfa57d5d1 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsSystem01.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsSystem01.bob
@@ -479,7 +479,7 @@ Reset all non-active interlocks</tooltip>
<widget type="bool_button" version="2.0.0">
<name>Boolean Button_3</name>
<pv_name>$(PREFIX):CPU-TEST-ALL-ADS</pv_name>
- <x>195</x>
+ <x>362</x>
<y>137</y>
<width>150</width>
<off_label>AD Test</off_label>
@@ -510,22 +510,6 @@ Reset all non-active interlocks</tooltip>
<show_confirm_dialog>2</show_confirm_dialog>
<confirm_message>This will test the arc detectors and will generate interlocks</confirm_message>
</widget>
- <widget type="action_button" version="3.0.0">
- <name>Action Button_19</name>
- <actions execute_as_one="true">
- <action type="write_pv">
- <pv_name>$(pv_name)</pv_name>
- <value>1</value>
- <description>Set amplifier OFF</description>
- </action>
- </actions>
- <pv_name>$(PREFIX):CPU-OFF</pv_name>
- <text>OFF</text>
- <x>360</x>
- <y>137</y>
- <width>152</width>
- <tooltip>$(actions)</tooltip>
- </widget>
</widget>
<widget type="group" version="2.0.0">
<name> FIM - History Buffer Management 1</name>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsSystem02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsSystem02.bob
index 6a5a9fd564437f43efe53b75bd5a3390ddbd8abd..4cca429cdeaeda692d7fdcb3a2cb591f9d8359b6 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsSystem02.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsSystem02.bob
@@ -478,7 +478,7 @@ Reset all non-active interlocks</tooltip>
<widget type="bool_button" version="2.0.0">
<name>Boolean Button_3</name>
<pv_name>$(PREFIX):CPU-TEST-ALL-ADS</pv_name>
- <x>195</x>
+ <x>362</x>
<y>137</y>
<width>150</width>
<off_label>AD Test</off_label>
@@ -509,22 +509,6 @@ Reset all non-active interlocks</tooltip>
<show_confirm_dialog>2</show_confirm_dialog>
<confirm_message>This will test the arc detectors and will generate interlocks</confirm_message>
</widget>
- <widget type="action_button" version="3.0.0">
- <name>Action Button_19</name>
- <actions execute_as_one="true">
- <action type="write_pv">
- <pv_name>$(pv_name)</pv_name>
- <value>1</value>
- <description>Set amplifier OFF</description>
- </action>
- </actions>
- <pv_name>$(PREFIX):CPU-OFF</pv_name>
- <text>OFF</text>
- <x>360</x>
- <y>137</y>
- <width>152</width>
- <tooltip>$(actions)</tooltip>
- </widget>
</widget>
<widget type="group" version="2.0.0">
<name> FIM - History Buffer Management 1</name>