From 04d891de6aac23d87737a6b776f76f4ed622e204 Mon Sep 17 00:00:00 2001
From: Juliano Murari <juliano.murari@ess.eu>
Date: Tue, 22 Nov 2022 16:08:18 +0100
Subject: [PATCH] Update BPM top macros

---
 10-Top/bpmioc/top.bob | 112 ++++++++++++------------------------------
 1 file changed, 32 insertions(+), 80 deletions(-)

diff --git a/10-Top/bpmioc/top.bob b/10-Top/bpmioc/top.bob
index 29cb617..ce981eb 100644
--- a/10-Top/bpmioc/top.bob
+++ b/10-Top/bpmioc/top.bob
@@ -2595,10 +2595,8 @@ if (action_ == 1):
                 <BPM_TITLE>DTL-030 BPM 1/2</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
@@ -2607,7 +2605,6 @@ if (action_ == 1):
                 <S2_BPMMan>DTL-</S2_BPMMan>
                 <SYSTEM1>DTL-030:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>DTL-030:PBI-BPM-002:</SYSTEM2>
-                <SYSTEM_P>DTL-030</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>71</y>
@@ -2629,10 +2626,8 @@ if (action_ == 1):
                 <BPM_TITLE>DTL-040 BPM 1/2</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
@@ -2641,7 +2636,6 @@ if (action_ == 1):
                 <S2_BPMMan>DTL-</S2_BPMMan>
                 <SYSTEM1>DTL-040:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>DTL-040:PBI-BPM-002:</SYSTEM2>
-                <SYSTEM_P>DTL-040</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>161</y>
@@ -2663,10 +2657,8 @@ if (action_ == 1):
                 <BPM_TITLE>DTL-050 BPM 1/2</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-130</RFFE_NAME>
@@ -2675,7 +2667,6 @@ if (action_ == 1):
                 <S2_BPMMan>DTL-</S2_BPMMan>
                 <SYSTEM1>DTL-050:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>DTL-050:PBI-BPM-002:</SYSTEM2>
-                <SYSTEM_P>DTL-050</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>251</y>
@@ -3067,10 +3058,8 @@ if (action_ == 1):
                 <BPM_TITLE>SPK-010 BPM 1/2</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-210</RFFE_NAME>
@@ -3079,7 +3068,6 @@ if (action_ == 1):
                 <S2_BPMMan>SPK-</S2_BPMMan>
                 <SYSTEM1>SPK-010:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>SPK-010:PBI-BPM-002:</SYSTEM2>
-                <SYSTEM_P>SPK-010</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>71</y>
@@ -3101,10 +3089,8 @@ if (action_ == 1):
                 <BPM_TITLE>SPK-020 BPM 1/SPK-030 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-220</RFFE_NAME>
@@ -3113,7 +3099,6 @@ if (action_ == 1):
                 <S2_BPMMan>SPK-</S2_BPMMan>
                 <SYSTEM1>SPK-020:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>SPK-030:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>SPK-020</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>161</y>
@@ -3135,10 +3120,8 @@ if (action_ == 1):
                 <BPM_TITLE>SPK-040 BPM 1/SPK-050 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-230</RFFE_NAME>
@@ -3147,7 +3130,6 @@ if (action_ == 1):
                 <S2_BPMMan>SPK-</S2_BPMMan>
                 <SYSTEM1>SPK-040:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>SPK-050:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>SPK-040</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>251</y>
@@ -4608,10 +4590,8 @@ if (action_ == 1):
                 <BPM_TITLE>SPK-060 BPM 1/SPK-070 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM03</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
@@ -4620,7 +4600,6 @@ if (action_ == 1):
                 <S2_BPMMan>SPK-</S2_BPMMan>
                 <SYSTEM1>SPK-060:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>SPK-070:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>SPK-060</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>70</y>
@@ -4642,10 +4621,8 @@ if (action_ == 1):
                 <BPM_TITLE>SPK-080 BPM 1/SPK-090 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM03</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
@@ -4654,7 +4631,6 @@ if (action_ == 1):
                 <S2_BPMMan>SPK-</S2_BPMMan>
                 <SYSTEM1>SPK-080:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>SPK-090:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>SPK-080</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>160</y>
@@ -4676,10 +4652,8 @@ if (action_ == 1):
                 <BPM_TITLE>SPK-100 BPM 1/SPK-110 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM03</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM01-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-130</RFFE_NAME>
@@ -4688,7 +4662,6 @@ if (action_ == 1):
                 <S2_BPMMan>SPK-</S2_BPMMan>
                 <SYSTEM1>SPK-100:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>SPK-110:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>SPK-100</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>250</y>
@@ -4710,10 +4683,8 @@ if (action_ == 1):
                 <BPM_TITLE>SPK-120 BPM 1/SPK-130 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM03</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM01-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-140</RFFE_NAME>
@@ -4722,7 +4693,6 @@ if (action_ == 1):
                 <S2_BPMMan>SPK-</S2_BPMMan>
                 <SYSTEM1>SPK-120:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>SPK-130:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>SPK-120</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>340</y>
@@ -5737,10 +5707,8 @@ if (action_ == 1):
                 <BPM_TITLE>MBL-010 BPM 1/MBL-020 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM04</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
@@ -5749,7 +5717,6 @@ if (action_ == 1):
                 <S2_BPMMan>MBL-</S2_BPMMan>
                 <SYSTEM1>MBL-010:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>MBL-020:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>MBL-010</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>70</y>
@@ -5771,10 +5738,8 @@ if (action_ == 1):
                 <BPM_TITLE>MBL-030 BPM 1/MBL-040 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM04</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
@@ -5783,7 +5748,6 @@ if (action_ == 1):
                 <S2_BPMMan>MBL-</S2_BPMMan>
                 <SYSTEM1>MBL-030:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>MBL-040:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>MBL-030</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>160</y>
@@ -6622,10 +6586,8 @@ if (action_ == 1):
                 <BPM_TITLE>MBL-050 BPM 1/MBL-060 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM05</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
@@ -6634,7 +6596,6 @@ if (action_ == 1):
                 <S2_BPMMan>MBL-</S2_BPMMan>
                 <SYSTEM1>MBL-050:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>MBL-060:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>MBL-050</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>70</y>
@@ -6656,10 +6617,8 @@ if (action_ == 1):
                 <BPM_TITLE>MBL-070 BPM 1/MBL-080 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM05</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
@@ -6668,7 +6627,6 @@ if (action_ == 1):
                 <S2_BPMMan>MBL-</S2_BPMMan>
                 <SYSTEM1>MBL-070:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>MBL-080:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>MBL-070</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>160</y>
@@ -7507,10 +7465,8 @@ if (action_ == 1):
                 <BPM_TITLE>MBL-090 BPM 1/HBL-010 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM06</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
@@ -7519,7 +7475,6 @@ if (action_ == 1):
                 <S2_BPMMan>HBL-</S2_BPMMan>
                 <SYSTEM1>MBL-090LWU:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>HBL-010LWU:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>MBL-090</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>70</y>
@@ -7541,10 +7496,8 @@ if (action_ == 1):
                 <BPM_TITLE>HBL-020 BPM 1/HBL-030 BPM 1</BPM_TITLE>
                 <CONTROL_GROUP>PBI-BPM06</CONTROL_GROUP>
                 <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>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
                 <R1_BPMMan>BPM01-</R1_BPMMan>
                 <R2_BPMMan>BPM02-</R2_BPMMan>
                 <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
@@ -7553,7 +7506,6 @@ if (action_ == 1):
                 <S2_BPMMan>MBL-</S2_BPMMan>
                 <SYSTEM1>HBL-020LWU:PBI-BPM-001:</SYSTEM1>
                 <SYSTEM2>HBL-030LWU:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>HBL-020</SYSTEM_P>
               </macros>
               <file>support/instance.opi</file>
               <y>160</y>
-- 
GitLab