From f9b139b984033b82255b5f05e3aba4ab7c1b1231 Mon Sep 17 00:00:00 2001
From: Juliano Murari <juliano.murari@ess.eu>
Date: Tue, 22 Nov 2022 13:29:27 +0100
Subject: [PATCH] Fix BPM IOC names
---
10-Top/bpmioc/top.bob | 75 ++++++++++++++++++++-----------------------
1 file changed, 34 insertions(+), 41 deletions(-)
diff --git a/10-Top/bpmioc/top.bob b/10-Top/bpmioc/top.bob
index 72552ec..7eee3c8 100644
--- a/10-Top/bpmioc/top.bob
+++ b/10-Top/bpmioc/top.bob
@@ -238,7 +238,7 @@
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<BPM_TITLE>MEBT BPM 1/2</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
- <IOCNAME>PBI-BPM01:Ctrl-IOC-101</IOCNAME>
+ <IOCNAME>PBI-BPM01:SC-IOC-101</IOCNAME>
<PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
<P_BPMMan>PBI-BPM::</P_BPMMan>
<R1_BPMMan>BPM01-</R1_BPMMan>
@@ -249,7 +249,6 @@
<S2_BPMMan>MEBT-</S2_BPMMan>
<SYSTEM1>MEBT-010:PBI-BPM-001:</SYSTEM1>
<SYSTEM2>MEBT-010:PBI-BPM-002:</SYSTEM2>
- <SYSTEM_P>MEBT-010</SYSTEM_P>
</macros>
<file>support/instance.opi</file>
<y>70</y>
@@ -270,7 +269,7 @@
<AMC_NAME>Ctrl-AMC-120</AMC_NAME>
<BPM_TITLE>MEBT BPM 3/5</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
- <IOCNAME>PBI-BPM01:Ctrl-IOC-102</IOCNAME>
+ <IOCNAME>PBI-BPM01:SC-IOC-102</IOCNAME>
<PAIR_BPMMan>BPM03-05</PAIR_BPMMan>
<P_BPMMan>PBI-BPM::</P_BPMMan>
<R1_BPMMan>BPM03-</R1_BPMMan>
@@ -281,7 +280,6 @@
<S2_BPMMan>MEBT-</S2_BPMMan>
<SYSTEM1>MEBT-010:PBI-BPM-003:</SYSTEM1>
<SYSTEM2>MEBT-010:PBI-BPM-005:</SYSTEM2>
- <SYSTEM_P>MEBT-010</SYSTEM_P>
</macros>
<file>support/instance.opi</file>
<y>160</y>
@@ -302,7 +300,7 @@
<AMC_NAME>Ctrl-AMC-130</AMC_NAME>
<BPM_TITLE>MEBT BPM 6/7</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
- <IOCNAME>PBI-BPM01:Ctrl-IOC-103</IOCNAME>
+ <IOCNAME>PBI-BPM01:SC-IOC-103</IOCNAME>
<PAIR_BPMMan>BPM06-07</PAIR_BPMMan>
<P_BPMMan>PBI-BPM::</P_BPMMan>
<R1_BPMMan>BPM06-</R1_BPMMan>
@@ -313,7 +311,6 @@
<S2_BPMMan>MEBT-</S2_BPMMan>
<SYSTEM1>MEBT-010:PBI-BPM-006:</SYSTEM1>
<SYSTEM2>MEBT-010:PBI-BPM-007:</SYSTEM2>
- <SYSTEM_P>MEBT-010</SYSTEM_P>
</macros>
<file>support/instance.opi</file>
<y>250</y>
@@ -334,7 +331,7 @@
<AMC_NAME>Ctrl-AMC-140</AMC_NAME>
<BPM_TITLE>MEBT BPM 8 / DTL-010 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
- <IOCNAME>PBI-BPM01:Ctrl-IOC-104</IOCNAME>
+ <IOCNAME>PBI-BPM01:SC-IOC-104</IOCNAME>
<PAIR_BPMMan>BPM08-01</PAIR_BPMMan>
<P_BPMMan>PBI-BPM::</P_BPMMan>
<R1_BPMMan>BPM08-</R1_BPMMan>
@@ -448,8 +445,8 @@
<file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
<macros>
<CRATE_NUM>1</CRATE_NUM>
- <IOCNAME>PBI-BPM01:Ctrl-IOC-107</IOCNAME>
- <IOC_PREF>PBI-BPM01:Ctrl-IOC-$(CRATE_NUM)07:</IOC_PREF>
+ <IOCNAME>PBI-BPM01:SC-IOC-107</IOCNAME>
+ <IOC_PREF>PBI-BPM01:SC-IOC-$(CRATE_NUM)07:</IOC_PREF>
<MTCA_PREF>PBI-BPM01:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
<NAME_MODE>0</NAME_MODE>
<P>PBI-BPM01:Ctrl</P>
@@ -766,7 +763,6 @@ if (action_ == 1):
<S2_BPMMan>DTL-</S2_BPMMan>
<SYSTEM1>DTL-010:PBI-BPM-002:</SYSTEM1>
<SYSTEM2>DTL-010:PBI-BPM-003:</SYSTEM2>
- <SYSTEM_P>PBI-BPM01</SYSTEM_P>
</macros>
<file>support/instance.opi</file>
<y>70</y>
@@ -798,7 +794,6 @@ if (action_ == 1):
<S2_BPMMan>DTL-</S2_BPMMan>
<SYSTEM1>DTL-010:PBI-BPM-004:</SYSTEM1>
<SYSTEM2>DTL-010:PBI-BPM-005:</SYSTEM2>
- <SYSTEM_P>PBI-BPM01</SYSTEM_P>
</macros>
<file>support/instance.opi</file>
<y>160</y>
@@ -830,7 +825,6 @@ if (action_ == 1):
<S2_BPMMan>DTL-</S2_BPMMan>
<SYSTEM1>DTL-010:PBI-BPM-006:</SYSTEM1>
<SYSTEM2>DTL-020:PBI-BPM-001:</SYSTEM2>
- <SYSTEM_P>PBI-BPM01</SYSTEM_P>
</macros>
<file>support/instance.opi</file>
<y>250</y>
@@ -862,7 +856,6 @@ if (action_ == 1):
<S2_BPMMan>DTL-</S2_BPMMan>
<SYSTEM1>DTL-020:PBI-BPM-002:</SYSTEM1>
<SYSTEM2>DTL-020:PBI-BPM-003:</SYSTEM2>
- <SYSTEM_P>PBI-BPM01</SYSTEM_P>
</macros>
<file>support/instance.opi</file>
<y>340</y>
@@ -2507,7 +2500,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<BPM_TITLE>DTL-030 BPM 1/2</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
- <IOCNAME>PBI-BPM02:Ctrl-IOC-101</IOCNAME>
+ <IOCNAME>PBI-BPM02:SC-IOC-101</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -2541,7 +2534,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-120</AMC_NAME>
<BPM_TITLE>DTL-040 BPM 1/2</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
- <IOCNAME>PBI-BPM02:Ctrl-IOC-102</IOCNAME>
+ <IOCNAME>PBI-BPM02:SC-IOC-102</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -2575,7 +2568,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-130</AMC_NAME>
<BPM_TITLE>DTL-050 BPM 1/2</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
- <IOCNAME>PBI-BPM02:Ctrl-IOC-103</IOCNAME>
+ <IOCNAME>PBI-BPM02:SC-IOC-103</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -2643,8 +2636,8 @@ if (action_ == 1):
<file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
<macros>
<CRATE_NUM>1</CRATE_NUM>
- <IOCNAME>PBI-BPM02:Ctrl-IOC-107</IOCNAME>
- <IOC_PREF>PBI-BPM02:Ctrl-IOC-$(CRATE_NUM)07:</IOC_PREF>
+ <IOCNAME>PBI-BPM02:SC-IOC-107</IOCNAME>
+ <IOC_PREF>PBI-BPM02:SC-IOC-$(CRATE_NUM)07:</IOC_PREF>
<MTCA_PREF>PBI-BPM02:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
<NAME_MODE>0</NAME_MODE>
<P>PBI-BPM02:Ctrl</P>
@@ -2994,7 +2987,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-210</AMC_NAME>
<BPM_TITLE>SPK-010 BPM 1/2</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
- <IOCNAME>PBI-BPM02:Ctrl-IOC-201</IOCNAME>
+ <IOCNAME>PBI-BPM02:SC-IOC-201</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -3028,7 +3021,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-220</AMC_NAME>
<BPM_TITLE>SPK-020 BPM 1/SPK-030 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
- <IOCNAME>PBI-BPM02:Ctrl-IOC-202</IOCNAME>
+ <IOCNAME>PBI-BPM02:SC-IOC-202</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -3062,7 +3055,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-230</AMC_NAME>
<BPM_TITLE>SPK-040 BPM 1/SPK-050 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
- <IOCNAME>PBI-BPM02:Ctrl-IOC-203</IOCNAME>
+ <IOCNAME>PBI-BPM02:SC-IOC-203</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -3130,8 +3123,8 @@ if (action_ == 1):
<file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
<macros>
<CRATE_NUM>2</CRATE_NUM>
- <IOCNAME>PBI-BPM02:Ctrl-IOC-207</IOCNAME>
- <IOC_PREF>PBI-BPM02:Ctrl-IOC-$(CRATE_NUM)07:</IOC_PREF>
+ <IOCNAME>PBI-BPM02:SC-IOC-207</IOCNAME>
+ <IOC_PREF>PBI-BPM02:SC-IOC-$(CRATE_NUM)07:</IOC_PREF>
<MTCA_PREF>PBI-BPM02:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
<NAME_MODE>0</NAME_MODE>
<P>PBI-BPM02:Ctrl</P>
@@ -4550,7 +4543,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<BPM_TITLE>SPK-060 BPM 1/SPK-070 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM03</CONTROL_GROUP>
- <IOCNAME>PBI-BPM03:Ctrl-IOC-101</IOCNAME>
+ <IOCNAME>PBI-BPM03:SC-IOC-101</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -4584,7 +4577,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-120</AMC_NAME>
<BPM_TITLE>SPK-080 BPM 1/SPK-090 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM03</CONTROL_GROUP>
- <IOCNAME>PBI-BPM03:Ctrl-IOC-102</IOCNAME>
+ <IOCNAME>PBI-BPM03:SC-IOC-102</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -4618,7 +4611,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-130</AMC_NAME>
<BPM_TITLE>SPK-100 BPM 1/SPK-110 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM03</CONTROL_GROUP>
- <IOCNAME>PBI-BPM03:Ctrl-IOC-103</IOCNAME>
+ <IOCNAME>PBI-BPM03:SC-IOC-103</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -4652,7 +4645,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-140</AMC_NAME>
<BPM_TITLE>SPK-120 BPM 1/SPK-130 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM03</CONTROL_GROUP>
- <IOCNAME>PBI-BPM03:Ctrl-IOC-104</IOCNAME>
+ <IOCNAME>PBI-BPM03:SC-IOC-104</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -4768,8 +4761,8 @@ if (action_ == 1):
<file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
<macros>
<CRATE_NUM>1</CRATE_NUM>
- <IOCNAME>PBI-BPM03:Ctrl-IOC-107</IOCNAME>
- <IOC_PREF>PBI-BPM03:Ctrl-IOC-$(CRATE_NUM)07:</IOC_PREF>
+ <IOCNAME>PBI-BPM03:SC-IOC-107</IOCNAME>
+ <IOC_PREF>PBI-BPM03:SC-IOC-$(CRATE_NUM)07:</IOC_PREF>
<MTCA_PREF>PBI-BPM03:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
<NAME_MODE>0</NAME_MODE>
<P>PBI-BPM03:Ctrl</P>
@@ -5694,7 +5687,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<BPM_TITLE>MBL-010 BPM 1/MBL-020 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM04</CONTROL_GROUP>
- <IOCNAME>PBI-BPM04:Ctrl-IOC-101</IOCNAME>
+ <IOCNAME>PBI-BPM04:SC-IOC-101</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -5728,7 +5721,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-120</AMC_NAME>
<BPM_TITLE>MBL-030 BPM 1/MBL-040 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM04</CONTROL_GROUP>
- <IOCNAME>PBI-BPM04:Ctrl-IOC-102</IOCNAME>
+ <IOCNAME>PBI-BPM04:SC-IOC-102</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -5844,8 +5837,8 @@ if (action_ == 1):
<file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
<macros>
<CRATE_NUM>1</CRATE_NUM>
- <IOCNAME>PBI-BPM04:Ctrl-IOC-107</IOCNAME>
- <IOC_PREF>PBI-BPM04:Ctrl-IOC-$(CRATE_NUM)07:</IOC_PREF>
+ <IOCNAME>PBI-BPM04:SC-IOC-107</IOCNAME>
+ <IOC_PREF>PBI-BPM04:SC-IOC-$(CRATE_NUM)07:</IOC_PREF>
<MTCA_PREF>PBI-BPM04:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
<NAME_MODE>0</NAME_MODE>
<P>PBI-BPM04:Ctrl</P>
@@ -6594,7 +6587,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<BPM_TITLE>MBL-050 BPM 1/MBL-060 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM05</CONTROL_GROUP>
- <IOCNAME>PBI-BPM05:Ctrl-IOC-101</IOCNAME>
+ <IOCNAME>PBI-BPM05:SC-IOC-101</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -6628,7 +6621,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-120</AMC_NAME>
<BPM_TITLE>MBL-070 BPM 1/MBL-080 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM05</CONTROL_GROUP>
- <IOCNAME>PBI-BPM05:Ctrl-IOC-102</IOCNAME>
+ <IOCNAME>PBI-BPM05:SC-IOC-102</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -6744,8 +6737,8 @@ if (action_ == 1):
<file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
<macros>
<CRATE_NUM>1</CRATE_NUM>
- <IOCNAME>PBI-BPM05:Ctrl-IOC-107</IOCNAME>
- <IOC_PREF>PBI-BPM05:Ctrl-IOC-$(CRATE_NUM)07:</IOC_PREF>
+ <IOCNAME>PBI-BPM05:SC-IOC-107</IOCNAME>
+ <IOC_PREF>PBI-BPM05:SC-IOC-$(CRATE_NUM)07:</IOC_PREF>
<MTCA_PREF>PBI-BPM05:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
<NAME_MODE>0</NAME_MODE>
<P>PBI-BPM05:Ctrl</P>
@@ -7494,7 +7487,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<BPM_TITLE>MBL-090 BPM 1/HBL-010 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM06</CONTROL_GROUP>
- <IOCNAME>PBI-BPM06:Ctrl-IOC-101</IOCNAME>
+ <IOCNAME>PBI-BPM06:SC-IOC-101</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -7528,7 +7521,7 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-120</AMC_NAME>
<BPM_TITLE>HBL-020 BPM 1/HBL-030 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM06</CONTROL_GROUP>
- <IOCNAME>PBI-BPM06:Ctrl-IOC-102</IOCNAME>
+ <IOCNAME>PBI-BPM06:SC-IOC-102</IOCNAME>
<P1_BPMMan>PBI-BPM::</P1_BPMMan>
<P2_BPMMan>PBI-BPM::</P2_BPMMan>
<PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
@@ -7644,8 +7637,8 @@ if (action_ == 1):
<file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
<macros>
<CRATE_NUM>1</CRATE_NUM>
- <IOCNAME>PBI-BPM05:Ctrl-IOC-107</IOCNAME>
- <IOC_PREF>PBI-BPM05:Ctrl-IOC-$(CRATE_NUM)07:</IOC_PREF>
+ <IOCNAME>PBI-BPM05:SC-IOC-107</IOCNAME>
+ <IOC_PREF>PBI-BPM05:SC-IOC-$(CRATE_NUM)07:</IOC_PREF>
<MTCA_PREF>PBI-BPM05:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
<NAME_MODE>0</NAME_MODE>
<P>PBI-BPM05:Ctrl</P>
--
GitLab