diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref
index 88f9e2dc46f12ce80477b11595f59db089d6d689..f72d0f90dc9fe76cae8ac6fb9ace599fc0d23d33 100644
--- a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref
+++ b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref
@@ -105,12 +105,12 @@ CaloSelectiveBremMatchAlg_Downst...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#links in table"                               |       100 |        217 |     2.1700 |     2.4497 |       0.0000 |      14.000 |
  | "average chi2"                                  |       217 |   1341.993 |     6.1843 |     10.030 |    0.010269 |      107.21 |
- | "average energy (track based)"                  |       744 |   58611.34 |     78.779 |     230.91 |       0.0000 |      2564.8 |
+ | "average energy (track based)"                  |       744 |   58611.33 |     78.779 |     230.91 |       0.0000 |      2564.8 |
 CaloSelectiveBremMatchAlg_Long         INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#links in table"                               |       100 |       1688 |     16.880 |     15.370 |       0.0000 |      56.000 |
  | "average chi2"                                  |      1688 |   1567.141 |    0.92840 |     1.7975 |  1.6109e-06 |      32.085 |
- | "average energy (track based)"                  |      4392 |    70648.5 |     16.086 |     48.664 |       0.0000 |      822.33 |
+ | "average energy (track based)"                  |      4392 |   70648.51 |     16.086 |     48.664 |       0.0000 |      822.33 |
 CaloSelectiveElectronMatchAlg_Do...    INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#links in table"                               |       100 |        724 |     7.2400 |     5.3144 |       0.0000 |      24.000 |
@@ -119,7 +119,7 @@ CaloSelectiveElectronMatchAlg_Long     INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#above threshold"                              |         3 |          3 |     1.0000 |      0.0000 |      1.0000 |      1.0000 |
  | "#links in table"                               |       100 |       4571 |     45.710 |     30.185 |       0.0000 |      119.00 |
- | "average chi2"                                  |      4571 |   46394.28 |     10.150 |     22.104 |   0.0014158 |      486.00 |
+ | "average chi2"                                  |      4571 |   46394.27 |     10.150 |     22.104 |   0.0014158 |      486.00 |
 CaloSelectiveTrackMatchAlg_Downs...    INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#links in table"                               |       100 |        785 |     7.8500 |     5.8213 |       0.0000 |      28.000 |
@@ -131,14 +131,14 @@ CaloSelectiveTrackMatchAlg_Long        INFO Number of counters : 2
 CaloSelectiveTrackMatchAlg_Ttrack      INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#links in table"                               |       100 |       2816 |     28.160 |     33.158 |       0.0000 |      315.00 |
- | "average chi2"                                  |      2816 |   494.3726 |    0.17556 |    0.35954 |  3.4188e-05 |      8.0989 |
+ | "average chi2"                                  |      2816 |   494.3725 |    0.17556 |    0.35954 |  3.4188e-05 |      8.0989 |
 CaloTrackBasedElectronShowerAlg_...    INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "average DLL"                                   |       793 |  -158.7765 |   -0.20022 |    0.74647 |     -8.6620 |      4.7885 |
- | "average E/p"                                   |       793 |   48.32425 |   0.060939 |   0.075759 |       0.0000 |     0.88830 |
+ | "average E/p"                                   |       793 |   48.32424 |   0.060939 |   0.075759 |       0.0000 |     0.88830 |
 CaloTrackBasedElectronShowerAlg_...    INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "average DLL"                                   |      5236 |  -330.3275 |  -0.063088 |    0.12780 |     -4.4860 |     0.91900 |
+ | "average DLL"                                   |      5236 |  -330.3276 |  -0.063088 |    0.12780 |     -4.4860 |     0.91900 |
  | "average E/p"                                   |      5236 |   32.90786 |  0.0062849 |   0.011387 |       0.0000 |     0.44431 |
 CaloTrackToHcalEnergyAlg_Downstream    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
@@ -504,9 +504,6 @@ PrMatchNN.PrAddUTHitsTool              INFO Number of counters : 2
 PrStorePrUTHits                        INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#banks"                                        |       100 |      18000 |     180.00 |
-PrStoreUTHit                           INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "#banks"                                        |       100 |      18000 |     180.00 |
 PromptHyperonHHCombiner                INFO Number of counters : 8
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"# passed"                                      |       100 |          1 |( 1.000000 +- 0.9949874)% |
diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref.x86_64_v3-opt b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref.x86_64_v3-opt
index b5d50019e34544d05765ea29c1ad3fd158377489..28f4b68eefffaefa38de1517cd89c15503aa509e 100644
--- a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref.x86_64_v3-opt
+++ b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref.x86_64_v3-opt
@@ -69,7 +69,7 @@ CaloFutureClusterCovarianceAlg.E...    INFO Number of counters : 1
 CaloFutureClusterCovarianceAlg.E...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Corrected Clusters: # cells "                  |      4213 |      16728 |     3.9706 |     1.4404 |      2.0000 |      12.000 |
- | "Corrected Clusters: ET"                        |      4213 |   509061.7 |     120.83 |     208.09 |     0.40000 |      4609.4 |
+ | "Corrected Clusters: ET"                        |      4213 |   509061.6 |     120.83 |     208.09 |     0.40000 |      4609.4 |
  | "Corrected Clusters: size ratio"                |      4213 |   1350.436 |    0.32054 |    0.34740 | -8.2628e-16 |      4.1232 |
 CaloFutureMergedPi0                    INFO Number of counters : 12
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
@@ -105,12 +105,12 @@ CaloSelectiveBremMatchAlg_Downst...    INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#links in table"                               |       100 |        217 |     2.1700 |     2.4497 |       0.0000 |      14.000 |
  | "average chi2"                                  |       217 |   1341.992 |     6.1843 |     10.030 |    0.010270 |      107.21 |
- | "average energy (track based)"                  |       743 |   58651.21 |     78.938 |     231.08 |       0.0000 |      2564.8 |
+ | "average energy (track based)"                  |       743 |    58651.2 |     78.938 |     231.08 |       0.0000 |      2564.8 |
 CaloSelectiveBremMatchAlg_Long         INFO Number of counters : 3
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#links in table"                               |       100 |       1686 |     16.860 |     15.394 |       0.0000 |      56.000 |
  | "average chi2"                                  |      1686 |    1570.36 |    0.93141 |     1.7991 |  1.5748e-06 |      32.085 |
- | "average energy (track based)"                  |      4391 |   70465.44 |     16.048 |     48.651 |       0.0000 |      822.33 |
+ | "average energy (track based)"                  |      4391 |   70465.45 |     16.048 |     48.651 |       0.0000 |      822.33 |
 CaloSelectiveElectronMatchAlg_Do...    INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#links in table"                               |       100 |        722 |     7.2200 |     5.2964 |       0.0000 |      24.000 |
@@ -138,14 +138,14 @@ CaloTrackBasedElectronShowerAlg_...    INFO Number of counters : 2
  | "average E/p"                                   |       791 |   48.11149 |   0.060824 |   0.075751 |       0.0000 |     0.88830 |
 CaloTrackBasedElectronShowerAlg_...    INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "average DLL"                                   |      5235 |  -330.3867 |  -0.063111 |    0.12779 |     -4.4860 |     0.91900 |
+ | "average DLL"                                   |      5235 |  -330.3868 |  -0.063111 |    0.12779 |     -4.4860 |     0.91900 |
  | "average E/p"                                   |      5235 |   32.95672 |  0.0062955 |   0.011449 |       0.0000 |     0.44431 |
 CaloTrackToHcalEnergyAlg_Downstream    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "energy (calo) associated to track"             |       719 |    2625068 |     3651.0 |     7386.3 |       0.0000 |      65629.0 |
 CaloTrackToHcalEnergyAlg_Long          INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "energy (calo) associated to track"             |      4949 |3.210201e+07 |     6486.6 |     13197.0 |       0.0000 |  3.3987e+05 |
+ | "energy (calo) associated to track"             |      4949 | 3.2102e+07 |     6486.6 |     13197.0 |       0.0000 |  3.3987e+05 |
 ClassifyPhotonElectronAlg              INFO Number of counters : 14
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Electron Delta(E)"                             |      6264 |   -2465203 |    -393.55 |     505.54 |     -4698.3 |      1339.7 |
@@ -504,9 +504,6 @@ PrMatchNN.PrAddUTHitsTool              INFO Number of counters : 2
 PrStorePrUTHits                        INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#banks"                                        |       100 |      18000 |     180.00 |
-PrStoreUTHit                           INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "#banks"                                        |       100 |      18000 |     180.00 |
 PromptHyperonHHCombiner                INFO Number of counters : 8
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"# passed"                                      |       100 |          1 |( 1.000000 +- 0.9949874)% |
diff --git a/Hlt/RecoConf/tests/refs/hlt2_fastest_reco_without_UT_with_mcchecking.ref b/Hlt/RecoConf/tests/refs/hlt2_fastest_reco_without_UT_with_mcchecking.ref
index ff910065a866874a97756de0aa4616a855d00f72..b83fe3052794ffed96be510be606ec5bf5dcc3fc 100644
--- a/Hlt/RecoConf/tests/refs/hlt2_fastest_reco_without_UT_with_mcchecking.ref
+++ b/Hlt/RecoConf/tests/refs/hlt2_fastest_reco_without_UT_with_mcchecking.ref
@@ -460,6 +460,9 @@ PrMatchNN                              INFO Number of counters : 3
  | "#MatchingChi2"                                 |     14890 |   75635.76 |     5.0796 |
  | "#MatchingTracks"                               |        97 |       5853 |     60.340 |
  | "TracksMLP"                                     |     14890 |   5813.644 |    0.39044 |
+PrStorePrUTHits                        INFO Number of counters : 1
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ | "#banks"                                        |        97 |      17460 |     180.00 |
 PrStoreUTHit                           INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#banks"                                        |        97 |      17460 |     180.00 |
diff --git a/Hlt/RecoConf/tests/refs/hlt2_fastest_reco_without_UT_with_mcchecking.ref.x86_64_v3-opt b/Hlt/RecoConf/tests/refs/hlt2_fastest_reco_without_UT_with_mcchecking.ref.x86_64_v3-opt
index 207e05ea6d1b5ce9f8c5da6d89cea61dd303ecdd..306e13fc6d27a29e92e19dc9a9e3b87d212cdbac 100644
--- a/Hlt/RecoConf/tests/refs/hlt2_fastest_reco_without_UT_with_mcchecking.ref.x86_64_v3-opt
+++ b/Hlt/RecoConf/tests/refs/hlt2_fastest_reco_without_UT_with_mcchecking.ref.x86_64_v3-opt
@@ -460,6 +460,9 @@ PrMatchNN                              INFO Number of counters : 3
  | "#MatchingChi2"                                 |     14930 |   75794.85 |     5.0767 |
  | "#MatchingTracks"                               |        97 |       5864 |     60.454 |
  | "TracksMLP"                                     |     14930 |   5828.363 |    0.39038 |
+PrStorePrUTHits                        INFO Number of counters : 1
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ | "#banks"                                        |        97 |      17460 |     180.00 |
 PrStoreUTHit                           INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#banks"                                        |        97 |      17460 |     180.00 |
diff --git a/Hlt/RecoConf/tests/refs/hlt2_lead_lead_light_reco_pr_kf.ref b/Hlt/RecoConf/tests/refs/hlt2_lead_lead_light_reco_pr_kf.ref
index 20d14d698138e0ef64c5ecd6e2a39b41ef935518..8d1f6683202592a3fda10e523f4d82eab2ad47b2 100644
--- a/Hlt/RecoConf/tests/refs/hlt2_lead_lead_light_reco_pr_kf.ref
+++ b/Hlt/RecoConf/tests/refs/hlt2_lead_lead_light_reco_pr_kf.ref
@@ -316,9 +316,6 @@ PrMatchNN.PrAddUTHitsTool              INFO Number of counters : 2
 PrStorePrUTHits                        INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#banks"                                        |        14 |       2520 |     180.00 |
-PrStoreUTHit                           INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "#banks"                                        |        14 |       2520 |     180.00 |
 RichGPIDLikelihoodIt0Downstream        INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Taken more than maximum number of iterations -> quitting"|         1 |
diff --git a/Hlt/RecoConf/tests/refs/hlt2_lead_lead_light_reco_pr_kf.ref.x86_64_v3-opt b/Hlt/RecoConf/tests/refs/hlt2_lead_lead_light_reco_pr_kf.ref.x86_64_v3-opt
index 256d7d1f517c5aa45a6a102c75c0930318206e15..b821fa6eb7cd87724edd039dfe4cc3ed07171fa7 100644
--- a/Hlt/RecoConf/tests/refs/hlt2_lead_lead_light_reco_pr_kf.ref.x86_64_v3-opt
+++ b/Hlt/RecoConf/tests/refs/hlt2_lead_lead_light_reco_pr_kf.ref.x86_64_v3-opt
@@ -315,9 +315,6 @@ PrMatchNN.PrAddUTHitsTool              INFO Number of counters : 2
 PrStorePrUTHits                        INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#banks"                                        |        14 |       2520 |     180.00 |
-PrStoreUTHit                           INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "#banks"                                        |        14 |       2520 |     180.00 |
 RichGPIDLikelihoodIt0Downstream        INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Taken more than maximum number of iterations -> quitting"|         1 |
diff --git a/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_velo_open_without_UT_with_mcchecking.ref b/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_velo_open_without_UT_with_mcchecking.ref
index e000fc6ff2b73a6ad826bc7068936cad2e3c1cfc..ebe19864187f677407fbacd7b28910bc74bca912 100644
--- a/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_velo_open_without_UT_with_mcchecking.ref
+++ b/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_velo_open_without_UT_with_mcchecking.ref
@@ -403,6 +403,9 @@ PrMatchNN                              INFO Number of counters : 3
  | "#MatchingChi2"                                 |      3165 |   13411.75 |     4.2375 |
  | "#MatchingTracks"                               |        96 |       1726 |     17.979 |
  | "TracksMLP"                                     |      3165 |   1689.028 |    0.53366 |
+PrStorePrUTHits                        INFO Number of counters : 1
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ | "#banks"                                        |        96 |      20736 |     216.00 |
 PrStoreUTHit                           INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#banks"                                        |        96 |      20736 |     216.00 |
diff --git a/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_velo_open_without_UT_with_mcchecking.ref.x86_64_v3-opt b/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_velo_open_without_UT_with_mcchecking.ref.x86_64_v3-opt
index 8eb8477f53ad54ff123a7ab9c7229360c2a595ec..65006860960b4bd46c8860b3225eac375869c7be 100644
--- a/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_velo_open_without_UT_with_mcchecking.ref.x86_64_v3-opt
+++ b/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_velo_open_without_UT_with_mcchecking.ref.x86_64_v3-opt
@@ -403,6 +403,9 @@ PrMatchNN                              INFO Number of counters : 3
  | "#MatchingChi2"                                 |      3179 |   13452.86 |     4.2318 |
  | "#MatchingTracks"                               |        96 |       1734 |     18.062 |
  | "TracksMLP"                                     |      3179 |   1697.909 |    0.53410 |
+PrStorePrUTHits                        INFO Number of counters : 1
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ | "#banks"                                        |        96 |      20736 |     216.00 |
 PrStoreUTHit                           INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#banks"                                        |        96 |      20736 |     216.00 |
diff --git a/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_without_UT_with_mcchecking.ref b/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_without_UT_with_mcchecking.ref
index 80dc782da2d94d347b6857374b85d80b10a8e224..39b69d722694980e23d8a32249866c7f261de272 100644
--- a/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_without_UT_with_mcchecking.ref
+++ b/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_without_UT_with_mcchecking.ref
@@ -450,6 +450,9 @@ PrMatchNN                              INFO Number of counters : 3
  | "#MatchingChi2"                                 |     14890 |   75635.76 |     5.0796 |
  | "#MatchingTracks"                               |        97 |       5853 |     60.340 |
  | "TracksMLP"                                     |     14890 |   5813.644 |    0.39044 |
+PrStorePrUTHits                        INFO Number of counters : 1
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ | "#banks"                                        |        97 |      17460 |     180.00 |
 PrStoreUTHit                           INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#banks"                                        |        97 |      17460 |     180.00 |
diff --git a/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_without_UT_with_mcchecking.ref.x86_64_v3-opt b/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_without_UT_with_mcchecking.ref.x86_64_v3-opt
index 747c3cba8e5e7684b9d22054dcf545d248f1e2b6..baeae4e4a3fd06f8e2eb77be5b74eab9f3454375 100644
--- a/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_without_UT_with_mcchecking.ref.x86_64_v3-opt
+++ b/Hlt/RecoConf/tests/refs/hlt2_light_reco_pr_kf_without_UT_with_mcchecking.ref.x86_64_v3-opt
@@ -450,6 +450,9 @@ PrMatchNN                              INFO Number of counters : 3
  | "#MatchingChi2"                                 |     14930 |   75794.85 |     5.0767 |
  | "#MatchingTracks"                               |        97 |       5864 |     60.454 |
  | "TracksMLP"                                     |     14930 |   5828.363 |    0.39038 |
+PrStorePrUTHits                        INFO Number of counters : 1
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ | "#banks"                                        |        97 |      17460 |     180.00 |
 PrStoreUTHit                           INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "#banks"                                        |        97 |      17460 |     180.00 |