From 4674c78556ddf82ec5c68cdc878d914bcfce3449 Mon Sep 17 00:00:00 2001
From: Joao Paulo Martins <joaopaulo.martins@ess.eu>
Date: Mon, 20 Jul 2020 12:09:18 +0200
Subject: [PATCH] Updated LAB-010 RFLPS
---
.../TS2/ts2-010rfc-rflps/01_mainLAB10.bob | 2 +-
.../TS2/ts2-010rfc-rflps/rflpsMainLAB.bob | 2 +-
.../scripts/fim_macros_lab_10.py | 95 ++++++-----
.../scripts/fim_macros_lab_11.py | 28 +++-
.../scripts/fim_macros_rfq_01.py | 22 ++-
.../scripts/fim_macros_ts2_01.py | 16 ++
.../scripts/fim_macros_ts2_02.py | 17 ++
.../support/machineStateControl.bob | 48 +++---
.../ts2-010rfc-rflps/support/overviewRFQ.bob | 80 ++++-----
.../support/rflpsDiagnosticsRFQ.bob | 2 +-
.../support/transitionsRFQ.bob | 158 +++++++++---------
11 files changed, 270 insertions(+), 200 deletions(-)
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB10.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB10.bob
index 81f07f79..a7095806 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB10.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB10.bob
@@ -2,7 +2,7 @@
<display version="2.0.0">
<name>01_main_LAB</name>
<macros>
- <DEVICE>FIM-110</DEVICE>
+ <DEVICE>RFS-FIM-110</DEVICE>
</macros>
<width>2300</width>
<height>1270</height>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainLAB.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainLAB.bob
index 6959a903..18cf9097 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainLAB.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainLAB.bob
@@ -2,7 +2,7 @@
<display version="2.0.0">
<name>rflpsMainLAB</name>
<macros>
- <DEVICE>FIM-110</DEVICE>
+ <DEVICE>RFS-FIM-110</DEVICE>
</macros>
<width>2280</width>
<height>1200</height>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py
index 218ec7fd..110bdafc 100755
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py
@@ -5,9 +5,9 @@ from org.csstudio.opibuilder.scriptUtil import PVUtil
# The next step is to read the values from a file under version control;
# Section and subsection are fixed per script
-prefix_ = "LAB-010RFC:RFS01"
+prefix_ = "LAB-010RFC"
sec_ = "LAB"
-subsec_ = "010RFC:RFS01"
+subsec_ = "010RFC"
# Adding the macros on the widget that will consume this script
widget.getPropertyValue("macros").add("PREFIX", prefix_)
@@ -22,47 +22,54 @@ iocstats_ = "RFLAB-01"
##################################################################################################
# This macro refers to the IOC main PVs:
-ioc_ = "FIM-110"
+ioc_ = "RFS-FIM-110"
# Analog input macros
-ai00_ = "Mod-110:Cur"
-ai01_ = "Mod-110:Vol"
-ai02_ = "SolPS-110:Cur"
-ai03_ = "SolPS-120:Cur"
-ai04_ = "SolPS-130:Cur"
-ai05_ = "FIM-110:AI5"
-ai06_ = "FIM-110:AI6"
-ai07_ = "FIM-110:AI7"
-ai08_ = "FIM-110:AI8"
-ai09_ = "FIM-110:AI9"
+ai00_ = "RFS-Mod-110:Cur"
+ai01_ = "RFS-Mod-110:Vol"
+ai02_ = "RFS-SolPS-110:Cur"
+ai03_ = "RFS-SolPS-120:Cur"
+ai04_ = "RFS-SolPS-130:Cur"
+ai05_ = "RFS-FIM-110:AI5"
+ai06_ = "RFS-FIM-110:AI6"
+ai07_ = "RFS-FIM-110:AI7"
+ai08_ = "RFS-FIM-110:AI8"
+ai09_ = "RFS-FIM-110:AI9"
+ai10_ = "RFS-DirC-110:PwrFwdDA"
+ai11_ = "RFS-DirC-110:PwrFwdPA"
+ai12_ = "RFS-DirC-110:PwrFwdL2"
+ai13_ = "RFS-DirC-110:PwrRflctPA"
+ai14_ = "RFS-DirC-110:PwrFwdC1"
+ai15_ = "RFS-DirC-110:PwrFwdC2"
+ai16_ = "RFS-DirC-110:PwrFwdL1"
+ai17_ = "RFS-DirC-110:PwrRflctL2"
+ai18_ = "RFS-DirC-110:PwrRflctC1"
+ai19_ = "RFS-DirC-110:PwrRflctC2"
-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_ = "RFS-SIM-110:HvEnaCmd"
+di01_ = "RFS-SIM-110:RfEnaCmd"
+di02_ = "RFS-SIM-110:PCconnect"
+di03_ = "RFS-Mod-110:Fault"
+di04_ = "RFS-VacPS-110:I-SP"
+di05_ = "RFS-VacPS-120:I-SP"
+di06_ = "RFS-ADR-110:ItlckStat"
+di07_ = "RFS-FIM-110:DI7"
+di08_ = "RFS-ADR-201001:ItckStat"
+di09_ = "RFS-ADR-201002:ItckStat"
+di10_ = "RFS-ADR-201003:ItckStat"
+di11_ = "RFS-ADR-201004:ItckStat"
+di12_ = "RFS-ADR-201005:ItckStat"
+di13_ = "RFS-FIM-110:DI13"
+di14_ = "RFS-FIM-110:DI14"
+di15_ = "RFS-FIM-110:DI15"
+di16_ = "RFS-FIM-110:DI16"
+di17_ = "RFS-FIM-110:DI17"
+di18_ = "RFS-FIM-110:DI18"
+di19_ = "RFS-FIM-110:DI19"
+di20_ = "RFS-FIM-110:DI20"
-di00_ = "SIM-110:HvEnaCmd"
-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"
-di07_ = "FIM-110:DI7"
-di08_ = "ADR-201001:ItckStat"
-di09_ = "ADR-201002:ItckStat"
-di10_ = "ADR-201003:ItckStat"
-di11_ = "ADR-201004:ItckStat"
-di12_ = "ADR-201005:ItckStat"
-di13_ = "FIM-110:DI13"
-di14_ = "FIM-110:DI14"
-di15_ = "FIM-110:DI15"
+refpwr00_ = "RFS-FIM-110:REFPWR0"
+refpwr01_ = "RFS-FIM-110:REFPWR1"
########################################################################################################
@@ -70,7 +77,6 @@ di15_ = "FIM-110:DI15"
widget.getPropertyValue("macros").add("IOC_", ioc_)
widget.getPropertyValue("macros").add("IOCSTATS_", iocstats_)
-
# Analog input macros
widget.getPropertyValue("macros").add("AI00", ai00_)
widget.getPropertyValue("macros").add("AI01", ai01_)
@@ -110,4 +116,13 @@ widget.getPropertyValue("macros").add("DI12", di12_)
widget.getPropertyValue("macros").add("DI13", di13_)
widget.getPropertyValue("macros").add("DI14", di14_)
widget.getPropertyValue("macros").add("DI15", di15_)
+widget.getPropertyValue("macros").add("DI16", di16_)
+widget.getPropertyValue("macros").add("DI17", di17_)
+widget.getPropertyValue("macros").add("DI18", di18_)
+widget.getPropertyValue("macros").add("DI19", di19_)
+widget.getPropertyValue("macros").add("DI20", di20_)
+
+# Reflected Power macros
+widget.getPropertyValue("macros").add("REFPWR0", refpwr00_)
+widget.getPropertyValue("macros").add("REFPWR1", refpwr01_)
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_11.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_11.py
index 344cf5c2..8ba3fe14 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_11.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_11.py
@@ -5,9 +5,9 @@ from org.csstudio.opibuilder.scriptUtil import PVUtil
# The next step is to read the values from a file under version control;
# Section and subsection are fixed per script
-prefix_ = "LAB-011RFC"
+prefix_ = "LAB-011RFC:RFS01"
sec_ = "LAB"
-subsec_ = "010RFC:RFS01"
+subsec_ = "011RFC:RFS01"
# Adding the macros on the widget that will consume this script
widget.getPropertyValue("macros").add("PREFIX", prefix_)
@@ -15,7 +15,7 @@ widget.getPropertyValue("macros").add("SEC", sec_)
widget.getPropertyValue("macros").add("SUB", subsec_)
# This macro refers to the IOCStats Modules:
-iocstats_ = "RFLAB-01"
+iocstats_ = "RFLAB-02"
##################################################################################################
# Hardcoded macro data
@@ -35,7 +35,6 @@ ai06_ = "FIM-110:AI6"
ai07_ = "FIM-110:AI7"
ai08_ = "FIM-110:AI8"
ai09_ = "FIM-110:AI9"
-
ai10_ = "DirC-110:PwrFwdDA"
ai11_ = "DirC-110:PwrFwdPA"
ai12_ = "DirC-110:PwrFwdL2"
@@ -52,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"
@@ -63,6 +62,14 @@ di12_ = "ADR-201005:ItckStat"
di13_ = "FIM-110:DI13"
di14_ = "FIM-110:DI14"
di15_ = "FIM-110:DI15"
+di16_ = "FIM-110:DI16"
+di17_ = "FIM-110:DI17"
+di18_ = "FIM-110:DI18"
+di19_ = "FIM-110:DI19"
+di20_ = "FIM-110:DI20"
+
+refpwr00_ = "FIM-110:REFPWR0"
+refpwr01_ = "FIM-110:REFPWR1"
########################################################################################################
@@ -110,4 +117,13 @@ widget.getPropertyValue("macros").add("DI12", di12_)
widget.getPropertyValue("macros").add("DI13", di13_)
widget.getPropertyValue("macros").add("DI14", di14_)
widget.getPropertyValue("macros").add("DI15", di15_)
+widget.getPropertyValue("macros").add("DI16", di16_)
+widget.getPropertyValue("macros").add("DI17", di17_)
+widget.getPropertyValue("macros").add("DI18", di18_)
+widget.getPropertyValue("macros").add("DI19", di19_)
+widget.getPropertyValue("macros").add("DI20", di20_)
+
+# Reflected Power macros
+widget.getPropertyValue("macros").add("REFPWR0", refpwr00_)
+widget.getPropertyValue("macros").add("REFPWR1", refpwr01_)
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py
index 0a6e93ad..af1497cb 100755
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py
@@ -35,7 +35,6 @@ ai06_ = "FIM-110:AI6"
ai07_ = "FIM-110:AI7"
ai08_ = "FIM-110:AI8"
ai09_ = "FIM-110:AI9"
-
ai10_ = "DirC-110:PwrFwdDA"
ai11_ = "DirC-110:PwrFwdPA"
ai12_ = "DirC-110:PwrFwdL2"
@@ -52,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"
@@ -63,6 +62,15 @@ di12_ = "ADR-201005:ItckStat"
di13_ = "FIM-110:DI13"
di14_ = "FIM-110:DI14"
di15_ = "FIM-110:DI15"
+di16_ = "FIM-110:DI16"
+di17_ = "FIM-110:DI17"
+di18_ = "FIM-110:DI18"
+di19_ = "FIM-110:DI19"
+di20_ = "FIM-110:DI20"
+
+refpwr00_ = "FIM-110:REFPWR0"
+refpwr01_ = "FIM-110:REFPWR1"
+
########################################################################################################
@@ -110,4 +118,12 @@ widget.getPropertyValue("macros").add("DI12", di12_)
widget.getPropertyValue("macros").add("DI13", di13_)
widget.getPropertyValue("macros").add("DI14", di14_)
widget.getPropertyValue("macros").add("DI15", di15_)
+widget.getPropertyValue("macros").add("DI16", di16_)
+widget.getPropertyValue("macros").add("DI17", di17_)
+widget.getPropertyValue("macros").add("DI18", di18_)
+widget.getPropertyValue("macros").add("DI19", di19_)
+widget.getPropertyValue("macros").add("DI20", di20_)
+# Reflected Power macros
+widget.getPropertyValue("macros").add("REFPWR0", refpwr00_)
+widget.getPropertyValue("macros").add("REFPWR1", refpwr01_)
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 5e4957a0..1ede96ad 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
@@ -62,6 +62,14 @@ di12_ = "ADR-201005:ItckStat"
di13_ = "FIM-110:DI13"
di14_ = "FIM-110:DI14"
di15_ = "FIM-110:DI15"
+di16_ = "FIM-110:DI16"
+di17_ = "FIM-110:DI17"
+di18_ = "FIM-110:DI18"
+di19_ = "FIM-110:DI19"
+di20_ = "FIM-110:DI20"
+
+refpwr00_ = "FIM-110:REFPWR0"
+refpwr01_ = "FIM-110:REFPWR1"
########################################################################################################
@@ -109,4 +117,12 @@ widget.getPropertyValue("macros").add("DI12", di12_)
widget.getPropertyValue("macros").add("DI13", di13_)
widget.getPropertyValue("macros").add("DI14", di14_)
widget.getPropertyValue("macros").add("DI15", di15_)
+widget.getPropertyValue("macros").add("DI16", di16_)
+widget.getPropertyValue("macros").add("DI17", di17_)
+widget.getPropertyValue("macros").add("DI18", di18_)
+widget.getPropertyValue("macros").add("DI19", di19_)
+widget.getPropertyValue("macros").add("DI20", di20_)
+# Reflected Power macros
+widget.getPropertyValue("macros").add("REFPWR0", refpwr00_)
+widget.getPropertyValue("macros").add("REFPWR1", refpwr01_)
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 a864ee60..254f55f6 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
@@ -62,6 +62,14 @@ di12_ = "ADR-201005:ItckStat"
di13_ = "FIM-110:DI13"
di14_ = "FIM-110:DI14"
di15_ = "FIM-110:DI15"
+di16_ = "FIM-110:DI16"
+di17_ = "FIM-110:DI17"
+di18_ = "FIM-110:DI18"
+di19_ = "FIM-110:DI19"
+di20_ = "FIM-110:DI20"
+
+refpwr00_ = "FIM-110:REFPWR0"
+refpwr01_ = "FIM-110:REFPWR1"
########################################################################################################
@@ -109,4 +117,13 @@ widget.getPropertyValue("macros").add("DI12", di12_)
widget.getPropertyValue("macros").add("DI13", di13_)
widget.getPropertyValue("macros").add("DI14", di14_)
widget.getPropertyValue("macros").add("DI15", di15_)
+widget.getPropertyValue("macros").add("DI16", di16_)
+widget.getPropertyValue("macros").add("DI17", di17_)
+widget.getPropertyValue("macros").add("DI18", di18_)
+widget.getPropertyValue("macros").add("DI19", di19_)
+widget.getPropertyValue("macros").add("DI20", di20_)
+
+# Reflected Power macros
+widget.getPropertyValue("macros").add("REFPWR0", refpwr00_)
+widget.getPropertyValue("macros").add("REFPWR1", refpwr01_)
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/machineStateControl.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/machineStateControl.bob
index c1211bb3..ce548a1c 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/machineStateControl.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/machineStateControl.bob
@@ -246,11 +246,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>
@@ -294,7 +289,7 @@
<description>Write PV</description>
</action>
</actions>
- <pv_name>$(PREFIX):CPU-RFON</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-RFON</pv_name>
<text>FIM RFON</text>
<x>39</x>
<y>165</y>
@@ -305,7 +300,7 @@
<exp bool_exp="pv0 > 8">
<value>true</value>
</exp>
- <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
</rule>
</rules>
<tooltip>$(actions)</tooltip>
@@ -393,11 +388,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>
@@ -657,11 +651,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>
@@ -917,11 +910,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>
@@ -1015,11 +1007,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>
@@ -1383,11 +1374,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>
@@ -1431,7 +1421,7 @@ Actual Machine State read-back</tooltip>
<description>Write PV</description>
</action>
</actions>
- <pv_name>$(PREFIX):CPU-HVON</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-HVON</pv_name>
<text>FIM HVON</text>
<x>39</x>
<y>375</y>
@@ -1441,7 +1431,7 @@ Actual Machine State read-back</tooltip>
<exp bool_exp="pv0 > 6">
<value>true</value>
</exp>
- <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
</rule>
</rules>
<tooltip>$(actions)</tooltip>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob
index 6c53447b..f9afc8ec 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/overviewRFQ.bob
@@ -275,7 +275,7 @@ else:
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_170</name>
- <pv_name>$(PREFIX):SolPS-110:Cur</pv_name>
+ <pv_name>$(PREFIX):RFS-SolPS-110:Cur</pv_name>
<x>623</x>
<y>656</y>
<width>90</width>
@@ -460,7 +460,7 @@ else:
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_176</name>
- <pv_name>$(PREFIX):SolPS-120:Cur</pv_name>
+ <pv_name>$(PREFIX):RFS-SolPS-120:Cur</pv_name>
<x>623</x>
<y>740</y>
<width>90</width>
@@ -573,7 +573,7 @@ else:
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_178</name>
- <pv_name>$(PREFIX):SolPS-130:Cur</pv_name>
+ <pv_name>$(PREFIX):RFS-SolPS-130:Cur</pv_name>
<x>623</x>
<y>823</y>
<width>90</width>
@@ -784,7 +784,7 @@ else:
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_219</name>
- <pv_name>$(PREFIX):Mod-110:Cur:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-Mod-110:Cur:WaveHigh</pv_name>
<x>1849</x>
<y>274</y>
<width>80</width>
@@ -797,7 +797,7 @@ else:
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_220</name>
- <pv_name>$(PREFIX):Mod-110:Vol:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-Mod-110:Vol:WaveHigh</pv_name>
<x>1849</x>
<y>306</y>
<width>80</width>
@@ -828,7 +828,7 @@ else:
</widget>
<widget type="led" version="2.0.0">
<name>LED_59</name>
- <pv_name>$(PREFIX):Mod-110:Fault:FastIntStat</pv_name>
+ <pv_name>$(PREFIX):RFS-Mod-110:Fault:FastIntStat</pv_name>
<x>1704</x>
<y>236</y>
<off_color>
@@ -939,7 +939,7 @@ HV Output Enable</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED_62</name>
- <pv_name>$(PREFIX):VacPS-120:I-SP:FastIntStat</pv_name>
+ <pv_name>$(PREFIX):RFS-VacPS-120:I-SP:FastIntStat</pv_name>
<x>34</x>
<y>896</y>
<off_color>
@@ -1168,7 +1168,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="led" version="2.0.0">
<name>LED_57</name>
- <pv_name>$(PREFIX):VacPS-110:I-SP:FastIntStat</pv_name>
+ <pv_name>$(PREFIX):RFS-VacPS-110:I-SP:FastIntStat</pv_name>
<x>32</x>
<y>624</y>
<off_color>
@@ -1260,7 +1260,7 @@ HV Output Enable</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED_28</name>
- <pv_name>$(PREFIX):ADR-201001:ItckStat:FastIntStat</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-201001:ItckStat:FastIntStat</pv_name>
<x>34</x>
<y>282</y>
<off_color>
@@ -1280,7 +1280,7 @@ HV Output Enable</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_64</name>
- <pv_name>$(PREFIX):ADR-201001:ItckStat.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-201001:ItckStat.DESC</pv_name>
<x>63</x>
<y>282</y>
<width>240</width>
@@ -1290,7 +1290,7 @@ HV Output Enable</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_65</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdPA:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdPA:WaveHigh</pv_name>
<x>259</x>
<y>348</y>
<width>80</width>
@@ -1303,7 +1303,7 @@ HV Output Enable</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_66</name>
- <pv_name>$(PREFIX):DirC-110:PwrRflctPA:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctPA:WaveHigh</pv_name>
<x>259</x>
<y>381</y>
<width>80</width>
@@ -1316,7 +1316,7 @@ HV Output Enable</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_67</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdPA.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdPA.DESC</pv_name>
<x>34</x>
<y>348</y>
<width>214</width>
@@ -1348,7 +1348,7 @@ HV Output Enable</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_68</name>
- <pv_name>$(PREFIX):DirC-110:PwrRflctPA.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctPA.DESC</pv_name>
<x>34</x>
<y>381</y>
<width>214</width>
@@ -1417,7 +1417,7 @@ HV Output Enable</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_209</name>
- <pv_name>$(PREFIX):ADR-201003:ItckStat.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-201003:ItckStat.DESC</pv_name>
<x>493</x>
<y>99</y>
<width>240</width>
@@ -1427,7 +1427,7 @@ HV Output Enable</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED_63</name>
- <pv_name>$(PREFIX):ADR-201003:ItckStat:FastIntStat</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-201003:ItckStat:FastIntStat</pv_name>
<x>464</x>
<y>99</y>
<off_color>
@@ -1829,7 +1829,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_69</name>
- <pv_name>$(PREFIX):VacPS-110:I-SP.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-VacPS-110:I-SP.DESC</pv_name>
<x>62</x>
<y>624</y>
<width>148</width>
@@ -1859,7 +1859,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_76</name>
- <pv_name>$(PREFIX):VacPS-120:I-SP.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-VacPS-120:I-SP.DESC</pv_name>
<x>62</x>
<y>896</y>
<width>148</width>
@@ -1869,7 +1869,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="led" version="2.0.0">
<name>LED_67</name>
- <pv_name>$(PREFIX):ADR-201002:ItckStat:FastIntStat</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-201002:ItckStat:FastIntStat</pv_name>
<x>464</x>
<y>66</y>
<off_color>
@@ -1889,7 +1889,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_210</name>
- <pv_name>$(PREFIX):ADR-201002:ItckStat.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-201002:ItckStat.DESC</pv_name>
<x>493</x>
<y>66</y>
<width>240</width>
@@ -1899,7 +1899,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="led" version="2.0.0">
<name>LED_69</name>
- <pv_name>$(PREFIX):ADR-110:ItlckStat:FastIntStat</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-110:ItlckStat:FastIntStat</pv_name>
<x>34</x>
<y>315</y>
<off_color>
@@ -1919,7 +1919,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_222</name>
- <pv_name>$(PREFIX):ADR-110:ItlckStat.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-110:ItlckStat.DESC</pv_name>
<x>63</x>
<y>315</y>
<width>240</width>
@@ -2930,7 +2930,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<action type="open_display">
<file>rflpsAFsignal.bob</file>
<macros>
- <SGNL>$(PREFIX):Oil-120:TT</SGNL>
+ <SGNL>$(PREFIX):RFS-Oil-120:TT</SGNL>
</macros>
<target>standalone</target>
<description>Open Display</description>
@@ -2940,7 +2940,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_214</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdL1.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdL1.DESC</pv_name>
<x>463</x>
<y>136</y>
<width>225</width>
@@ -2972,7 +2972,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_215</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdL1:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdL1:WaveHigh</pv_name>
<x>693</x>
<y>136</y>
<width>80</width>
@@ -2985,7 +2985,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_216</name>
- <pv_name>$(PREFIX):DirC-110:PwrRflctL2.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctL2.DESC</pv_name>
<x>849</x>
<y>367</y>
<width>225</width>
@@ -3017,7 +3017,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_217</name>
- <pv_name>$(PREFIX):DirC-110:PwrRflctL2:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctL2:WaveHigh</pv_name>
<x>1079</x>
<y>367</y>
<width>80</width>
@@ -3037,7 +3037,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="led" version="2.0.0">
<name>LED_75</name>
- <pv_name>$(PREFIX):ADR-201004:ItckStat:FastIntStat</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-201004:ItckStat:FastIntStat</pv_name>
<x>865</x>
<y>401</y>
<off_color>
@@ -3057,7 +3057,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_218</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdL2.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdL2.DESC</pv_name>
<x>849</x>
<y>333</y>
<width>225</width>
@@ -3089,7 +3089,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_221</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdL2:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdL2:WaveHigh</pv_name>
<x>1079</x>
<y>333</y>
<width>80</width>
@@ -3147,7 +3147,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_251</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdC2:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdC2:WaveHigh</pv_name>
<x>1571</x>
<y>739</y>
<width>80</width>
@@ -3160,7 +3160,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_252</name>
- <pv_name>$(PREFIX):DirC-110:PwrRflctC2.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctC2.DESC</pv_name>
<x>1338</x>
<y>773</y>
<width>225</width>
@@ -3192,7 +3192,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_253</name>
- <pv_name>$(PREFIX):DirC-110:PwrRflctC2:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctC2:WaveHigh</pv_name>
<x>1571</x>
<y>773</y>
<width>80</width>
@@ -3205,7 +3205,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_254</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdC2.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdC2.DESC</pv_name>
<x>1338</x>
<y>739</y>
<width>225</width>
@@ -3292,7 +3292,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_255</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdC1:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdC1:WaveHigh</pv_name>
<x>1568</x>
<y>589</y>
<width>80</width>
@@ -3305,7 +3305,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_256</name>
- <pv_name>$(PREFIX):DirC-110:PwrRflctC1.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctC1.DESC</pv_name>
<x>1336</x>
<y>623</y>
<width>225</width>
@@ -3337,7 +3337,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_257</name>
- <pv_name>$(PREFIX):DirC-110:PwrRflctC1:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrRflctC1:WaveHigh</pv_name>
<x>1568</x>
<y>623</y>
<width>80</width>
@@ -3350,7 +3350,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_258</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdC1.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdC1.DESC</pv_name>
<x>1336</x>
<y>589</y>
<width>225</width>
@@ -3382,7 +3382,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_260</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdDA.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdDA.DESC</pv_name>
<x>1691</x>
<y>398</y>
<width>146</width>
@@ -3414,7 +3414,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_261</name>
- <pv_name>$(PREFIX):DirC-110:PwrFwdDA:WaveHigh</pv_name>
+ <pv_name>$(PREFIX):RFS-DirC-110:PwrFwdDA:WaveHigh</pv_name>
<x>1849</x>
<y>398</y>
<width>80</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob
index 46e05b80..f490a9a0 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsDiagnosticsRFQ.bob
@@ -2,7 +2,7 @@
<display version="2.0.0">
<name>rflpsDiagnosticsRFQ</name>
<macros>
- <DEVICE>FIM-110</DEVICE>
+ <DEVICE>RFS-FIM-110</DEVICE>
</macros>
<width>1940</width>
<height>1040</height>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitionsRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitionsRFQ.bob
index a1c4a561..6ddd64eb 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitionsRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitionsRFQ.bob
@@ -90,14 +90,14 @@
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:CWM-WtrC-Tmp</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:CWM-WtrC-Tmp</pv_name>
<text>...</text>
<x>660</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_13</name>
@@ -122,14 +122,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:Oil-WtrC-Tmp</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:Oil-WtrC-Tmp</pv_name>
<text>...</text>
<x>660</x>
<y>110</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_11</name>
@@ -154,14 +154,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:CWH-WtrC-Tmp</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:CWH-WtrC-Tmp</pv_name>
<text>...</text>
<x>660</x>
<y>75</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_10</name>
@@ -186,14 +186,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:ConILck</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:ConILck</pv_name>
<text>...</text>
<x>20</x>
<y>105</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_9</name>
@@ -218,14 +218,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:Oil-Leak</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:Oil-Leak</pv_name>
<text>...</text>
<x>20</x>
<y>75</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_8</name>
@@ -250,14 +250,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:Oil-LS</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:Oil-LS</pv_name>
<text>...</text>
<x>20</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_7</name>
@@ -367,14 +367,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Oil-110:FIS</pv_name>
+ <pv_name>$(PREFIX):RFS-Oil-110:FIS</pv_name>
<text>...</text>
<x>340</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_65</name>
@@ -388,7 +388,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:Oil-Tmp</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:Oil-Tmp</pv_name>
<text>...</text>
<x>980</x>
<y>45</y>
@@ -503,14 +503,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-TCU-110:ES</pv_name>
+ <pv_name>$(PREFIX):RFS-TCU-110:ES</pv_name>
<text>...</text>
<x>20</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_67</name>
@@ -535,14 +535,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-SIM-110:Cav-Ready</pv_name>
+ <pv_name>$(PREFIX):RFS-SIM-110:Cav-Ready</pv_name>
<text>...</text>
<x>20</x>
<y>75</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_53</name>
@@ -556,14 +556,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11001:ILck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11001:ILck</pv_name>
<text>...</text>
<x>20</x>
<y>105</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_68</name>
@@ -599,14 +599,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11002:Ilck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11002:Ilck</pv_name>
<text>...</text>
<x>20</x>
<y>135</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_70</name>
@@ -653,14 +653,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11003:Ilck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11003:Ilck</pv_name>
<text>...</text>
<x>340</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_56</name>
@@ -674,14 +674,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11004:Ilck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11004:Ilck</pv_name>
<text>...</text>
<x>340</x>
<y>75</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_57</name>
@@ -695,7 +695,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11005:Ilck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11005:Ilck</pv_name>
<text>...</text>
<x>340</x>
<y>105</y>
@@ -726,7 +726,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11006:Ilck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11006:Ilck</pv_name>
<text>...</text>
<x>340</x>
<y>135</y>
@@ -757,7 +757,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11007:Ilck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11007:Ilck</pv_name>
<text>...</text>
<x>660</x>
<y>45</y>
@@ -777,7 +777,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Load-120:WtrC-Tmp</pv_name>
+ <pv_name>$(PREFIX):RFS-Load-120:WtrC-Tmp</pv_name>
<text>...</text>
<x>1260</x>
<y>45</y>
@@ -830,7 +830,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Load-130:WtrC-Tmp</pv_name>
+ <pv_name>$(PREFIX):RFS-Load-130:WtrC-Tmp</pv_name>
<text>...</text>
<x>1260</x>
<y>75</y>
@@ -850,7 +850,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Load-120:WtrC-Flw</pv_name>
+ <pv_name>$(PREFIX):RFS-Load-120:WtrC-Flw</pv_name>
<text>...</text>
<x>1260</x>
<y>105</y>
@@ -881,7 +881,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11008:Ilck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11008:Ilck</pv_name>
<text>...</text>
<x>660</x>
<y>75</y>
@@ -912,7 +912,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11009:Ilck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11009:Ilck</pv_name>
<text>...</text>
<x>660</x>
<y>105</y>
@@ -943,7 +943,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11010:Ilck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11010:Ilck</pv_name>
<text>...</text>
<x>660</x>
<y>135</y>
@@ -974,7 +974,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11011:Ilck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11011:Ilck</pv_name>
<text>...</text>
<x>950</x>
<y>45</y>
@@ -1005,7 +1005,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-ADR-11012:Ilck</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-11012:Ilck</pv_name>
<text>...</text>
<x>950</x>
<y>75</y>
@@ -1077,14 +1077,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:APS</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:APS</pv_name>
<text>...</text>
<x>20</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_48</name>
@@ -1098,14 +1098,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:OPWin-Tmp</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:OPWin-Tmp</pv_name>
<text>...</text>
<x>660</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_62</name>
@@ -1152,14 +1152,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Circ-120:WtrC-Tmp</pv_name>
+ <pv_name>$(PREFIX):RFS-Circ-120:WtrC-Tmp</pv_name>
<text>...</text>
<x>660</x>
<y>75</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_50</name>
@@ -1173,14 +1173,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:Coll-WtrC-Tmp</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:Coll-WtrC-Tmp</pv_name>
<text>...</text>
<x>660</x>
<y>105</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_85</name>
@@ -1205,14 +1205,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-SIM-110:PSS-Ready</pv_name>
+ <pv_name>$(PREFIX):RFS-SIM-110:PSS-Ready</pv_name>
<text>...</text>
<x>20</x>
<y>75</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_79</name>
@@ -1226,7 +1226,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:Coll-WtrC-Flw</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:Coll-WtrC-Flw</pv_name>
<text>...</text>
<x>660</x>
<y>135</y>
@@ -1257,14 +1257,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Coll-110:SW_CALC</pv_name>
+ <pv_name>$(PREFIX):RFS-Coll-110:SW_CALC</pv_name>
<text>...</text>
<x>990</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_78</name>
@@ -1443,7 +1443,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-SOLENOID01</pv_name>
+ <pv_name>$(PREFIX):RFS-SOLENOID01</pv_name>
<text>...</text>
<x>1320</x>
<y>45</y>
@@ -1463,7 +1463,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-SOLENOID03</pv_name>
+ <pv_name>$(PREFIX):RFS-SOLENOID03</pv_name>
<text>...</text>
<x>1320</x>
<y>105</y>
@@ -1483,7 +1483,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-SOLENOID02</pv_name>
+ <pv_name>$(PREFIX):RFS-SOLENOID02</pv_name>
<text>...</text>
<x>1320</x>
<y>75</y>
@@ -1514,14 +1514,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:Oil-LO</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:Oil-LO</pv_name>
<text>...</text>
<x>20</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_59</name>
@@ -1546,7 +1546,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-PAmp-110:Ready</pv_name>
+ <pv_name>$(PREFIX):RFS-PAmp-110:Ready</pv_name>
<text>...</text>
<x>20</x>
<y>75</y>
@@ -1577,7 +1577,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Body-110:FIS</pv_name>
+ <pv_name>$(PREFIX):RFS-Body-110:FIS</pv_name>
<text>...</text>
<x>20</x>
<y>105</y>
@@ -1619,7 +1619,7 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:Sol-WtrC-Tmp</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:Sol-WtrC-Tmp</pv_name>
<text>...</text>
<x>660</x>
<y>75</y>
@@ -1639,14 +1639,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:Body-WtrC-Tmp</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:Body-WtrC-Tmp</pv_name>
<text>...</text>
<x>660</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_75</name>
@@ -1660,14 +1660,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Sol-110:FIS</pv_name>
+ <pv_name>$(PREFIX):RFS-Sol-110:FIS</pv_name>
<text>...</text>
<x>340</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_83</name>
@@ -1703,14 +1703,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Circ-120:FIS</pv_name>
+ <pv_name>$(PREFIX):RFS-Circ-120:FIS</pv_name>
<text>...</text>
<x>340</x>
<y>75</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
</widget>
<widget type="rectangle" version="2.0.0">
@@ -1770,14 +1770,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-VacPS-110:I</pv_name>
+ <pv_name>$(PREFIX):RFS-VacPS-110:I</pv_name>
<text>...</text>
<x>340</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_45</name>
@@ -1802,14 +1802,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-VacPS-120:I</pv_name>
+ <pv_name>$(PREFIX):RFS-VacPS-120:I</pv_name>
<text>...</text>
<x>340</x>
<y>75</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_74</name>
@@ -1823,14 +1823,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-Kly-110:EmSw</pv_name>
+ <pv_name>$(PREFIX):RFS-Kly-110:EmSw</pv_name>
<text>...</text>
<x>20</x>
<y>105</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_72</name>
@@ -1844,14 +1844,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-VacPS-120:HVON</pv_name>
+ <pv_name>$(PREFIX):RFS-VacPS-120:HVON</pv_name>
<text>...</text>
<x>20</x>
<y>75</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_47</name>
@@ -1898,14 +1898,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-VacPS-110:HVON</pv_name>
+ <pv_name>$(PREFIX):RFS-VacPS-110:HVON</pv_name>
<text>...</text>
<x>20</x>
<y>45</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label_284</name>
@@ -2392,14 +2392,14 @@ $(pv_value)
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-FIM-110:HVenaStat</pv_name>
+ <pv_name>$(PREFIX):RFS-FIM-110:HVenaStat</pv_name>
<text>...</text>
<x>220</x>
<y>130</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_129</name>
@@ -2537,14 +2537,14 @@ $(PREFIX):$(pv_name)</tooltip>
<description>Change PV settings</description>
</action>
</actions>
- <pv_name>RFS-FIM-110:RFenaStat</pv_name>
+ <pv_name>$(PREFIX):RFS-FIM-110:RFenaStat</pv_name>
<text>...</text>
<x>220</x>
<y>130</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions) for:
-$(PREFIX):$(pv_name)</tooltip>
+$(pv_name)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_106</name>
--
GitLab