diff --git a/10-Top/bpmioc/support/instance.bob b/10-Top/bpmioc/support/instance.bob
index 337d1698384edb5f84e5ddc9c4b894712139e593..58813c25dfd468bc07a5a4bcc926dd97d8262571 100644
--- a/10-Top/bpmioc/support/instance.bob
+++ b/10-Top/bpmioc/support/instance.bob
@@ -763,8 +763,8 @@ M7 - FRU Communication Lost</tooltip>
<name>BPM01</name>
<class></class>
<macros>
- <BPM_PAIR>$(PAIR1_BPMMan)</BPM_PAIR>
- <P>$(P1_BPMMan)</P>
+ <BPM_PAIR>$(PAIR_BPMMan)</BPM_PAIR>
+ <P>$(P_BPMMan)</P>
<R>$(R1_BPMMan)</R>
<S>$(S1_BPMMan)</S>
</macros>
@@ -787,12 +787,12 @@ M7 - FRU Communication Lost</tooltip>
<action type="open_display">
<file>../../../99-Shared/bpmmanager/bpmmanager-bpm-instance.bob</file>
<macros>
- <BPM_PAIR>$(PAIR1_BPMMan)</BPM_PAIR>
- <P>$(P1_BPMMan)$(S1_BPMMan)</P>
+ <BPM_PAIR>$(PAIR_BPMMan)</BPM_PAIR>
+ <P>$(P_BPMMan)$(S1_BPMMan)</P>
<R>$(R1_BPMMan)</R>
</macros>
<target>tab</target>
- <description>$(S2_BPMMan)BPM01</description>
+ <description>$(S1_BPMMan)$(R1_BPMMan)</description>
</action>
</actions>
<text>...</text>
@@ -810,8 +810,8 @@ M7 - FRU Communication Lost</tooltip>
<name>BPM01_1</name>
<class></class>
<macros>
- <BPM_PAIR>$(PAIR2_BPMMan)</BPM_PAIR>
- <P>$(P2_BPMMan)</P>
+ <BPM_PAIR>$(PAIR_BPMMan)</BPM_PAIR>
+ <P>$(P_BPMMan)</P>
<R>$(R2_BPMMan)</R>
<S>$(S2_BPMMan)</S>
</macros>
@@ -834,12 +834,12 @@ M7 - FRU Communication Lost</tooltip>
<action type="open_display">
<file>../../../99-Shared/bpmmanager/bpmmanager-bpm-instance.bob</file>
<macros>
- <BPM_PAIR>$(PAIR2_BPMMan)</BPM_PAIR>
- <P>$(P2_BPMMan)$(S2_BPMMan)</P>
+ <BPM_PAIR>$(PAIR_BPMMan)</BPM_PAIR>
+ <P>$(P_BPMMan)$(S2_BPMMan)</P>
<R>$(R2_BPMMan)</R>
</macros>
<target>tab</target>
- <description>$(S2_BPMMan)BPM01</description>
+ <description>$(S2_BPMMan)$(R2_BPMMan)</description>
</action>
</actions>
<text>...</text>
diff --git a/10-Top/bpmioc/top.bob b/10-Top/bpmioc/top.bob
index 74a20304e46f2115a54d0085ec92acf8dbc58768..67c18f262533e1789a4c3cd52a7311b15303a999 100644
--- a/10-Top/bpmioc/top.bob
+++ b/10-Top/bpmioc/top.bob
@@ -141,7 +141,7 @@
<IOCNAME>PBI-BPM:SC-IOC-001</IOCNAME>
</macros>
<x>1860</x>
- <width>220</width>
+ <width>350</width>
<height>50</height>
<style>3</style>
<transparent>true</transparent>
@@ -149,6 +149,7 @@
<name>BGGrey02-title_47</name>
<text>BPM Manager IOC</text>
<x>10</x>
+ <y>15</y>
<width>200</width>
<font>
<font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
@@ -163,7 +164,8 @@
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_54</name>
- <y>20</y>
+ <x>120</x>
+ <y>5</y>
<width>220</width>
<height>40</height>
<line_width>0</line_width>
@@ -188,8 +190,8 @@
</action>
</actions>
<text>$(IOCNAME)</text>
- <x>10</x>
- <y>28</y>
+ <x>130</x>
+ <y>13</y>
<width>180</width>
<height>25</height>
<font>
@@ -202,8 +204,8 @@
<name>LED_21</name>
<pv_name>$(IOCNAME):HEARTBEAT</pv_name>
<bit>0</bit>
- <x>190</x>
- <y>28</y>
+ <x>310</x>
+ <y>13</y>
<height>25</height>
<off_color>
<color name="OK" red="61" green="216" blue="61">
@@ -237,10 +239,8 @@
<BPM_TITLE>MEBT BPM 1/2</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
<IOCNAME>PBI-BPM01:Ctrl-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>
+ <PAIR_BPMMan>BPM01-02</PAIR_BPMMan>
+ <P_BPMMan>PBI-BPM::</P_BPMMan>
<R1_BPMMan>BPM01-</R1_BPMMan>
<R2_BPMMan>BPM02-</R2_BPMMan>
<RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
@@ -271,10 +271,8 @@
<BPM_TITLE>MEBT BPM 3/5</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
<IOCNAME>PBI-BPM01:Ctrl-IOC-102</IOCNAME>
- <P1_BPMMan>PBI-BPM::</P1_BPMMan>
- <P2_BPMMan>PBI-BPM::</P2_BPMMan>
- <PAIR1_BPMMan>BPM03-05</PAIR1_BPMMan>
- <PAIR2_BPMMan>BPM03-05</PAIR2_BPMMan>
+ <PAIR_BPMMan>BPM03-05</PAIR_BPMMan>
+ <P_BPMMan>PBI-BPM::</P_BPMMan>
<R1_BPMMan>BPM03-</R1_BPMMan>
<R2_BPMMan>BPM05-</R2_BPMMan>
<RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
@@ -305,10 +303,8 @@
<BPM_TITLE>MEBT BPM 6/7</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
<IOCNAME>PBI-BPM01:Ctrl-IOC-103</IOCNAME>
- <P1_BPMMan>PBI-BPM::</P1_BPMMan>
- <P2_BPMMan>PBI-BPM::</P2_BPMMan>
- <PAIR1_BPMMan>BPM06-07</PAIR1_BPMMan>
- <PAIR2_BPMMan>BPM06-07</PAIR2_BPMMan>
+ <PAIR_BPMMan>BPM06-07</PAIR_BPMMan>
+ <P_BPMMan>PBI-BPM::</P_BPMMan>
<R1_BPMMan>BPM06-</R1_BPMMan>
<R2_BPMMan>BPM07-</R2_BPMMan>
<RFFE_NAME>PBI-BPMFE-130</RFFE_NAME>
@@ -339,10 +335,8 @@
<BPM_TITLE>MEBT BPM 8 / DTL-010 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
<IOCNAME>PBI-BPM01:Ctrl-IOC-104</IOCNAME>
- <P1_BPMMan>PBI-BPM::</P1_BPMMan>
- <P2_BPMMan>PBI-BPM::</P2_BPMMan>
- <PAIR1_BPMMan>BPM08-01</PAIR1_BPMMan>
- <PAIR2_BPMMan>BPM08-01</PAIR2_BPMMan>
+ <PAIR_BPMMan>BPM08-01</PAIR_BPMMan>
+ <P_BPMMan>PBI-BPM::</P_BPMMan>
<R1_BPMMan>BPM08-</R1_BPMMan>
<R2_BPMMan>BPM01-</R2_BPMMan>
<RFFE_NAME>PBI-BPMFE-140</RFFE_NAME>
@@ -761,9 +755,15 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-210</AMC_NAME>
<BPM_TITLE>DTL-010 BPM 2/3</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
- <IOCNAME>PBI-BPM01:Ctrl-IOC-108</IOCNAME>
+ <IOCNAME>PBI-BPM01:SC-IOC-201</IOCNAME>
+ <PAIR_BPMMan>BPM02-03</PAIR_BPMMan>
+ <P_BPMMan>PBI-BPM::</P_BPMMan>
+ <R1_BPMMan>BPM02-</R1_BPMMan>
+ <R2_BPMMan>BPM03-</R2_BPMMan>
<RFFE_NAME>PBI-BPMFE-150</RFFE_NAME>
<RTM_NAME>Ctrl-RTM-210</RTM_NAME>
+ <S1_BPMMan>DTL-</S1_BPMMan>
+ <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>
@@ -787,9 +787,15 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-220</AMC_NAME>
<BPM_TITLE>DTL-010 BPM 4/5</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
- <IOCNAME>PBI-BPM01:Ctrl-IOC-109</IOCNAME>
+ <IOCNAME>PBI-BPM01:SC-IOC-202</IOCNAME>
+ <PAIR_BPMMan>BPM04-05</PAIR_BPMMan>
+ <P_BPMMan>PBI-BPM::</P_BPMMan>
+ <R1_BPMMan>BPM04-</R1_BPMMan>
+ <R2_BPMMan>BPM05-</R2_BPMMan>
<RFFE_NAME>PBI-BPMFE-160</RFFE_NAME>
<RTM_NAME>Ctrl-RTM-220</RTM_NAME>
+ <S1_BPMMan>DTL-</S1_BPMMan>
+ <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>
@@ -813,9 +819,15 @@ if (action_ == 1):
<AMC_NAME>Ctrl-AMC-230</AMC_NAME>
<BPM_TITLE>DTL-010 BPM 6/ DTL-020 BPM 1</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
- <IOCNAME>PBI-BPM01:Ctrl-IOC-110</IOCNAME>
+ <IOCNAME>PBI-BPM01:SC-IOC-203</IOCNAME>
+ <PAIR_BPMMan>BPM06-07</PAIR_BPMMan>
+ <P_BPMMan>PBI-BPM::</P_BPMMan>
+ <R1_BPMMan>BPM04-</R1_BPMMan>
+ <R2_BPMMan>BPM05-</R2_BPMMan>
<RFFE_NAME>PBI-BPMFE-170</RFFE_NAME>
<RTM_NAME>Ctrl-RTM-230</RTM_NAME>
+ <S1_BPMMan>DTL-</S1_BPMMan>
+ <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>
@@ -837,11 +849,17 @@ if (action_ == 1):
<name>AMC-240</name>
<macros>
<AMC_NAME>Ctrl-AMC-240</AMC_NAME>
- <BPM_TITLE>DTL-030 BPM 2/3</BPM_TITLE>
+ <BPM_TITLE>DTL-020 BPM 2/3</BPM_TITLE>
<CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
- <IOCNAME>PBI-BPM01:Ctrl-IOC-111</IOCNAME>
+ <IOCNAME>PBI-BPM01:SC-IOC-204</IOCNAME>
+ <PAIR_BPMMan>BPM08-09</PAIR_BPMMan>
+ <P_BPMMan>PBI-BPM::</P_BPMMan>
+ <R1_BPMMan>BPM08-</R1_BPMMan>
+ <R2_BPMMan>BPM09-</R2_BPMMan>
<RFFE_NAME>PBI-BPMFE-180</RFFE_NAME>
<RTM_NAME>Ctrl-RTM-240</RTM_NAME>
+ <S1_BPMMan>DTL-</S1_BPMMan>
+ <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>
@@ -8388,7 +8406,6 @@ if (action_ == 1):
<y>50</y>
<width>2390</width>
<height>1150</height>
- <active_tab>5</active_tab>
<direction>1</direction>
</widget>
</display>