From 704a7fe39fc19f44807314c6da7642c02381be3e Mon Sep 17 00:00:00 2001
From: Per Nilsson <per.nilsson2@esss.se>
Date: Mon, 1 Nov 2021 10:52:37 +0100
Subject: [PATCH] Fixed some bugs in ACCP OPI.

---
 .../Coldbox/processCBXColdEnd1.bob            |  10 +-
 .../ACCP_Phoebus/Coldbox/processDewar.bob     |   5 +-
 .../Cryo/ACCP_Phoebus/Common/Element/MCD.bob  |  26 +-
 .../Common/Faceplate/genericUSFP.bob          | 345 ++++++++
 .../Common/Faceplate/heaterFP.bob             | 807 ++++++++++++++++++
 .../Common/Process/processGasAnalyser.bob     |   1 +
 6 files changed, 1180 insertions(+), 14 deletions(-)
 create mode 100644 NON-APPROVED/Cryo/ACCP_Phoebus/Common/Faceplate/genericUSFP.bob
 create mode 100644 NON-APPROVED/Cryo/ACCP_Phoebus/Common/Faceplate/heaterFP.bob

diff --git a/NON-APPROVED/Cryo/ACCP_Phoebus/Coldbox/processCBXColdEnd1.bob b/NON-APPROVED/Cryo/ACCP_Phoebus/Coldbox/processCBXColdEnd1.bob
index 0156dbc6..640f0e1c 100644
--- a/NON-APPROVED/Cryo/ACCP_Phoebus/Coldbox/processCBXColdEnd1.bob
+++ b/NON-APPROVED/Cryo/ACCP_Phoebus/Coldbox/processCBXColdEnd1.bob
@@ -4166,7 +4166,7 @@ $(pv_value)</tooltip>
     <text>SP return</text>
     <x>1191</x>
     <y>805</y>
-    <width>50</width>
+    <width>48</width>
     <height>18</height>
     <font>
       <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
@@ -4375,7 +4375,7 @@ $(pv_value)</tooltip>
     <text>Dewar return to Subcooler</text>
     <x>1106</x>
     <y>244</y>
-    <width>135</width>
+    <width>133</width>
     <height>18</height>
     <font>
       <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
@@ -5042,7 +5042,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update</name>
-      <pv_name>$(P)-HS-33710:SwLvl-RB</pv_name>
+      <pv_name>$(P)-HS-33710:SwLvl</pv_name>
       <x>101</x>
       <y>40</y>
       <width>120</width>
@@ -5052,6 +5052,7 @@ $(pv_value)</tooltip>
         </font>
       </font>
       <vertical_alignment>1</vertical_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label_2</name>
@@ -5123,7 +5124,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_2</name>
-      <pv_name>$(P)-HS-32890:SwLvl-RB</pv_name>
+      <pv_name>$(P)-HS-32890:SwLvl</pv_name>
       <x>101</x>
       <y>40</y>
       <width>120</width>
@@ -5133,6 +5134,7 @@ $(pv_value)</tooltip>
         </font>
       </font>
       <vertical_alignment>1</vertical_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label_3</name>
diff --git a/NON-APPROVED/Cryo/ACCP_Phoebus/Coldbox/processDewar.bob b/NON-APPROVED/Cryo/ACCP_Phoebus/Coldbox/processDewar.bob
index 4ae4a121..e9998258 100644
--- a/NON-APPROVED/Cryo/ACCP_Phoebus/Coldbox/processDewar.bob
+++ b/NON-APPROVED/Cryo/ACCP_Phoebus/Coldbox/processDewar.bob
@@ -1066,7 +1066,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update</name>
-      <pv_name>$(P)-HS-63000:SwLvl-RB</pv_name>
+      <pv_name>$(P)-HS-63000:SwLvl</pv_name>
       <x>101</x>
       <y>40</y>
       <width>120</width>
@@ -1076,6 +1076,7 @@ $(pv_value)</tooltip>
         </font>
       </font>
       <vertical_alignment>1</vertical_alignment>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label_2</name>
@@ -1171,7 +1172,7 @@ $(pv_value)</tooltip>
     <x>603</x>
     <y>870</y>
     <width>54</width>
-    <height>14</height>
+    <height>15</height>
     <font>
       <font name="Normal" family="sans" style="REGULAR" size="11.881188118811881">
       </font>
diff --git a/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Element/MCD.bob b/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Element/MCD.bob
index c0e72f69..fef9d0b1 100644
--- a/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Element/MCD.bob
+++ b/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Element/MCD.bob
@@ -188,14 +188,6 @@ $(pv_value)</tooltip>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
-      <action type="open_display">
-        <file>../Faceplate/genericUSFP.opi</file>
-        <macros>
-          <ADD></ADD>
-          <DEV>US</DEV>
-        </macros>
-        <target>tab</target>
-      </action>
     </actions>
     <rules>
       <rule name="BackgroundRule" prop_id="background_color" out_exp="false">
@@ -216,4 +208,22 @@ $(pv_value)</tooltip>
     </rules>
     <border_width>1</border_width>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="open_display">
+        <file>../Faceplate/genericUSFP.bob</file>
+        <macros>
+          <DEV>US</DEV>
+        </macros>
+        <target>tab</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text></text>
+    <width>81</width>
+    <height>67</height>
+    <transparent>true</transparent>
+    <tooltip>$(actions)</tooltip>
+  </widget>
 </display>
diff --git a/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Faceplate/genericUSFP.bob b/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Faceplate/genericUSFP.bob
new file mode 100644
index 00000000..5130ce4a
--- /dev/null
+++ b/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Faceplate/genericUSFP.bob
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>$(DEV)$(IND)$(ADD)</name>
+  <macros>
+    <PRE>$(P)-US-$(IND)</PRE>
+    <ScreenName>$(DEV)$(IND)$(ADD)</ScreenName>
+  </macros>
+  <width>1260</width>
+  <height>970</height>
+  <actions>
+  </actions>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>../MainOPI/header_aux.opi</file>
+    <width>1259</width>
+    <height>165</height>
+    <resize>2</resize>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Close_1</name>
+    <actions execute_as_one="true">
+      <action type="execute">
+        <script file="../Scripts/closeOpi.js">
+        </script>
+      </action>
+    </actions>
+    <text>Exit</text>
+    <x>210</x>
+    <y>360</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Manual_1</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(PRE):MM$(ADD)</pv_name>
+    <text>Manual</text>
+    <x>20</x>
+    <y>300</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pvInt0==1">
+          <value>
+            <color name="Manual" red="190" green="115" blue="240">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PRE):MM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BorderRule" prop_id="border_style" out_exp="false">
+        <exp bool_exp="pvInt0==1">
+          <value>7</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+      <rule name="Lock" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pv1==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pv0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Auto_1</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(PRE):MM$(ADD)</pv_name>
+    <text>Auto</text>
+    <x>110</x>
+    <y>300</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="BackgroundAuto" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pvInt0==0">
+          <value>
+            <color name="Automatic" red="132" green="190" blue="225">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PRE):MM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BorderRule" prop_id="border_style" out_exp="false">
+        <exp bool_exp="pvInt0==0">
+          <value>7</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+      <rule name="Lock" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pv1==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pv0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <text>State</text>
+    <x>22</x>
+    <y>185</y>
+    <width>60</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(PRE):Sta$(ADD)</pv_name>
+    <x>110</x>
+    <y>190</y>
+    <width>80</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read-only Field Bkgd Grey" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <format>6</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Manual_1</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(PRE):OnM$(ADD)</pv_name>
+    <text>On</text>
+    <x>20</x>
+    <y>230</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="Lock" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pvInt1==1 &amp;&amp; pvInt2==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pvInt0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>$(PRE):MM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BkgdRule" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pvInt0==1">
+          <value>
+            <color name="Normal Green" red="0" green="150" blue="0">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PRE):OnM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BorderRule" prop_id="border_style" out_exp="false">
+        <exp bool_exp="pvInt0==1">
+          <value>7</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Manual_2</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(PRE):OnM$(ADD)</pv_name>
+    <text>Off</text>
+    <x>110</x>
+    <y>230</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="Lock" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pvInt1==1 &amp;&amp; pvInt2==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pvInt0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>$(PRE):MM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BkgdRule" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pvInt0==0">
+          <value>
+            <color name="Normal Green" red="0" green="150" blue="0">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PRE):OnM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BorderRule" prop_id="border_style" out_exp="false">
+        <exp bool_exp="pvInt0==0">
+          <value>7</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+</display>
diff --git a/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Faceplate/heaterFP.bob b/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Faceplate/heaterFP.bob
new file mode 100644
index 00000000..8c95ac41
--- /dev/null
+++ b/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Faceplate/heaterFP.bob
@@ -0,0 +1,807 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>$(DEV)$(IND)$(ADD)</name>
+  <macros>
+    <PRE>$(P)-$(USDEV)-$(IND)</PRE>
+    <PREC>$(P)-$(UYDEV)-$(IND)</PREC>
+    <ScreenName>$(DEV)$(IND)$(ADD)</ScreenName>
+  </macros>
+  <width>1260</width>
+  <height>970</height>
+  <actions>
+  </actions>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>../MainOPI/header_aux.opi</file>
+    <width>1259</width>
+    <height>165</height>
+    <resize>2</resize>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <text>$(USSTR)</text>
+    <x>20</x>
+    <y>180</y>
+    <width>170</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_3</name>
+    <text>$(UYSTR)</text>
+    <x>330</x>
+    <y>180</y>
+    <width>170</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Close_1</name>
+    <actions execute_as_one="true">
+      <action type="execute">
+        <script file="../Scripts/closeOpi.js">
+        </script>
+      </action>
+    </actions>
+    <text>Exit</text>
+    <x>520</x>
+    <y>400</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Manual_1</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(PRE):MM$(ADD)</pv_name>
+    <text>Manual</text>
+    <x>20</x>
+    <y>340</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pvInt0==1">
+          <value>
+            <color name="Manual" red="190" green="115" blue="240">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PRE):MM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BorderRule" prop_id="border_style" out_exp="false">
+        <exp bool_exp="pvInt0==1">
+          <value>7</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+      <rule name="Lock" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pv1==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pv0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Auto_1</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(PRE):MM$(ADD)</pv_name>
+    <text>Auto</text>
+    <x>110</x>
+    <y>340</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="BackgroundAuto" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pvInt0==0">
+          <value>
+            <color name="Automatic" red="132" green="190" blue="225">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PRE):MM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BorderRule" prop_id="border_style" out_exp="false">
+        <exp bool_exp="pvInt0==0">
+          <value>7</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+      <rule name="Lock" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pv1==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pv0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <text>Ramp</text>
+    <x>250</x>
+    <y>300</y>
+    <width>60</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Manual</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(PREC):Man$(ADD)</pv_name>
+    <text>Manual</text>
+    <x>330</x>
+    <y>340</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pvInt0==1">
+          <value>
+            <color name="Manual" red="190" green="115" blue="240">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PREC):Man$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BorderRule" prop_id="border_style" out_exp="false">
+        <exp bool_exp="pvInt0==1">
+          <value>7</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+      <rule name="Lock" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pv1==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pv0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Auto</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(PREC):Man$(ADD)</pv_name>
+    <text>Auto</text>
+    <x>420</x>
+    <y>340</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="BackgroundAuto" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pvInt0==0">
+          <value>
+            <color name="Automatic" red="132" green="190" blue="225">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PREC):Man$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BorderRule" prop_id="border_style" out_exp="false">
+        <exp bool_exp="pvInt0==0">
+          <value>7</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+      <rule name="Lock" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pv1==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pv0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input</name>
+    <pv_name>$(PREC):Mval$(ADD)</pv_name>
+    <x>330</x>
+    <y>260</y>
+    <width>80</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="EnabledRule" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pvInt1==1 &amp;&amp; pvInt2==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pvInt0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>$(PREC):Man$(ADD)-RB</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_1</name>
+    <pv_name>$(PREC):RM$(ADD)</pv_name>
+    <x>330</x>
+    <y>300</y>
+    <width>80</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="EnabledRule" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pvInt1==1 &amp;&amp; pvInt2==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pvInt0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>$(PREC):Man$(ADD)-RB</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <text>ManVal</text>
+    <x>250</x>
+    <y>260</y>
+    <width>60</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(PREC):Mval$(ADD)-RB</pv_name>
+    <x>420</x>
+    <y>260</y>
+    <width>80</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read-only Field Bkgd Grey" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <format>1</format>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(PREC):RM$(ADD)-RB</pv_name>
+    <x>420</x>
+    <y>300</y>
+    <width>80</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read-only Field Bkgd Grey" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <format>1</format>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_6</name>
+    <text>State</text>
+    <x>22</x>
+    <y>220</y>
+    <width>60</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>State</text>
+    <x>250</x>
+    <y>220</y>
+    <width>60</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_2</name>
+    <pv_name>$(PRE):Sta$(ADD)</pv_name>
+    <x>110</x>
+    <y>220</y>
+    <width>80</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read-only Field Bkgd Grey" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <format>6</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_4</name>
+    <pv_name>$(PREC):Sta$(ADD)</pv_name>
+    <x>330</x>
+    <y>220</y>
+    <width>80</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read-only Field Bkgd Grey" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <format>6</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_5</name>
+    <pv_name>$(PREC):PrcO$(ADD)</pv_name>
+    <x>420</x>
+    <y>220</y>
+    <width>80</width>
+    <height>30</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read-only Field Bkgd Grey" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <format>1</format>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Manual_2</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(PRE):OnM$(ADD)</pv_name>
+    <text>On</text>
+    <x>20</x>
+    <y>260</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="Lock" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pvInt1==1 &amp;&amp; pvInt2==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pvInt0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>$(PRE):MM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BkgdRule" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pvInt0==1">
+          <value>
+            <color name="Normal Green" red="0" green="150" blue="0">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PRE):OnM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BorderRule" prop_id="border_style" out_exp="false">
+        <exp bool_exp="pvInt0==1">
+          <value>7</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Manual_3</name>
+    <actions execute_as_one="true">
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(PRE):OnM$(ADD)</pv_name>
+    <text>Off</text>
+    <x>110</x>
+    <y>260</y>
+    <width>80</width>
+    <height>40</height>
+    <font>
+      <font name="SMALL-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="14.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Background Grey" red="220" green="220" blue="220">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="Lock" prop_id="enabled" out_exp="false">
+        <exp bool_exp="pvInt1==1 &amp;&amp; pvInt2==1">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="pvInt0==1">
+          <value>false</value>
+        </exp>
+        <exp bool_exp="1">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)-SCREENLOCK</pv_name>
+        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>$(PRE):MM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BkgdRule" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pvInt0==0">
+          <value>
+            <color name="Normal Green" red="0" green="150" blue="0">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PRE):OnM$(ADD)-RB</pv_name>
+      </rule>
+      <rule name="BorderRule" prop_id="border_style" out_exp="false">
+        <exp bool_exp="pvInt0==0">
+          <value>7</value>
+        </exp>
+        <pv_name>$(pv_name)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+</display>
diff --git a/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Process/processGasAnalyser.bob b/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Process/processGasAnalyser.bob
index 6f011ffd..c2071b96 100644
--- a/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Process/processGasAnalyser.bob
+++ b/NON-APPROVED/Cryo/ACCP_Phoebus/Common/Process/processGasAnalyser.bob
@@ -2,6 +2,7 @@
 <display version="2.0.0">
   <name>ACCP - $(ScreenName)</name>
   <macros>
+    <LOCKID>LCR1</LOCKID>
     <P>CrS-ACCP:CRYO</P>
     <ScreenName>Gas Impurity Measurements</ScreenName>
   </macros>
-- 
GitLab