diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
index b3890d6e73c6be83b4179b77d1909031b56927aa..f938cf337d505e68cdbc2e2054a5995ca190d3de 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
@@ -94,11 +94,6 @@
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
- </color>
- </background_color>
- <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -144,11 +139,10 @@ Actual Machine State read-back</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -231,11 +225,10 @@ Actual Machine State read-back</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -277,7 +270,7 @@ Actual Machine State read-back</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_193</name>
- <pv_name>RFQ-010RFC:RFS01:CPU-ACTSTATE-RB</pv_name>
+ <pv_name>RFQ-010RFC:RFS-CPU-ACTSTATE-RB</pv_name>
<x>130</x>
<y>367</y>
<width>80</width>
@@ -318,11 +311,10 @@ Actual Machine State read-back</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -332,7 +324,7 @@ Actual Machine State read-back</tooltip>
<action type="open_display">
<file>01_mainRFQ.bob</file>
<macros>
- <PREFIX>RFQ-010RFC:RFS01</PREFIX>
+ <PREFIX>RFQ-010RFC</PREFIX>
</macros>
<target>window</target>
<description>Open Display</description>
@@ -383,11 +375,6 @@ Actual Machine State read-back</tooltip>
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
- </color>
- </background_color>
- <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -430,11 +417,6 @@ Actual Machine State read-back</tooltip>
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
- </color>
- </background_color>
- <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -477,11 +459,6 @@ Actual Machine State read-back</tooltip>
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
- </color>
- </background_color>
- <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -546,11 +523,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>
@@ -633,11 +609,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>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB11.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB11.bob
index ec4c5c8f9779e1887094153a612eb4cd69376326..99f78bbf9956a6a95e17a4ae7f6cfd4dacffbfc7 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB11.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainLAB11.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/scripts/fim_macros_lab_10.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py
index 110bdafcc961b58e3511449f60a93205b854efe7..08df9d452425c3f1915751913797291aff2be9f8 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
@@ -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_ = "LAB-010"
##################################################################################################
# Hardcoded macro data
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 8ba3fe14c4225f0b19a4555efe767d74b991faf2..656c71296478d6f33d0cb3b6452a0f44aa4ab2fe 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:RFS01"
+prefix_ = "LAB-011RFC"
sec_ = "LAB"
-subsec_ = "011RFC:RFS01"
+subsec_ = "011RFC"
# Adding the macros on the widget that will consume this script
widget.getPropertyValue("macros").add("PREFIX", prefix_)
@@ -15,61 +15,61 @@ widget.getPropertyValue("macros").add("SEC", sec_)
widget.getPropertyValue("macros").add("SUB", subsec_)
# This macro refers to the IOCStats Modules:
-iocstats_ = "RFLAB-02"
+iocstats_ = "LAB-011"
##################################################################################################
# Hardcoded macro data
##################################################################################################
# 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"
-ai10_ = "DirC-110:PwrFwdDA"
-ai11_ = "DirC-110:PwrFwdPA"
-ai12_ = "DirC-110:PwrFwdL2"
-ai13_ = "DirC-110:PwrRflctPA"
-ai14_ = "DirC-110:PwrFwdC1"
-ai15_ = "DirC-110:PwrFwdC2"
-ai16_ = "DirC-110:PwrFwdL1"
-ai17_ = "DirC-110:PwrRflctL2"
-ai18_ = "DirC-110:PwrRflctC1"
-ai19_ = "DirC-110:PwrRflctC2"
-
-di00_ = "SIM-110:HvEnaCmd"
-di01_ = "SIM-110:RfEnaCmd"
-di02_ = "SIM-110:PCconnect"
-di03_ = "Mod-110:Fault"
-di04_ = "VacPS-110:I-SP"
-di05_ = "VacPS-120:I-SP"
-di06_ = "ADR-110:ItlckStat"
-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"
-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"
+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"
+
+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"
+
+refpwr00_ = "RFS-FIM-110:REFPWR0"
+refpwr01_ = "RFS-FIM-110:REFPWR1"
########################################################################################################
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 af1497cb485a3c998272e69c655c3489fcabada5..94049a1d4eac4b34f581c45b27ee3c6426975e13 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
@@ -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_ = "RFQ-010RFC:RFS01"
+prefix_ = "RFQ-010RFC"
sec_ = "RFQ"
-subsec_ = "010RFC:RFS01"
+subsec_ = "010RFC"
# Adding the macros on the widget that will consume this script
widget.getPropertyValue("macros").add("PREFIX", prefix_)
@@ -15,62 +15,61 @@ widget.getPropertyValue("macros").add("SEC", sec_)
widget.getPropertyValue("macros").add("SUB", subsec_)
# This macro refers to the IOCStats Modules:
-iocstats_ = "RFQ-01"
+iocstats_ = "RFQ-010"
##################################################################################################
# Hardcoded macro data
##################################################################################################
# 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"
-ai10_ = "DirC-110:PwrFwdDA"
-ai11_ = "DirC-110:PwrFwdPA"
-ai12_ = "DirC-110:PwrFwdL2"
-ai13_ = "DirC-110:PwrRflctPA"
-ai14_ = "DirC-110:PwrFwdC1"
-ai15_ = "DirC-110:PwrFwdC2"
-ai16_ = "DirC-110:PwrFwdL1"
-ai17_ = "DirC-110:PwrRflctL2"
-ai18_ = "DirC-110:PwrRflctC1"
-ai19_ = "DirC-110:PwrRflctC2"
-
-di00_ = "SIM-110:HvEnaCmd"
-di01_ = "SIM-110:RfEnaCmd"
-di02_ = "SIM-110:PCconnect"
-di03_ = "Mod-110:Fault"
-di04_ = "VacPS-110:I-SP"
-di05_ = "VacPS-120:I-SP"
-di06_ = "ADR-110:ItlckStat"
-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"
-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"
-
+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"
+
+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"
+
+refpwr00_ = "RFS-FIM-110:REFPWR0"
+refpwr01_ = "RFS-FIM-110:REFPWR1"
########################################################################################################
@@ -127,3 +126,4 @@ widget.getPropertyValue("macros").add("DI20", di20_)
# Reflected Power macros
widget.getPropertyValue("macros").add("REFPWR0", refpwr00_)
widget.getPropertyValue("macros").add("REFPWR1", refpwr01_)
+