diff --git a/Rich/RichFutureRecSys/tests/refs/decode-2023-data.ref b/Rich/RichFutureRecSys/tests/refs/decode-2023-data.ref
index 8c2cbbd49ace28b29438888ae0ecffac47e7de03..5ae17ba94c7f4f5abdb693159c602fdab2cb74ce 100644
--- a/Rich/RichFutureRecSys/tests/refs/decode-2023-data.ref
+++ b/Rich/RichFutureRecSys/tests/refs/decode-2023-data.ref
@@ -8,7 +8,7 @@ RndmGenSvc.Engine    INFO Generator engine type:CLHEP::RanluxEngine
 RndmGenSvc.Engine    INFO Current Seed:1234567 Luxury:3
 RndmGenSvc           INFO Using Random engine:HepRndm::Engine<CLHEP::RanluxEngine>
 ToolSvc.RichPar...   INFO Particle types considered = [electron, muon, pion, kaon, proton, deuteron, below_threshold]
-IODataManager       ERROR Referring to existing dataset mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-2023/data-0020.mdf by its physical name.
+IODataManager       ERROR Referring to existing dataset mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-2023/data-0010.mdf by its physical name.
 IODataManager       ERROR You may not be able to navigate back to the input file -- processing continues
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr       INFO Application Manager Started successfully
@@ -36,37 +36,37 @@ ApplicationMgr       INFO Application Manager Finalized successfully
 ApplicationMgr       INFO Application Manager Terminated successfully
 RichClustering       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "No DePD object found for decoded channel ID"   |         4 |
+ | "No DePD object found for decoded channel ID"   |       117 |
 RichRecPixelQC       INFO 1D histograms in directory "RichRecPixelQC" : 21
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | /RICH/RichRecPixelQC/Rich1/bottom/pixXGlo     | "Rich1 bottom Global X hits;Global X / mm"    |      97787 |    -14.268 | 232.19     |  -0.013136 |    0.17408 |
- | /RICH/RichRecPixelQC/Rich1/bottom/pixYGlo     | "Rich1 bottom Global Y hits;Global Y / mm"    |      97787 |    -1353.5 | 63.091     |   -0.91132 |    0.57851 |
- | /RICH/RichRecPixelQC/Rich1/nActivePDs         | "Rich1 # Active PDs (nHits>0)"                |        100 |      599.9 | 288.78     |    0.44197 |     1.7952 |
- | /RICH/RichRecPixelQC/Rich1/nTotalPixs         | "Rich1 Overall occupancy (nHits>0)"           |         99 |       2105 | 1747.0     |     4.3641 |     29.154 |
- | /RICH/RichRecPixelQC/Rich1/nTotalPixsPerInner | "Rich1 Average overall Inner PD occupancy..." |      59990 |     3.4616 | 3.7115     |     3.0681 |     15.128 |
- | /RICH/RichRecPixelQC/Rich1/nTotalPixsPerPD    | "Rich1 Average overall PD occupancy (nHit..." |      59990 |     3.4616 | 3.7115     |     3.0681 |     15.128 |
- | /RICH/RichRecPixelQC/Rich1/pixXLoc            | "Rich1 Local X hits;Local X / mm"             |     207664 |    -3.0594 | 230.16     |  -0.038294 |    0.23721 |
- | /RICH/RichRecPixelQC/Rich1/pixYLoc            | "Rich1 Local Y hits;Local Y / mm"             |     207664 |     8.5209 | 245.90     |   -0.05402 |   -0.75847 |
- | /RICH/RichRecPixelQC/Rich1/top/pixXGlo        | "Rich1 top Global X hits;Global X / mm"       |     109877 |     6.9723 | 228.64     |  -0.057812 |    0.30551 |
- | /RICH/RichRecPixelQC/Rich1/top/pixYGlo        | "Rich1 top Global Y hits;Global Y / mm"       |     109877 |     1350.9 | 64.463     |    0.91432 |    0.55455 |
- | /RICH/RichRecPixelQC/Rich2/ASide-left/pixXGlo | "Rich2 ASide-left Global X hits;Global X ..." |      75752 |     3904.7 | 83.667     |    -0.1181 |   -0.92648 |
- | /RICH/RichRecPixelQC/Rich2/ASide-left/pixYGlo | "Rich2 ASide-left Global Y hits;Global Y ..." |      75752 |     8.9534 | 259.52     |  -0.001515 |    0.28066 |
- | /RICH/RichRecPixelQC/Rich2/CSide-right/pixXGl | "Rich2 CSide-right Global X hits;Global X..." |      71623 |    -3902.4 | 81.492     |    0.13091 |     -0.826 |
- | /RICH/RichRecPixelQC/Rich2/CSide-right/pixYGl | "Rich2 CSide-right Global Y hits;Global Y..." |      71623 |     6.9155 | 266.65     |   0.023696 |     0.1806 |
- | /RICH/RichRecPixelQC/Rich2/nActivePDs         | "Rich2 # Active PDs (nHits>0)"                |        100 |     639.36 | 235.31     |    -1.0069 |     0.9392 |
- | /RICH/RichRecPixelQC/Rich2/nTotalPixs         | "Rich2 Overall occupancy (nHits>0)"           |        100 |     1478.5 | 802.88     |    0.61001 |    0.69939 |
- | /RICH/RichRecPixelQC/Rich2/nTotalPixsPerInner | "Rich2 Average overall Inner PD occupancy..." |      41721 |     2.3572 | 1.7050     |      1.808 |     4.4339 |
- | /RICH/RichRecPixelQC/Rich2/nTotalPixsPerOuter | "Rich2 Average overall Outer PD occupancy..." |      22215 |     2.2071 | 1.6919     |     2.4045 |     9.5276 |
- | /RICH/RichRecPixelQC/Rich2/nTotalPixsPerPD    | "Rich2 Average overall PD occupancy (nHit..." |      63936 |      2.305 | 1.7020     |     2.0078 |     6.1035 |
- | /RICH/RichRecPixelQC/Rich2/pixXLoc            | "Rich2 Local X hits;Local X / mm"             |     147375 |     9.8961 | 460.72     |  -0.034725 |    -1.5277 |
- | /RICH/RichRecPixelQC/Rich2/pixYLoc            | "Rich2 Local Y hits;Local Y / mm"             |     147375 |     7.8192 | 262.73     |   0.011936 |    0.22524 |
+ | /RICH/RichRecPixelQC/Rich1/bottom/pixXGlo     | "Rich1 bottom Global X hits;Global X / mm"    |     179387 |    -10.056 | 233.18     |  0.0036559 |    0.16004 |
+ | /RICH/RichRecPixelQC/Rich1/bottom/pixYGlo     | "Rich1 bottom Global Y hits;Global Y / mm"    |     179387 |    -1355.8 | 65.126     |   -0.88346 |     0.4277 |
+ | /RICH/RichRecPixelQC/Rich1/nActivePDs         | "Rich1 # Active PDs (nHits>0)"                |        100 |     906.71 | 232.31     |   -0.92602 |     3.0245 |
+ | /RICH/RichRecPixelQC/Rich1/nTotalPixs         | "Rich1 Overall occupancy (nHits>0)"           |        100 |     3737.5 | 1619.5     |      1.109 |     4.0975 |
+ | /RICH/RichRecPixelQC/Rich1/nTotalPixsPerInner | "Rich1 Average overall Inner PD occupancy..." |      90671 |     4.1228 | 4.5562     |      2.553 |     8.9643 |
+ | /RICH/RichRecPixelQC/Rich1/nTotalPixsPerPD    | "Rich1 Average overall PD occupancy (nHit..." |      90671 |     4.1228 | 4.5562     |      2.553 |     8.9643 |
+ | /RICH/RichRecPixelQC/Rich1/pixXLoc            | "Rich1 Local X hits;Local X / mm"             |     373816 |    0.33838 | 231.60     |  -0.039053 |    0.21206 |
+ | /RICH/RichRecPixelQC/Rich1/pixYLoc            | "Rich1 Local Y hits;Local Y / mm"             |     373816 |     3.0447 | 248.73     |  -0.068302 |    -0.7822 |
+ | /RICH/RichRecPixelQC/Rich1/top/pixXGlo        | "Rich1 top Global X hits;Global X / mm"       |     194429 |     9.9393 | 230.49     |  -0.078417 |    0.27799 |
+ | /RICH/RichRecPixelQC/Rich1/top/pixYGlo        | "Rich1 top Global Y hits;Global Y / mm"       |     194429 |     1351.3 | 63.518     |    0.88652 |    0.55098 |
+ | /RICH/RichRecPixelQC/Rich2/ASide-left/pixXGlo | "Rich2 ASide-left Global X hits;Global X ..." |     150701 |     3903.9 | 84.232     |   -0.10952 |   -0.93584 |
+ | /RICH/RichRecPixelQC/Rich2/ASide-left/pixYGlo | "Rich2 ASide-left Global Y hits;Global Y ..." |     150701 |      10.77 | 261.55     |  0.0037896 |    0.26118 |
+ | /RICH/RichRecPixelQC/Rich2/CSide-right/pixXGl | "Rich2 CSide-right Global X hits;Global X..." |     145305 |    -3903.5 | 82.023     |    0.13986 |   -0.84838 |
+ | /RICH/RichRecPixelQC/Rich2/CSide-right/pixYGl | "Rich2 CSide-right Global Y hits;Global Y..." |     145305 |     12.884 | 267.30     |   -0.00547 |    0.17264 |
+ | /RICH/RichRecPixelQC/Rich2/nActivePDs         | "Rich2 # Active PDs (nHits>0)"                |        100 |      901.6 | 182.13     |    -2.3856 |     8.0938 |
+ | /RICH/RichRecPixelQC/Rich2/nTotalPixs         | "Rich2 Overall occupancy (nHits>0)"           |        100 |     2965.5 | 1325.1     |    0.74961 |     1.6855 |
+ | /RICH/RichRecPixelQC/Rich2/nTotalPixsPerInner | "Rich2 Average overall Inner PD occupancy..." |      58866 |     3.3499 | 2.5234     |     1.6825 |     4.1625 |
+ | /RICH/RichRecPixelQC/Rich2/nTotalPixsPerOuter | "Rich2 Average overall Outer PD occupancy..." |      31294 |     3.1575 | 2.3933     |     1.8451 |     5.0663 |
+ | /RICH/RichRecPixelQC/Rich2/nTotalPixsPerPD    | "Rich2 Average overall PD occupancy (nHit..." |      90160 |     3.2831 | 2.4807     |     1.7367 |     4.4482 |
+ | /RICH/RichRecPixelQC/Rich2/pixXLoc            | "Rich2 Local X hits;Local X / mm"             |     296006 |     3.7392 | 461.51     |  -0.018435 |    -1.5252 |
+ | /RICH/RichRecPixelQC/Rich2/pixYLoc            | "Rich2 Local Y hits;Local Y / mm"             |     296006 |     11.716 | 264.14     | 0.00078862 |    0.21097 |
 RichRecPixelQC       INFO 1D profile histograms in directory "RichRecPixelQC" : 8
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | /RICH/RichRecPixelQC/Rich1/hitDensityX        | "Rich1 <#hits/mm^2> (X);Local X / mm;hits..." |     250000 |     22.342 | 230.20     |  -0.031471 |    0.23834 |
- | /RICH/RichRecPixelQC/Rich1/hitDensityY        | "Rich1 <#hits/mm^2> (Y);Local Y / mm;hits..." |     240000 |      36.16 | 246.42     |  -0.047736 |   -0.71264 |
- | /RICH/RichRecPixelQC/Rich1/pdOccXLoc          | "Rich1 PD Average Occupancy (X);Local X /..." |     250000 |     22.342 | 230.20     |  -0.031471 |    0.23834 |
- | /RICH/RichRecPixelQC/Rich1/pdOccYLoc          | "Rich1 PD Average Occupancy (Y);Local Y /..." |     250000 |     36.374 | 248.39     |  -0.057814 |   -0.82527 |
- | /RICH/RichRecPixelQC/Rich2/hitDensityX        | "Rich2 <#hits/mm^2> (X);Local X / mm;hits..." |     250000 |     43.466 | 460.11     |  -0.042635 |     -1.532 |
- | /RICH/RichRecPixelQC/Rich2/hitDensityY        | "Rich2 <#hits/mm^2> (Y);Local Y / mm;hits..." |     250000 |     38.366 | 210.98     | -0.0017506 |      1.245 |
- | /RICH/RichRecPixelQC/Rich2/pdOccXLoc          | "Rich2 PD Average Occupancy (X);Local X /..." |     250000 |     39.279 | 465.11     |  -0.022503 |    -1.5303 |
- | /RICH/RichRecPixelQC/Rich2/pdOccYLoc          | "Rich2 PD Average Occupancy (Y);Local Y /..." |     250000 |     31.456 | 305.52     |   0.046447 |   -0.58465 |
+ | /RICH/RichRecPixelQC/Rich1/hitDensityX        | "Rich1 <#hits/mm^2> (X);Local X / mm;hits..." |     250000 |     26.565 | 233.17     |  -0.036169 |    0.18604 |
+ | /RICH/RichRecPixelQC/Rich1/hitDensityY        | "Rich1 <#hits/mm^2> (Y);Local Y / mm;hits..." |     240000 |     30.424 | 251.10     |   -0.06285 |    -0.7566 |
+ | /RICH/RichRecPixelQC/Rich1/pdOccXLoc          | "Rich1 PD Average Occupancy (X);Local X /..." |     250000 |     26.565 | 233.17     |  -0.036169 |    0.18604 |
+ | /RICH/RichRecPixelQC/Rich1/pdOccYLoc          | "Rich1 PD Average Occupancy (Y);Local Y /..." |     250000 |     30.549 | 252.81     |  -0.069365 |   -0.86242 |
+ | /RICH/RichRecPixelQC/Rich2/hitDensityX        | "Rich2 <#hits/mm^2> (X);Local X / mm;hits..." |     250000 |     35.571 | 461.19     |  -0.017118 |     -1.523 |
+ | /RICH/RichRecPixelQC/Rich2/hitDensityY        | "Rich2 <#hits/mm^2> (Y);Local Y / mm;hits..." |     250000 |     42.518 | 226.63     |   0.011018 |    0.89611 |
+ | /RICH/RichRecPixelQC/Rich2/pdOccXLoc          | "Rich2 PD Average Occupancy (X);Local X /..." |     250000 |     31.636 | 465.72     | -0.0046122 |    -1.5182 |
+ | /RICH/RichRecPixelQC/Rich2/pdOccYLoc          | "Rich2 PD Average Occupancy (Y);Local Y /..." |     250000 |     41.116 | 322.39     |   0.011103 |   -0.78277 |