From 98178c131bdb4da4bcb5eb19060cc7661e432444 Mon Sep 17 00:00:00 2001 From: Gustavo de Souza dos Reis Date: Thu, 22 Jan 2026 08:51:52 -0300 Subject: [PATCH] Add virtual slot information on BPM devices. Each AFC BPM is able to handle two BPMs, and this happen in most cases at Sirius. For this reason, when addressing an specific BPM, besides the physical slot, we must also use the virtual slot information - i.e. if it's the first or the second AFC slot. Add this information in the microTCA mapping so it can be used as single source of truth. The siriuspy RaBPMSearch class must be updated to reflect this changes. --- .../names_crate01.cfg | 20 ++++++------- .../names_crate02.cfg | 22 +++++++------- .../names_crate03.cfg | 20 ++++++------- .../names_crate04.cfg | 22 +++++++------- .../names_crate05.cfg | 20 ++++++------- .../names_crate06.cfg | 30 +++++++++---------- .../names_crate07.cfg | 28 ++++++++--------- .../names_crate08.cfg | 30 +++++++++---------- .../names_crate09.cfg | 28 ++++++++--------- .../names_crate10.cfg | 30 +++++++++---------- .../names_crate11.cfg | 28 ++++++++--------- .../names_crate12.cfg | 30 +++++++++---------- .../names_crate13.cfg | 24 +++++++-------- .../names_crate14.cfg | 30 +++++++++---------- .../names_crate15.cfg | 20 ++++++------- .../names_crate16.cfg | 22 +++++++------- .../names_crate17.cfg | 20 ++++++------- .../names_crate18.cfg | 22 +++++++------- .../names_crate19.cfg | 20 ++++++------- .../names_crate20.cfg | 22 +++++++------- .../names_crate21.cfg | 22 +++++++------- 21 files changed, 255 insertions(+), 255 deletions(-) diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate01.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate01.cfg index 676373a3..b4d84f9e 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate01.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate01.cfg @@ -1,12 +1,12 @@ IA-01RaBPM:TI-AMCFPGAEVR 1 timing -SI-01M1:DI-BPM 7 rfbpm-sr -SI-01M2:DI-BPM 7 rfbpm-sr -SI-01C1:DI-BPM-1 8 rfbpm-sr -SI-01C1:DI-BPM-2 8 rfbpm-sr -SI-01C2:DI-BPM 9 rfbpm-sr -SI-01C3:DI-BPM-1 9 rfbpm-sr -SI-01C3:DI-BPM-2 10 rfbpm-sr -SI-01C4:DI-BPM 10 rfbpm-sr -BO-01U:DI-BPM 11 rfbpm-boo -BO-02U:DI-BPM 11 rfbpm-boo +SI-01M1:DI-BPM 7-1 rfbpm-sr +SI-01M2:DI-BPM 7-2 rfbpm-sr +SI-01C1:DI-BPM-1 8-1 rfbpm-sr +SI-01C1:DI-BPM-2 8-2 rfbpm-sr +SI-01C2:DI-BPM 9-1 rfbpm-sr +SI-01C3:DI-BPM-1 9-2 rfbpm-sr +SI-01C3:DI-BPM-2 10-1 rfbpm-sr +SI-01C4:DI-BPM 10-2 rfbpm-sr +BO-01U:DI-BPM 11-1 rfbpm-boo +BO-02U:DI-BPM 11-2 rfbpm-boo IA-01RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate02.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate02.cfg index 36131d73..fcddb9f4 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate02.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate02.cfg @@ -1,13 +1,13 @@ IA-02RaBPM:TI-AMCFPGAEVR 1 timing -SI-02M1:DI-BPM 7 rfbpm-sr -SI-02M2:DI-BPM 7 rfbpm-sr -SI-02C1:DI-BPM-1 8 rfbpm-sr -SI-02C1:DI-BPM-2 8 rfbpm-sr -SI-02C2:DI-BPM 9 rfbpm-sr -SI-02C3:DI-BPM-1 9 rfbpm-sr -SI-02C3:DI-BPM-2 10 rfbpm-sr -SI-02C4:DI-BPM 10 rfbpm-sr -BO-03U:DI-BPM 11 rfbpm-boo -BO-04U:DI-BPM 11 rfbpm-boo -BO-05U:DI-BPM 12 rfbpm-boo +SI-02M1:DI-BPM 7-1 rfbpm-sr +SI-02M2:DI-BPM 7-2 rfbpm-sr +SI-02C1:DI-BPM-1 8-1 rfbpm-sr +SI-02C1:DI-BPM-2 8-2 rfbpm-sr +SI-02C2:DI-BPM 9-1 rfbpm-sr +SI-02C3:DI-BPM-1 9-2 rfbpm-sr +SI-02C3:DI-BPM-2 10-1 rfbpm-sr +SI-02C4:DI-BPM 10-2 rfbpm-sr +BO-03U:DI-BPM 11-1 rfbpm-boo +BO-04U:DI-BPM 11-2 rfbpm-boo +BO-05U:DI-BPM 12-1 rfbpm-boo IA-02RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate03.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate03.cfg index 9dc9a224..3d76e14e 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate03.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate03.cfg @@ -1,12 +1,12 @@ IA-03RaBPM:TI-AMCFPGAEVR 1 timing -SI-03M1:DI-BPM 7 rfbpm-sr -SI-03M2:DI-BPM 7 rfbpm-sr -SI-03C1:DI-BPM-1 8 rfbpm-sr -SI-03C1:DI-BPM-2 8 rfbpm-sr -SI-03C2:DI-BPM 9 rfbpm-sr -SI-03C3:DI-BPM-1 9 rfbpm-sr -SI-03C3:DI-BPM-2 10 rfbpm-sr -SI-03C4:DI-BPM 10 rfbpm-sr -BO-06U:DI-BPM 11 rfbpm-boo -BO-07U:DI-BPM 11 rfbpm-boo +SI-03M1:DI-BPM 7-1 rfbpm-sr +SI-03M2:DI-BPM 7-2 rfbpm-sr +SI-03C1:DI-BPM-1 8-1 rfbpm-sr +SI-03C1:DI-BPM-2 8-2 rfbpm-sr +SI-03C2:DI-BPM 9-1 rfbpm-sr +SI-03C3:DI-BPM-1 9-2 rfbpm-sr +SI-03C3:DI-BPM-2 10-1 rfbpm-sr +SI-03C4:DI-BPM 10-2 rfbpm-sr +BO-06U:DI-BPM 11-1 rfbpm-boo +BO-07U:DI-BPM 11-2 rfbpm-boo IA-03RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate04.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate04.cfg index 16328c06..714ed377 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate04.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate04.cfg @@ -1,13 +1,13 @@ IA-04RaBPM:TI-AMCFPGAEVR 1 timing -SI-04M1:DI-BPM 7 rfbpm-sr -SI-04M2:DI-BPM 7 rfbpm-sr -SI-04C1:DI-BPM-1 8 rfbpm-sr -SI-04C1:DI-BPM-2 8 rfbpm-sr -SI-04C2:DI-BPM 9 rfbpm-sr -SI-04C3:DI-BPM-1 9 rfbpm-sr -SI-04C3:DI-BPM-2 10 rfbpm-sr -SI-04C4:DI-BPM 10 rfbpm-sr -BO-08U:DI-BPM 11 rfbpm-boo -BO-09U:DI-BPM 11 rfbpm-boo -BO-10U:DI-BPM 12 rfbpm-boo +SI-04M1:DI-BPM 7-1 rfbpm-sr +SI-04M2:DI-BPM 7-2 rfbpm-sr +SI-04C1:DI-BPM-1 8-1 rfbpm-sr +SI-04C1:DI-BPM-2 8-2 rfbpm-sr +SI-04C2:DI-BPM 9-1 rfbpm-sr +SI-04C3:DI-BPM-1 9-2 rfbpm-sr +SI-04C3:DI-BPM-2 10-1 rfbpm-sr +SI-04C4:DI-BPM 10-2 rfbpm-sr +BO-08U:DI-BPM 11-1 rfbpm-boo +BO-09U:DI-BPM 11-2 rfbpm-boo +BO-10U:DI-BPM 12-1 rfbpm-boo IA-04RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate05.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate05.cfg index 96b621c8..f9c2b9a5 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate05.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate05.cfg @@ -1,12 +1,12 @@ IA-05RaBPM:TI-AMCFPGAEVR 1 timing -SI-05M1:DI-BPM 7 rfbpm-sr -SI-05M2:DI-BPM 7 rfbpm-sr -SI-05C1:DI-BPM-1 8 rfbpm-sr -SI-05C1:DI-BPM-2 8 rfbpm-sr -SI-05C2:DI-BPM 9 rfbpm-sr -SI-05C3:DI-BPM-1 9 rfbpm-sr -SI-05C3:DI-BPM-2 10 rfbpm-sr -SI-05C4:DI-BPM 10 rfbpm-sr -BO-11U:DI-BPM 11 rfbpm-boo -BO-12U:DI-BPM 11 rfbpm-boo +SI-05M1:DI-BPM 7-1 rfbpm-sr +SI-05M2:DI-BPM 7-2 rfbpm-sr +SI-05C1:DI-BPM-1 8-1 rfbpm-sr +SI-05C1:DI-BPM-2 8-2 rfbpm-sr +SI-05C2:DI-BPM 9-1 rfbpm-sr +SI-05C3:DI-BPM-1 9-2 rfbpm-sr +SI-05C3:DI-BPM-2 10-1 rfbpm-sr +SI-05C4:DI-BPM 10-2 rfbpm-sr +BO-11U:DI-BPM 11-1 rfbpm-boo +BO-12U:DI-BPM 11-2 rfbpm-boo IA-05RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate06.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate06.cfg index 1814dfc0..d9c51e9e 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate06.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate06.cfg @@ -1,17 +1,17 @@ IA-06RaBPM:TI-AMCFPGAEVR 1 timing -SI-06SBFE:DI-PBPM-1 4 pbpm -SI-06SBFE:DI-PBPM-2 4 pbpm -SI-06SB:DI-BPM-1 6 rfbpm-sr -SI-06SB:DI-BPM-2 6 rfbpm-sr -SI-06M1:DI-BPM 7 rfbpm-sr -SI-06M2:DI-BPM 7 rfbpm-sr -SI-06C1:DI-BPM-1 8 rfbpm-sr -SI-06C1:DI-BPM-2 8 rfbpm-sr -SI-06C2:DI-BPM 9 rfbpm-sr -SI-06C3:DI-BPM-1 9 rfbpm-sr -SI-06C3:DI-BPM-2 10 rfbpm-sr -SI-06C4:DI-BPM 10 rfbpm-sr -BO-13U:DI-BPM 11 rfbpm-boo -BO-14U:DI-BPM 11 rfbpm-boo -BO-15U:DI-BPM 12 rfbpm-boo +SI-06SBFE:DI-PBPM-1 4-1 pbpm +SI-06SBFE:DI-PBPM-2 4-2 pbpm +SI-06SB:DI-BPM-1 6-1 rfbpm-sr +SI-06SB:DI-BPM-2 6-2 rfbpm-sr +SI-06M1:DI-BPM 7-1 rfbpm-sr +SI-06M2:DI-BPM 7-2 rfbpm-sr +SI-06C1:DI-BPM-1 8-1 rfbpm-sr +SI-06C1:DI-BPM-2 8-2 rfbpm-sr +SI-06C2:DI-BPM 9-1 rfbpm-sr +SI-06C3:DI-BPM-1 9-2 rfbpm-sr +SI-06C3:DI-BPM-2 10-1 rfbpm-sr +SI-06C4:DI-BPM 10-2 rfbpm-sr +BO-13U:DI-BPM 11-1 rfbpm-boo +BO-14U:DI-BPM 11-2 rfbpm-boo +BO-15U:DI-BPM 12-1 rfbpm-boo IA-06RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate07.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate07.cfg index e37d2480..b2f28088 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate07.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate07.cfg @@ -1,16 +1,16 @@ IA-07RaBPM:TI-AMCFPGAEVR 1 timing -SI-07SPFE:DI-PBPM-1 4 pbpm -SI-07SPFE:DI-PBPM-2 4 pbpm -SI-07SP:DI-BPM-1 6 rfbpm-sr -SI-07SP:DI-BPM-2 6 rfbpm-sr -SI-07M1:DI-BPM 7 rfbpm-sr -SI-07M2:DI-BPM 7 rfbpm-sr -SI-07C1:DI-BPM-1 8 rfbpm-sr -SI-07C1:DI-BPM-2 8 rfbpm-sr -SI-07C2:DI-BPM 9 rfbpm-sr -SI-07C3:DI-BPM-1 9 rfbpm-sr -SI-07C3:DI-BPM-2 10 rfbpm-sr -SI-07C4:DI-BPM 10 rfbpm-sr -BO-16U:DI-BPM 11 rfbpm-boo -BO-17U:DI-BPM 11 rfbpm-boo +SI-07SPFE:DI-PBPM-1 4-1 pbpm +SI-07SPFE:DI-PBPM-2 4-2 pbpm +SI-07SP:DI-BPM-1 6-1 rfbpm-sr +SI-07SP:DI-BPM-2 6-2 rfbpm-sr +SI-07M1:DI-BPM 7-1 rfbpm-sr +SI-07M2:DI-BPM 7-2 rfbpm-sr +SI-07C1:DI-BPM-1 8-1 rfbpm-sr +SI-07C1:DI-BPM-2 8-2 rfbpm-sr +SI-07C2:DI-BPM 9-1 rfbpm-sr +SI-07C3:DI-BPM-1 9-2 rfbpm-sr +SI-07C3:DI-BPM-2 10-1 rfbpm-sr +SI-07C4:DI-BPM 10-2 rfbpm-sr +BO-16U:DI-BPM 11-1 rfbpm-boo +BO-17U:DI-BPM 11-2 rfbpm-boo IA-07RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate08.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate08.cfg index fb389849..ecd32ac4 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate08.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate08.cfg @@ -1,17 +1,17 @@ IA-08RaBPM:TI-AMCFPGAEVR 1 timing -SI-08SBFE:DI-PBPM-1 4 pbpm -SI-08SBFE:DI-PBPM-2 4 pbpm -SI-08SB:DI-BPM-1 6 rfbpm-sr -SI-08SB:DI-BPM-2 6 rfbpm-sr -SI-08M1:DI-BPM 7 rfbpm-sr -SI-08M2:DI-BPM 7 rfbpm-sr -SI-08C1:DI-BPM-1 8 rfbpm-sr -SI-08C1:DI-BPM-2 8 rfbpm-sr -SI-08C2:DI-BPM 9 rfbpm-sr -SI-08C3:DI-BPM-1 9 rfbpm-sr -SI-08C3:DI-BPM-2 10 rfbpm-sr -SI-08C4:DI-BPM 10 rfbpm-sr -BO-18U:DI-BPM 11 rfbpm-boo -BO-19U:DI-BPM 11 rfbpm-boo -BO-20U:DI-BPM 12 rfbpm-boo +SI-08SBFE:DI-PBPM-1 4-1 pbpm +SI-08SBFE:DI-PBPM-2 4-2 pbpm +SI-08SB:DI-BPM-1 6-1 rfbpm-sr +SI-08SB:DI-BPM-2 6-2 rfbpm-sr +SI-08M1:DI-BPM 7-1 rfbpm-sr +SI-08M2:DI-BPM 7-2 rfbpm-sr +SI-08C1:DI-BPM-1 8-1 rfbpm-sr +SI-08C1:DI-BPM-2 8-2 rfbpm-sr +SI-08C2:DI-BPM 9-1 rfbpm-sr +SI-08C3:DI-BPM-1 9-2 rfbpm-sr +SI-08C3:DI-BPM-2 10-1 rfbpm-sr +SI-08C4:DI-BPM 10-2 rfbpm-sr +BO-18U:DI-BPM 11-1 rfbpm-boo +BO-19U:DI-BPM 11-2 rfbpm-boo +BO-20U:DI-BPM 12-1 rfbpm-boo IA-08RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate09.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate09.cfg index d57c92d0..0e79cdc2 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate09.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate09.cfg @@ -1,16 +1,16 @@ IA-09RaBPM:TI-AMCFPGAEVR 1 timing -SI-09SAFE:DI-PBPM-1 4 pbpm -SI-09SAFE:DI-PBPM-2 4 pbpm -SI-09SA:DI-BPM-1 6 rfbpm-sr -SI-09SA:DI-BPM-2 6 rfbpm-sr -SI-09M1:DI-BPM 7 rfbpm-sr -SI-09M2:DI-BPM 7 rfbpm-sr -SI-09C1:DI-BPM-1 8 rfbpm-sr -SI-09C1:DI-BPM-2 8 rfbpm-sr -SI-09C2:DI-BPM 9 rfbpm-sr -SI-09C3:DI-BPM-1 9 rfbpm-sr -SI-09C3:DI-BPM-2 10 rfbpm-sr -SI-09C4:DI-BPM 10 rfbpm-sr -BO-21U:DI-BPM 11 rfbpm-boo -BO-22U:DI-BPM 11 rfbpm-boo +SI-09SAFE:DI-PBPM-1 4-1 pbpm +SI-09SAFE:DI-PBPM-2 4-2 pbpm +SI-09SA:DI-BPM-1 6-1 rfbpm-sr +SI-09SA:DI-BPM-2 6-2 rfbpm-sr +SI-09M1:DI-BPM 7-1 rfbpm-sr +SI-09M2:DI-BPM 7-2 rfbpm-sr +SI-09C1:DI-BPM-1 8-1 rfbpm-sr +SI-09C1:DI-BPM-2 8-2 rfbpm-sr +SI-09C2:DI-BPM 9-1 rfbpm-sr +SI-09C3:DI-BPM-1 9-2 rfbpm-sr +SI-09C3:DI-BPM-2 10-1 rfbpm-sr +SI-09C4:DI-BPM 10-2 rfbpm-sr +BO-21U:DI-BPM 11-1 rfbpm-boo +BO-22U:DI-BPM 11-2 rfbpm-boo IA-09RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate10.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate10.cfg index 76052a0e..77654a7c 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate10.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate10.cfg @@ -1,17 +1,17 @@ IA-10RaBPM:TI-AMCFPGAEVR 1 timing -SI-10BCFE:DI-PBPM-1 5 pbpm -SI-10BCFE:DI-PBPM-2 5 pbpm -SI-10SB:DI-BPM-1 6 rfbpm-sr -SI-10SB:DI-BPM-2 6 rfbpm-sr -SI-10M1:DI-BPM 7 rfbpm-sr -SI-10M2:DI-BPM 7 rfbpm-sr -SI-10C1:DI-BPM-1 8 rfbpm-sr -SI-10C1:DI-BPM-2 8 rfbpm-sr -SI-10C2:DI-BPM 9 rfbpm-sr -SI-10C3:DI-BPM-1 9 rfbpm-sr -SI-10C3:DI-BPM-2 10 rfbpm-sr -SI-10C4:DI-BPM 10 rfbpm-sr -BO-23U:DI-BPM 11 rfbpm-boo -BO-24U:DI-BPM 11 rfbpm-boo -BO-25U:DI-BPM 12 rfbpm-boo +SI-10BCFE:DI-PBPM-1 5-1 pbpm +SI-10BCFE:DI-PBPM-2 5-2 pbpm +SI-10SB:DI-BPM-1 6-1 rfbpm-sr +SI-10SB:DI-BPM-2 6-2 rfbpm-sr +SI-10M1:DI-BPM 7-1 rfbpm-sr +SI-10M2:DI-BPM 7-2 rfbpm-sr +SI-10C1:DI-BPM-1 8-1 rfbpm-sr +SI-10C1:DI-BPM-2 8-2 rfbpm-sr +SI-10C2:DI-BPM 9-1 rfbpm-sr +SI-10C3:DI-BPM-1 9-2 rfbpm-sr +SI-10C3:DI-BPM-2 10-1 rfbpm-sr +SI-10C4:DI-BPM 10-2 rfbpm-sr +BO-23U:DI-BPM 11-1 rfbpm-boo +BO-24U:DI-BPM 11-2 rfbpm-boo +BO-25U:DI-BPM 12-1 rfbpm-boo IA-10RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate11.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate11.cfg index 9a884e97..ef1efe51 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate11.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate11.cfg @@ -1,16 +1,16 @@ IA-11RaBPM:TI-AMCFPGAEVR 1 timing -SI-11SPFE:DI-PBPM-1 4 pbpm -SI-11SPFE:DI-PBPM-2 4 pbpm -SI-11SP:DI-BPM-1 6 rfbpm-sr -SI-11SP:DI-BPM-2 6 rfbpm-sr -SI-11M1:DI-BPM 7 rfbpm-sr -SI-11M2:DI-BPM 7 rfbpm-sr -SI-11C1:DI-BPM-1 8 rfbpm-sr -SI-11C1:DI-BPM-2 8 rfbpm-sr -SI-11C2:DI-BPM 9 rfbpm-sr -SI-11C3:DI-BPM-1 9 rfbpm-sr -SI-11C3:DI-BPM-2 10 rfbpm-sr -SI-11C4:DI-BPM 10 rfbpm-sr -BO-26U:DI-BPM 11 rfbpm-boo -BO-27U:DI-BPM 11 rfbpm-boo +SI-11SPFE:DI-PBPM-1 4-1 pbpm +SI-11SPFE:DI-PBPM-2 4-2 pbpm +SI-11SP:DI-BPM-1 6-1 rfbpm-sr +SI-11SP:DI-BPM-2 6-2 rfbpm-sr +SI-11M1:DI-BPM 7-1 rfbpm-sr +SI-11M2:DI-BPM 7-2 rfbpm-sr +SI-11C1:DI-BPM-1 8-1 rfbpm-sr +SI-11C1:DI-BPM-2 8-2 rfbpm-sr +SI-11C2:DI-BPM 9-1 rfbpm-sr +SI-11C3:DI-BPM-1 9-2 rfbpm-sr +SI-11C3:DI-BPM-2 10-1 rfbpm-sr +SI-11C4:DI-BPM 10-2 rfbpm-sr +BO-26U:DI-BPM 11-1 rfbpm-boo +BO-27U:DI-BPM 11-2 rfbpm-boo IA-11RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate12.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate12.cfg index 14185ff1..2cde493d 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate12.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate12.cfg @@ -1,17 +1,17 @@ IA-12RaBPM:TI-AMCFPGAEVR 1 timing -SI-12SBFE:DI-PBPM-1 4 pbpm -SI-12SBFE:DI-PBPM-2 4 pbpm -SI-12SB:DI-BPM-1 6 rfbpm-sr -SI-12SB:DI-BPM-2 6 rfbpm-sr -SI-12M1:DI-BPM 7 rfbpm-sr -SI-12M2:DI-BPM 7 rfbpm-sr -SI-12C1:DI-BPM-1 8 rfbpm-sr -SI-12C1:DI-BPM-2 8 rfbpm-sr -SI-12C2:DI-BPM 9 rfbpm-sr -SI-12C3:DI-BPM-1 9 rfbpm-sr -SI-12C3:DI-BPM-2 10 rfbpm-sr -SI-12C4:DI-BPM 10 rfbpm-sr -BO-28U:DI-BPM 11 rfbpm-boo -BO-29U:DI-BPM 11 rfbpm-boo -BO-30U:DI-BPM 12 rfbpm-boo +SI-12SBFE:DI-PBPM-1 4-1 pbpm +SI-12SBFE:DI-PBPM-2 4-2 pbpm +SI-12SB:DI-BPM-1 6-1 rfbpm-sr +SI-12SB:DI-BPM-2 6-2 rfbpm-sr +SI-12M1:DI-BPM 7-1 rfbpm-sr +SI-12M2:DI-BPM 7-2 rfbpm-sr +SI-12C1:DI-BPM-1 8-1 rfbpm-sr +SI-12C1:DI-BPM-2 8-2 rfbpm-sr +SI-12C2:DI-BPM 9-1 rfbpm-sr +SI-12C3:DI-BPM-1 9-2 rfbpm-sr +SI-12C3:DI-BPM-2 10-1 rfbpm-sr +SI-12C4:DI-BPM 10-2 rfbpm-sr +BO-28U:DI-BPM 11-1 rfbpm-boo +BO-29U:DI-BPM 11-2 rfbpm-boo +BO-30U:DI-BPM 12-1 rfbpm-boo IA-12RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate13.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate13.cfg index 52018a54..562d52d7 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate13.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate13.cfg @@ -1,14 +1,14 @@ IA-13RaBPM:TI-AMCFPGAEVR 1 timing -SI-13BCFE:DI-PBPM-1 5 pbpm -SI-13BCFE:DI-PBPM-2 5 pbpm -SI-13M1:DI-BPM 7 rfbpm-sr -SI-13M2:DI-BPM 7 rfbpm-sr -SI-13C1:DI-BPM-1 8 rfbpm-sr -SI-13C1:DI-BPM-2 8 rfbpm-sr -SI-13C2:DI-BPM 9 rfbpm-sr -SI-13C3:DI-BPM-1 9 rfbpm-sr -SI-13C3:DI-BPM-2 10 rfbpm-sr -SI-13C4:DI-BPM 10 rfbpm-sr -BO-31U:DI-BPM 11 rfbpm-boo -BO-32U:DI-BPM 11 rfbpm-boo +SI-13BCFE:DI-PBPM-1 5-1 pbpm +SI-13BCFE:DI-PBPM-2 5-2 pbpm +SI-13M1:DI-BPM 7-1 rfbpm-sr +SI-13M2:DI-BPM 7-2 rfbpm-sr +SI-13C1:DI-BPM-1 8-1 rfbpm-sr +SI-13C1:DI-BPM-2 8-2 rfbpm-sr +SI-13C2:DI-BPM 9-1 rfbpm-sr +SI-13C3:DI-BPM-1 9-2 rfbpm-sr +SI-13C3:DI-BPM-2 10-1 rfbpm-sr +SI-13C4:DI-BPM 10-2 rfbpm-sr +BO-31U:DI-BPM 11-1 rfbpm-boo +BO-32U:DI-BPM 11-2 rfbpm-boo IA-13RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate14.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate14.cfg index 5a83a819..4f38a68c 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate14.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate14.cfg @@ -1,17 +1,17 @@ IA-14RaBPM:TI-AMCFPGAEVR 1 timing -SI-14SBFE:DI-PBPM-1 4 pbpm -SI-14SBFE:DI-PBPM-2 4 pbpm -SI-14SB:DI-BPM-1 6 rfbpm-sr -SI-14SB:DI-BPM-2 6 rfbpm-sr -SI-14M1:DI-BPM 7 rfbpm-sr -SI-14M2:DI-BPM 7 rfbpm-sr -SI-14C1:DI-BPM-1 8 rfbpm-sr -SI-14C1:DI-BPM-2 8 rfbpm-sr -SI-14C2:DI-BPM 9 rfbpm-sr -SI-14C3:DI-BPM-1 9 rfbpm-sr -SI-14C3:DI-BPM-2 10 rfbpm-sr -SI-14C4:DI-BPM 10 rfbpm-sr -BO-33U:DI-BPM 11 rfbpm-boo -BO-34U:DI-BPM 11 rfbpm-boo -BO-35U:DI-BPM 12 rfbpm-boo +SI-14SBFE:DI-PBPM-1 4-1 pbpm +SI-14SBFE:DI-PBPM-2 4-2 pbpm +SI-14SB:DI-BPM-1 6-1 rfbpm-sr +SI-14SB:DI-BPM-2 6-2 rfbpm-sr +SI-14M1:DI-BPM 7-1 rfbpm-sr +SI-14M2:DI-BPM 7-2 rfbpm-sr +SI-14C1:DI-BPM-1 8-1 rfbpm-sr +SI-14C1:DI-BPM-2 8-2 rfbpm-sr +SI-14C2:DI-BPM 9-1 rfbpm-sr +SI-14C3:DI-BPM-1 9-2 rfbpm-sr +SI-14C3:DI-BPM-2 10-1 rfbpm-sr +SI-14C4:DI-BPM 10-2 rfbpm-sr +BO-33U:DI-BPM 11-1 rfbpm-boo +BO-34U:DI-BPM 11-2 rfbpm-boo +BO-35U:DI-BPM 12-1 rfbpm-boo IA-14RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate15.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate15.cfg index 05339ddf..e44b6141 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate15.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate15.cfg @@ -1,12 +1,12 @@ IA-15RaBPM:TI-AMCFPGAEVR 1 timing -SI-15M1:DI-BPM 7 rfbpm-sr -SI-15M2:DI-BPM 7 rfbpm-sr -SI-15C1:DI-BPM-1 8 rfbpm-sr -SI-15C1:DI-BPM-2 8 rfbpm-sr -SI-15C2:DI-BPM 9 rfbpm-sr -SI-15C3:DI-BPM-1 9 rfbpm-sr -SI-15C3:DI-BPM-2 10 rfbpm-sr -SI-15C4:DI-BPM 10 rfbpm-sr -BO-36U:DI-BPM 11 rfbpm-boo -BO-37U:DI-BPM 11 rfbpm-boo +SI-15M1:DI-BPM 7-1 rfbpm-sr +SI-15M2:DI-BPM 7-2 rfbpm-sr +SI-15C1:DI-BPM-1 8-1 rfbpm-sr +SI-15C1:DI-BPM-2 8-2 rfbpm-sr +SI-15C2:DI-BPM 9-1 rfbpm-sr +SI-15C3:DI-BPM-1 9-2 rfbpm-sr +SI-15C3:DI-BPM-2 10-1 rfbpm-sr +SI-15C4:DI-BPM 10-2 rfbpm-sr +BO-36U:DI-BPM 11-1 rfbpm-boo +BO-37U:DI-BPM 11-2 rfbpm-boo IA-15RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate16.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate16.cfg index 6dc57705..cf1df232 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate16.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate16.cfg @@ -1,13 +1,13 @@ IA-16RaBPM:TI-AMCFPGAEVR 1 timing -SI-16M1:DI-BPM 7 rfbpm-sr -SI-16M2:DI-BPM 7 rfbpm-sr -SI-16C1:DI-BPM-1 8 rfbpm-sr -SI-16C1:DI-BPM-2 8 rfbpm-sr -SI-16C2:DI-BPM 9 rfbpm-sr -SI-16C3:DI-BPM-1 9 rfbpm-sr -SI-16C3:DI-BPM-2 10 rfbpm-sr -SI-16C4:DI-BPM 10 rfbpm-sr -BO-38U:DI-BPM 11 rfbpm-boo -BO-39U:DI-BPM 11 rfbpm-boo -BO-40U:DI-BPM 12 rfbpm-boo +SI-16M1:DI-BPM 7-1 rfbpm-sr +SI-16M2:DI-BPM 7-2 rfbpm-sr +SI-16C1:DI-BPM-1 8-1 rfbpm-sr +SI-16C1:DI-BPM-2 8-2 rfbpm-sr +SI-16C2:DI-BPM 9-1 rfbpm-sr +SI-16C3:DI-BPM-1 9-2 rfbpm-sr +SI-16C3:DI-BPM-2 10-1 rfbpm-sr +SI-16C4:DI-BPM 10-2 rfbpm-sr +BO-38U:DI-BPM 11-1 rfbpm-boo +BO-39U:DI-BPM 11-2 rfbpm-boo +BO-40U:DI-BPM 12-1 rfbpm-boo IA-16RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate17.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate17.cfg index 4c1c8d83..d6876004 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate17.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate17.cfg @@ -1,12 +1,12 @@ IA-17RaBPM:TI-AMCFPGAEVR 1 timing -SI-17M1:DI-BPM 7 rfbpm-sr -SI-17M2:DI-BPM 7 rfbpm-sr -SI-17C1:DI-BPM-1 8 rfbpm-sr -SI-17C1:DI-BPM-2 8 rfbpm-sr -SI-17C2:DI-BPM 9 rfbpm-sr -SI-17C3:DI-BPM-1 9 rfbpm-sr -SI-17C3:DI-BPM-2 10 rfbpm-sr -SI-17C4:DI-BPM 10 rfbpm-sr -BO-41U:DI-BPM 11 rfbpm-boo -BO-42U:DI-BPM 11 rfbpm-boo +SI-17M1:DI-BPM 7-1 rfbpm-sr +SI-17M2:DI-BPM 7-2 rfbpm-sr +SI-17C1:DI-BPM-1 8-1 rfbpm-sr +SI-17C1:DI-BPM-2 8-2 rfbpm-sr +SI-17C2:DI-BPM 9-1 rfbpm-sr +SI-17C3:DI-BPM-1 9-2 rfbpm-sr +SI-17C3:DI-BPM-2 10-1 rfbpm-sr +SI-17C4:DI-BPM 10-2 rfbpm-sr +BO-41U:DI-BPM 11-1 rfbpm-boo +BO-42U:DI-BPM 11-2 rfbpm-boo IA-17RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate18.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate18.cfg index 4b8d6ae7..cc1986fe 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate18.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate18.cfg @@ -1,13 +1,13 @@ IA-18RaBPM:TI-AMCFPGAEVR 1 timing -SI-18M1:DI-BPM 7 rfbpm-sr -SI-18M2:DI-BPM 7 rfbpm-sr -SI-18C1:DI-BPM-1 8 rfbpm-sr -SI-18C1:DI-BPM-2 8 rfbpm-sr -SI-18C2:DI-BPM 9 rfbpm-sr -SI-18C3:DI-BPM-1 9 rfbpm-sr -SI-18C3:DI-BPM-2 10 rfbpm-sr -SI-18C4:DI-BPM 10 rfbpm-sr -BO-43U:DI-BPM 11 rfbpm-boo -BO-44U:DI-BPM 11 rfbpm-boo -BO-45U:DI-BPM 12 rfbpm-boo +SI-18M1:DI-BPM 7-1 rfbpm-sr +SI-18M2:DI-BPM 7-2 rfbpm-sr +SI-18C1:DI-BPM-1 8-1 rfbpm-sr +SI-18C1:DI-BPM-2 8-2 rfbpm-sr +SI-18C2:DI-BPM 9-1 rfbpm-sr +SI-18C3:DI-BPM-1 9-2 rfbpm-sr +SI-18C3:DI-BPM-2 10-1 rfbpm-sr +SI-18C4:DI-BPM 10-2 rfbpm-sr +BO-43U:DI-BPM 11-1 rfbpm-boo +BO-44U:DI-BPM 11-2 rfbpm-boo +BO-45U:DI-BPM 12-1 rfbpm-boo IA-18RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate19.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate19.cfg index 03e31e10..d015ed3f 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate19.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate19.cfg @@ -1,12 +1,12 @@ IA-19RaBPM:TI-AMCFPGAEVR 1 timing -SI-19M1:DI-BPM 7 rfbpm-sr -SI-19M2:DI-BPM 7 rfbpm-sr -SI-19C1:DI-BPM-1 8 rfbpm-sr -SI-19C1:DI-BPM-2 8 rfbpm-sr -SI-19C2:DI-BPM 9 rfbpm-sr -SI-19C3:DI-BPM-1 9 rfbpm-sr -SI-19C3:DI-BPM-2 10 rfbpm-sr -SI-19C4:DI-BPM 10 rfbpm-sr -BO-46U:DI-BPM 11 rfbpm-boo -BO-47U:DI-BPM 11 rfbpm-boo +SI-19M1:DI-BPM 7-1 rfbpm-sr +SI-19M2:DI-BPM 7-2 rfbpm-sr +SI-19C1:DI-BPM-1 8-1 rfbpm-sr +SI-19C1:DI-BPM-2 8-2 rfbpm-sr +SI-19C2:DI-BPM 9-1 rfbpm-sr +SI-19C3:DI-BPM-1 9-2 rfbpm-sr +SI-19C3:DI-BPM-2 10-1 rfbpm-sr +SI-19C4:DI-BPM 10-2 rfbpm-sr +BO-46U:DI-BPM 11-1 rfbpm-boo +BO-47U:DI-BPM 11-2 rfbpm-boo IA-19RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate20.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate20.cfg index c7e6864c..1296a5ac 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate20.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate20.cfg @@ -1,13 +1,13 @@ IA-20RaBPM:TI-AMCFPGAEVR 1 timing -SI-20M1:DI-BPM 7 rfbpm-sr -SI-20M2:DI-BPM 7 rfbpm-sr -SI-20C1:DI-BPM-1 8 rfbpm-sr -SI-20C1:DI-BPM-2 8 rfbpm-sr -SI-20C2:DI-BPM 9 rfbpm-sr -SI-20C3:DI-BPM-1 9 rfbpm-sr -SI-20C3:DI-BPM-2 10 rfbpm-sr -SI-20C4:DI-BPM 10 rfbpm-sr -BO-48U:DI-BPM 11 rfbpm-boo -BO-49U:DI-BPM 11 rfbpm-boo -BO-50U:DI-BPM 12 rfbpm-boo +SI-20M1:DI-BPM 7-1 rfbpm-sr +SI-20M2:DI-BPM 7-2 rfbpm-sr +SI-20C1:DI-BPM-1 8-1 rfbpm-sr +SI-20C1:DI-BPM-2 8-2 rfbpm-sr +SI-20C2:DI-BPM 9-1 rfbpm-sr +SI-20C3:DI-BPM-1 9-2 rfbpm-sr +SI-20C3:DI-BPM-2 10-1 rfbpm-sr +SI-20C4:DI-BPM 10-2 rfbpm-sr +BO-48U:DI-BPM 11-1 rfbpm-boo +BO-49U:DI-BPM 11-2 rfbpm-boo +BO-50U:DI-BPM 12-1 rfbpm-boo IA-20RaBPM:BS-FOFBCtrl 2 fofb-ctrl diff --git a/diagnostics/microTCA-vs-BPMs-mapping/names_crate21.cfg b/diagnostics/microTCA-vs-BPMs-mapping/names_crate21.cfg index c0be31b9..8dec8222 100755 --- a/diagnostics/microTCA-vs-BPMs-mapping/names_crate21.cfg +++ b/diagnostics/microTCA-vs-BPMs-mapping/names_crate21.cfg @@ -1,12 +1,12 @@ IA-20RaBPMTL:TI-AMCFPGAEVR 1 timing -TB-01:DI-BPM-1 6 rfbpm-sp -TB-01:DI-BPM-2 6 rfbpm-sp -TB-02:DI-BPM-1 7 rfbpm-sp -TB-02:DI-BPM-2 7 rfbpm-sp -TB-03:DI-BPM 8 rfbpm-sp -TB-04:DI-BPM 8 rfbpm-sp -TS-01:DI-BPM 9 rfbpm-sp -TS-02:DI-BPM 9 rfbpm-sp -TS-03:DI-BPM 10 rfbpm-sp -TS-04:DI-BPM-1 10 rfbpm-sp -TS-04:DI-BPM-2 11 rfbpm-sp +TB-01:DI-BPM-1 6-1 rfbpm-sp +TB-01:DI-BPM-2 6-2 rfbpm-sp +TB-02:DI-BPM-1 7-1 rfbpm-sp +TB-02:DI-BPM-2 7-2 rfbpm-sp +TB-03:DI-BPM 8-1 rfbpm-sp +TB-04:DI-BPM 8-2 rfbpm-sp +TS-01:DI-BPM 9-1 rfbpm-sp +TS-02:DI-BPM 9-2 rfbpm-sp +TS-03:DI-BPM 10-1 rfbpm-sp +TS-04:DI-BPM-1 10-2 rfbpm-sp +TS-04:DI-BPM-2 11-1 rfbpm-sp