Skip to content
Snippets Groups Projects
Commit 3a08fe8a authored by Anders Harrisson's avatar Anders Harrisson
Browse files

Merge branch 'master' into 'master' 

Updates to Cryo OPI

See merge request !251
parents 12ad87bd 2acf5bfa
No related branches found
No related tags found
1 merge request!251Updates to Cryo OPI
Pipeline #68076 failed
Hide whitespace changes
Inline Side-by-side
Showing
with 491 additions and 60 deletions
NON-APPROVED/Cryo/PHS/embedded/PHS_purity_faceplate.bob 0 → 100644
+ 152
− 0
View file @ 3a08fe8a
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>Tank purity faceplate. PHS:D-$(Tank)00</name>
<width>590</width>
<height>270</height>
<widget type="rectangle" version="2.0.0">
<name>Titlebar</name>
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
<width>590</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>TitleText</name>
<class>TITLE</class>
<text>Set purity for tank PHS:D-$(Tank)00</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>570</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>
</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>0.0</value>
<description>Write PV</description>
</action>
</actions>
<pv_name>${WIDSecSub}:${WIDDis}-D-$(Tank)00:Purity</pv_name>
<text>Set tank purity level to CLEAN (&lt; 5 ppm N2)</text>
<x>70</x>
<y>70</y>
<width>500</width>
<tooltip>Clean tanks can be used for cooldown of cryo plants.</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_1</name>
<actions>
<action type="write_pv">
<pv_name>$(pv_name)</pv_name>
<value>1.0</value>
<description>Write PV</description>
</action>
</actions>
<pv_name>${WIDSecSub}:${WIDDis}-D-$(Tank)00:Purity</pv_name>
<text>Set tank purity level to OKEY (&lt; 20 ppm N2)</text>
<x>70</x>
<y>120</y>
<width>500</width>
<tooltip>Okey levels can be used to liquify with adsorbers online.</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_2</name>
<actions>
<action type="write_pv">
<pv_name>$(pv_name)</pv_name>
<value>2.0</value>
<description>Write PV</description>
</action>
</actions>
<pv_name>${WIDSecSub}:${WIDDis}-D-$(Tank)00:Purity</pv_name>
<text>Set tank purity level to UNKNOWN.</text>
<x>70</x>
<y>170</y>
<width>500</width>
<tooltip>Unknown purity level potetially dirty. Analyzis needed.</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_3</name>
<actions>
<action type="write_pv">
<pv_name>$(pv_name)</pv_name>
<value>3.0</value>
<description>Write PV</description>
</action>
</actions>
<pv_name>${WIDSecSub}:${WIDDis}-D-$(Tank)00:Purity</pv_name>
<text>Set tank purity level to DIRTY(&gt;20 ppm N2)</text>
<x>70</x>
<y>220</y>
<width>500</width>
<tooltip>Dirty tank. Must be set to purifyer.</tooltip>
</widget>
<widget type="rectangle" version="2.0.0">
<name>Rectangle</name>
<x>20</x>
<y>70</y>
<width>30</width>
<height>30</height>
<line_width>0</line_width>
<background_color>
<color name="OK" red="61" green="216" blue="61">
</color>
</background_color>
</widget>
<widget type="rectangle" version="2.0.0">
<name>Rectangle_1</name>
<x>20</x>
<y>120</y>
<width>30</width>
<height>30</height>
<line_width>0</line_width>
<background_color>
<color name="LED-YELLOW-ON" red="255" green="235" blue="17">
</color>
</background_color>
</widget>
<widget type="rectangle" version="2.0.0">
<name>Rectangle_2</name>
<x>20</x>
<y>170</y>
<width>30</width>
<height>30</height>
<line_width>0</line_width>
<background_color>
<color name="LED-ORANGE-ON" red="255" green="175" blue="81">
</color>
</background_color>
</widget>
<widget type="rectangle" version="2.0.0">
<name>Rectangle_3</name>
<x>20</x>
<y>220</y>
<width>30</width>
<height>30</height>
<line_width>0</line_width>
<background_color>
<color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
</background_color>
</widget>
</display>
NON-APPROVED/Cryo/PHS/embedded/PHS_purity_indicator.bob 0 → 100644
+ 68
− 0
View file @ 3a08fe8a
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>Purity indicator</name>
<width>40</width>
<height>40</height>
<widget type="multi_state_led" version="2.0.0">
<name>LED (Multi State)</name>
<pv_name>${WIDSecSub}:${WIDDis}-D-$(Tank)00:Purity</pv_name>
<x>10</x>
<y>10</y>
<square>true</square>
<tooltip></tooltip>
<states>
<state>
<value>0</value>
<label></label>
<color>
<color name="ON" red="70" green="255" blue="70">
</color>
</color>
</state>
<state>
<value>1</value>
<label></label>
<color>
<color name="MINOR" red="252" green="242" blue="17">
</color>
</color>
</state>
<state>
<value>2</value>
<label></label>
<color>
<color name="LED-ORANGE-ON" red="255" green="175" blue="81">
</color>
</color>
</state>
<state>
<value>3</value>
<label></label>
<color>
<color name="MAJOR" red="252" green="13" blue="27">
</color>
</color>
</state>
</states>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button</name>
<actions>
<action type="open_display">
<file>PHS_purity_faceplate.bob</file>
<target>window</target>
<description>Open Display</description>
</action>
</actions>
<text></text>
<x>1</x>
<y>1</y>
<width>38</width>
<height>38</height>
<transparent>true</transparent>
<tooltip>Green: Clean - OK for cooldown (&lt; 5 ppm N2)
Yellow: Okey for feeding ACCP with adsorbes online.
Orange: Unknown state. Potentially dirty!
Red: DIRTY! To be processed with ext. purifer.</tooltip>
</widget>
</display>
NON-APPROVED/Cryo/PHS/embedded/Tanks_01-10__GroupContainer.bob
+ 19
− 10
View file @ 3a08fe8a
......@@ -15,17 +15,17 @@
<y>148</y>
<width>1</width>
<height>81</height>
<line_width>4</line_width>
<line_color>
<color name="RED-BORDER" red="150" green="8" blue="16">
</color>
</line_color>
<points>
<point x="0.0" y="0.0">
</point>
<point x="0.0" y="80.01219512195122">
</point>
</points>
<line_width>4</line_width>
<line_color>
<color name="RED-BORDER" red="150" green="8" blue="16">
</color>
</line_color>
<actions>
</actions>
<tooltip>$(pv_name)
......@@ -37,17 +37,17 @@ $(pv_value)</tooltip>
<y>148</y>
<width>1</width>
<height>83</height>
<line_width>4</line_width>
<line_color>
<color name="ORANGE" red="254" green="194" blue="81">
</color>
</line_color>
<points>
<point x="0.0" y="0.0">
</point>
<point x="0.0" y="82.03488372093022">
</point>
</points>
<line_width>4</line_width>
<line_color>
<color name="ORANGE" red="254" green="194" blue="81">
</color>
</line_color>
<actions>
</actions>
<tooltip>$(pv_name)
......@@ -336,4 +336,13 @@ $(pv_value)</tooltip>
</rules>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display</name>
<file>PHS_purity_indicator.bob</file>
<x>63</x>
<y>121</y>
<width>40</width>
<height>40</height>
<transparent>true</transparent>
</widget>
</display>
NON-APPROVED/Cryo/PHS/embedded/Tanks_10-14__GroupContainer.bob
+ 23
− 14
View file @ 3a08fe8a
......@@ -15,17 +15,17 @@
<y>70</y>
<width>1</width>
<height>83</height>
<line_width>4</line_width>
<line_color>
<color name="RED-BORDER" red="150" green="8" blue="16">
</color>
</line_color>
<points>
<point x="0.0" y="0.0">
</point>
<point x="0.0" y="81.98780487804879">
</point>
</points>
<line_width>4</line_width>
<line_color>
<color name="RED-BORDER" red="150" green="8" blue="16">
</color>
</line_color>
<actions>
</actions>
<tooltip>$(pv_name)
......@@ -37,17 +37,17 @@ $(pv_value)</tooltip>
<y>70</y>
<width>1</width>
<height>83</height>
<line_width>4</line_width>
<line_color>
<color name="ORANGE" red="254" green="194" blue="81">
</color>
</line_color>
<points>
<point x="0.0" y="0.0">
</point>
<point x="0.0" y="82.03488372093022">
</point>
</points>
<line_width>4</line_width>
<line_color>
<color name="ORANGE" red="254" green="194" blue="81">
</color>
</line_color>
<actions>
</actions>
<tooltip>$(pv_name)
......@@ -131,7 +131,7 @@ $(pv_value)</tooltip>
<name>PHS:D-Pressure_2</name>
<pv_name>CrS-PHS:Cryo-PI-$(Tank)10:Pressure</pv_name>
<x>52</x>
<y>226</y>
<y>222</y>
<width>60</width>
<font>
<font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
......@@ -199,9 +199,9 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>PHS:D-Mass</name>
<pv_name>CrS-PHS:Cryo-D-$(Tank)00:HeliumMass</pv_name>
<x>48</x>
<y>245</y>
<width>69</width>
<x>52</x>
<y>241</y>
<width>60</width>
<font>
<font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
......@@ -334,4 +334,13 @@ $(pv_value)</tooltip>
</rules>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display</name>
<file>PHS_purity_indicator.bob</file>
<x>62</x>
<y>254</y>
<width>40</width>
<height>40</height>
<transparent>true</transparent>
</widget>
</display>
NON-APPROVED/Cryo/PHS/embedded/Tanks_15-18__GroupContainer.bob
+ 24
− 15
View file @ 3a08fe8a
......@@ -15,17 +15,17 @@
<y>70</y>
<width>1</width>
<height>82</height>
<line_width>4</line_width>
<line_color>
<color name="BLUE" red="79" green="228" blue="250">
</color>
</line_color>
<points>
<point x="0.0" y="0.0">
</point>
<point x="0.0" y="81.00000000000001">
</point>
</points>
<line_width>4</line_width>
<line_color>
<color name="BLUE" red="79" green="228" blue="250">
</color>
</line_color>
<actions>
</actions>
<tooltip>$(pv_name)
......@@ -37,17 +37,17 @@ $(pv_value)</tooltip>
<y>70</y>
<width>1</width>
<height>83</height>
<line_width>4</line_width>
<line_color>
<color red="0" green="64" blue="255">
</color>
</line_color>
<points>
<point x="0.0" y="0.0">
</point>
<point x="0.0" y="82.03488372093022">
</point>
</points>
<line_width>4</line_width>
<line_color>
<color red="0" green="64" blue="255">
</color>
</line_color>
<actions>
</actions>
<tooltip>$(pv_name)
......@@ -130,8 +130,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>PHS:D-Pressure_2</name>
<pv_name>CrS-PHS:Cryo-PI-$(Tank)10:Pressure</pv_name>
<x>54</x>
<y>224</y>
<x>52</x>
<y>222</y>
<width>60</width>
<font>
<font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
......@@ -199,9 +199,9 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>PHS:D-Mass</name>
<pv_name>CrS-PHS:Cryo-D-$(Tank)00:HeliumMass</pv_name>
<x>49</x>
<y>245</y>
<width>69</width>
<x>52</x>
<y>241</y>
<width>60</width>
<font>
<font name="NORMAL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
......@@ -334,4 +334,13 @@ $(pv_value)</tooltip>
</rules>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display</name>
<file>PHS_purity_indicator.bob</file>
<x>62</x>
<y>254</y>
<width>40</width>
<height>40</height>
<transparent>true</transparent>
</widget>
</display>
NON-APPROVED/Cryo/PHS/embedded/Tanks_19__GroupContainer.bob
+ 19
− 10
View file @ 3a08fe8a
......@@ -15,17 +15,17 @@
<y>147</y>
<width>1</width>
<height>81</height>
<line_width>4</line_width>
<line_color>
<color red="79" green="143" blue="35">
</color>
</line_color>
<points>
<point x="0.0" y="0.0">
</point>
<point x="0.0" y="80.01219512195122">
</point>
</points>
<line_width>4</line_width>
<line_color>
<color red="79" green="143" blue="35">
</color>
</line_color>
<actions>
</actions>
<tooltip>$(pv_name)
......@@ -37,17 +37,17 @@ $(pv_value)</tooltip>
<y>147</y>
<width>1</width>
<height>83</height>
<line_width>4</line_width>
<line_color>
<color name="ORANGE" red="254" green="194" blue="81">
</color>
</line_color>
<points>
<point x="0.0" y="0.0">
</point>
<point x="0.0" y="82.03488372093022">
</point>
</points>
<line_width>4</line_width>
<line_color>
<color name="ORANGE" red="254" green="194" blue="81">
</color>
</line_color>
<actions>
</actions>
<tooltip>$(pv_name)
......@@ -336,4 +336,13 @@ $(pv_value)</tooltip>
</rules>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display</name>
<file>PHS_purity_indicator.bob</file>
<x>63</x>
<y>121</y>
<width>40</width>
<height>40</height>
<transparent>true</transparent>
</widget>
</display>
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Controls/Objects/cmd_dialog.bob 0 → 100644
+ 109
− 0
View file @ 3a08fe8a
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>cmd cooldown</name>
<width>364</width>
<height>40</height>
<widget type="action_button" version="3.0.0">
<name>Action Button_Start</name>
<actions>
<action type="execute">
<script file="EmbeddedPy">
<text><![CDATA[from org.csstudio.display.builder.runtime.script import ScriptUtil, PVUtil
from org.csstudio.display.builder.runtime.pv import PVFactory
myPV = PVFactory.getPV("CrS-TICP:Cryo-PT-31390:Val")
myVal = PVUtil.getDouble(myPV)
if myVal <13.3:
ScriptUtil.showMessageDialog(widget, "PT-31390 is below 13.3 BarA and cooldown will not start")
else:
#ßScriptUtil.showMessageDialog(widget, "PT-31390 is above 13.3 BarA and cooldown will start")
PVUtil.writePV(widget.propPVName().getValue(), 1, 5000)
# Prompt. Could also use ScriptUtil.showPasswordDialog
#if ScriptUtil.showConfirmationDialog(widget,
# "Do you want to write\n5 to the PV?"):
# PVUtil.writePV(widget.propPVName().getValue(), 5, 5000)
PVFactory.releasePV(myPV)]]></text>
</script>
<description>Execute Start Script</description>
</action>
</actions>
<pv_name>$(Pref)-$(Dev):$(PrefixCmd)$(Cmd)$(SufixOn)
</pv_name>
<text>$(LabelOn)</text>
<x>285</x>
<y>5</y>
<width>70</width>
<font>
<font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<rules>
<rule name="Color" prop_id="background_color" out_exp="false">
<exp bool_exp="pv0==0">
<value>
<color name="Button_Background" red="236" green="236" blue="236">
</color>
</value>
</exp>
<exp bool_exp="pv0==1">
<value>
<color name="ON" red="70" green="255" blue="70">
</color>
</value>
</exp>
<pv_name>$(Pref)-$(Dev):$(PrefixSts)$(Cmd)</pv_name>
</rule>
</rules>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_Stop</name>
<actions>
<action type="write_pv">
<pv_name>$(pv_name)</pv_name>
<value>1</value>
<description>Write PV</description>
</action>
</actions>
<pv_name>$(Pref)-$(Dev):$(PrefixCmd)$(Cmd)$(SufixOff)</pv_name>
<text>$(LabelOff)</text>
<x>210</x>
<y>5</y>
<width>70</width>
<font>
<font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<rules>
<rule name="Color" prop_id="background_color" out_exp="false">
<exp bool_exp="pv0==0">
<value>
<color name="GREEN-GROUP-BORDER" red="131" green="150" blue="131">
</color>
</value>
</exp>
<exp bool_exp="pv0==1">
<value>
<color name="Button_Background" red="236" green="236" blue="236">
</color>
</value>
</exp>
<pv_name>$(Pref)-$(Dev):$(PrefixSts)$(Cmd)</pv_name>
</rule>
</rules>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>Label_Command</name>
<text>$(Label):</text>
<x>10</x>
<y>10</y>
<width>210</width>
<font>
<font name="Comment" family="Source Sans Pro" style="ITALIC" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
</widget>
</display>
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/opi/cryo-50-cmds-1.bob
+ 11
− 11
View file @ 3a08fe8a
......@@ -9,11 +9,6 @@
<y>20</y>
<width>735</width>
<height>590</height>
<line_width>1</line_width>
<line_color>
<color name="GRAY-BORDER" red="121" green="121" blue="121">
</color>
</line_color>
<points>
<point x="0.0" y="0.0">
</point>
......@@ -26,6 +21,11 @@
<point x="0.0" y="0.0">
</point>
</points>
<line_width>1</line_width>
<line_color>
<color name="GRAY-BORDER" red="121" green="121" blue="121">
</color>
</line_color>
</widget>
<widget type="label" version="2.0.0">
<name>Label_Header</name>
......@@ -172,7 +172,7 @@
<SufixOff>_Stop</SufixOff>
<SufixOn>_Start</SufixOn>
</macros>
<file>../Controls/Objects/cmd.bob</file>
<file>../Controls/Objects/cmd_dialog.bob</file>
<x>21</x>
<y>239</y>
<width>364</width>
......@@ -403,17 +403,17 @@
<y>44</y>
<width>2</width>
<height>565</height>
<line_width>1</line_width>
<line_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<points>
<point x="0.0" y="565.0">
</point>
<point x="2.0" y="0.0">
</point>
</points>
<line_width>1</line_width>
<line_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_44</name>
......
NON-APPROVED/Cryo/Utilities/Cooling water G04/CoolingWater-CUB.bob
+ 66
− 0
View file @ 3a08fe8a
......@@ -347,4 +347,70 @@
<transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_11</name>
<macros>
<PVBase>CWS-G04:WtrC-TT-002</PVBase>
<PVName>CWS-G04:WtrC-TT-002:ProcessValueRB</PVName>
<PVShortName>TT-002</PVShortName>
<PVUnit>°C</PVUnit>
</macros>
<file>Embedded/Indicator.bob</file>
<x>62</x>
<y>361</y>
<width>124</width>
<height>48</height>
<resize>2</resize>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_12</name>
<macros>
<PVBase>CWS-G04:WtrC-TT-015</PVBase>
<PVName>CWS-G04:WtrC-TT-015:ProcessValueRB</PVName>
<PVShortName>TT-015</PVShortName>
<PVUnit>°C</PVUnit>
</macros>
<file>Embedded/Indicator.bob</file>
<x>60</x>
<y>445</y>
<width>124</width>
<height>48</height>
<resize>2</resize>
</widget>
<widget type="label" version="2.0.0">
<name>Label</name>
<text>CWM Return</text>
<x>63</x>
<y>340</y>
<width>123</width>
</widget>
<widget type="label" version="2.0.0">
<name>Label_1</name>
<text>CWM Supply</text>
<x>62</x>
<y>424</y>
<width>122</width>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_14</name>
<macros>
<PVBase>CWS-G04:WtrC-TT-016</PVBase>
<PVName>CWS-G04:WtrC-TT-016:ProcessValueRB</PVName>
<PVShortName>TT-016</PVShortName>
<PVUnit>°C</PVUnit>
</macros>
<file>Embedded/Indicator.bob</file>
<x>60</x>
<y>535</y>
<width>124</width>
<height>48</height>
<resize>2</resize>
</widget>
<widget type="label" version="2.0.0">
<name>Label_2</name>
<text>CWH Return</text>
<x>62</x>
<y>514</y>
<width>122</width>
</widget>
</display>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment