diff --git a/Digi/Boole/tests/refs/boole-Calo.ref b/Digi/Boole/tests/refs/boole-Calo.ref
index 53cb70ecb136f5d9849c18c9a3c652e1c880d521..81cad054d506b6fd1a965ca8969b7170d0956160 100644
--- a/Digi/Boole/tests/refs/boole-Calo.ref
+++ b/Digi/Boole/tests/refs/boole-Calo.ref
@@ -41,6 +41,7 @@ KillVPBanks       SUCCESS bankKiller : all banks of type 'VP' will be removed.
 EventPersistenc...   INFO Added successfully Conversion service:LHCb::RawDataCnvSvc
 RawWriter            INFO Data source: EventDataSvc output: DATAFILE='PFN:Boole-Calo-10ev.mdf' SVC='LHCb::RawDataCnvSvc' OPT='REC'
 ApplicationMgr       INFO Application Manager Initialized successfully
+LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Calo-10ev.mdf ID:0x########
 ApplicationMgr       INFO Application Manager Started successfully
 BooleInit            INFO Evt 2951,  Run 16564960,  Nr. in job = 1
 HcalDigit            INFO ----- Detector parameters (from condDB) ------------------
@@ -58,7 +59,6 @@ EcalDigit            INFO Nominal gain parameters for    Inner region :  20000.0
 EcalDigit            INFO Noise          :   1.2 +   0.3 (coherent) counts.
 EcalDigit            INFO Pedestal shift :  0.40 counts
 EcalDigit            INFO Actual dynamics saturation :   0.95 x ADCMax
-LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Calo-10ev.mdf ID:0x########
 BooleInit            INFO Evt 2952,  Run 16564960,  Nr. in job = 2
 BooleInit            INFO Evt 2953,  Run 16564960,  Nr. in job = 3
 BooleInit            INFO Evt 2954,  Run 16564960,  Nr. in job = 4
@@ -85,7 +85,7 @@ BooleInit.Boole...   INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
 FutureEcalDigit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Number of MC-links #"                          |        10 |     138047 |     13805.0 |     5806.7 |      3465.0 |      22508.0 |
+ | "Number of MC-links #"                          |        10 |     138047 |    13805.0 |     5806.7 |      3465.0 |     22508.0 |
 FutureHcalDigit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Number of MC-links #"                          |        10 |      27945 |     2794.5 |     855.67 |      1038.0 |      3664.0 |
@@ -94,7 +94,7 @@ KillVPBanks          INFO Number of counters : 1
  | "Requested banks are empty"                     |        10 |
 UnpackMCEcalHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |     118228 |     11823.0 |     3835.2 |      4821.0 |      16738.0 |
+ | "# UnPackedData"                                |        10 |     118228 |    11823.0 |     3835.2 |      4821.0 |     16738.0 |
 UnpackMCHcalHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnPackedData"                                |        10 |      19624 |     1962.4 |     592.00 |      797.00 |      2620.0 |
diff --git a/Digi/Boole/tests/refs/boole-Calo.ref.detdesc b/Digi/Boole/tests/refs/boole-Calo.ref.detdesc
index 187b16cf4457568bb053f536739d4c06fcfd0620..a575c773c9640c5db6153f1e1cbbf524ed955749 100644
--- a/Digi/Boole/tests/refs/boole-Calo.ref.detdesc
+++ b/Digi/Boole/tests/refs/boole-Calo.ref.detdesc
@@ -40,6 +40,7 @@ KillVPBanks       SUCCESS bankKiller : all banks of type 'VP' will be removed.
 EventPersistenc...   INFO Added successfully Conversion service:LHCb::RawDataCnvSvc
 RawWriter            INFO Data source: EventDataSvc output: DATAFILE='PFN:Boole-Calo-10ev.mdf' SVC='LHCb::RawDataCnvSvc' OPT='REC'
 ApplicationMgr       INFO Application Manager Initialized successfully
+LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Calo-10ev.mdf ID:0x########
 ApplicationMgr       INFO Application Manager Started successfully
 EcalDigit            INFO ----- Detector parameters (from condDB) ------------------
 EcalDigit            INFO Nominal gain parameters for    Outer region :  20000.0 + 14000.0 x sin(theta)
@@ -55,7 +56,6 @@ HcalDigit            INFO Noise          :   1.2 +   0.3 (coherent) counts.
 HcalDigit            INFO Pedestal shift :  0.40 counts
 HcalDigit            INFO Actual dynamics saturation :   0.95 x ADCMax
 BooleInit            INFO Evt 2951,  Run 16564960,  Nr. in job = 1
-LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Calo-10ev.mdf ID:0x########
 BooleInit            INFO Evt 2952,  Run 16564960,  Nr. in job = 2
 BooleInit            INFO Evt 2953,  Run 16564960,  Nr. in job = 3
 BooleInit            INFO Evt 2954,  Run 16564960,  Nr. in job = 4
@@ -82,7 +82,7 @@ BooleInit.Boole...   INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
 FutureEcalDigit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Number of MC-links #"                          |        10 |     138767 |     13877.0 |     5800.3 |      3653.0 |      22423.0 |
+ | "Number of MC-links #"                          |        10 |     138767 |    13877.0 |     5800.3 |      3653.0 |     22423.0 |
 FutureHcalDigit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Number of MC-links #"                          |        10 |      27881 |     2788.1 |     865.32 |      1063.0 |      3676.0 |
@@ -91,7 +91,7 @@ KillVPBanks          INFO Number of counters : 1
  | "Requested banks are empty"                     |        10 |
 UnpackMCEcalHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |     118228 |     11823.0 |     3835.2 |      4821.0 |      16738.0 |
+ | "# UnPackedData"                                |        10 |     118228 |    11823.0 |     3835.2 |      4821.0 |     16738.0 |
 UnpackMCHcalHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnPackedData"                                |        10 |      19624 |     1962.4 |     592.00 |      797.00 |      2620.0 |
diff --git a/Digi/Boole/tests/refs/boole-FT.ref.detdesc b/Digi/Boole/tests/refs/boole-FT.ref.detdesc
index 451efe2543a3df8102b0df7eec70c10b305a9a88..ab6ca89be09642d7f07cc5490fd41646dccf1da2 100644
--- a/Digi/Boole/tests/refs/boole-FT.ref.detdesc
+++ b/Digi/Boole/tests/refs/boole-FT.ref.detdesc
@@ -32,11 +32,11 @@ KillVPBanks       SUCCESS bankKiller : all banks of type 'VP' will be removed.
 EventPersistenc...   INFO Added successfully Conversion service:LHCb::RawDataCnvSvc
 RawWriter            INFO Data source: EventDataSvc output: DATAFILE='PFN:Boole-FT-10ev.mdf' SVC='LHCb::RawDataCnvSvc' OPT='REC'
 ApplicationMgr       INFO Application Manager Initialized successfully
+LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-FT-10ev.mdf ID:0x########
 ApplicationMgr       INFO Application Manager Started successfully
 FTRawBankEncoder     INFO Conditions DB is compatible with FT bank version 7 and 8.
 FTRawBankDecoder     INFO Conditions DB is compatible with FT bank version 7 and 8.
 BooleInit            INFO Evt 2951,  Run 16564960,  Nr. in job = 1
-LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-FT-10ev.mdf ID:0x########
 BooleInit            INFO Evt 2952,  Run 16564960,  Nr. in job = 2
 BooleInit            INFO Evt 2953,  Run 16564960,  Nr. in job = 3
 BooleInit            INFO Evt 2954,  Run 16564960,  Nr. in job = 4
diff --git a/Digi/Boole/tests/refs/boole-Muon.ref b/Digi/Boole/tests/refs/boole-Muon.ref
index 39f0595c921a347509a1a3c33fb7c7a4266a3952..d63d5efe89b6a040ef88b7ae0550f651366e8f0e 100644
--- a/Digi/Boole/tests/refs/boole-Muon.ref
+++ b/Digi/Boole/tests/refs/boole-Muon.ref
@@ -35,6 +35,7 @@ KillVPBanks       SUCCESS bankKiller : all banks of type 'VP' will be removed.
 EventPersistenc...   INFO Added successfully Conversion service:LHCb::RawDataCnvSvc
 RawWriter            INFO Data source: EventDataSvc output: DATAFILE='PFN:Boole-Muon-10ev.mdf' SVC='LHCb::RawDataCnvSvc' OPT='REC'
 ApplicationMgr       INFO Application Manager Initialized successfully
+LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Muon-10ev.mdf ID:0x########
 ApplicationMgr       INFO Application Manager Started successfully
 BooleInit            INFO Evt 2951,  Run 16564960,  Nr. in job = 1
 RFileCnv             INFO opening Root file "PARAM/ParamFiles/vXrYpZ/data/muonflat-G4.root" for reading
@@ -42,7 +43,6 @@ RFileCnv             INFO opening Root file "PARAM/ParamFiles/vXrYpZ/data/muonlo
 DeMagnetConditi...   INFO Loading mag field from DBASE/FieldMap/vXrYpZ/cdf
 MagneticFieldEx...   INFO Scale factor: 0.000000
 MuonFlatSpillover    INFO  luminosity factor 5.40302 compared to default 2*10^32 cm-2 s-1
-LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Muon-10ev.mdf ID:0x########
 BooleInit            INFO Evt 2952,  Run 16564960,  Nr. in job = 2
 BooleInit            INFO Evt 2953,  Run 16564960,  Nr. in job = 3
 BooleInit            INFO Evt 2954,  Run 16564960,  Nr. in job = 4
@@ -110,102 +110,102 @@ KillVPBanks          INFO Number of counters : 1
  | "Requested banks are empty"                     |        10 |
 MuonDigitChecker     INFO Number of counters : 96
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "M2R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R1/Crosstalk"                                |        10 |         91 |     9.1000 |
- | "M2R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M2R1/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M2R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M2R1/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M2R1/Geant"                                    |        10 |        695 |     69.500 |
- | "M2R1/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M2R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R1/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M2R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R2/Crosstalk"                                |        10 |         53 |     5.3000 |
- | "M2R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M2R2/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M2R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M2R2/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M2R2/Geant"                                    |        10 |        658 |     65.800 |
- | "M2R2/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M2R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R2/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M2R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R3/Crosstalk"                                |        10 |         25 |     2.5000 |
- | "M2R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M2R3/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M2R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M2R3/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M2R3/Geant"                                    |        10 |        166 |     16.600 |
- | "M2R3/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M2R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R3/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M2R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R4/Crosstalk"                                |        10 |          6 |    0.60000 |
- | "M2R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M2R4/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M2R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M2R4/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M2R4/Geant"                                    |        10 |        122 |     12.200 |
- | "M2R4/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M3R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R4/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M3R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R1/Crosstalk"                                |        10 |         46 |     4.6000 |
- | "M3R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M3R1/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M3R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M3R1/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M3R1/Geant"                                    |        10 |        399 |     39.900 |
- | "M3R1/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M3R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R1/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M3R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R2/Crosstalk"                                |        10 |          2 |    0.20000 |
- | "M3R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M3R2/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M3R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M3R2/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M3R2/Geant"                                    |        10 |         61 |     6.1000 |
- | "M3R2/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M3R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R2/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M3R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R3/Crosstalk"                                |        10 |          7 |    0.70000 |
- | "M3R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M3R3/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M3R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M3R3/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M3R3/Geant"                                    |        10 |         37 |     3.7000 |
- | "M3R3/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M3R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M3R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M3R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M3R4/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M3R3/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M3R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M3R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M3R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M3R4/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M3R4/Geant"                                    |        10 |         32 |     3.2000 |
- | "M3R4/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M4R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R4/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M4R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R1/Crosstalk"                                |        10 |         14 |     1.4000 |
- | "M4R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M4R1/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M4R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M4R1/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M4R1/Geant"                                    |        10 |         73 |     7.3000 |
- | "M4R1/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M4R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R1/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M4R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R2/Crosstalk"                                |        10 |         10 |     1.0000 |
- | "M4R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M4R2/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M4R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M4R2/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M4R2/Geant"                                    |        10 |         31 |     3.1000 |
- | "M4R2/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M4R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R2/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M4R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R3/Crosstalk"                                |        10 |          1 |    0.10000 |
  | "M4R3/Electronic Noise"                         |        10 |          2 |    0.20000 |
- | "M4R3/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M4R3/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M4R3/Geant"                                    |        10 |         20 |     2.0000 |
- | "M4R3/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M4R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M4R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M4R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M4R4/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M4R3/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M4R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M4R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M4R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M4R4/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M4R4/Geant"                                    |        10 |          4 |    0.40000 |
- | "M4R4/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M5R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R4/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M5R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R1/Crosstalk"                                |        10 |          7 |    0.70000 |
- | "M5R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M5R1/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M5R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M5R1/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M5R1/Geant"                                    |        10 |         42 |     4.2000 |
- | "M5R1/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M5R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R1/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M5R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R2/Crosstalk"                                |        10 |          1 |    0.10000 |
- | "M5R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M5R2/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M5R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M5R2/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M5R2/Geant"                                    |        10 |         29 |     2.9000 |
- | "M5R2/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M5R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R2/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M5R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R3/Crosstalk"                                |        10 |          3 |    0.30000 |
- | "M5R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M5R3/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M5R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M5R3/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M5R3/Geant"                                    |        10 |         13 |     1.3000 |
- | "M5R3/Low Energy Background"                    |        10 |          0 |      0.0000 |
- | "M5R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M5R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M5R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
- | "M5R4/FlatSpillOver"                            |        10 |          0 |      0.0000 |
+ | "M5R3/Low Energy Background"                    |        10 |          0 |     0.0000 |
+ | "M5R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M5R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M5R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
+ | "M5R4/FlatSpillOver"                            |        10 |          0 |     0.0000 |
  | "M5R4/Geant"                                    |        10 |          3 |    0.30000 |
- | "M5R4/Low Energy Background"                    |        10 |          0 |      0.0000 |
+ | "M5R4/Low Energy Background"                    |        10 |          0 |     0.0000 |
 UnpackMCMuonHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnPackedData"                                |        10 |       3204 |     320.40 |     174.09 |      120.00 |      748.00 |
diff --git a/Digi/Boole/tests/refs/boole-Muon.ref.detdesc b/Digi/Boole/tests/refs/boole-Muon.ref.detdesc
index e5547fe421aebd9f88841d4e35e63f72cb23e345..53e0597a35bdcc3beb16a093565c1da60ecc0925 100644
--- a/Digi/Boole/tests/refs/boole-Muon.ref.detdesc
+++ b/Digi/Boole/tests/refs/boole-Muon.ref.detdesc
@@ -34,12 +34,12 @@ KillVPBanks       SUCCESS bankKiller : all banks of type 'VP' will be removed.
 EventPersistenc...   INFO Added successfully Conversion service:LHCb::RawDataCnvSvc
 RawWriter            INFO Data source: EventDataSvc output: DATAFILE='PFN:Boole-Muon-10ev.mdf' SVC='LHCb::RawDataCnvSvc' OPT='REC'
 ApplicationMgr       INFO Application Manager Initialized successfully
+LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Muon-10ev.mdf ID:0x########
 ApplicationMgr       INFO Application Manager Started successfully
 RFileCnv             INFO opening Root file "PARAM/ParamFiles/vXrYpZ/data/muonlow-G4.root" for reading
 RFileCnv             INFO opening Root file "PARAM/ParamFiles/vXrYpZ/data/muonflat-G4.root" for reading
 BooleInit            INFO Evt 2951,  Run 16564960,  Nr. in job = 1
 MuonFlatSpillover    INFO  luminosity factor 5.40302 compared to default 2*10^32 cm-2 s-1
-LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Muon-10ev.mdf ID:0x########
 BooleInit            INFO Evt 2952,  Run 16564960,  Nr. in job = 2
 BooleInit            INFO Evt 2953,  Run 16564960,  Nr. in job = 3
 BooleInit            INFO Evt 2954,  Run 16564960,  Nr. in job = 4
@@ -107,98 +107,98 @@ KillVPBanks          INFO Number of counters : 1
  | "Requested banks are empty"                     |        10 |
 MuonDigitChecker     INFO Number of counters : 96
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "M2R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R1/Crosstalk"                                |        10 |        103 |     10.300 |
- | "M2R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R1/FlatSpillOver"                            |        10 |         17 |     1.7000 |
  | "M2R1/Geant"                                    |        10 |        686 |     68.600 |
  | "M2R1/Low Energy Background"                    |        10 |        134 |     13.400 |
- | "M2R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R2/Crosstalk"                                |        10 |         73 |     7.3000 |
- | "M2R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R2/FlatSpillOver"                            |        10 |         43 |     4.3000 |
  | "M2R2/Geant"                                    |        10 |        642 |     64.200 |
  | "M2R2/Low Energy Background"                    |        10 |        135 |     13.500 |
- | "M2R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R3/Crosstalk"                                |        10 |         39 |     3.9000 |
- | "M2R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R3/FlatSpillOver"                            |        10 |         48 |     4.8000 |
  | "M2R3/Geant"                                    |        10 |        156 |     15.600 |
  | "M2R3/Low Energy Background"                    |        10 |         28 |     2.8000 |
- | "M2R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R4/Crosstalk"                                |        10 |          5 |    0.50000 |
- | "M2R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R4/FlatSpillOver"                            |        10 |         22 |     2.2000 |
  | "M2R4/Geant"                                    |        10 |        126 |     12.600 |
  | "M2R4/Low Energy Background"                    |        10 |         14 |     1.4000 |
- | "M3R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R1/Crosstalk"                                |        10 |         54 |     5.4000 |
- | "M3R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R1/FlatSpillOver"                            |        10 |         20 |     2.0000 |
  | "M3R1/Geant"                                    |        10 |        376 |     37.600 |
  | "M3R1/Low Energy Background"                    |        10 |        107 |     10.700 |
- | "M3R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R2/Crosstalk"                                |        10 |          6 |    0.60000 |
- | "M3R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R2/FlatSpillOver"                            |        10 |         33 |     3.3000 |
  | "M3R2/Geant"                                    |        10 |         67 |     6.7000 |
  | "M3R2/Low Energy Background"                    |        10 |         43 |     4.3000 |
- | "M3R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R3/Crosstalk"                                |        10 |          9 |    0.90000 |
- | "M3R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R3/FlatSpillOver"                            |        10 |         26 |     2.6000 |
  | "M3R3/Geant"                                    |        10 |         30 |     3.0000 |
  | "M3R3/Low Energy Background"                    |        10 |         12 |     1.2000 |
- | "M3R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M3R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M3R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M3R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M3R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R4/FlatSpillOver"                            |        10 |         16 |     1.6000 |
  | "M3R4/Geant"                                    |        10 |         32 |     3.2000 |
  | "M3R4/Low Energy Background"                    |        10 |         12 |     1.2000 |
- | "M4R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R1/Crosstalk"                                |        10 |         15 |     1.5000 |
  | "M4R1/Electronic Noise"                         |        10 |          1 |    0.10000 |
  | "M4R1/FlatSpillOver"                            |        10 |          6 |    0.60000 |
  | "M4R1/Geant"                                    |        10 |         68 |     6.8000 |
  | "M4R1/Low Energy Background"                    |        10 |         13 |     1.3000 |
- | "M4R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R2/Crosstalk"                                |        10 |          5 |    0.50000 |
- | "M4R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R2/FlatSpillOver"                            |        10 |         19 |     1.9000 |
  | "M4R2/Geant"                                    |        10 |         28 |     2.8000 |
  | "M4R2/Low Energy Background"                    |        10 |         11 |     1.1000 |
- | "M4R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R3/Crosstalk"                                |        10 |          1 |    0.10000 |
  | "M4R3/Electronic Noise"                         |        10 |          2 |    0.20000 |
  | "M4R3/FlatSpillOver"                            |        10 |         14 |     1.4000 |
  | "M4R3/Geant"                                    |        10 |         18 |     1.8000 |
  | "M4R3/Low Energy Background"                    |        10 |          9 |    0.90000 |
- | "M4R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M4R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M4R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M4R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M4R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R4/FlatSpillOver"                            |        10 |          6 |    0.60000 |
  | "M4R4/Geant"                                    |        10 |          6 |    0.60000 |
  | "M4R4/Low Energy Background"                    |        10 |          2 |    0.20000 |
- | "M5R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R1/Crosstalk"                                |        10 |         14 |     1.4000 |
- | "M5R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R1/FlatSpillOver"                            |        10 |         11 |     1.1000 |
  | "M5R1/Geant"                                    |        10 |         48 |     4.8000 |
  | "M5R1/Low Energy Background"                    |        10 |         20 |     2.0000 |
- | "M5R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R2/Crosstalk"                                |        10 |          6 |    0.60000 |
- | "M5R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R2/FlatSpillOver"                            |        10 |         29 |     2.9000 |
  | "M5R2/Geant"                                    |        10 |         27 |     2.7000 |
  | "M5R2/Low Energy Background"                    |        10 |         12 |     1.2000 |
- | "M5R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R3/Crosstalk"                                |        10 |          2 |    0.20000 |
- | "M5R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R3/FlatSpillOver"                            |        10 |         51 |     5.1000 |
  | "M5R3/Geant"                                    |        10 |         14 |     1.4000 |
  | "M5R3/Low Energy Background"                    |        10 |          8 |    0.80000 |
- | "M5R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M5R4/Crosstalk"                                |        10 |          0 |      0.0000 |
+ | "M5R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M5R4/Crosstalk"                                |        10 |          0 |     0.0000 |
  | "M5R4/Electronic Noise"                         |        10 |          1 |    0.10000 |
  | "M5R4/FlatSpillOver"                            |        10 |         52 |     5.2000 |
  | "M5R4/Geant"                                    |        10 |          3 |    0.30000 |
diff --git a/Digi/Boole/tests/refs/boole-Rich.ref.detdesc b/Digi/Boole/tests/refs/boole-Rich.ref.detdesc
index 80abc8539b8a12fbbb37ff78e07304cbe72d6224..13919f38191ef88975873f2171534fee44f92c1e 100644
--- a/Digi/Boole/tests/refs/boole-Rich.ref.detdesc
+++ b/Digi/Boole/tests/refs/boole-Rich.ref.detdesc
@@ -31,12 +31,12 @@ KillVPBanks       SUCCESS bankKiller : all banks of type 'VP' will be removed.
 EventPersistenc...   INFO Added successfully Conversion service:LHCb::RawDataCnvSvc
 RawWriter            INFO Data source: EventDataSvc output: DATAFILE='PFN:Boole-Rich-10ev.mdf' SVC='LHCb::RawDataCnvSvc' OPT='REC'
 ApplicationMgr       INFO Application Manager Initialized successfully
+LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Rich-10ev.mdf ID:0x########
 ApplicationMgr       INFO Application Manager Started successfully
 RichPDResponse....   INFO Created active PD channel list : # channels RICH(1/2) = 122880 / 73728
 BooleInit            INFO Evt 2951,  Run 16564960,  Nr. in job = 1
 RichPDResponse       INFO Occupancy for the SIN simulation will be scaled by a factor of 1.0000 wrt the reference one provided for nu = 7.60022.
 RichFillRawBuffer WARNING DB tags too old to support realistic PMT data format, falling back to ID streaming format.
-LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Rich-10ev.mdf ID:0x########
 BooleInit            INFO Evt 2952,  Run 16564960,  Nr. in job = 2
 RichFillRawBuffer WARNING DB tags too old to support realistic PMT data format, falling back to ID streaming format.
 BooleInit            INFO Evt 2953,  Run 16564960,  Nr. in job = 3
@@ -116,13 +116,13 @@ KillVPBanks          INFO Number of counters : 1
  | "Requested banks are empty"                     |        10 |
 MCRichDigitSumm...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# PackedData"                                  |        10 |     113002 |     11300.0 |     3846.1 |      4536.0 |      17476.0 |
+ | "# PackedData"                                  |        10 |     113002 |    11300.0 |     3846.1 |      4536.0 |     17476.0 |
 RichFillRawBuffer    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "DB tags too old to support realistic PMT data format, falling back to ID streaming format."|        10 |
 RichPDSignal         INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Found MCRichHits at MC/Rich/Hits"              |        10 |     106336 |     10634.0 |
+ | "Found MCRichHits at MC/Rich/Hits"              |        10 |     106336 |    10634.0 |
 UnpackMCRichHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |     106336 |     10634.0 |     3924.4 |      3798.0 |      16938.0 |
+ | "# UnPackedData"                                |        10 |     106336 |    10634.0 |     3924.4 |      3798.0 |     16938.0 |
diff --git a/Digi/Boole/tests/refs/boole-UT.ref.detdesc b/Digi/Boole/tests/refs/boole-UT.ref.detdesc
index 3c8963326e15fceb1c7d78d0b008507a423100bd..863ebfdefcfe94a3a44f3ebf4affee596df64c12 100644
--- a/Digi/Boole/tests/refs/boole-UT.ref.detdesc
+++ b/Digi/Boole/tests/refs/boole-UT.ref.detdesc
@@ -33,10 +33,10 @@ KillVPBanks       SUCCESS bankKiller : all banks of type 'VP' will be removed.
 EventPersistenc...   INFO Added successfully Conversion service:LHCb::RawDataCnvSvc
 RawWriter            INFO Data source: EventDataSvc output: DATAFILE='PFN:Boole-UT-10ev.mdf' SVC='LHCb::RawDataCnvSvc' OPT='REC'
 ApplicationMgr       INFO Application Manager Initialized successfully
+LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-UT-10ev.mdf ID:0x########
 ApplicationMgr       INFO Application Manager Started successfully
 UTTightDigitCre...   INFO Loading cuts tagged as Data11
 BooleInit            INFO Evt 2951,  Run 16564960,  Nr. in job = 1
-LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-UT-10ev.mdf ID:0x########
 BooleInit            INFO Evt 2952,  Run 16564960,  Nr. in job = 2
 BooleInit            INFO Evt 2953,  Run 16564960,  Nr. in job = 3
 BooleInit            INFO Evt 2954,  Run 16564960,  Nr. in job = 4
diff --git a/Digi/Boole/tests/refs/boole-VP.ref.detdesc b/Digi/Boole/tests/refs/boole-VP.ref.detdesc
index a489370a52f02f203bb4c3c5675f76f4277b6e91..670a26399918c6d7e7709afb765449345eb21069 100644
--- a/Digi/Boole/tests/refs/boole-VP.ref.detdesc
+++ b/Digi/Boole/tests/refs/boole-VP.ref.detdesc
@@ -31,9 +31,9 @@ KillVPBanks       SUCCESS bankKiller : all banks of type 'VP' will be removed.
 EventPersistenc...   INFO Added successfully Conversion service:LHCb::RawDataCnvSvc
 RawWriter            INFO Data source: EventDataSvc output: DATAFILE='PFN:Boole-VP-10ev.mdf' SVC='LHCb::RawDataCnvSvc' OPT='REC'
 ApplicationMgr       INFO Application Manager Initialized successfully
+LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-VP-10ev.mdf ID:0x########
 ApplicationMgr       INFO Application Manager Started successfully
 BooleInit            INFO Evt 2951,  Run 16564960,  Nr. in job = 1
-LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-VP-10ev.mdf ID:0x########
 BooleInit            INFO Evt 2952,  Run 16564960,  Nr. in job = 2
 BooleInit            INFO Evt 2953,  Run 16564960,  Nr. in job = 3
 BooleInit            INFO Evt 2954,  Run 16564960,  Nr. in job = 4
@@ -66,17 +66,17 @@ VPClusterEffSimDQ    INFO Number of counters : 1
  | "numCalls"                                      |        10 |
 VPDepositCreator     INFO Number of counters : 5
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "1 VPDeposits from Prev/Prev"                   |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
- | "2 VPDeposits from Prev"                        |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "1 VPDeposits from Prev/Prev"                   |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
+ | "2 VPDeposits from Prev"                        |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "3 VPDeposits from Main"                        |        10 |      56118 |     5611.8 |     2033.5 |      2025.0 |      8727.0 |
- | "4 VPDeposits from Next"                        |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "4 VPDeposits from Next"                        |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "5 Deadtime removed VPDeposits"                 |        10 |        239 |     23.900 |     10.114 |      8.0000 |      44.000 |
 VPDigitCreator       INFO Number of counters : 5
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "1 Signal VPDigits"                             |        10 |      38700 |     3870.0 |     1410.1 |      1381.0 |      5967.0 |
- | "2 Noise VPDigits"                              |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "2 Noise VPDigits"                              |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "3 Lost Random bad pixels"                      |        10 |         24 |     2.4000 |     1.0198 |      1.0000 |      4.0000 |
- | "4 Spillover VPDigits"                          |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "4 Spillover VPDigits"                          |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "5 Out of time VPDigits"                        |        10 |      17686 |     1768.6 |     637.26 |      653.00 |      2813.0 |
 VPRetinaFullClu...   INFO Number of counters : 13
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
@@ -88,8 +88,8 @@ VPRetinaFullClu...   INFO Number of counters : 13
  | "Number of clusters at matrix edge"             |        10 |       2628 |     262.80 |
  | "Number of clusters from SPs w/ neighbors"      |        10 |       5553 |     555.30 |
  | "Number of clusters from isolated SPs"          |        10 |      17779 |     1777.9 |
- | "Number of clusters from overflowing SPs"       |        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 14"|        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 15"|        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 16"|        10 |          0 |      0.0000 |
+ | "Number of clusters from overflowing SPs"       |        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 14"|        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 15"|        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 16"|        10 |          0 |     0.0000 |
  | "Number of clusters not self contained"         |        10 |        977 |     97.700 |
diff --git a/Digi/Boole/tests/refs/boole-reprocess-xdigi.ref.detdesc b/Digi/Boole/tests/refs/boole-reprocess-xdigi.ref.detdesc
index 80fffa8ef57a66698e2e6ebe11426a50dc73e76b..239937eef18291d3d13e9435af9f070d04bbb97f 100644
--- a/Digi/Boole/tests/refs/boole-reprocess-xdigi.ref.detdesc
+++ b/Digi/Boole/tests/refs/boole-reprocess-xdigi.ref.detdesc
@@ -69,6 +69,7 @@ KillVPBanks       SUCCESS bankKiller : all banks of type 'VP' will be removed.
 EventPersistenc...   INFO Added successfully Conversion service:LHCb::RawDataCnvSvc
 RawWriter            INFO Data source: EventDataSvc output: DATAFILE='PFN:reprocess-xdigi-10ev.mdf' SVC='LHCb::RawDataCnvSvc' OPT='REC'
 ApplicationMgr       INFO Application Manager Initialized successfully
+LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:reprocess-xdigi-10ev.mdf ID:0x########
 ApplicationMgr       INFO Application Manager Started successfully
 RFileCnv             INFO opening Root file "PARAM/ParamFiles/vXrYpZ/data/muonlow-G4.root" for reading
 RFileCnv             INFO opening Root file "PARAM/ParamFiles/vXrYpZ/data/muonflat-G4.root" for reading
@@ -93,7 +94,6 @@ BooleInit            INFO Evt 2951,  Run 16564960,  Nr. in job = 1
 MuonFlatSpillover    INFO  luminosity factor 5.40302 compared to default 2*10^32 cm-2 s-1
 RichPDResponse       INFO Occupancy for the SIN simulation will be scaled by a factor of 1.0000 wrt the reference one provided for nu = 7.60022.
 RichFillRawBuffer WARNING DB tags too old to support realistic PMT data format, falling back to ID streaming format.
-LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:reprocess-xdigi-10ev.mdf ID:0x########
 BooleInit            INFO Evt 2952,  Run 16564960,  Nr. in job = 2
 RichFillRawBuffer WARNING DB tags too old to support realistic PMT data format, falling back to ID streaming format.
 BooleInit            INFO Evt 2953,  Run 16564960,  Nr. in job = 3
@@ -232,7 +232,7 @@ BuildMCTrackInfo     INFO Number of counters : 12
  | "true VP multiplicity"                          |     71088 |      22826 |    0.32109 |
 FutureEcalDigit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Number of MC-links #"                          |        10 |     139330 |     13933.0 |     5651.5 |      3420.0 |      21375.0 |
+ | "Number of MC-links #"                          |        10 |     139330 |    13933.0 |     5651.5 |      3420.0 |     21375.0 |
 FutureHcalDigit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Number of MC-links #"                          |        10 |      27781 |     2778.1 |     818.34 |      1036.0 |      3628.0 |
@@ -242,105 +242,105 @@ MCFTDepositCreator   INFO Number of counters : 2
  | "NbOfMissedMCHits"                              |         1 |
 MCRichDigitSumm...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# PackedData"                                  |        10 |     112907 |     11291.0 |     3831.3 |      4599.0 |      17415.0 |
+ | "# PackedData"                                  |        10 |     112907 |    11291.0 |     3831.3 |      4599.0 |     17415.0 |
 MCRichDigitSumm...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |     112907 |     11291.0 |     3831.3 |      4599.0 |      17415.0 |
+ | "# UnPackedData"                                |        10 |     112907 |    11291.0 |     3831.3 |      4599.0 |     17415.0 |
 MuonDigitChecker     INFO Number of counters : 96
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "M2R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R1/Crosstalk"                                |        10 |         93 |     9.3000 |
- | "M2R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R1/FlatSpillOver"                            |        10 |         14 |     1.4000 |
  | "M2R1/Geant"                                    |        10 |        695 |     69.500 |
  | "M2R1/Low Energy Background"                    |        10 |        131 |     13.100 |
- | "M2R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R2/Crosstalk"                                |        10 |         78 |     7.8000 |
  | "M2R2/Electronic Noise"                         |        10 |          1 |    0.10000 |
  | "M2R2/FlatSpillOver"                            |        10 |         45 |     4.5000 |
  | "M2R2/Geant"                                    |        10 |        641 |     64.100 |
  | "M2R2/Low Energy Background"                    |        10 |        132 |     13.200 |
- | "M2R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R3/Crosstalk"                                |        10 |         34 |     3.4000 |
- | "M2R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R3/FlatSpillOver"                            |        10 |         49 |     4.9000 |
  | "M2R3/Geant"                                    |        10 |        169 |     16.900 |
  | "M2R3/Low Energy Background"                    |        10 |         36 |     3.6000 |
- | "M2R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R4/Crosstalk"                                |        10 |          6 |    0.60000 |
- | "M2R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R4/FlatSpillOver"                            |        10 |         26 |     2.6000 |
  | "M2R4/Geant"                                    |        10 |        126 |     12.600 |
  | "M2R4/Low Energy Background"                    |        10 |          9 |    0.90000 |
- | "M3R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R1/Crosstalk"                                |        10 |         45 |     4.5000 |
  | "M3R1/Electronic Noise"                         |        10 |          1 |    0.10000 |
  | "M3R1/FlatSpillOver"                            |        10 |         17 |     1.7000 |
  | "M3R1/Geant"                                    |        10 |        398 |     39.800 |
  | "M3R1/Low Energy Background"                    |        10 |        111 |     11.100 |
- | "M3R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R2/Crosstalk"                                |        10 |          7 |    0.70000 |
- | "M3R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R2/FlatSpillOver"                            |        10 |         24 |     2.4000 |
  | "M3R2/Geant"                                    |        10 |         60 |     6.0000 |
  | "M3R2/Low Energy Background"                    |        10 |         46 |     4.6000 |
- | "M3R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R3/Crosstalk"                                |        10 |          4 |    0.40000 |
- | "M3R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R3/FlatSpillOver"                            |        10 |         29 |     2.9000 |
  | "M3R3/Geant"                                    |        10 |         32 |     3.2000 |
  | "M3R3/Low Energy Background"                    |        10 |         17 |     1.7000 |
- | "M3R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M3R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M3R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M3R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M3R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R4/FlatSpillOver"                            |        10 |         14 |     1.4000 |
  | "M3R4/Geant"                                    |        10 |         32 |     3.2000 |
  | "M3R4/Low Energy Background"                    |        10 |          6 |    0.60000 |
- | "M4R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R1/Crosstalk"                                |        10 |         19 |     1.9000 |
- | "M4R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R1/FlatSpillOver"                            |        10 |          5 |    0.50000 |
  | "M4R1/Geant"                                    |        10 |         70 |     7.0000 |
  | "M4R1/Low Energy Background"                    |        10 |         11 |     1.1000 |
- | "M4R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R2/Crosstalk"                                |        10 |          6 |    0.60000 |
- | "M4R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R2/FlatSpillOver"                            |        10 |         17 |     1.7000 |
  | "M4R2/Geant"                                    |        10 |         33 |     3.3000 |
  | "M4R2/Low Energy Background"                    |        10 |         13 |     1.3000 |
- | "M4R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M4R3/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M4R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M4R3/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M4R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R3/FlatSpillOver"                            |        10 |         16 |     1.6000 |
  | "M4R3/Geant"                                    |        10 |         20 |     2.0000 |
  | "M4R3/Low Energy Background"                    |        10 |          9 |    0.90000 |
- | "M4R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M4R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M4R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M4R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M4R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R4/FlatSpillOver"                            |        10 |         10 |     1.0000 |
  | "M4R4/Geant"                                    |        10 |          6 |    0.60000 |
  | "M4R4/Low Energy Background"                    |        10 |          4 |    0.40000 |
- | "M5R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R1/Crosstalk"                                |        10 |          9 |    0.90000 |
- | "M5R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R1/FlatSpillOver"                            |        10 |         11 |     1.1000 |
  | "M5R1/Geant"                                    |        10 |         46 |     4.6000 |
  | "M5R1/Low Energy Background"                    |        10 |         16 |     1.6000 |
- | "M5R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R2/Crosstalk"                                |        10 |          3 |    0.30000 |
- | "M5R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R2/FlatSpillOver"                            |        10 |         23 |     2.3000 |
  | "M5R2/Geant"                                    |        10 |         31 |     3.1000 |
  | "M5R2/Low Energy Background"                    |        10 |         10 |     1.0000 |
- | "M5R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R3/Crosstalk"                                |        10 |          7 |    0.70000 |
  | "M5R3/Electronic Noise"                         |        10 |          2 |    0.20000 |
  | "M5R3/FlatSpillOver"                            |        10 |         53 |     5.3000 |
  | "M5R3/Geant"                                    |        10 |         13 |     1.3000 |
  | "M5R3/Low Energy Background"                    |        10 |          4 |    0.40000 |
- | "M5R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M5R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M5R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M5R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M5R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R4/FlatSpillOver"                            |        10 |         56 |     5.6000 |
  | "M5R4/Geant"                                    |        10 |          3 |    0.30000 |
  | "M5R4/Low Energy Background"                    |        10 |          2 |    0.20000 |
@@ -349,10 +349,10 @@ RichFillRawBuffer    INFO Number of counters : 1
  | "DB tags too old to support realistic PMT data format, falling back to ID streaming format."|        10 |
 RichPDSignal         INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Found MCRichHits at MC/Rich/Hits"              |        10 |     106336 |     10634.0 |
+ | "Found MCRichHits at MC/Rich/Hits"              |        10 |     106336 |    10634.0 |
 UnpackMCEcalHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |     118228 |     11823.0 |     3835.2 |      4821.0 |      16738.0 |
+ | "# UnPackedData"                                |        10 |     118228 |    11823.0 |     3835.2 |      4821.0 |     16738.0 |
 UnpackMCFTHits       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnPackedData"                                |        10 |      43597 |     4359.7 |     1692.6 |      1686.0 |      7176.0 |
@@ -364,7 +364,7 @@ UnpackMCMuonHits     INFO Number of counters : 1
  | "# UnPackedData"                                |        10 |       3204 |     320.40 |     174.09 |      120.00 |      748.00 |
 UnpackMCRichHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |     106336 |     10634.0 |     3924.4 |      3798.0 |      16938.0 |
+ | "# UnPackedData"                                |        10 |     106336 |    10634.0 |     3924.4 |      3798.0 |     16938.0 |
 UnpackMCUTHits       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnPackedData"                                |        10 |      15532 |     1553.2 |     637.17 |      566.00 |      2652.0 |
@@ -376,17 +376,17 @@ VPClusterEffSimDQ    INFO Number of counters : 1
  | "numCalls"                                      |        10 |
 VPDepositCreator     INFO Number of counters : 5
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "1 VPDeposits from Prev/Prev"                   |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
- | "2 VPDeposits from Prev"                        |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "1 VPDeposits from Prev/Prev"                   |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
+ | "2 VPDeposits from Prev"                        |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "3 VPDeposits from Main"                        |        10 |      56184 |     5618.4 |     2031.9 |      2032.0 |      8727.0 |
- | "4 VPDeposits from Next"                        |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "4 VPDeposits from Next"                        |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "5 Deadtime removed VPDeposits"                 |        10 |        246 |     24.600 |     13.215 |      9.0000 |      50.000 |
 VPDigitCreator       INFO Number of counters : 5
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "1 Signal VPDigits"                             |        10 |      38697 |     3869.7 |     1411.6 |      1375.0 |      5966.0 |
- | "2 Noise VPDigits"                              |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
- | "3 Lost Random bad pixels"                      |        10 |         20 |     2.0000 |     1.3416 |       0.0000 |      5.0000 |
- | "4 Spillover VPDigits"                          |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "2 Noise VPDigits"                              |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
+ | "3 Lost Random bad pixels"                      |        10 |         20 |     2.0000 |     1.3416 |      0.0000 |      5.0000 |
+ | "4 Spillover VPDigits"                          |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "5 Out of time VPDigits"                        |        10 |      17754 |     1775.4 |     634.19 |      668.00 |      2814.0 |
 VPRetinaFullClu...   INFO Number of counters : 13
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
@@ -398,8 +398,8 @@ VPRetinaFullClu...   INFO Number of counters : 13
  | "Number of clusters at matrix edge"             |        10 |       2580 |     258.00 |
  | "Number of clusters from SPs w/ neighbors"      |        10 |       5548 |     554.80 |
  | "Number of clusters from isolated SPs"          |        10 |      17785 |     1778.5 |
- | "Number of clusters from overflowing SPs"       |        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 14"|        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 15"|        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 16"|        10 |          0 |      0.0000 |
+ | "Number of clusters from overflowing SPs"       |        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 14"|        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 15"|        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 16"|        10 |          0 |     0.0000 |
  | "Number of clusters not self contained"         |        10 |        970 |     97.000 |
diff --git a/Digi/Boole/tests/refs/boole-spillover.ref.detdesc b/Digi/Boole/tests/refs/boole-spillover.ref.detdesc
index 37b5be1fffb3119fe9e63a5cfddff5aba8b63536..6bce9752a4aa874988794b145e1f8c06906010f4 100644
--- a/Digi/Boole/tests/refs/boole-spillover.ref.detdesc
+++ b/Digi/Boole/tests/refs/boole-spillover.ref.detdesc
@@ -68,6 +68,7 @@ KillVPBanks       SUCCESS bankKiller : all banks of type 'VP' will be removed.
 EventPersistenc...   INFO Added successfully Conversion service:LHCb::RawDataCnvSvc
 RawWriter            INFO Data source: EventDataSvc output: DATAFILE='PFN:Boole-Spillover-10ev.mdf' SVC='LHCb::RawDataCnvSvc' OPT='REC'
 ApplicationMgr       INFO Application Manager Initialized successfully
+LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Spillover-10ev.mdf ID:0x########
 ApplicationMgr       INFO Application Manager Started successfully
 RFileCnv             INFO opening Root file "PARAM/ParamFiles/vXrYpZ/data/muonlow-G4.root" for reading
 RFileCnv             INFO opening Root file "PARAM/ParamFiles/vXrYpZ/data/muonflat-G4.root" for reading
@@ -92,7 +93,6 @@ BooleInit            INFO Evt 2951,  Run 16564960,  Nr. in job = 1
 MuonFlatSpillover    INFO  luminosity factor 5.40302 compared to default 2*10^32 cm-2 s-1
 RichPDResponse       INFO Occupancy for the SIN simulation will be scaled by a factor of 1.0000 wrt the reference one provided for nu = 7.60022.
 RichFillRawBuffer WARNING DB tags too old to support realistic PMT data format, falling back to ID streaming format.
-LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-Spillover-10ev.mdf ID:0x########
 BooleInit            INFO Evt 2952,  Run 16564960,  Nr. in job = 2
 RichFillRawBuffer WARNING DB tags too old to support realistic PMT data format, falling back to ID streaming format.
 BooleInit            INFO Evt 2953,  Run 16564960,  Nr. in job = 3
@@ -235,7 +235,7 @@ BuildMCTrackInfo     INFO Number of counters : 12
  | "true VP multiplicity"                          |     71088 |      22823 |    0.32105 |
 FutureEcalDigit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Number of MC-links #"                          |        10 |     139319 |     13932.0 |     5894.6 |      3476.0 |      23417.0 |
+ | "Number of MC-links #"                          |        10 |     139319 |    13932.0 |     5894.6 |      3476.0 |     23417.0 |
 FutureHcalDigit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Number of MC-links #"                          |        10 |      27947 |     2794.7 |     802.86 |      1078.0 |      3588.0 |
@@ -245,102 +245,102 @@ MCFTDepositCreator   INFO Number of counters : 2
  | "NbOfMissedMCHits"                              |         3 |
 MCRichDigitSumm...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# PackedData"                                  |        10 |      99321 |     9932.1 |     3482.0 |      4296.0 |      15866.0 |
+ | "# PackedData"                                  |        10 |      99321 |     9932.1 |     3482.0 |      4296.0 |     15866.0 |
 MuonDigitChecker     INFO Number of counters : 96
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "M2R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R1/Crosstalk"                                |        10 |        101 |     10.100 |
- | "M2R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R1/FlatSpillOver"                            |        10 |         17 |     1.7000 |
  | "M2R1/Geant"                                    |        10 |        676 |     67.600 |
  | "M2R1/Low Energy Background"                    |        10 |        148 |     14.800 |
- | "M2R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R2/Crosstalk"                                |        10 |         80 |     8.0000 |
- | "M2R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R2/FlatSpillOver"                            |        10 |         49 |     4.9000 |
  | "M2R2/Geant"                                    |        10 |        686 |     68.600 |
  | "M2R2/Low Energy Background"                    |        10 |        170 |     17.000 |
- | "M2R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R3/Crosstalk"                                |        10 |         49 |     4.9000 |
- | "M2R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R3/FlatSpillOver"                            |        10 |         49 |     4.9000 |
  | "M2R3/Geant"                                    |        10 |        184 |     18.400 |
  | "M2R3/Low Energy Background"                    |        10 |         46 |     4.6000 |
- | "M2R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R4/Crosstalk"                                |        10 |          7 |    0.70000 |
  | "M2R4/Electronic Noise"                         |        10 |          2 |    0.20000 |
  | "M2R4/FlatSpillOver"                            |        10 |         32 |     3.2000 |
  | "M2R4/Geant"                                    |        10 |        148 |     14.800 |
  | "M2R4/Low Energy Background"                    |        10 |         25 |     2.5000 |
- | "M3R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R1/Crosstalk"                                |        10 |         60 |     6.0000 |
- | "M3R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R1/FlatSpillOver"                            |        10 |         33 |     3.3000 |
  | "M3R1/Geant"                                    |        10 |        413 |     41.300 |
  | "M3R1/Low Energy Background"                    |        10 |        109 |     10.900 |
- | "M3R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R2/Crosstalk"                                |        10 |          8 |    0.80000 |
- | "M3R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R2/FlatSpillOver"                            |        10 |         27 |     2.7000 |
  | "M3R2/Geant"                                    |        10 |         80 |     8.0000 |
  | "M3R2/Low Energy Background"                    |        10 |         62 |     6.2000 |
- | "M3R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R3/Crosstalk"                                |        10 |         20 |     2.0000 |
- | "M3R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R3/FlatSpillOver"                            |        10 |         26 |     2.6000 |
  | "M3R3/Geant"                                    |        10 |         33 |     3.3000 |
  | "M3R3/Low Energy Background"                    |        10 |         22 |     2.2000 |
- | "M3R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R4/Crosstalk"                                |        10 |          1 |    0.10000 |
- | "M3R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R4/FlatSpillOver"                            |        10 |         10 |     1.0000 |
  | "M3R4/Geant"                                    |        10 |         31 |     3.1000 |
  | "M3R4/Low Energy Background"                    |        10 |         10 |     1.0000 |
- | "M4R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R1/Crosstalk"                                |        10 |         23 |     2.3000 |
- | "M4R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R1/FlatSpillOver"                            |        10 |          5 |    0.50000 |
  | "M4R1/Geant"                                    |        10 |         91 |     9.1000 |
  | "M4R1/Low Energy Background"                    |        10 |         22 |     2.2000 |
- | "M4R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R2/Crosstalk"                                |        10 |          4 |    0.40000 |
- | "M4R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R2/FlatSpillOver"                            |        10 |         23 |     2.3000 |
  | "M4R2/Geant"                                    |        10 |         40 |     4.0000 |
  | "M4R2/Low Energy Background"                    |        10 |         21 |     2.1000 |
- | "M4R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R3/Crosstalk"                                |        10 |          3 |    0.30000 |
- | "M4R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R3/FlatSpillOver"                            |        10 |          8 |    0.80000 |
  | "M4R3/Geant"                                    |        10 |         22 |     2.2000 |
  | "M4R3/Low Energy Background"                    |        10 |         10 |     1.0000 |
- | "M4R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M4R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M4R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M4R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M4R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R4/FlatSpillOver"                            |        10 |          7 |    0.70000 |
  | "M4R4/Geant"                                    |        10 |          6 |    0.60000 |
  | "M4R4/Low Energy Background"                    |        10 |          4 |    0.40000 |
- | "M5R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R1/Crosstalk"                                |        10 |         16 |     1.6000 |
- | "M5R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R1/FlatSpillOver"                            |        10 |          8 |    0.80000 |
  | "M5R1/Geant"                                    |        10 |         51 |     5.1000 |
  | "M5R1/Low Energy Background"                    |        10 |         24 |     2.4000 |
- | "M5R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R2/Crosstalk"                                |        10 |         13 |     1.3000 |
- | "M5R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R2/FlatSpillOver"                            |        10 |         37 |     3.7000 |
  | "M5R2/Geant"                                    |        10 |         30 |     3.0000 |
  | "M5R2/Low Energy Background"                    |        10 |         14 |     1.4000 |
- | "M5R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R3/Crosstalk"                                |        10 |          4 |    0.40000 |
  | "M5R3/Electronic Noise"                         |        10 |          2 |    0.20000 |
  | "M5R3/FlatSpillOver"                            |        10 |         45 |     4.5000 |
  | "M5R3/Geant"                                    |        10 |         18 |     1.8000 |
  | "M5R3/Low Energy Background"                    |        10 |         15 |     1.5000 |
- | "M5R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R4/Crosstalk"                                |        10 |          3 |    0.30000 |
- | "M5R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R4/FlatSpillOver"                            |        10 |         49 |     4.9000 |
  | "M5R4/Geant"                                    |        10 |          5 |    0.50000 |
  | "M5R4/Low Energy Background"                    |        10 |         29 |     2.9000 |
@@ -349,17 +349,17 @@ RichFillRawBuffer    INFO Number of counters : 1
  | "DB tags too old to support realistic PMT data format, falling back to ID streaming format."|        10 |
 RichPDSignal         INFO Number of counters : 5
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Found MCRichHits at MC/Rich/Hits"              |        10 |     106336 |     10634.0 |
+ | "Found MCRichHits at MC/Rich/Hits"              |        10 |     106336 |    10634.0 |
  | "Found MCRichHits at Next/MC/Rich/Hits"         |        10 |      72611 |     7261.1 |
  | "Found MCRichHits at NextNext/MC/Rich/Hits"     |        10 |      81101 |     8110.1 |
- | "Found MCRichHits at Prev/MC/Rich/Hits"         |        10 |     113858 |     11386.0 |
+ | "Found MCRichHits at Prev/MC/Rich/Hits"         |        10 |     113858 |    11386.0 |
  | "Found MCRichHits at PrevPrev/MC/Rich/Hits"     |        10 |      58953 |     5895.3 |
 UnpackMCEcalHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |     118228 |     11823.0 |     3835.2 |      4821.0 |      16738.0 |
+ | "# UnPackedData"                                |        10 |     118228 |    11823.0 |     3835.2 |      4821.0 |     16738.0 |
 UnpackMCEcalHit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |      66377 |     6637.7 |     4595.4 |      647.00 |      16697.0 |
+ | "# UnPackedData"                                |        10 |      66377 |     6637.7 |     4595.4 |      647.00 |     16697.0 |
 UnpackMCFTHits       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnPackedData"                                |        10 |      43597 |     4359.7 |     1692.6 |      1686.0 |      7176.0 |
@@ -371,7 +371,7 @@ UnpackMCFTHitsPrev   INFO Number of counters : 1
  | "# UnPackedData"                                |        10 |      25210 |     2521.0 |     1740.5 |      301.00 |      5997.0 |
 UnpackMCFTHitsP...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |      48501 |     4850.1 |     3866.7 |      699.00 |      12307.0 |
+ | "# UnPackedData"                                |        10 |      48501 |     4850.1 |     3866.7 |      699.00 |     12307.0 |
 UnpackMCHcalHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnPackedData"                                |        10 |      19624 |     1962.4 |     592.00 |      797.00 |      2620.0 |
@@ -395,19 +395,19 @@ UnpackMCMuonHit...   INFO Number of counters : 1
  | "# UnPackedData"                                |        10 |       2412 |     241.20 |     189.33 |      40.000 |      604.00 |
 UnpackMCRichHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |     106336 |     10634.0 |     3924.4 |      3798.0 |      16938.0 |
+ | "# UnPackedData"                                |        10 |     106336 |    10634.0 |     3924.4 |      3798.0 |     16938.0 |
 UnpackMCRichHit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |      72611 |     7261.1 |     4043.9 |      2101.0 |      15318.0 |
+ | "# UnPackedData"                                |        10 |      72611 |     7261.1 |     4043.9 |      2101.0 |     15318.0 |
 UnpackMCRichHit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |      81101 |     8110.1 |     4568.8 |      1639.0 |      16551.0 |
+ | "# UnPackedData"                                |        10 |      81101 |     8110.1 |     4568.8 |      1639.0 |     16551.0 |
 UnpackMCRichHit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |      58953 |     5895.3 |     4288.1 |      314.00 |      14493.0 |
+ | "# UnPackedData"                                |        10 |      58953 |     5895.3 |     4288.1 |      314.00 |     14493.0 |
 UnpackMCRichHit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |     113858 |     11386.0 |     8562.7 |      1421.0 |      27072.0 |
+ | "# UnPackedData"                                |        10 |     113858 |    11386.0 |     8562.7 |      1421.0 |     27072.0 |
 UnpackMCUTHits       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnPackedData"                                |        10 |      15532 |     1553.2 |     637.17 |      566.00 |      2652.0 |
@@ -428,16 +428,16 @@ VPClusterEffSimDQ    INFO Number of counters : 1
  | "numCalls"                                      |        10 |
 VPDepositCreator     INFO Number of counters : 5
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "1 VPDeposits from Prev/Prev"                   |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "1 VPDeposits from Prev/Prev"                   |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "2 VPDeposits from Prev"                        |        10 |      34969 |     3496.9 |     2381.1 |      100.00 |      8102.0 |
  | "3 VPDeposits from Main"                        |        10 |      56147 |     5614.7 |     2029.9 |      2028.0 |      8716.0 |
- | "4 VPDeposits from Next"                        |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "4 VPDeposits from Next"                        |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "5 Deadtime removed VPDeposits"                 |        10 |        375 |     37.500 |     12.524 |      19.000 |      59.000 |
 VPDigitCreator       INFO Number of counters : 5
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "1 Signal VPDigits"                             |        10 |      38659 |     3865.9 |     1416.6 |      1384.0 |      5983.0 |
- | "2 Noise VPDigits"                              |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
- | "3 Lost Random bad pixels"                      |        10 |         19 |     1.9000 |     1.3748 |       0.0000 |      5.0000 |
+ | "2 Noise VPDigits"                              |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
+ | "3 Lost Random bad pixels"                      |        10 |         19 |     1.9000 |     1.3748 |      0.0000 |      5.0000 |
  | "4 Spillover VPDigits"                          |        10 |       2823 |     282.30 |     200.00 |      5.0000 |      700.00 |
  | "5 Out of time VPDigits"                        |        10 |      17769 |     1776.9 |     627.20 |      654.00 |      2782.0 |
 VPRetinaFullClu...   INFO Number of counters : 13
@@ -450,8 +450,8 @@ VPRetinaFullClu...   INFO Number of counters : 13
  | "Number of clusters at matrix edge"             |        10 |       2785 |     278.50 |
  | "Number of clusters from SPs w/ neighbors"      |        10 |       5950 |     595.00 |
  | "Number of clusters from isolated SPs"          |        10 |      19929 |     1992.9 |
- | "Number of clusters from overflowing SPs"       |        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 14"|        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 15"|        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 16"|        10 |          0 |      0.0000 |
+ | "Number of clusters from overflowing SPs"       |        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 14"|        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 15"|        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 16"|        10 |          0 |     0.0000 |
  | "Number of clusters not self contained"         |        10 |       1049 |     104.90 |
diff --git a/Digi/Boole/tests/refs/boole-upgrade-baseline.ref.detdesc b/Digi/Boole/tests/refs/boole-upgrade-baseline.ref.detdesc
index ac7b54f8ee6c0fbe0ce47b6a78a0547361dc9129..3f77f07757c4e28d6acf8dcd06543db1bfe371a5 100644
--- a/Digi/Boole/tests/refs/boole-upgrade-baseline.ref.detdesc
+++ b/Digi/Boole/tests/refs/boole-upgrade-baseline.ref.detdesc
@@ -68,6 +68,7 @@ KillVPBanks       SUCCESS bankKiller : all banks of type 'VP' will be removed.
 EventPersistenc...   INFO Added successfully Conversion service:LHCb::RawDataCnvSvc
 RawWriter            INFO Data source: EventDataSvc output: DATAFILE='PFN:Boole-10ev.mdf' SVC='LHCb::RawDataCnvSvc' OPT='REC'
 ApplicationMgr       INFO Application Manager Initialized successfully
+LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-10ev.mdf ID:0x########
 ApplicationMgr       INFO Application Manager Started successfully
 RFileCnv             INFO opening Root file "PARAM/ParamFiles/vXrYpZ/data/muonlow-G4.root" for reading
 RFileCnv             INFO opening Root file "PARAM/ParamFiles/vXrYpZ/data/muonflat-G4.root" for reading
@@ -92,7 +93,6 @@ BooleInit            INFO Evt 2951,  Run 16564960,  Nr. in job = 1
 MuonFlatSpillover    INFO  luminosity factor 5.40302 compared to default 2*10^32 cm-2 s-1
 RichPDResponse       INFO Occupancy for the SIN simulation will be scaled by a factor of 1.0000 wrt the reference one provided for nu = 7.60022.
 RichFillRawBuffer WARNING DB tags too old to support realistic PMT data format, falling back to ID streaming format.
-LHCb::RawDataCn...   INFO Opened(NEW)  MDF stream:PFN:Boole-10ev.mdf ID:0x########
 BooleInit            INFO Evt 2952,  Run 16564960,  Nr. in job = 2
 RichFillRawBuffer WARNING DB tags too old to support realistic PMT data format, falling back to ID streaming format.
 BooleInit            INFO Evt 2953,  Run 16564960,  Nr. in job = 3
@@ -231,7 +231,7 @@ BuildMCTrackInfo     INFO Number of counters : 12
  | "true VP multiplicity"                          |     71088 |      22826 |    0.32109 |
 FutureEcalDigit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Number of MC-links #"                          |        10 |     139330 |     13933.0 |     5651.5 |      3420.0 |      21375.0 |
+ | "Number of MC-links #"                          |        10 |     139330 |    13933.0 |     5651.5 |      3420.0 |     21375.0 |
 FutureHcalDigit...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Number of MC-links #"                          |        10 |      27781 |     2778.1 |     818.34 |      1036.0 |      3628.0 |
@@ -241,102 +241,102 @@ MCFTDepositCreator   INFO Number of counters : 2
  | "NbOfMissedMCHits"                              |         1 |
 MCRichDigitSumm...   INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# PackedData"                                  |        10 |     112907 |     11291.0 |     3831.3 |      4599.0 |      17415.0 |
+ | "# PackedData"                                  |        10 |     112907 |    11291.0 |     3831.3 |      4599.0 |     17415.0 |
 MuonDigitChecker     INFO Number of counters : 96
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "M2R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R1/Crosstalk"                                |        10 |         93 |     9.3000 |
- | "M2R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R1/FlatSpillOver"                            |        10 |         14 |     1.4000 |
  | "M2R1/Geant"                                    |        10 |        695 |     69.500 |
  | "M2R1/Low Energy Background"                    |        10 |        131 |     13.100 |
- | "M2R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R2/Crosstalk"                                |        10 |         78 |     7.8000 |
  | "M2R2/Electronic Noise"                         |        10 |          1 |    0.10000 |
  | "M2R2/FlatSpillOver"                            |        10 |         45 |     4.5000 |
  | "M2R2/Geant"                                    |        10 |        641 |     64.100 |
  | "M2R2/Low Energy Background"                    |        10 |        132 |     13.200 |
- | "M2R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R3/Crosstalk"                                |        10 |         34 |     3.4000 |
- | "M2R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R3/FlatSpillOver"                            |        10 |         49 |     4.9000 |
  | "M2R3/Geant"                                    |        10 |        169 |     16.900 |
  | "M2R3/Low Energy Background"                    |        10 |         36 |     3.6000 |
- | "M2R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M2R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M2R4/Crosstalk"                                |        10 |          6 |    0.60000 |
- | "M2R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M2R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M2R4/FlatSpillOver"                            |        10 |         26 |     2.6000 |
  | "M2R4/Geant"                                    |        10 |        126 |     12.600 |
  | "M2R4/Low Energy Background"                    |        10 |          9 |    0.90000 |
- | "M3R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R1/Crosstalk"                                |        10 |         45 |     4.5000 |
  | "M3R1/Electronic Noise"                         |        10 |          1 |    0.10000 |
  | "M3R1/FlatSpillOver"                            |        10 |         17 |     1.7000 |
  | "M3R1/Geant"                                    |        10 |        398 |     39.800 |
  | "M3R1/Low Energy Background"                    |        10 |        111 |     11.100 |
- | "M3R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R2/Crosstalk"                                |        10 |          7 |    0.70000 |
- | "M3R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R2/FlatSpillOver"                            |        10 |         24 |     2.4000 |
  | "M3R2/Geant"                                    |        10 |         60 |     6.0000 |
  | "M3R2/Low Energy Background"                    |        10 |         46 |     4.6000 |
- | "M3R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M3R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M3R3/Crosstalk"                                |        10 |          4 |    0.40000 |
- | "M3R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R3/FlatSpillOver"                            |        10 |         29 |     2.9000 |
  | "M3R3/Geant"                                    |        10 |         32 |     3.2000 |
  | "M3R3/Low Energy Background"                    |        10 |         17 |     1.7000 |
- | "M3R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M3R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M3R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M3R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M3R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M3R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M3R4/FlatSpillOver"                            |        10 |         14 |     1.4000 |
  | "M3R4/Geant"                                    |        10 |         32 |     3.2000 |
  | "M3R4/Low Energy Background"                    |        10 |          6 |    0.60000 |
- | "M4R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R1/Crosstalk"                                |        10 |         19 |     1.9000 |
- | "M4R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R1/FlatSpillOver"                            |        10 |          5 |    0.50000 |
  | "M4R1/Geant"                                    |        10 |         70 |     7.0000 |
  | "M4R1/Low Energy Background"                    |        10 |         11 |     1.1000 |
- | "M4R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M4R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M4R2/Crosstalk"                                |        10 |          6 |    0.60000 |
- | "M4R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R2/FlatSpillOver"                            |        10 |         17 |     1.7000 |
  | "M4R2/Geant"                                    |        10 |         33 |     3.3000 |
  | "M4R2/Low Energy Background"                    |        10 |         13 |     1.3000 |
- | "M4R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M4R3/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M4R3/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M4R3/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M4R3/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R3/FlatSpillOver"                            |        10 |         16 |     1.6000 |
  | "M4R3/Geant"                                    |        10 |         20 |     2.0000 |
  | "M4R3/Low Energy Background"                    |        10 |          9 |    0.90000 |
- | "M4R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M4R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M4R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M4R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M4R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M4R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M4R4/FlatSpillOver"                            |        10 |         10 |     1.0000 |
  | "M4R4/Geant"                                    |        10 |          6 |    0.60000 |
  | "M4R4/Low Energy Background"                    |        10 |          4 |    0.40000 |
- | "M5R1/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R1/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R1/Crosstalk"                                |        10 |          9 |    0.90000 |
- | "M5R1/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R1/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R1/FlatSpillOver"                            |        10 |         11 |     1.1000 |
  | "M5R1/Geant"                                    |        10 |         46 |     4.6000 |
  | "M5R1/Low Energy Background"                    |        10 |         16 |     1.6000 |
- | "M5R2/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R2/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R2/Crosstalk"                                |        10 |          3 |    0.30000 |
- | "M5R2/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R2/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R2/FlatSpillOver"                            |        10 |         23 |     2.3000 |
  | "M5R2/Geant"                                    |        10 |         31 |     3.1000 |
  | "M5R2/Low Energy Background"                    |        10 |         10 |     1.0000 |
- | "M5R3/Chamber Noise"                            |        10 |          0 |      0.0000 |
+ | "M5R3/Chamber Noise"                            |        10 |          0 |     0.0000 |
  | "M5R3/Crosstalk"                                |        10 |          7 |    0.70000 |
  | "M5R3/Electronic Noise"                         |        10 |          2 |    0.20000 |
  | "M5R3/FlatSpillOver"                            |        10 |         53 |     5.3000 |
  | "M5R3/Geant"                                    |        10 |         13 |     1.3000 |
  | "M5R3/Low Energy Background"                    |        10 |          4 |    0.40000 |
- | "M5R4/Chamber Noise"                            |        10 |          0 |      0.0000 |
- | "M5R4/Crosstalk"                                |        10 |          0 |      0.0000 |
- | "M5R4/Electronic Noise"                         |        10 |          0 |      0.0000 |
+ | "M5R4/Chamber Noise"                            |        10 |          0 |     0.0000 |
+ | "M5R4/Crosstalk"                                |        10 |          0 |     0.0000 |
+ | "M5R4/Electronic Noise"                         |        10 |          0 |     0.0000 |
  | "M5R4/FlatSpillOver"                            |        10 |         56 |     5.6000 |
  | "M5R4/Geant"                                    |        10 |          3 |    0.30000 |
  | "M5R4/Low Energy Background"                    |        10 |          2 |    0.20000 |
@@ -345,10 +345,10 @@ RichFillRawBuffer    INFO Number of counters : 1
  | "DB tags too old to support realistic PMT data format, falling back to ID streaming format."|        10 |
 RichPDSignal         INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Found MCRichHits at MC/Rich/Hits"              |        10 |     106336 |     10634.0 |
+ | "Found MCRichHits at MC/Rich/Hits"              |        10 |     106336 |    10634.0 |
 UnpackMCEcalHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |     118228 |     11823.0 |     3835.2 |      4821.0 |      16738.0 |
+ | "# UnPackedData"                                |        10 |     118228 |    11823.0 |     3835.2 |      4821.0 |     16738.0 |
 UnpackMCFTHits       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnPackedData"                                |        10 |      43597 |     4359.7 |     1692.6 |      1686.0 |      7176.0 |
@@ -360,7 +360,7 @@ UnpackMCMuonHits     INFO Number of counters : 1
  | "# UnPackedData"                                |        10 |       3204 |     320.40 |     174.09 |      120.00 |      748.00 |
 UnpackMCRichHits     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnPackedData"                                |        10 |     106336 |     10634.0 |     3924.4 |      3798.0 |      16938.0 |
+ | "# UnPackedData"                                |        10 |     106336 |    10634.0 |     3924.4 |      3798.0 |     16938.0 |
 UnpackMCUTHits       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# UnPackedData"                                |        10 |      15532 |     1553.2 |     637.17 |      566.00 |      2652.0 |
@@ -372,17 +372,17 @@ VPClusterEffSimDQ    INFO Number of counters : 1
  | "numCalls"                                      |        10 |
 VPDepositCreator     INFO Number of counters : 5
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "1 VPDeposits from Prev/Prev"                   |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
- | "2 VPDeposits from Prev"                        |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "1 VPDeposits from Prev/Prev"                   |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
+ | "2 VPDeposits from Prev"                        |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "3 VPDeposits from Main"                        |        10 |      56184 |     5618.4 |     2031.9 |      2032.0 |      8727.0 |
- | "4 VPDeposits from Next"                        |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "4 VPDeposits from Next"                        |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "5 Deadtime removed VPDeposits"                 |        10 |        246 |     24.600 |     13.215 |      9.0000 |      50.000 |
 VPDigitCreator       INFO Number of counters : 5
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "1 Signal VPDigits"                             |        10 |      38697 |     3869.7 |     1411.6 |      1375.0 |      5966.0 |
- | "2 Noise VPDigits"                              |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
- | "3 Lost Random bad pixels"                      |        10 |         20 |     2.0000 |     1.3416 |       0.0000 |      5.0000 |
- | "4 Spillover VPDigits"                          |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "2 Noise VPDigits"                              |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
+ | "3 Lost Random bad pixels"                      |        10 |         20 |     2.0000 |     1.3416 |      0.0000 |      5.0000 |
+ | "4 Spillover VPDigits"                          |        10 |          0 |     0.0000 |     0.0000 |      0.0000 |      0.0000 |
  | "5 Out of time VPDigits"                        |        10 |      17754 |     1775.4 |     634.19 |      668.00 |      2814.0 |
 VPRetinaFullClu...   INFO Number of counters : 13
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
@@ -394,8 +394,8 @@ VPRetinaFullClu...   INFO Number of counters : 13
  | "Number of clusters at matrix edge"             |        10 |       2580 |     258.00 |
  | "Number of clusters from SPs w/ neighbors"      |        10 |       5548 |     554.80 |
  | "Number of clusters from isolated SPs"          |        10 |      17785 |     1778.5 |
- | "Number of clusters from overflowing SPs"       |        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 14"|        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 15"|        10 |          0 |      0.0000 |
- | "Number of clusters from overflowing SPs - Mod 16"|        10 |          0 |      0.0000 |
+ | "Number of clusters from overflowing SPs"       |        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 14"|        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 15"|        10 |          0 |     0.0000 |
+ | "Number of clusters from overflowing SPs - Mod 16"|        10 |          0 |     0.0000 |
  | "Number of clusters not self contained"         |        10 |        970 |     97.000 |