diff --git a/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref b/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref
index 5145b0006dd277e8f22ce68fab67215d52e1572e..8405c61232f65d1f4ec0c97edee41e65ce9bf680 100644
--- a/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref
+++ b/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref
@@ -16,47 +16,6 @@ CloneKillerForward_d2c9bbd5            INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "nTracksInput"                                  |       100 |       5923 |     59.230 |
  | "nTracksSelected"                               |       100 |       1365 |     13.650 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |       633 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against looping tracks. See debug for details"|        28 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|       468 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|       137 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |        15 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against absurd tracks. See debug for details"|         2 |
- | "Protect against looping tracks. See debug for details"|         1 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|        11 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|         1 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |       604 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against looping tracks. See debug for details"|        26 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|       444 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|       134 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |        14 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against absurd tracks. See debug for details"|         2 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|        11 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|         1 |
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |       100 |
@@ -509,81 +468,81 @@ VeloRetinaClusterTrackingSIMD_66...    INFO Number of counters : 2
  | "Nb of Produced Tracks"                         |       100 |      22716 |     227.16 |
 FTHitEfficiencyLayer0                  INFO 1D histograms in directory "FTHitEfficiencyLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      20389 |  0.0091973 | 1.6244     |   0.028722 |     0.4663 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      20389 |  0.0055056 | 1.6292     |   0.021885 |    0.45175 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      20389 |-0.00030801 | 0.042005   | -0.0029478 |    -1.3017 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      20389 |   0.037387 | 1.7421     |   0.015457 |   -0.23178 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2171 |     1.1133 | 0.65384    |     1.4128 |     5.3561 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      25006 |  -0.037259 | 1.4010     |  0.0090192 |     1.8904 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      25006 |  -0.038221 | 1.4062     |  0.0097931 |     1.8505 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      25006 |-0.00071343 | 0.043764   |   0.075595 |   -0.84632 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      25006 |   0.037007 | 1.7405     | -0.0044147 |   -0.18293 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2792 |      1.217 | 0.53678    |      2.514 |      8.803 |
 FTHitEfficiencyLayer1                  INFO 1D histograms in directory "FTHitEfficiencyLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26858 |  -0.011211 | 1.4049     |  -0.022808 |     1.9573 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26858 | -0.0083284 | 1.4075     |  -0.012489 |     1.8995 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26858 |  -0.014834 | 2.0028     |  0.0067265 |   -0.73946 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26858 |  -0.010345 | 1.7598     |  -0.016738 |   -0.25402 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2910 |      1.188 | 0.50976    |     2.6753 |     12.408 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27021 | -0.0062503 | 1.4048     |  -0.011797 |     1.9684 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27021 | -0.0053438 | 1.4048     | -0.0090251 |     1.9167 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27021 |  -0.012964 | 2.0030     |  0.0039188 |   -0.73786 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27021 | -0.0054178 | 1.7633     |  -0.021657 |   -0.26277 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2925 |     1.1904 | 0.50870    |     2.7486 |     12.664 |
 FTHitEfficiencyLayer2                  INFO 1D histograms in directory "FTHitEfficiencyLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27758 |  0.0088813 | 1.3990     |   0.083805 |      1.894 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27758 |  0.0013021 | 1.4077     |   0.055772 |     1.8462 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27758 | -0.0030376 | 2.0114     | -0.0059916 |   -0.73218 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27758 |   0.028948 | 1.7847     |  0.0064071 |    -0.2872 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2932 |     1.2203 | 0.54587    |     2.6948 |      11.22 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27758 |   0.008672 | 1.3973     |   0.081719 |     1.9022 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27758 | 0.00099397 | 1.4062     |   0.054085 |     1.8543 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27758 | -0.0028137 | 2.0117     | -0.0058996 |    -0.7323 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27758 |   0.029294 | 1.7851     |  0.0070247 |    -0.2871 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2932 |       1.22 | 0.54570    |     2.6982 |     11.244 |
 FTHitEfficiencyLayer3                  INFO 1D histograms in directory "FTHitEfficiencyLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27441 |  -0.010037 | 1.4898     |   0.022037 |     1.3504 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27441 |   -0.01538 | 1.4957     |  0.0056674 |     1.3219 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27441 |  0.0015524 | 0.043168   |  -0.022781 |   -0.92872 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27441 |  -0.030617 | 1.7414     |   0.026593 |   -0.21261 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27441 | -0.0099976 | 1.4898     |   0.022164 |       1.35 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27441 |  -0.015361 | 1.4958     |  0.0059195 |     1.3219 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27441 |   0.001462 | 0.043176   |  -0.017624 |   -0.92823 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27441 |  -0.030591 | 1.7414     |   0.026541 |   -0.21249 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2807 |     1.2312 | 0.55510    |     2.3793 |     8.0199 |
 FTHitEfficiencyNoGhostsLayer0          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      19632 |   0.011407 | 1.6262     |   0.029515 |    0.46971 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      19632 |  0.0077446 | 1.6316     |   0.023114 |    0.45383 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      19632 |-0.00015892 | 0.041824   | 0.00043817 |    -1.3501 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      19632 |   0.034541 | 1.7376     |   0.013572 |   -0.22381 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2112 |     1.1146 | 0.65289    |     1.4314 |     5.4823 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      23936 |  -0.035096 | 1.3998     |   0.016137 |     1.9195 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      23936 |  -0.037121 | 1.4045     |   0.013268 |     1.8791 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      23936 |-0.00033757 | 0.043637   |   0.062273 |   -0.87039 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      23936 |    0.02373 | 1.7300     | -0.0022507 |   -0.16184 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2705 |     1.2174 | 0.53774    |     2.5585 |     8.9839 |
 FTHitEfficiencyNoGhostsLayer1          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      25869 | -0.0094184 | 1.3981     |  -0.016312 |     2.0116 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      25869 | -0.0063576 | 1.4021     | -0.0062989 |     1.9517 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      25869 |  -0.019641 | 2.0005     |  0.0086554 |   -0.73354 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      25869 |   -0.01419 | 1.7541     |  -0.021469 |   -0.23584 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2828 |     1.1892 | 0.50660    |     2.7304 |      12.74 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26001 | -0.0047813 | 1.3983     | -0.0039763 |     2.0192 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26001 | -0.0037541 | 1.3997     | -0.0018687 |     1.9659 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26001 |  -0.016487 | 2.0000     |   0.005736 |   -0.73092 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26001 | -0.0093382 | 1.7572     |  -0.026268 |   -0.24288 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2842 |     1.1918 | 0.50559    |     2.8069 |     13.004 |
 FTHitEfficiencyNoGhostsLayer2          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26612 |  0.0077313 | 1.3900     |    0.07009 |     1.9429 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26612 |  0.0018839 | 1.3982     |   0.048522 |     1.8994 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26612 |  0.0018894 | 2.0115     | -0.0067094 |   -0.72922 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26612 |    0.03654 | 1.7803     |  0.0036865 |   -0.28091 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2838 |     1.2234 | 0.54351    |     2.7487 |     11.482 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26612 |  0.0074944 | 1.3883     |   0.067864 |     1.9515 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26612 |  0.0015856 | 1.3966     |   0.046663 |      1.908 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26612 |  0.0021175 | 2.0118     | -0.0066084 |   -0.72935 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26612 |   0.036899 | 1.7808     |  0.0043293 |   -0.28081 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2838 |      1.223 | 0.54333    |     2.7523 |     11.507 |
 FTHitEfficiencyNoGhostsLayer3          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26256 | -0.0094825 | 1.4819     |   0.019415 |     1.3959 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26256 |  -0.016046 | 1.4878     |-0.00027953 |     1.3654 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26256 |  0.0014077 | 0.043126   |  -0.029761 |   -0.93233 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26256 |  -0.028833 | 1.7435     |   0.026059 |   -0.21769 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26256 | -0.0094623 | 1.4820     |   0.019436 |     1.3954 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26256 |  -0.016066 | 1.4878     |-0.00020041 |     1.3656 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26256 |   0.001301 | 0.043135   |  -0.023756 |   -0.93189 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26256 |  -0.028811 | 1.7435     |   0.025986 |   -0.21755 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2721 |     1.2271 | 0.54817    |     2.3672 |     7.9314 |
 FTHitEfficiencyLayer0                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2171 |     25.244 | 542.32     |    0.09173 |     1.9584 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2792 |     20.281 | 712.33     |    0.03287 |    0.98747 |
 FTHitEfficiencyLayer1                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2910 |     18.314 | 718.19     |   0.026778 |     1.0566 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2925 |     18.079 | 717.80     |    0.02826 |     1.0573 |
 FTHitEfficiencyLayer2                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2932 |     21.236 | 734.56     |   0.027259 |     1.0206 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2932 |     21.236 | 734.56     |   0.027262 |     1.0206 |
 FTHitEfficiencyLayer3                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2807 |     22.287 | 742.59     |    0.02684 |     1.0331 |
 FTHitEfficiencyNoGhostsLayer0          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2112 |     22.202 | 542.33     |   0.093272 |      2.008 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2705 |     17.358 | 713.76     |   0.032145 |    0.99421 |
 FTHitEfficiencyNoGhostsLayer1          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2828 |     16.038 | 719.19     |   0.024853 |     1.0706 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2842 |     15.686 | 718.87     |   0.026857 |     1.0705 |
 FTHitEfficiencyNoGhostsLayer2          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2838 |     18.182 | 735.85     |   0.024218 |     1.0309 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2838 |     18.182 | 735.85     |    0.02422 |     1.0309 |
 FTHitEfficiencyNoGhostsLayer3          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2721 |     19.639 | 745.70     |   0.029431 |     1.0268 |
diff --git a/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.armv8.1_a b/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.armv8.1_a
index e7f53e196bff61485df704492cb6ebaaa9118d14..1d0596cc81bcba5d0b33bc929f67be1bd9036142 100644
--- a/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.armv8.1_a
+++ b/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.armv8.1_a
@@ -16,47 +16,6 @@ CloneKillerForward_d2c9bbd5            INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "nTracksInput"                                  |       100 |       5921 |     59.210 |
  | "nTracksSelected"                               |       100 |       1362 |     13.620 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |       633 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against looping tracks. See debug for details"|        30 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|       467 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|       136 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |        15 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against absurd tracks. See debug for details"|         2 |
- | "Protect against looping tracks. See debug for details"|         1 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|        11 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|         1 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |       605 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against looping tracks. See debug for details"|        28 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|       444 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|       133 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |        14 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against absurd tracks. See debug for details"|         2 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|        11 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|         1 |
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |       100 |
@@ -509,81 +468,81 @@ VeloRetinaClusterTrackingSIMD_66...    INFO Number of counters : 2
  | "Nb of Produced Tracks"                         |       100 |      22717 |     227.17 |
 FTHitEfficiencyLayer0                  INFO 1D histograms in directory "FTHitEfficiencyLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      20389 |   0.010483 | 1.6234     |   0.030309 |    0.46761 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      20389 |  0.0082544 | 1.6290     |   0.026023 |    0.45104 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      20389 |-0.00030409 | 0.041997   | -0.0021357 |    -1.3037 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      20389 |   0.037187 | 1.7421     |    0.01541 |   -0.23235 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2171 |     1.1124 | 0.65471    |     1.4069 |     5.3277 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      25006 |   -0.03734 | 1.4010     |  0.0090238 |     1.8906 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      25006 |  -0.038282 | 1.4062     |  0.0097573 |     1.8506 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      25006 |-0.00067184 | 0.043759   |    0.07282 |   -0.84781 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      25006 |   0.037012 | 1.7405     | -0.0043646 |   -0.18286 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2792 |      1.217 | 0.53678    |      2.514 |      8.803 |
 FTHitEfficiencyLayer1                  INFO 1D histograms in directory "FTHitEfficiencyLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26858 |  -0.011211 | 1.4049     |  -0.022809 |     1.9574 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26858 | -0.0083284 | 1.4075     |  -0.012258 |     1.8996 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26858 |  -0.014843 | 2.0028     |  0.0067329 |   -0.73945 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26858 |  -0.010354 | 1.7598     |  -0.016726 |   -0.25402 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2910 |      1.188 | 0.50976    |     2.6753 |     12.408 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27021 | -0.0062306 | 1.4048     |   -0.01184 |     1.9685 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27021 | -0.0053242 | 1.4048     | -0.0088373 |     1.9168 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27021 |  -0.012973 | 2.0030     |  0.0039541 |   -0.73785 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27021 | -0.0054223 | 1.7633     |  -0.021651 |   -0.26276 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2925 |     1.1904 | 0.50870    |     2.7486 |     12.664 |
 FTHitEfficiencyLayer2                  INFO 1D histograms in directory "FTHitEfficiencyLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27758 |  0.0088231 | 1.3990     |   0.084076 |      1.894 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27758 |   0.001225 | 1.4078     |   0.055757 |     1.8462 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27758 |  -0.003033 | 2.0114     | -0.0059827 |   -0.73217 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27758 |   0.028957 | 1.7847     |  0.0064109 |    -0.2872 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2932 |     1.2203 | 0.54587    |     2.6948 |      11.22 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27758 |  0.0086526 | 1.3973     |   0.082199 |      1.902 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27758 | 0.00093607 | 1.4062     |   0.054205 |     1.8544 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27758 | -0.0028275 | 2.0117     | -0.0058883 |   -0.73229 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27758 |   0.029302 | 1.7851     |  0.0070285 |    -0.2871 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2932 |       1.22 | 0.54570    |     2.6982 |     11.244 |
 FTHitEfficiencyLayer3                  INFO 1D histograms in directory "FTHitEfficiencyLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27441 |  -0.010192 | 1.4898     |    0.02234 |     1.3507 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27441 |  -0.015535 | 1.4957     |  0.0059668 |     1.3222 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27441 |  0.0015787 | 0.043172   |  -0.023404 |   -0.92754 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27441 |  -0.030608 | 1.7414     |   0.026589 |   -0.21259 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27441 |  -0.010153 | 1.4898     |   0.022467 |     1.3503 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27441 |  -0.015496 | 1.4958     |   0.006209 |      1.322 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27441 |  0.0015408 | 0.043168   |  -0.022202 |   -0.92879 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27441 |  -0.030586 | 1.7414     |   0.026544 |   -0.21248 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2807 |     1.2312 | 0.55510    |     2.3793 |     8.0199 |
 FTHitEfficiencyNoGhostsLayer0          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      19642 |   0.012719 | 1.6247     |   0.031168 |    0.47349 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      19642 |   0.010558 | 1.6308     |   0.027352 |    0.45548 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      19642 |-0.00016292 | 0.041823   | 0.00064055 |    -1.3503 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      19642 |   0.034452 | 1.7377     |   0.013072 |   -0.22464 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2114 |     1.1135 | 0.65348    |     1.4263 |     5.4609 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      23959 |  -0.034389 | 1.3998     |   0.016515 |     1.9187 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      23959 |  -0.036394 | 1.4044     |   0.013591 |     1.8783 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      23959 |-0.00032556 | 0.043627   |   0.060893 |   -0.87237 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      23959 |   0.024571 | 1.7303     | -0.0024376 |   -0.16226 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2708 |     1.2171 | 0.53749    |     2.5605 |     8.9975 |
 FTHitEfficiencyNoGhostsLayer1          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      25892 | -0.0094702 | 1.3974     |  -0.016235 |     2.0161 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      25892 | -0.0063919 | 1.4014     |  -0.006007 |     1.9563 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      25892 |  -0.019994 | 2.0006     |  0.0090623 |   -0.73373 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      25892 |  -0.013955 | 1.7544     |  -0.021331 |   -0.23661 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2831 |     1.1893 | 0.50659    |     2.7283 |     12.724 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26024 | -0.0048171 | 1.3976     |  -0.003929 |     2.0237 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26024 | -0.0037705 | 1.3990     | -0.0016143 |     1.9705 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26024 |  -0.016841 | 2.0002     |  0.0061734 |   -0.73111 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26024 | -0.0091034 | 1.7575     |  -0.026135 |   -0.24362 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2845 |     1.1919 | 0.50558    |     2.8047 |     12.987 |
 FTHitEfficiencyNoGhostsLayer2          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26648 |  0.0077756 | 1.3895     |   0.070181 |     1.9463 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26648 |  0.0019124 | 1.3977     |   0.048296 |     1.9028 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26648 |  0.0034002 | 2.0116     |  -0.007622 |   -0.72936 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26648 |   0.035908 | 1.7805     |   0.003408 |   -0.28117 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2841 |     1.2232 | 0.54328    |     2.7507 |     11.497 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26648 |  0.0075789 | 1.3878     |   0.068172 |     1.9547 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26648 |  0.0016343 | 1.3961     |   0.046579 |     1.9116 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26648 |  0.0036139 | 2.0119     | -0.0075258 |   -0.72948 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26648 |   0.036266 | 1.7809     |  0.0040508 |   -0.28107 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2841 |     1.2228 | 0.54310    |     2.7543 |     11.522 |
 FTHitEfficiencyNoGhostsLayer3          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26278 |  -0.010462 | 1.4821     |   0.018558 |     1.3955 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26278 |  -0.017014 | 1.4880     | -0.0010768 |     1.3651 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26278 |  0.0014126 | 0.043128   |  -0.029317 |   -0.93185 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26278 |  -0.028476 | 1.7433     |   0.025851 |   -0.21734 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26278 |  -0.010441 | 1.4822     |   0.018579 |      1.395 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26278 |  -0.017014 | 1.4880     | -0.0010075 |     1.3651 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26278 |  0.0013852 | 0.043124   |  -0.028673 |    -0.9331 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26278 |  -0.028457 | 1.7433     |   0.025786 |   -0.21721 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2724 |     1.2269 | 0.54792    |     2.3692 |     7.9437 |
 FTHitEfficiencyLayer0                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2171 |     24.784 | 542.40     |   0.093579 |     1.9605 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2792 |     20.281 | 712.33     |    0.03287 |    0.98747 |
 FTHitEfficiencyLayer1                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2910 |     18.314 | 718.19     |   0.026778 |     1.0566 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2925 |     18.079 | 717.80     |    0.02826 |     1.0573 |
 FTHitEfficiencyLayer2                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2932 |     21.236 | 734.56     |   0.027259 |     1.0206 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2932 |     21.236 | 734.56     |   0.027262 |     1.0206 |
 FTHitEfficiencyLayer3                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2807 |     22.287 | 742.59     |    0.02684 |     1.0331 |
 FTHitEfficiencyNoGhostsLayer0          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2114 |      21.38 | 542.22     |   0.096847 |     2.0121 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2708 |     17.211 | 713.43     |   0.032717 |    0.99714 |
 FTHitEfficiencyNoGhostsLayer1          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2831 |     15.895 | 718.87     |   0.025403 |     1.0734 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2845 |     15.544 | 718.56     |   0.027403 |     1.0733 |
 FTHitEfficiencyNoGhostsLayer2          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2841 |      18.04 | 735.53     |   0.024749 |     1.0337 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2841 |      18.04 | 735.53     |   0.024751 |     1.0337 |
 FTHitEfficiencyNoGhostsLayer3          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2724 |     19.482 | 745.36     |    0.03001 |     1.0297 |
diff --git a/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.detdesc b/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.detdesc
index 0682629f91facd64189e36d58fe83c0d759515e5..670bbbde0f6fcf12826f562d40f494516721a68e 100644
--- a/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.detdesc
+++ b/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.detdesc
@@ -1,28 +1,3 @@
-TransportSvc                        SUCCESS  GEOMETRY ERRORS: 'Skip'     map has the size 1
-   |                      Logical Volume                     |    |  #          mean             RMS          min              max    |
-   | LHCb/lvLHCb                                             | mm | 2       -242.96426                  0 -242.96426         -242.964 |
-   | LHCb/lvLHCb                                             | X0 | 2       -0.74700727                 0 -0.74700727       -0.747007 |
-TransportSvc                        SUCCESS  GEOMETRY ERRORS: 'Recover'  map has the size 8
-   |                      Logical Volume                     |    |  #          mean             RMS          min              max    |
-   | AfterMagnetRegion/T/FT/Layers/lvLayer5U                 | mm | 2       3.7467119e-11               0 3.7467119e-11   3.7467119e- |
-   | AfterMagnetRegion/T/FT/Layers/lvLayer5U                 | X0 | 2       0                           0 0                           |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleFull           | mm | 6       9.3976715e-13   1.0933069e-12 8.7394906e-14   2.4831265e- |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleFull           | X0 | 6       2.8589864e-15   3.3260893e-15 2.6587527e-16   7.5542382e- |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleHoleRightU     | mm | 2       5.4383561e-13               0 5.4383561e-13   5.4383561e- |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleHoleRightU     | X0 | 2       1.6544722e-15               0 1.6544722e-15   1.6544722e- |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleHoleRightX     | mm | 4       2.6513131e-13    3.989725e-14 2.2523406e-13   3.0502856e- |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleHoleRightX     | X0 | 4       8.0659003e-16   1.2137655e-16 6.8521348e-16   9.2796658e- |
-   | LHCb/lvLHCb                                             | mm | 4       240.55874           229.49694 11.061793           470.055 |
-   | LHCb/lvLHCb                                             | X0 | 4       0.73750099          0.7061718 0.031329189         1.44367 |
-   | egion/PipeSupportsInMagnet/lvUX852CollarForkAttachProng | mm | 2       0.1612586                   0 0.1612586           0.16125 |
-   | egion/PipeSupportsInMagnet/lvUX852CollarForkAttachProng | X0 | 2       0                           0 0                           |
-   | agnetRegion/PipeSupportsInMagnet/lvUX85SupportsInMagnet | mm | 70      5.7348356           8.3946849 0.10000167          25.6425 |
-   | agnetRegion/PipeSupportsInMagnet/lvUX85SupportsInMagnet | X0 | 70      0.00079923901    0.0014893635 0                0.00592725 |
-   | MagnetRegion/lvMagnetRegion                             | mm | 53      0.19863485         0.34362237 0.10000119          1.40243 |
-   | MagnetRegion/lvMagnetRegion                             | X0 | 53      3.4568277e-05    5.980035e-05 1.7403133e-05   0.000244065 |
-TransportSvc                        SUCCESS  GEOMETRY ERRORS: 'Codes'    map has the size 0
-TransportSvc                           INFO Reset the static pointer to DetDesc::IGeometyrErrorSvc
-ChronoStatSvc.finalize()               INFO  Service finalized successfully
 ApplicationMgr                         INFO Application Manager Finalized successfully
 ApplicationMgr                         INFO Application Manager Terminated successfully
 CloneKillerForward_29b31bdb            INFO Number of counters : 2
@@ -41,51 +16,6 @@ CloneKillerForward_d2c9bbd5            INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "nTracksInput"                                  |       100 |       5920 |     59.200 |
  | "nTracksSelected"                               |       100 |       1345 |     13.450 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure inverting matrix in smoother"          |        57 |
- | "Failure propagating upstream state"            |       638 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against looping tracks. See debug for details"|        29 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|       473 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|       136 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure inverting matrix in smoother"          |         2 |
- | "Failure propagating upstream state"            |        15 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against absurd tracks. See debug for details"|         2 |
- | "Protect against looping tracks. See debug for details"|         1 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|        11 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|         1 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure inverting matrix in smoother"          |        57 |
- | "Failure propagating upstream state"            |       610 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against looping tracks. See debug for details"|        27 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|       451 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|       132 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure inverting matrix in smoother"          |         2 |
- | "Failure propagating upstream state"            |        14 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against absurd tracks. See debug for details"|         2 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|        11 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|         1 |
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |       100 |
@@ -538,81 +468,81 @@ VeloRetinaClusterTrackingSIMD_66...    INFO Number of counters : 2
  | "Nb of Produced Tracks"                         |       100 |      22601 |     226.01 |
 FTHitEfficiencyLayer0                  INFO 1D histograms in directory "FTHitEfficiencyLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      19903 | 0.00043508 | 1.6020     |  0.0033789 |    0.61472 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      19903 | -0.0021153 | 1.5971     | -0.0040381 |    0.61345 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      19903 |  -0.000207 | 0.041861   |   0.007164 |    -1.3239 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      19903 |   0.038692 | 1.7402     |   0.001596 |   -0.21479 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2103 |     1.1564 | 0.61505    |     1.5851 |     5.7845 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      24966 |  -0.028775 | 1.4021     |  -0.012529 |     1.8752 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      24966 |  -0.028621 | 1.4062     | -0.0083616 |     1.8424 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      24966 | -0.0006633 | 0.043788   |     0.0841 |   -0.83095 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      24966 |   0.037083 | 1.7389     | -0.0081957 |   -0.17925 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2786 |     1.2179 | 0.54012    |     2.4852 |     8.6257 |
 FTHitEfficiencyLayer1                  INFO 1D histograms in directory "FTHitEfficiencyLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26710 | -0.0057913 | 1.4002     |  -0.017696 |       1.97 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26710 | -0.0053968 | 1.4067     |  -0.018125 |     1.9066 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26710 | -0.0076846 | 2.0007     |   0.004979 |     -0.732 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26710 | -0.0055921 | 1.7573     |  -0.016471 |   -0.24592 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2902 |     1.1875 | 0.50770    |     2.7233 |     12.669 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26911 | -0.0054086 | 1.4023     |   -0.01377 |     1.9728 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26911 | -0.0049852 | 1.4043     |  -0.015633 |     1.9198 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26911 | -0.0091314 | 2.0020     |  0.0031693 |    -0.7346 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26911 | -0.0022816 | 1.7624     |  -0.020643 |   -0.25865 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2919 |     1.1891 | 0.50878    |     2.7666 |     12.755 |
 FTHitEfficiencyLayer2                  INFO 1D histograms in directory "FTHitEfficiencyLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27761 |   0.020136 | 1.3950     |   0.056693 |     1.8992 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27761 |    0.01323 | 1.4032     |    0.03332 |     1.8554 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27761 |  0.0046494 | 2.0110     | -0.0085651 |   -0.73273 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27761 |   0.033062 | 1.7816     |    0.00355 |   -0.28179 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27761 |   0.018976 | 1.3968     |   0.052271 |     1.8983 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27761 |   0.014138 | 1.3998     |   0.038213 |     1.8577 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27761 |  0.0047498 | 2.0109     | -0.0087067 |   -0.73284 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27761 |    0.03332 | 1.7815     |  0.0038668 |   -0.28166 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2932 |     1.2214 | 0.54640    |     2.6844 |      11.15 |
 FTHitEfficiencyLayer3                  INFO 1D histograms in directory "FTHitEfficiencyLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27480 |  -0.010551 | 1.4853     |-0.00067618 |     1.3684 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27480 |  -0.011368 | 1.4921     | -0.0029735 |      1.337 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27480 |  0.0013683 | 0.043186   |  -0.014464 |   -0.92736 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27480 |  -0.021419 | 1.7429     |   0.020458 |   -0.21721 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27480 | -0.0090643 | 1.4875     |  0.0063828 |      1.363 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27480 |  -0.012325 | 1.4935     | -0.0038375 |     1.3338 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27480 |  0.0013013 | 0.043188   |  -0.011145 |   -0.92767 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27480 |  -0.021147 | 1.7428     |   0.020486 |    -0.2171 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2806 |     1.2313 | 0.55518    |     2.3786 |     8.0159 |
 FTHitEfficiencyNoGhostsLayer0          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      19214 |  0.0017015 | 1.5970     |   0.010851 |    0.63221 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      19214 |-0.00086231 | 1.5925     |  0.0037047 |    0.62995 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      19214 | 7.4945e-05 | 0.041696   | 0.00067302 |    -1.3688 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      19214 |   0.030754 | 1.7347     |  0.0039327 |   -0.20184 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2049 |     1.1591 | 0.61307    |       1.61 |     5.9268 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      23931 |  -0.025729 | 1.3972     | 0.00028939 |      1.921 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      23931 |  -0.026562 | 1.4007     | 0.00068065 |     1.8879 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      23931 |-0.00028582 | 0.043668   |    0.06964 |   -0.85321 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      23931 |   0.023785 | 1.7288     | -0.0061124 |   -0.15774 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2703 |     1.2179 | 0.53947    |      2.542 |      8.883 |
 FTHitEfficiencyNoGhostsLayer1          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      25662 | -0.0065447 | 1.3914     |  -0.014611 |     2.0396 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      25662 | -0.0070661 | 1.3986     |  -0.018691 |     1.9738 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      25662 |  -0.011274 | 1.9971     |  0.0058147 |    -0.7236 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      25662 |  -0.012734 | 1.7520     |  -0.019734 |    -0.2285 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2815 |     1.1893 | 0.50436    |     2.7886 |     13.033 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      25832 | -0.0060532 | 1.3938     |  -0.010349 |     2.0401 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      25832 | -0.0065192 | 1.3964     |  -0.015725 |      1.987 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      25832 |   -0.01164 | 1.9980     |  0.0039089 |   -0.72538 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      25832 | -0.0095394 | 1.7567     |  -0.023745 |    -0.2398 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2831 |     1.1911 | 0.50557    |     2.8329 |     13.114 |
 FTHitEfficiencyNoGhostsLayer2          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26658 |   0.019066 | 1.3834     |   0.050018 |      1.972 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26658 |   0.012921 | 1.3925     |   0.028967 |      1.931 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26658 |  0.0088322 | 2.0112     | -0.0092474 |   -0.73039 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26658 |   0.041428 | 1.7766     |  0.0010648 |   -0.27157 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26658 |   0.017886 | 1.3851     |   0.045323 |     1.9704 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26658 |    0.01388 | 1.3889     |   0.033705 |     1.9335 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26658 |  0.0089319 | 2.0112     | -0.0093916 |   -0.73051 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26658 |   0.041682 | 1.7764     |  0.0013947 |   -0.27142 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2841 |     1.2218 | 0.54126    |     2.7245 |     11.481 |
 FTHitEfficiencyNoGhostsLayer3          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26381 | -0.0062383 | 1.4798     | 0.00053405 |     1.3991 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26381 |   -0.01005 | 1.4840     |  -0.010636 |     1.3698 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26381 |  0.0012691 | 0.043149   |  -0.021675 |   -0.92986 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26381 |  -0.020657 | 1.7424     |    0.02104 |   -0.21527 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26381 | -0.0066415 | 1.4798     |  0.0023548 |     1.3971 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26381 |  -0.011121 | 1.4857     |  -0.011347 |     1.3667 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26381 |  0.0012115 | 0.043151   |  -0.018818 |   -0.93015 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26381 |  -0.020356 | 1.7422     |   0.021079 |   -0.21513 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2725 |     1.2286 | 0.55208    |     2.4137 |     8.3486 |
 FTHitEfficiencyLayer0                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2103 |     15.676 | 539.08     |   0.073011 |     1.9506 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2786 |     17.168 | 712.58     |   0.030054 |    0.98877 |
 FTHitEfficiencyLayer1                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2902 |     14.874 | 718.55     |   0.039713 |     1.0407 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2919 |     14.851 | 718.21     |   0.040469 |     1.0415 |
 FTHitEfficiencyLayer2                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2932 |     20.261 | 734.15     |   0.031087 |      1.024 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2932 |     20.264 | 734.15     |   0.031077 |      1.024 |
 FTHitEfficiencyLayer3                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2806 |     19.897 | 743.64     |   0.032493 |     1.0231 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2806 |     19.897 | 743.64     |   0.032514 |     1.0232 |
 FTHitEfficiencyNoGhostsLayer0          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2049 |     11.721 | 539.14     |   0.074189 |     1.9908 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2703 |     14.502 | 714.66     |   0.033383 |    0.99272 |
 FTHitEfficiencyNoGhostsLayer1          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2815 |     12.577 | 719.62     |   0.038258 |      1.057 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2831 |     12.442 | 719.36     |   0.039521 |      1.057 |
 FTHitEfficiencyNoGhostsLayer2          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2841 |     16.198 | 735.06     |    0.03068 |     1.0388 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2841 |     16.201 | 735.07     |   0.030669 |     1.0388 |
 FTHitEfficiencyNoGhostsLayer3          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2725 |     16.909 | 745.96     |   0.034584 |     1.0238 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2725 |     16.909 | 745.95     |   0.034604 |     1.0239 |
diff --git a/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.x86_64_v3-detdesc-opt b/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.x86_64_v3-detdesc-opt
index 2e33c9d79770d4854968a554dab0020eb6f883b0..9f15c34eb0d95b49a1ec135143d0f6af9c59643a 100644
--- a/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.x86_64_v3-detdesc-opt
+++ b/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.x86_64_v3-detdesc-opt
@@ -1,28 +1,3 @@
-TransportSvc                        SUCCESS  GEOMETRY ERRORS: 'Skip'     map has the size 1
-   |                      Logical Volume                     |    |  #          mean             RMS          min              max    |
-   | LHCb/lvLHCb                                             | mm | 2       -242.96426      1.0984734e-06 -242.96426         -242.964 |
-   | LHCb/lvLHCb                                             | X0 | 2       -0.74700727                 0 -0.74700727       -0.747007 |
-TransportSvc                        SUCCESS  GEOMETRY ERRORS: 'Recover'  map has the size 8
-   |                      Logical Volume                     |    |  #          mean             RMS          min              max    |
-   | AfterMagnetRegion/T/FT/Layers/lvLayer5U                 | mm | 2       3.7467119e-11               0 3.7467119e-11   3.7467119e- |
-   | AfterMagnetRegion/T/FT/Layers/lvLayer5U                 | X0 | 2       0                           0 0                           |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleFull           | mm | 6       9.3997317e-13   1.0935137e-12 8.7394906e-14   2.4836212e- |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleFull           | X0 | 6       2.8596132e-15   3.3267185e-15 2.6587527e-16   7.5557433e- |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleHoleRightU     | mm | 2       5.4383561e-13   4.3070975e-21 5.4383561e-13   5.4383561e- |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleHoleRightU     | X0 | 2       1.6544722e-15               0 1.6544722e-15   1.6544722e- |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleHoleRightX     | mm | 4       2.6516194e-13   3.9866622e-14 2.2529532e-13   3.0502856e- |
-   | AfterMagnetRegion/T/FT/Modules/lvFTModuleHoleRightX     | X0 | 4       8.0668321e-16   1.2128337e-16 6.8539983e-16   9.2796658e- |
-   | LHCb/lvLHCb                                             | mm | 4       240.55874           229.49694 11.061792           470.055 |
-   | LHCb/lvLHCb                                             | X0 | 4       0.73750099          0.7061718 0.031329189         1.44367 |
-   | egion/PipeSupportsInMagnet/lvUX852CollarForkAttachProng | mm | 2       0.16125689      1.1393352e-09 0.16125689         0.161256 |
-   | egion/PipeSupportsInMagnet/lvUX852CollarForkAttachProng | X0 | 2       0                           0 0                           |
-   | agnetRegion/PipeSupportsInMagnet/lvUX85SupportsInMagnet | mm | 70      5.7270338           8.3918626 0.10000167          25.6425 |
-   | agnetRegion/PipeSupportsInMagnet/lvUX85SupportsInMagnet | X0 | 70      0.00079579373    0.0014866265 0                0.00592725 |
-   | MagnetRegion/lvMagnetRegion                             | mm | 53      0.19863484         0.34362236 0.10000119          1.40243 |
-   | MagnetRegion/lvMagnetRegion                             | X0 | 53      3.4568276e-05   5.9800348e-05 1.7403133e-05   0.000244065 |
-TransportSvc                        SUCCESS  GEOMETRY ERRORS: 'Codes'    map has the size 0
-TransportSvc                           INFO Reset the static pointer to DetDesc::IGeometyrErrorSvc
-ChronoStatSvc.finalize()               INFO  Service finalized successfully
 ApplicationMgr                         INFO Application Manager Finalized successfully
 ApplicationMgr                         INFO Application Manager Terminated successfully
 CloneKillerForward_29b31bdb            INFO Number of counters : 2
@@ -41,51 +16,6 @@ CloneKillerForward_d2c9bbd5            INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "nTracksInput"                                  |       100 |       5920 |     59.200 |
  | "nTracksSelected"                               |       100 |       1346 |     13.460 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure inverting matrix in smoother"          |        55 |
- | "Failure propagating upstream state"            |       639 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against looping tracks. See debug for details"|        29 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|       474 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|       136 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure inverting matrix in smoother"          |         1 |
- | "Failure propagating upstream state"            |        15 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against absurd tracks. See debug for details"|         2 |
- | "Protect against looping tracks. See debug for details"|         1 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|        11 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|         1 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure inverting matrix in smoother"          |        55 |
- | "Failure propagating upstream state"            |       612 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against looping tracks. See debug for details"|        27 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|       453 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|       132 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure inverting matrix in smoother"          |         1 |
- | "Failure propagating upstream state"            |        14 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against absurd tracks. See debug for details"|         2 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|        11 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|         1 |
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |       100 |
@@ -538,81 +468,81 @@ VeloRetinaClusterTrackingSIMD_66...    INFO Number of counters : 2
  | "Nb of Produced Tracks"                         |       100 |      22652 |     226.52 |
 FTHitEfficiencyLayer0                  INFO 1D histograms in directory "FTHitEfficiencyLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      19899 | -0.0013043 | 1.6007     |   0.006795 |    0.61477 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      19899 | -0.0036856 | 1.5960     | -0.0001467 |    0.61384 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      19899 |-0.00023921 | 0.041862   |  0.0087689 |    -1.3238 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      19899 |   0.040338 | 1.7406     | 0.00025516 |   -0.21364 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2103 |     1.1579 | 0.61584    |     1.5757 |     5.7297 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      24967 |  -0.028815 | 1.4021     |  -0.012442 |     1.8752 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      24967 |  -0.028702 | 1.4061     | -0.0083562 |     1.8426 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      24967 | -0.0006841 | 0.043811   |   0.082116 |   -0.82668 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      24967 |   0.037436 | 1.7390     | -0.0085881 |   -0.17938 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2786 |     1.2179 | 0.54012    |     2.4852 |     8.6257 |
 FTHitEfficiencyLayer1                  INFO 1D histograms in directory "FTHitEfficiencyLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26709 | -0.0045643 | 1.4016     |  -0.014375 |     1.9673 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26709 | -0.0042173 | 1.4080     |  -0.015633 |     1.9026 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26709 | -0.0065235 | 2.0010     |  0.0045528 |   -0.73224 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26709 | -0.0050711 | 1.7579     |  -0.016569 |    -0.2464 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2901 |     1.1872 | 0.50757    |     2.7266 |     12.695 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26895 | -0.0051053 | 1.4027     |  -0.013818 |     1.9717 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26895 | -0.0046833 | 1.4047     |  -0.015962 |     1.9183 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26895 | -0.0088455 | 2.0021     |   0.002886 |   -0.73458 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26895 | -0.0019931 | 1.7624     |   -0.02096 |    -0.2583 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2917 |     1.1889 | 0.50872    |     2.7693 |     12.775 |
 FTHitEfficiencyLayer2                  INFO 1D histograms in directory "FTHitEfficiencyLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27761 |   0.022505 | 1.3955     |    0.06119 |     1.8933 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27761 |   0.015508 | 1.4036     |   0.036705 |     1.8497 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27761 |  0.0043608 | 2.0102     | -0.0091083 |   -0.73158 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27761 |   0.032154 | 1.7820     |  0.0038821 |   -0.28303 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27761 |   0.021403 | 1.3971     |   0.057193 |     1.8919 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27761 |   0.016417 | 1.4001     |   0.041752 |     1.8521 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27761 |  0.0044612 | 2.0102     | -0.0091927 |   -0.73166 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27761 |   0.032412 | 1.7818     |  0.0041988 |   -0.28291 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2931 |     1.2214 | 0.54647    |     2.6838 |     11.145 |
 FTHitEfficiencyLayer3                  INFO 1D histograms in directory "FTHitEfficiencyLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27475 |  -0.010505 | 1.4855     |-0.00064382 |     1.3673 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27475 |  -0.011322 | 1.4923     | -0.0030649 |     1.3359 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27475 |  0.0013612 | 0.043187   |  -0.014108 |   -0.92726 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27475 |  -0.021231 | 1.7431     |   0.020191 |   -0.21766 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27475 | -0.0090373 | 1.4877     |  0.0063276 |      1.362 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27475 |  -0.012299 | 1.4937     | -0.0038894 |     1.3328 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27475 |  0.0013496 | 0.043187   |   -0.01353 |   -0.92732 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27475 |  -0.020959 | 1.7430     |   0.020219 |   -0.21755 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2805 |     1.2314 | 0.55527    |      2.378 |     8.0119 |
 FTHitEfficiencyNoGhostsLayer0          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      19220 |  0.0010585 | 1.5962     |   0.014914 |    0.63019 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      19220 | -0.0013889 | 1.5918     |  0.0080007 |    0.62828 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      19220 | 2.9136e-05 | 0.041696   |  0.0029566 |     -1.369 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      19220 |   0.032668 | 1.7351     |  0.0021613 |   -0.20103 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2051 |     1.1599 | 0.61413    |     1.5966 |     5.8596 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      23955 |  -0.024969 | 1.3972     | 0.00073359 |       1.92 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      23955 |  -0.025846 | 1.4007     |  0.0010272 |     1.8871 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      23955 |-0.00032895 | 0.043689   |   0.068563 |   -0.84916 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      23955 |   0.024985 | 1.7293     | -0.0067489 |   -0.15836 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2706 |     1.2177 | 0.53922    |      2.544 |     8.8965 |
 FTHitEfficiencyNoGhostsLayer1          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      25699 | -0.0055673 | 1.3918     |  -0.010694 |     2.0425 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      25699 |  -0.006135 | 1.3990     |   -0.01562 |     1.9756 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      25699 |  -0.010942 | 1.9974     |  0.0062367 |   -0.72413 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      25699 |  -0.011801 | 1.7528     |  -0.019733 |   -0.22959 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2819 |     1.1894 | 0.50427    |      2.787 |     13.022 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      25854 | -0.0060266 | 1.3932     |  -0.010001 |     2.0447 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      25854 | -0.0064719 | 1.3957     |  -0.015683 |     1.9915 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      25854 |  -0.012214 | 1.9981     |  0.0044712 |   -0.72562 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      25854 |   -0.00886 | 1.7569     |   -0.02398 |   -0.23999 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2834 |     1.1912 | 0.50556    |     2.8307 |     13.098 |
 FTHitEfficiencyNoGhostsLayer2          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26716 |   0.020622 | 1.3841     |   0.051767 |     1.9683 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26716 |   0.014437 | 1.3931     |   0.030177 |     1.9268 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26716 |   0.010345 | 2.0106     |  -0.010662 |   -0.72918 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26716 |   0.039231 | 1.7772     |  0.0013227 |   -0.27327 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26716 |   0.019484 | 1.3858     |   0.047264 |     1.9666 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26716 |   0.015395 | 1.3894     |   0.035042 |     1.9294 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26716 |   0.010445 | 2.0106     |  -0.010747 |   -0.72928 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26716 |   0.039484 | 1.7770     |  0.0016512 |   -0.27313 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2845 |     1.2214 | 0.54094    |      2.727 |     11.501 |
 FTHitEfficiencyNoGhostsLayer3          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26403 |  -0.007118 | 1.4800     |-0.00037874 |     1.3986 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26403 |  -0.010922 | 1.4842     |  -0.011638 |     1.3694 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26403 |   0.001265 | 0.043152   |  -0.020791 |   -0.92942 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26403 |  -0.020159 | 1.7424     |   0.020473 |   -0.21563 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26403 | -0.0075409 | 1.4800     |  0.0013498 |     1.3967 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26403 |  -0.012011 | 1.4858     |    -0.0123 |     1.3663 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26403 |  0.0012589 | 0.043153   |   -0.02049 |   -0.92945 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26403 |  -0.019858 | 1.7422     |   0.020512 |   -0.21549 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2728 |     1.2284 | 0.55183    |     2.4156 |     8.3613 |
 FTHitEfficiencyLayer0                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2103 |     15.617 | 538.65     |   0.076757 |     1.9589 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2786 |     17.098 | 712.44     |   0.029201 |    0.98881 |
 FTHitEfficiencyLayer1                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2901 |     15.172 | 718.42     |   0.038165 |     1.0417 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2917 |     14.966 | 718.13     |   0.039559 |     1.0425 |
 FTHitEfficiencyLayer2                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2931 |     20.102 | 734.15     |   0.030881 |     1.0232 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2931 |     20.106 | 734.15     |    0.03087 |     1.0232 |
 FTHitEfficiencyLayer3                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2805 |      19.35 | 743.22     |   0.031703 |     1.0276 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2805 |      19.35 | 743.21     |   0.031723 |     1.0277 |
 FTHitEfficiencyNoGhostsLayer0          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2051 |     11.647 | 538.48     |   0.078653 |     2.0044 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2706 |     14.285 | 714.19     |   0.033073 |    0.99572 |
 FTHitEfficiencyNoGhostsLayer1          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2819 |     12.563 | 719.12     |   0.037401 |     1.0599 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2834 |      12.24 | 718.92     |   0.039315 |     1.0599 |
 FTHitEfficiencyNoGhostsLayer2          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2845 |     15.773 | 734.61     |   0.031265 |     1.0412 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2845 |     15.776 | 734.61     |   0.031254 |     1.0411 |
 FTHitEfficiencyNoGhostsLayer3          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2728 |     16.705 | 745.52     |   0.034601 |     1.0268 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2728 |     16.705 | 745.52     |   0.034621 |     1.0269 |
diff --git a/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.x86_64_v3-opt b/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.x86_64_v3-opt
index 2050fac14bc49352da6436c99c2914cb1eb7180c..b6cb7df63cee20048ac35ea0533486ea5557cef2 100644
--- a/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.x86_64_v3-opt
+++ b/Hlt/RecoConf/tests/refs/FT_hit_efficiency.ref.x86_64_v3-opt
@@ -16,47 +16,6 @@ CloneKillerForward_d2c9bbd5            INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "nTracksInput"                                  |       100 |       5924 |     59.240 |
  | "nTracksSelected"                               |       100 |       1369 |     13.690 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |       634 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against looping tracks. See debug for details"|        29 |
-FTHitEfficiencyLayer0.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|       469 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|       136 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |        15 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against absurd tracks. See debug for details"|         2 |
- | "Protect against looping tracks. See debug for details"|         1 |
-FTHitEfficiencyLayer1.TrackInter...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|        11 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|         1 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |       606 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against looping tracks. See debug for details"|        27 |
-FTHitEfficiencyNoGhostsLayer0.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|       446 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|       133 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Failure propagating upstream state"            |        14 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Protect against absurd tracks. See debug for details"|         2 |
-FTHitEfficiencyNoGhostsLayer1.Tr...    INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "RungeKuttaExtrapolator failed with code: RK: Curling"|        11 |
- | "RungeKuttaExtrapolator failed with code: RK: Very large value (> 1e6 mm) for state position. Breaking iteration"|         1 |
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |       100 |
@@ -509,81 +468,81 @@ VeloRetinaClusterTrackingSIMD_66...    INFO Number of counters : 2
  | "Nb of Produced Tracks"                         |       100 |      22788 |     227.88 |
 FTHitEfficiencyLayer0                  INFO 1D histograms in directory "FTHitEfficiencyLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      20391 |   0.013097 | 1.6229     |   0.030799 |    0.47343 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      20391 |   0.011896 | 1.6275     |   0.027542 |     0.4592 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      20391 |-0.00033152 | 0.041997   |-0.00076727 |    -1.3038 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      20391 |   0.038115 | 1.7439     |   0.016375 |   -0.23583 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2170 |     1.1115 | 0.65431    |     1.4019 |     5.3329 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      25028 |  -0.036834 | 1.4011     |  0.0090805 |     1.8882 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      25028 |  -0.037818 | 1.4063     |  0.0097225 |     1.8482 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      25028 |-0.00070961 | 0.043755   |   0.074664 |   -0.84814 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      25028 |    0.03797 | 1.7409     | -0.0040636 |   -0.18347 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2793 |     1.2173 | 0.53689    |     2.5112 |     8.7857 |
 FTHitEfficiencyLayer1                  INFO 1D histograms in directory "FTHitEfficiencyLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26879 |  -0.010226 | 1.4069     |  -0.022152 |     1.9507 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26879 | -0.0073715 | 1.4094     |  -0.012309 |     1.8924 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26879 |  -0.013137 | 2.0032     |  0.0059484 |   -0.73869 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26879 |  -0.010707 | 1.7597     |  -0.016023 |   -0.25405 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2911 |     1.1879 | 0.50901    |     2.6895 |     12.483 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27042 | -0.0062275 | 1.4058     |  -0.014155 |     1.9639 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27042 | -0.0053412 | 1.4058     |  -0.011472 |     1.9118 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27042 |  -0.011876 | 2.0032     |  0.0031724 |   -0.73712 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27042 | -0.0058688 | 1.7631     |  -0.021316 |   -0.26286 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2926 |       1.19 | 0.50842    |     2.7533 |       12.7 |
 FTHitEfficiencyLayer2                  INFO 1D histograms in directory "FTHitEfficiencyLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27793 |  0.0065842 | 1.4008     |   0.080272 |     1.8835 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27793 | -0.0010503 | 1.4096     |   0.051866 |     1.8366 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27793 | -0.0038661 | 2.0118     | -0.0056765 |   -0.73376 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27793 |   0.029064 | 1.7855     |  0.0064288 |   -0.28991 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2933 |     1.2203 | 0.54579    |     2.6954 |     11.225 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27793 |  0.0064128 | 1.3991     |   0.078527 |     1.8913 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27793 | -0.0013594 | 1.4081     |   0.050164 |     1.8447 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27793 | -0.0036563 | 2.0121     | -0.0055721 |   -0.73387 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27793 |   0.029409 | 1.7860     |   0.007044 |   -0.28981 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2933 |     1.2199 | 0.54562    |     2.6988 |     11.249 |
 FTHitEfficiencyLayer3                  INFO 1D histograms in directory "FTHitEfficiencyLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27470 |  -0.011381 | 1.4908     |    0.01974 |     1.3482 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27470 |  -0.016714 | 1.4967     |  0.0034879 |     1.3197 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27470 |  0.0015814 | 0.043169   |  -0.023585 |   -0.92831 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27470 |   -0.03024 | 1.7418     |   0.026442 |   -0.21415 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      27470 |  -0.011323 | 1.4908     |   0.019828 |     1.3478 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      27470 |  -0.016695 | 1.4968     |  0.0037398 |     1.3197 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      27470 |  0.0015202 | 0.043166   |   -0.02123 |    -0.9297 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      27470 |  -0.030214 | 1.7418     |   0.026391 |   -0.21403 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2808 |     1.2315 | 0.55519    |     2.3767 |     8.0054 |
 FTHitEfficiencyNoGhostsLayer0          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      19653 |   0.016559 | 1.6248     |   0.031828 |     0.4764 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      19653 |   0.015363 | 1.6299     |    0.02887 |    0.46085 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      19653 |-0.00018114 | 0.041822   |   0.001553 |    -1.3506 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      19653 |   0.034832 | 1.7400     |   0.014479 |   -0.22959 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2114 |     1.1121 | 0.65336    |     1.4187 |     5.4559 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      23990 |  -0.033828 | 1.3998     |   0.016485 |     1.9174 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      23990 |  -0.035876 | 1.4044     |   0.013469 |      1.877 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      23990 |-0.00035015 | 0.043623   |   0.062067 |   -0.87317 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      23990 |   0.024989 | 1.7313     |  -0.001782 |   -0.16413 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2710 |     1.2173 | 0.53752    |     2.5582 |     8.9838 |
 FTHitEfficiencyNoGhostsLayer1          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      25933 | -0.0086254 | 1.3991     |  -0.015403 |     2.0103 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      25933 | -0.0055779 | 1.4030     | -0.0058852 |     1.9503 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      25933 |  -0.017876 | 2.0009     |  0.0080999 |   -0.73281 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      25933 |  -0.014707 | 1.7543     |  -0.020097 |    -0.2371 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2834 |     1.1895 | 0.50587    |     2.7405 |     12.782 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26065 | -0.0049835 | 1.3984     | -0.0062041 |     2.0201 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26065 | -0.0039576 | 1.3997     | -0.0041826 |     1.9668 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26065 |  -0.015359 | 2.0002     |  0.0052137 |   -0.73023 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26065 |  -0.009952 | 1.7572     |  -0.025286 |   -0.24421 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2848 |     1.1917 | 0.50535    |     2.8067 |     13.004 |
 FTHitEfficiencyNoGhostsLayer2          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26705 |  0.0044311 | 1.3922     |   0.063143 |     1.9344 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26705 | -0.0013821 | 1.4003     |   0.042006 |      1.891 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26705 |  0.0028385 | 2.0122     | -0.0072307 |   -0.73089 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26705 |   0.035395 | 1.7814     |  0.0036454 |   -0.28411 |
- | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2844 |     1.2229 | 0.54304    |     2.7526 |     11.512 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26705 |  0.0042532 | 1.3904     |   0.061219 |     1.9426 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26705 | -0.0016812 | 1.3987     |    0.04012 |     1.8996 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26705 |  0.0030565 | 2.0124     | -0.0071245 |     -0.731 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26705 |   0.035753 | 1.7819     |  0.0042857 |   -0.28401 |
+ | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2844 |     1.2226 | 0.54286    |     2.7562 |     11.537 |
 FTHitEfficiencyNoGhostsLayer3          INFO 1D histograms in directory "FTHitEfficiencyNoGhostsLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26312 |  -0.011862 | 1.4830     |   0.016138 |     1.3943 |
- | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26312 |  -0.018401 | 1.4888     | -0.0033666 |     1.3638 |
- | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26312 |  0.0014381 | 0.043141   |  -0.028488 |   -0.92943 |
- | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26312 |  -0.028284 | 1.7439     |   0.025851 |   -0.21947 |
+ | Doca                                          | "DOCA;DOCA [mm];Entries"                      |      26312 |  -0.011822 | 1.4830     |   0.016119 |     1.3938 |
+ | DocaX                                         | "DOCA X;DOCA X [mm];Entries"                  |      26312 |  -0.018421 | 1.4888     | -0.0032879 |      1.364 |
+ | DocaY                                         | "DOCA Y;DOCA Y [mm];Entries"                  |      26312 |  0.0013895 | 0.043137   |  -0.026788 |    -0.9308 |
+ | DocaZ                                         | "DOCA Z;DOCA Z [mm];Entries"                  |      26312 |  -0.028261 | 1.7439     |   0.025779 |   -0.21934 |
  | MatchedHitsPerTrack                           | "Matched hits per Track;Hits;Entries"         |       2726 |     1.2271 | 0.54794    |     2.3671 |     7.9324 |
 FTHitEfficiencyLayer0                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2170 |     24.584 | 540.79     |   0.098279 |     1.9849 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2793 |     19.599 | 711.71     |   0.032218 |    0.99288 |
 FTHitEfficiencyLayer1                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2911 |     17.427 | 717.68     |   0.026685 |     1.0596 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2926 |     17.017 | 717.35     |   0.028788 |     1.0602 |
 FTHitEfficiencyLayer2                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2933 |     20.526 | 734.10     |   0.026691 |      1.024 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2933 |     20.526 | 734.10     |   0.026694 |     1.0239 |
 FTHitEfficiencyLayer3                  INFO 1D profile histograms in directory "FTHitEfficiencyLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2808 |     21.583 | 741.99     |   0.026495 |     1.0386 |
 FTHitEfficiencyNoGhostsLayer0          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer0" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2114 |     21.156 | 540.59     |    0.10155 |     2.0374 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2710 |      16.27 | 712.77     |   0.032761 |     1.0021 |
 FTHitEfficiencyNoGhostsLayer1          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer1" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2834 |     14.878 | 718.22     |   0.025528 |     1.0767 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2848 |     14.349 | 717.96     |   0.028164 |     1.0766 |
 FTHitEfficiencyNoGhostsLayer2          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer2" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2844 |     17.188 | 734.91     |   0.024427 |     1.0375 |
+ | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2844 |     17.188 | 734.91     |   0.024429 |     1.0375 |
 FTHitEfficiencyNoGhostsLayer3          INFO 1D profile histograms in directory "FTHitEfficiencyNoGhostsLayer3" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | EfficiencyVsX                                 | "Efficiency vs X;X [mm];Efficiency"           |       2726 |     18.867 | 744.96     |   0.029809 |     1.0306 |
diff --git a/Hlt/RecoConf/tests/refs/allen_gaudi_downstream_with_mcchecking.ref b/Hlt/RecoConf/tests/refs/allen_gaudi_downstream_with_mcchecking.ref
index a1872b296400f0413cf7a5ef2a3f5484e22ab0c5..4d70275926a8ce690c274834c17d459960557d3b 100644
--- a/Hlt/RecoConf/tests/refs/allen_gaudi_downstream_with_mcchecking.ref
+++ b/Hlt/RecoConf/tests/refs/allen_gaudi_downstream_with_mcchecking.ref
@@ -1,7 +1,7 @@
 DownstreamTrackChecker_b5b8b4e9        INFO Results
-DownstreamTrackChecker_b5b8b4e9        INFO **** Downstream                      6931 tracks including            519 ghosts [ 7.49 %], Event average  5.88 % ****
-DownstreamTrackChecker_b5b8b4e9        INFO   01_UT+T                       :    4496 from    66730 [  6.74 %]      0 clones [ 0.00 %], purity: 99.42 %, hitEff: 96.50 %
-DownstreamTrackChecker_b5b8b4e9        INFO   02_UT+T_P>5GeV                :    3114 from    40636 [  7.66 %]      0 clones [ 0.00 %], purity: 99.42 %, hitEff: 96.49 %
+DownstreamTrackChecker_b5b8b4e9        INFO **** Downstream                      6929 tracks including            519 ghosts [ 7.49 %], Event average  5.88 % ****
+DownstreamTrackChecker_b5b8b4e9        INFO   01_UT+T                       :    4495 from    66730 [  6.74 %]      0 clones [ 0.00 %], purity: 99.42 %, hitEff: 96.50 %
+DownstreamTrackChecker_b5b8b4e9        INFO   02_UT+T_P>5GeV                :    3113 from    40636 [  7.66 %]      0 clones [ 0.00 %], purity: 99.42 %, hitEff: 96.48 %
 DownstreamTrackChecker_b5b8b4e9        INFO   03_UT+T_strange               :    1671 from     7004 [ 23.86 %]      0 clones [ 0.00 %], purity: 99.50 %, hitEff: 96.90 %
 DownstreamTrackChecker_b5b8b4e9        INFO   04_UT+T_strange_P>5GeV        :    1223 from     3436 [ 35.59 %]      0 clones [ 0.00 %], purity: 99.51 %, hitEff: 96.84 %
 DownstreamTrackChecker_b5b8b4e9        INFO   05_noVelo+UT+T_strange        :    1536 from     3807 [ 40.35 %]      0 clones [ 0.00 %], purity: 99.51 %, hitEff: 96.84 %
@@ -30,8 +30,8 @@ PrStoreUTHitClusters_69298ec0          INFO Number of counters : 3
  |*"Non-unique UT clusters in event"               |      1000 |          0 |( 0.000000 +- 0.000000)% |
 PrTrackAssociator_74593611             INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- |*"Efficiency"                                    |      6931 |       6412 |( 92.51190 +- 0.3161452)% |
- | "MC particles per track"                        |      6412 |       6412 |     1.0000 |
+ |*"Efficiency"                                    |      6929 |       6410 |( 92.50974 +- 0.3162328)% |
+ | "MC particles per track"                        |      6410 |       6410 |     1.0000 |
 PrVPHitsToVPLightClusters_8cd36c45     INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Nb of Produced Clusters"                       |      1000 |    2178998 |     2179.0 |
@@ -44,28 +44,28 @@ VPLightClustersToVPMicroClusters...    INFO Number of counters : 1
 VeloRetinaClusterTrackingSIMD_66...    INFO Number of counters : 2
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Nb of Produced Clusters"                       |      1000 |    2178998 |     2179.0 |
- | "Nb of Produced Tracks"                         |      1000 |     240661 |     240.66 |
+ | "Nb of Produced Tracks"                         |      1000 |     240654 |     240.65 |
 downstream_consolidate_tracks          INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "n_downstream_tracks"                           |      1000 |       6931 |     6.9310 |
+ | "n_downstream_tracks"                           |      1000 |       6929 |     6.9290 |
 fromV3TrackV1Track_6f234e16            INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Nb of Produced Tracks"                         |      1000 |       6931 |     6.9310 |
+ | "Nb of Produced Tracks"                         |      1000 |       6929 |     6.9290 |
 matching_consolidate_tracks            INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "n_long_tracks_matching"                        |      1000 |      19482 |     19.482 |
 pv_beamline_cleanup                    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "n_PVs"                                         |      1000 |       5108 |     5.1080 |
+ | "n_PVs"                                         |      1000 |       5107 |     5.1070 |
 scifi_consolidate_seeds                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "n_seed_tracks"                                 |      1000 |      52245 |     52.245 |
+ | "n_seed_tracks"                                 |      1000 |      52242 |     52.242 |
 scifi_consolidate_tracks               INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "n_long_tracks_forward"                         |      1000 |      29340 |     29.340 |
+ | "n_long_tracks_forward"                         |      1000 |      29342 |     29.342 |
 velo_consolidate_tracks                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "n_velo_tracks"                                 |      1000 |     249199 |     249.20 |
+ | "n_velo_tracks"                                 |      1000 |     249202 |     249.20 |
 TransposeRawBanks_901cc252             INFO 1D histograms in directory "TransposeRawBanks_901cc252" : 1
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | ECal                                          | "ECal"                                        |      72000 |      157.5 | 0.0000     |          0 |          0 |
@@ -83,61 +83,61 @@ TransposeRawBanks_e9adf917             INFO 1D histograms in directory "Transpos
  | UT                                            | "UT"                                          |     216000 |     69.797 | 61.476     |     2.6463 |     11.635 |
 downstream_consolidate_tracks          INFO 1D histograms in directory "downstream_consolidate_tracks" : 4
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | downstream_track_eta                          | "#eta"                                        |       6931 |     3.5897 | 0.69747    |    -0.2155 |   -0.79282 |
- | downstream_track_nhits                        | "N. hits / track"                             |       6931 |     15.989 | 0.67755    |   -0.96833 |   -0.28738 |
- | downstream_track_phi                          | "#phi"                                        |       6931 |    0.03387 | 1.7758     |  -0.012693 |    -1.2098 |
- | n_downstream_tracks_event                     | "n_downstream_tracks_event"                   |       1000 |      6.931 | 4.5034     |    0.77523 |    0.58956 |
+ | downstream_track_eta                          | "#eta"                                        |       6929 |     3.5893 | 0.69754    |    -0.2145 |   -0.79352 |
+ | downstream_track_nhits                        | "N. hits / track"                             |       6929 |     15.989 | 0.67781    |   -0.96784 |   -0.28908 |
+ | downstream_track_phi                          | "#phi"                                        |       6929 |   0.034384 | 1.7757     |     -0.013 |    -1.2098 |
+ | n_downstream_tracks_event                     | "n_downstream_tracks_event"                   |       1000 |      6.929 | 4.5029     |     0.7777 |    0.59729 |
 downstream_make_particles              INFO 1D histograms in directory "downstream_make_particles" : 4
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | number_of_trks                                | "NTrks"                                       |        999 |     7.4229 | 4.4984     |     0.7782 |    0.60434 |
- | trk_eta                                       | "etaTrk"                                      |       6916 |     3.5892 | 0.69761    |   -0.21463 |   -0.79312 |
- | trk_phi                                       | "phiTrk"                                      |       6916 |   0.034785 | 1.7685     |  -0.013676 |     -1.235 |
- | trk_pt                                        | "ptTrk"                                       |       6916 |     544.14 | 504.09     |       4.16 |     38.109 |
+ | number_of_trks                                | "NTrks"                                       |        999 |     7.4209 | 4.4979     |    0.78068 |    0.61213 |
+ | trk_eta                                       | "etaTrk"                                      |       6914 |     3.5889 | 0.69768    |   -0.21363 |   -0.79382 |
+ | trk_phi                                       | "phiTrk"                                      |       6914 |   0.035175 | 1.7683     |  -0.013893 |    -1.2349 |
+ | trk_pt                                        | "ptTrk"                                       |       6914 |     544.24 | 504.14     |     4.1594 |     38.101 |
 is_muon_c92a16c2                       INFO 1D histograms in directory "is_muon_c92a16c2" : 3
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | n_muons                                       | "# muons"                                     |       6931 |    0.12192 | 0.32719    |     2.3111 |     3.3412 |
+ | n_muons                                       | "# muons"                                     |       6929 |     0.1221 | 0.32740    |     2.3085 |     3.3294 |
  | pv_x                                          | "pv_x"                                        |        550 |          2 | 0.0000     |          0 |          0 |
- | pv_y                                          | "pv_y"                                        |        845 |     462.21 | 278.88     |    0.92751 |    0.51044 |
+ | pv_y                                          | "pv_y"                                        |        846 |     462.27 | 278.72     |    0.92734 |    0.51347 |
 matching_consolidate_tracks            INFO 1D histograms in directory "matching_consolidate_tracks" : 6
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | long_track_ghost_prob                         | "GhostProb"                                   |      19482 |    0.12844 | 0.11965    |     1.2589 |    0.73258 |
- | long_track_matching_eta                       | "#eta"                                        |      19482 |     3.9591 | 0.69496    |   -0.68532 |  -0.088149 |
- | long_track_matching_nhits                     | "N. hits / track"                             |      19482 |     24.559 | 3.3654     |    0.12077 |   -0.68236 |
- | long_track_matching_phi                       | "#phi"                                        |      19482 |   0.010641 | 1.7513     |  -0.019746 |    -1.1539 |
- | long_track_matching_qop                       | "q/p"                                         |      19482 |-3.9524e-07 | 0.00017301 |   -0.01571 |    -1.1133 |
- | n_long_tracks_matching_event                  | "n_long_tracks_matching_event"                |       1000 |     19.482 | 13.600     |     1.1111 |     1.2438 |
+ | long_track_ghost_prob                         | "GhostProb"                                   |      19482 |     0.1285 | 0.11969    |     1.2576 |    0.72794 |
+ | long_track_matching_eta                       | "#eta"                                        |      19482 |     3.9592 | 0.69490    |   -0.68547 |  -0.087246 |
+ | long_track_matching_nhits                     | "N. hits / track"                             |      19482 |     24.559 | 3.3658     |    0.12084 |   -0.68266 |
+ | long_track_matching_phi                       | "#phi"                                        |      19482 |   0.011298 | 1.7510     |  -0.019936 |    -1.1536 |
+ | long_track_matching_qop                       | "q/p"                                         |      19482 |-3.3056e-07 | 0.00017302 |  -0.016275 |    -1.1132 |
+ | n_long_tracks_matching_event                  | "n_long_tracks_matching_event"                |       1000 |     19.482 | 13.605     |     1.1108 |     1.2391 |
 pv_beamline_cleanup                    INFO 1D histograms in directory "pv_beamline_cleanup" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | n_pvs_event                                   | "n_pvs_event"                                 |       1000 |      5.108 | 2.1896     |    0.40232 |   -0.12265 |
+ | n_pvs_event                                   | "n_pvs_event"                                 |       1000 |      5.107 | 2.1880     |    0.40351 |   -0.11488 |
  | n_smog2_PVs                                   | "n_smog2_PVs"                                 |       1000 |          0 | 0.0000     |          0 |          0 |
- | pv_x                                          | "pv_x"                                        |       5102 | 0.00026578 | 0.028513   |   -0.18749 |     3.1562 |
- | pv_y                                          | "pv_y"                                        |       5102 |-0.00044767 | 0.028276   |   0.021878 |     1.3696 |
- | pv_z                                          | "pv_z"                                        |       5102 |    0.46319 | 59.430     |   -0.03759 |   -0.10541 |
+ | pv_x                                          | "pv_x"                                        |       5101 | 0.00023094 | 0.028521   |   -0.19494 |     3.1679 |
+ | pv_y                                          | "pv_y"                                        |       5101 | -0.0004803 | 0.028196   |  -0.012409 |     1.2271 |
+ | pv_z                                          | "pv_z"                                        |       5101 |    0.44921 | 59.423     |  -0.037847 |   -0.10531 |
 scifi_consolidate_seeds                INFO 1D histograms in directory "scifi_consolidate_seeds" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | n_scifi_seeds_event                           | "n_scifi_seeds_event"                         |       1000 |     52.245 | 36.681     |     1.5739 |     3.8932 |
- | scifi_track_eta                               | "#eta"                                        |      52245 |     2.5964 | 0.69770    |    0.61505 |    0.11701 |
- | scifi_track_nhits                             | "N. hits / track"                             |      52245 |     11.328 | 0.77518    |   -0.64185 |    -1.0585 |
- | scifi_track_phi                               | "#phi"                                        |      52245 |  0.0085334 | 2.0693     | -0.0052066 |   -0.96257 |
- | scifi_track_qop                               | "q/p"                                         |      52245 |-1.6098e-06 | 0.00017317 | -0.0030434 |    -1.0081 |
+ | n_scifi_seeds_event                           | "n_scifi_seeds_event"                         |       1000 |     52.242 | 36.681     |     1.5741 |     3.8935 |
+ | scifi_track_eta                               | "#eta"                                        |      52242 |     2.5964 | 0.69775    |    0.61529 |    0.11764 |
+ | scifi_track_nhits                             | "N. hits / track"                             |      52242 |     11.328 | 0.77520    |   -0.64168 |    -1.0587 |
+ | scifi_track_phi                               | "#phi"                                        |      52242 |  0.0086712 | 2.0692     | -0.0052542 |   -0.96248 |
+ | scifi_track_qop                               | "q/p"                                         |      52242 |-1.6029e-06 | 0.00017318 | -0.0030777 |    -1.0081 |
 scifi_consolidate_tracks               INFO 1D histograms in directory "scifi_consolidate_tracks" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | long_track_forward_eta                        | "#eta"                                        |      29340 |     4.3666 | 0.54181    |  -0.021942 |   -0.36568 |
- | long_track_forward_nhits                      | "N. hits / track"                             |      29340 |     25.297 | 3.0364     |   -0.02826 |   -0.33495 |
- | long_track_forward_phi                        | "#phi"                                        |      29340 |   -0.61866 | 1.5716     |    0.31291 |   -0.77088 |
- | long_track_forward_qop                        | "q/p"                                         |      29340 |-1.5014e-06 | 0.00015666 |  0.0044297 |   0.051724 |
- | n_long_tracks_forward_event                   | "n_long_tracks_forward_event"                 |       1000 |      29.34 | 16.547     |    0.50869 |   -0.17407 |
+ | long_track_forward_eta                        | "#eta"                                        |      29342 |      4.367 | 0.54181    |  -0.024346 |   -0.36086 |
+ | long_track_forward_nhits                      | "N. hits / track"                             |      29342 |     25.297 | 3.0360     |   -0.02771 |   -0.33528 |
+ | long_track_forward_phi                        | "#phi"                                        |      29342 |   -0.61845 | 1.5714     |    0.31257 |   -0.77146 |
+ | long_track_forward_qop                        | "q/p"                                         |      29342 |-1.4992e-06 | 0.00015664 |  0.0047518 |   0.051494 |
+ | n_long_tracks_forward_event                   | "n_long_tracks_forward_event"                 |       1000 |     29.342 | 16.546     |    0.50818 |   -0.17421 |
 velo_consolidate_tracks                INFO 1D histograms in directory "velo_consolidate_tracks" : 1
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | n_velo_tracks_event                           | "n_velo_tracks_event"                         |       1000 |      249.2 | 138.92     |    0.80202 |    0.76951 |
+ | n_velo_tracks_event                           | "n_velo_tracks_event"                         |       1000 |      249.2 | 138.92     |    0.80213 |    0.76952 |
 velo_kalman_filter                     INFO 1D histograms in directory "velo_kalman_filter" : 9
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | velo_backward_track_eta                       | "#backward_eta"                               |      93151 |    -3.0206 | 0.80389    |   0.033507 |   -0.62837 |
- | velo_backward_track_nhits                     | "backward N. hits / track"                    |      93151 |     4.5716 | 1.3436     |     1.1909 |     2.2091 |
- | velo_backward_track_phi                       | "#backward_phi"                               |      93151 |  -0.018661 | 1.8047     |   0.001279 |    -1.1806 |
- | velo_forward_track_eta                        | "#forward_eta"                                |     156047 |     3.2744 | 1.0906     |    0.11803 |   -0.98045 |
- | velo_forward_track_nhits                      | "forward N. hits / track"                     |     156048 |     7.3537 | 3.4396     |    0.54358 |   -0.64326 |
- | velo_forward_track_phi                        | "#forward_phi"                                |     156048 |  0.0021119 | 1.8087     |  -0.009059 |    -1.1931 |
- | velo_total_track_eta                          | "#total_eta"                                  |     249198 |    0.92132 | 3.2034     |   -0.37213 |    -1.4837 |
- | velo_total_track_nhits                        | "total N. hits / track"                       |     249199 |     6.3137 | 3.1456     |     1.0681 |    0.34532 |
- | velo_total_track_phi                          | "#total_phi"                                  |     249199 |  -0.005653 | 1.8072     | -0.0051748 |    -1.1885 |
+ | velo_backward_track_eta                       | "#backward_eta"                               |      93153 |    -3.0206 | 0.80395    |   0.032821 |   -0.62543 |
+ | velo_backward_track_nhits                     | "backward N. hits / track"                    |      93153 |     4.5716 | 1.3436     |     1.1909 |      2.209 |
+ | velo_backward_track_phi                       | "#backward_phi"                               |      93153 |  -0.018546 | 1.8047     |  0.0012999 |    -1.1806 |
+ | velo_forward_track_eta                        | "#forward_eta"                                |     156048 |     3.2744 | 1.0906     |    0.11797 |   -0.98065 |
+ | velo_forward_track_nhits                      | "forward N. hits / track"                     |     156049 |     7.3536 | 3.4395     |    0.54368 |   -0.64307 |
+ | velo_forward_track_phi                        | "#forward_phi"                                |     156049 |  0.0021206 | 1.8087     | -0.0090842 |    -1.1931 |
+ | velo_total_track_eta                          | "#total_eta"                                  |     249201 |    0.92126 | 3.2034     |   -0.37215 |    -1.4837 |
+ | velo_total_track_nhits                        | "total N. hits / track"                       |     249202 |     6.3136 | 3.1455     |     1.0682 |    0.34561 |
+ | velo_total_track_phi                          | "#total_phi"                                  |     249202 | -0.0056045 | 1.8072     | -0.0051831 |    -1.1885 |
diff --git a/Hlt/RecoConf/tests/refs/allen_gaudi_pv_with_mcchecking_beamshift.ref b/Hlt/RecoConf/tests/refs/allen_gaudi_pv_with_mcchecking_beamshift.ref
index 1375ea93ba8e8558eb9d6853fc6d1c0b41182bc6..c8196e29c2dd87d3210c27dfdb9924173cc25182 100644
--- a/Hlt/RecoConf/tests/refs/allen_gaudi_pv_with_mcchecking_beamshift.ref
+++ b/Hlt/RecoConf/tests/refs/allen_gaudi_pv_with_mcchecking_beamshift.ref
@@ -5,52 +5,52 @@ PrimaryVertexChecker_6ecf8c4f          INFO  MC efficiency split by tracks with
 PrimaryVertexChecker_6ecf8c4f          INFO  MC efficiency split by z position: <-50, (-50,50), >50
 PrimaryVertexChecker_6ecf8c4f          INFO  REC and MC vertices matched:  by distance
 PrimaryVertexChecker_6ecf8c4f          INFO
-PrimaryVertexChecker_6ecf8c4f          INFO 00 all                    :      499 from      532 (     743-211     ) [ 93.80 %], false   12 from reco.      511 (     499+12  ) [  2.35 %]
+PrimaryVertexChecker_6ecf8c4f          INFO 00 all                    :      499 from      532 (     743-211     ) [ 93.80 %], false   13 from reco.      512 (     499+13  ) [  2.54 %]
 PrimaryVertexChecker_6ecf8c4f          INFO 01 isolated               :      292 from      298 (     415-117     ) [ 97.99 %], false    4 from reco.      296 (     292+4   ) [  1.35 %]
-PrimaryVertexChecker_6ecf8c4f          INFO 02 close                  :      207 from      234 (     328-94      ) [ 88.46 %], false    8 from reco.      215 (     207+8   ) [  3.72 %]
-PrimaryVertexChecker_6ecf8c4f          INFO 03 ntracks<10             :       38 from       50 (      50-0       ) [ 76.00 %], false    8 from reco.       46 (      38+8   ) [ 17.39 %]
+PrimaryVertexChecker_6ecf8c4f          INFO 02 close                  :      207 from      234 (     328-94      ) [ 88.46 %], false    9 from reco.      216 (     207+9   ) [  4.17 %]
+PrimaryVertexChecker_6ecf8c4f          INFO 03 ntracks<10             :       38 from       50 (      50-0       ) [ 76.00 %], false    9 from reco.       47 (      38+9   ) [ 19.15 %]
 PrimaryVertexChecker_6ecf8c4f          INFO 04 ntracks>=10            :      461 from      482 (     482-0       ) [ 95.64 %], false    4 from reco.      465 (     461+4   ) [  0.86 %]
-PrimaryVertexChecker_6ecf8c4f          INFO 05 z<-50.0                :      109 from      115 (     149-34      ) [ 94.78 %], false    1 from reco.      110 (     109+1   ) [  0.91 %]
+PrimaryVertexChecker_6ecf8c4f          INFO 05 z<-50.0                :      109 from      115 (     149-34      ) [ 94.78 %], false    2 from reco.      111 (     109+2   ) [  1.80 %]
 PrimaryVertexChecker_6ecf8c4f          INFO 06 z in (-50.0, 50.0)     :      278 from      300 (     427-127     ) [ 92.67 %], false    9 from reco.      287 (     278+9   ) [  3.14 %]
 PrimaryVertexChecker_6ecf8c4f          INFO 07 z >=50.0               :      112 from      117 (     167-50      ) [ 95.73 %], false    2 from reco.      114 (     112+2   ) [  1.75 %]
-PrimaryVertexChecker_6ecf8c4f          INFO 08 decayBeauty            :        6 from        6 (       6-0       ) [ 100.00 %], false    0 from reco.       18 (      18+0   ) [  0.00 %]
-PrimaryVertexChecker_6ecf8c4f          INFO 09 decayCharm             :       68 from       71 (      71-0       ) [ 95.77 %], false    3 from reco.       80 (      77+3   ) [  3.75 %]
-PrimaryVertexChecker_6ecf8c4f          INFO 10 decayStrange           :      499 from      532 (     558-26      ) [ 93.80 %], false   12 from reco.      511 (     499+12  ) [  2.35 %]
-PrimaryVertexChecker_6ecf8c4f          INFO 11 other                  :        0 from        0 (     185-185     ) [ -100.00 %], false    0 from reco.       12 (      12+0   ) [  0.00 %]
+PrimaryVertexChecker_6ecf8c4f          INFO 08 decayBeauty            :        6 from        6 (       6-0       ) [ 100.00 %], false    0 from reco.       19 (      19+0   ) [  0.00 %]
+PrimaryVertexChecker_6ecf8c4f          INFO 09 decayCharm             :       68 from       71 (      71-0       ) [ 95.77 %], false    3 from reco.       81 (      78+3   ) [  3.70 %]
+PrimaryVertexChecker_6ecf8c4f          INFO 10 decayStrange           :      499 from      532 (     558-26      ) [ 93.80 %], false   13 from reco.      512 (     499+13  ) [  2.54 %]
+PrimaryVertexChecker_6ecf8c4f          INFO 11 other                  :        0 from        0 (     185-185     ) [ -100.00 %], false    0 from reco.       13 (      13+0   ) [  0.00 %]
 PrimaryVertexChecker_6ecf8c4f          INFO 12 1MCPV                  :       97 from      100 (     100-0       ) [ 97.00 %], false    3 from reco.      100 (      97+3   ) [  3.00 %]
 PrimaryVertexChecker_6ecf8c4f          INFO 13 2MCPV                  :       99 from      100 (     100-0       ) [ 99.00 %], false    2 from reco.      101 (      99+2   ) [  1.98 %]
 PrimaryVertexChecker_6ecf8c4f          INFO 14 3MCPV                  :       90 from       93 (     100-7       ) [ 96.77 %], false    1 from reco.       91 (      90+1   ) [  1.10 %]
 PrimaryVertexChecker_6ecf8c4f          INFO 15 4MCPV                  :       75 from       78 (      96-18      ) [ 96.15 %], false    2 from reco.       77 (      75+2   ) [  2.60 %]
 PrimaryVertexChecker_6ecf8c4f          INFO 16 5MCPV                  :       54 from       57 (      84-27      ) [ 94.74 %], false    1 from reco.       55 (      54+1   ) [  1.82 %]
 PrimaryVertexChecker_6ecf8c4f          INFO
-PrimaryVertexChecker_6ecf8c4f          INFO 00 all                    : av. PV tracks:  39.55 [MC:  37.12]
-PrimaryVertexChecker_6ecf8c4f          INFO 01 isolated               : av. PV tracks:  36.38 [MC:  35.55]
+PrimaryVertexChecker_6ecf8c4f          INFO 00 all                    : av. PV tracks:  39.54 [MC:  37.12]
+PrimaryVertexChecker_6ecf8c4f          INFO 01 isolated               : av. PV tracks:  36.37 [MC:  35.55]
 PrimaryVertexChecker_6ecf8c4f          INFO 02 close                  : av. PV tracks:  44.02 [MC:  39.12]
-PrimaryVertexChecker_6ecf8c4f          INFO 03 ntracks<10             : av. PV tracks:   9.37 [MC:   6.44]
-PrimaryVertexChecker_6ecf8c4f          INFO 04 ntracks>=10            : av. PV tracks:  42.04 [MC:  40.30]
-PrimaryVertexChecker_6ecf8c4f          INFO 05 z<-50.0                : av. PV tracks:  34.46 [MC:  32.43]
-PrimaryVertexChecker_6ecf8c4f          INFO 06 z in (-50.0, 50.0)     : av. PV tracks:  39.78 [MC:  36.99]
+PrimaryVertexChecker_6ecf8c4f          INFO 03 ntracks<10             : av. PV tracks:   9.34 [MC:   6.44]
+PrimaryVertexChecker_6ecf8c4f          INFO 04 ntracks>=10            : av. PV tracks:  42.03 [MC:  40.30]
+PrimaryVertexChecker_6ecf8c4f          INFO 05 z<-50.0                : av. PV tracks:  34.45 [MC:  32.43]
+PrimaryVertexChecker_6ecf8c4f          INFO 06 z in (-50.0, 50.0)     : av. PV tracks:  39.77 [MC:  36.99]
 PrimaryVertexChecker_6ecf8c4f          INFO 07 z >=50.0               : av. PV tracks:  43.93 [MC:  42.06]
-PrimaryVertexChecker_6ecf8c4f          INFO 08 decayBeauty            : av. PV tracks:  87.67 [MC:  86.00]
+PrimaryVertexChecker_6ecf8c4f          INFO 08 decayBeauty            : av. PV tracks:  87.83 [MC:  86.00]
 PrimaryVertexChecker_6ecf8c4f          INFO 09 decayCharm             : av. PV tracks:  65.99 [MC:  62.11]
-PrimaryVertexChecker_6ecf8c4f          INFO 10 decayStrange           : av. PV tracks:  39.55 [MC:  37.12]
+PrimaryVertexChecker_6ecf8c4f          INFO 10 decayStrange           : av. PV tracks:  39.54 [MC:  37.12]
 PrimaryVertexChecker_6ecf8c4f          INFO 11 other                  : av. PV tracks:   0.00 [MC:   0.00]
-PrimaryVertexChecker_6ecf8c4f          INFO 12 1MCPV                  : av. PV tracks:  72.26 [MC:  72.92]
-PrimaryVertexChecker_6ecf8c4f          INFO 13 2MCPV                  : av. PV tracks:  48.25 [MC:  48.54]
-PrimaryVertexChecker_6ecf8c4f          INFO 14 3MCPV                  : av. PV tracks:  33.56 [MC:  32.14]
+PrimaryVertexChecker_6ecf8c4f          INFO 12 1MCPV                  : av. PV tracks:  72.22 [MC:  72.92]
+PrimaryVertexChecker_6ecf8c4f          INFO 13 2MCPV                  : av. PV tracks:  48.30 [MC:  48.54]
+PrimaryVertexChecker_6ecf8c4f          INFO 14 3MCPV                  : av. PV tracks:  33.53 [MC:  32.14]
 PrimaryVertexChecker_6ecf8c4f          INFO 15 4MCPV                  : av. PV tracks:  28.43 [MC:  24.96]
-PrimaryVertexChecker_6ecf8c4f          INFO 16 5MCPV                  : av. PV tracks:  24.52 [MC:  20.95]
+PrimaryVertexChecker_6ecf8c4f          INFO 16 5MCPV                  : av. PV tracks:  24.54 [MC:  20.95]
 PrimaryVertexChecker_6ecf8c4f          INFO
-PrimaryVertexChecker_6ecf8c4f          INFO 1_res_all                 :  x: +0.014, y: +0.013, z: +0.091
-PrimaryVertexChecker_6ecf8c4f          INFO 2_res_ntracks<10          :  x: +0.028, y: +0.025, z: +0.187
-PrimaryVertexChecker_6ecf8c4f          INFO 3_res_ntracks(10,30)      :  x: +0.016, y: +0.015, z: +0.105
+PrimaryVertexChecker_6ecf8c4f          INFO 1_res_all                 :  x: +0.014, y: +0.013, z: +0.092
+PrimaryVertexChecker_6ecf8c4f          INFO 2_res_ntracks<10          :  x: +0.029, y: +0.025, z: +0.188
+PrimaryVertexChecker_6ecf8c4f          INFO 3_res_ntracks(10,30)      :  x: +0.016, y: +0.015, z: +0.106
 PrimaryVertexChecker_6ecf8c4f          INFO 4_res_ntracks>30          :  x: +0.008, y: +0.007, z: +0.043
-PrimaryVertexChecker_6ecf8c4f          INFO 5_res_z<-50               :  x: +0.016, y: +0.015, z: +0.119
+PrimaryVertexChecker_6ecf8c4f          INFO 5_res_z<-50               :  x: +0.016, y: +0.015, z: +0.121
 PrimaryVertexChecker_6ecf8c4f          INFO 6_res_z(-50,50)           :  x: +0.014, y: +0.013, z: +0.089
-PrimaryVertexChecker_6ecf8c4f          INFO 7_res_z>50                :  x: +0.011, y: +0.013, z: +0.058
+PrimaryVertexChecker_6ecf8c4f          INFO 7_res_z>50                :  x: +0.011, y: +0.013, z: +0.059
 PrimaryVertexChecker_6ecf8c4f          INFO
-PrimaryVertexChecker_6ecf8c4f          INFO 1_pull_width_all          :  x: +1.115, y: +1.104, z: +1.181
-PrimaryVertexChecker_6ecf8c4f          INFO 1_pull_mean_all           :  x: -0.033, y: +0.046, z: +0.039
+PrimaryVertexChecker_6ecf8c4f          INFO 1_pull_width_all          :  x: +1.116, y: +1.107, z: +1.186
+PrimaryVertexChecker_6ecf8c4f          INFO 1_pull_mean_all           :  x: -0.033, y: +0.045, z: +0.042
 PrimaryVertexChecker_6ecf8c4f          INFO
 PrimaryVertexChecker_6ecf8c4f       SUCCESS Booked 2 N-Tuples and 0 Event Tag Collections
 PrimaryVertexChecker_6ecf8c4f       SUCCESS List of booked N-Tuples in directory "FILE1/PrimaryVertexChecker_6ecf8c4f"
@@ -61,7 +61,7 @@ ApplicationMgr                         INFO Application Manager Finalized succes
 ApplicationMgr                         INFO Application Manager Terminated successfully
 GaudiAllenPVsToPrimaryVertexCont...    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Nb PVs"                                        |       100 |        511 |     5.1100 |
+ | "Nb PVs"                                        |       100 |        512 |     5.1200 |
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |       100 |
@@ -80,37 +80,37 @@ VeloRetinaClusterTrackingSIMD_66...    INFO Number of counters : 2
  | "Nb of Produced Tracks"                         |       100 |      23441 |     234.41 |
 fromV3TrackV1Track_8cb534ec            INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Nb of Produced Tracks"                         |       100 |      15095 |     150.95 |
+ | "Nb of Produced Tracks"                         |       100 |      15093 |     150.93 |
 fromV3TrackV1Track_ccafc722            INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Nb of Produced Tracks"                         |       100 |       9183 |     91.830 |
+ | "Nb of Produced Tracks"                         |       100 |       9184 |     91.840 |
 pv_beamline_cleanup                    INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "n_PVs"                                         |        99 |        503 |     5.0808 |
+ | "n_PVs"                                         |        99 |        504 |     5.0909 |
 velo_consolidate_tracks                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "n_velo_tracks"                                 |       100 |      24278 |     242.78 |
+ | "n_velo_tracks"                                 |       100 |      24277 |     242.77 |
 TransposeRawBanks_d381aaa1             INFO 1D histograms in directory "TransposeRawBanks_d381aaa1" : 1
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | VP                                            | "VP"                                          |      20800 |     91.976 | 53.082     |     1.1414 |     2.4252 |
 pv_beamline_cleanup                    INFO 1D histograms in directory "pv_beamline_cleanup" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | n_pvs_event                                   | "n_pvs_event"                                 |         99 |     5.0808 | 2.0581     |    0.86467 |     1.1447 |
+ | n_pvs_event                                   | "n_pvs_event"                                 |         99 |     5.0909 | 2.0797     |    0.88957 |     1.1469 |
  | n_smog2_PVs                                   | "n_smog2_PVs"                                 |         99 |          0 | 0.0000     |          0 |          0 |
- | pv_x                                          | "pv_x"                                        |        502 |-0.00090837 | 0.029226   |    0.22571 |     0.2503 |
- | pv_y                                          | "pv_y"                                        |        502 | 0.00014343 | 0.028860   |    0.12825 |     1.1008 |
- | pv_z                                          | "pv_z"                                        |        502 |   -0.77769 | 62.999     |  -0.053897 |   -0.18087 |
+ | pv_x                                          | "pv_x"                                        |        503 |-0.00071173 | 0.029348   |    0.24018 |     0.2636 |
+ | pv_y                                          | "pv_y"                                        |        503 |  0.0002664 | 0.029120   |    0.15568 |     1.0692 |
+ | pv_z                                          | "pv_z"                                        |        503 |   -0.91968 | 63.019     |  -0.049807 |    -0.1869 |
 velo_consolidate_tracks                INFO 1D histograms in directory "velo_consolidate_tracks" : 1
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | n_velo_tracks_event                           | "n_velo_tracks_event"                         |        100 |     242.78 | 126.91     |    0.60024 |  -0.089309 |
+ | n_velo_tracks_event                           | "n_velo_tracks_event"                         |        100 |     242.77 | 126.90     |    0.60048 |  -0.088683 |
 velo_kalman_filter                     INFO 1D histograms in directory "velo_kalman_filter" : 9
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | velo_backward_track_eta                       | "#backward_eta"                               |       9183 |    -3.0023 | 0.79897    |   0.012368 |   -0.72527 |
- | velo_backward_track_nhits                     | "backward N. hits / track"                    |       9183 |     4.5761 | 1.3768     |     1.2732 |     2.4019 |
- | velo_backward_track_phi                       | "#backward_phi"                               |       9183 | 0.00029674 | 1.8049     |  -0.014911 |    -1.1806 |
- | velo_forward_track_eta                        | "#forward_eta"                                |      15095 |     3.2637 | 1.0895     |     0.1205 |   -0.97983 |
- | velo_forward_track_nhits                      | "forward N. hits / track"                     |      15095 |     7.3149 | 3.4654     |    0.58595 |   -0.59118 |
- | velo_forward_track_phi                        | "#forward_phi"                                |      15095 |  0.0010484 | 1.8141     |  -0.011629 |    -1.1992 |
- | velo_total_track_eta                          | "#total_eta"                                  |      24278 |    0.89361 | 3.1958     |   -0.35429 |    -1.4984 |
- | velo_total_track_nhits                        | "total N. hits / track"                       |      24278 |     6.2789 | 3.1540     |     1.1086 |    0.45651 |
- | velo_total_track_phi                          | "#total_phi"                                  |      24278 | 0.00076407 | 1.8106     |  -0.012856 |    -1.1922 |
+ | velo_backward_track_eta                       | "#backward_eta"                               |       9184 |    -3.0025 | 0.79916    |   0.011738 |   -0.72444 |
+ | velo_backward_track_nhits                     | "backward N. hits / track"                    |       9184 |      4.576 | 1.3767     |     1.2734 |     2.4026 |
+ | velo_backward_track_phi                       | "#backward_phi"                               |       9184 | 0.00033754 | 1.8048     |  -0.014982 |    -1.1804 |
+ | velo_forward_track_eta                        | "#forward_eta"                                |      15093 |     3.2635 | 1.0895     |    0.12055 |   -0.97981 |
+ | velo_forward_track_nhits                      | "forward N. hits / track"                     |      15093 |     7.3154 | 3.4652     |    0.58585 |   -0.59122 |
+ | velo_forward_track_phi                        | "#forward_phi"                                |      15093 | 0.00085967 | 1.8141     |  -0.011566 |    -1.1992 |
+ | velo_total_track_eta                          | "#total_eta"                                  |      24277 |     0.8931 | 3.1959     |   -0.35414 |    -1.4986 |
+ | velo_total_track_nhits                        | "total N. hits / track"                       |      24277 |     6.2791 | 3.1539     |     1.1086 |    0.45651 |
+ | velo_total_track_phi                          | "#total_phi"                                  |      24277 | 0.00066215 | 1.8106     |  -0.012844 |    -1.1922 |
diff --git a/Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_ut_with_mcchecking.ref.x86_64_v3-opt b/Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_ut_with_mcchecking.ref.x86_64_v3-opt
index 92d6daddbd82b29f89f979ac9787de0956c5cf07..df0d7fea0856fb9a2eee692cb117ad9a91cc4d23 100644
--- a/Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_ut_with_mcchecking.ref.x86_64_v3-opt
+++ b/Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_ut_with_mcchecking.ref.x86_64_v3-opt
@@ -58,7 +58,7 @@ pv_beamline_cleanup                    INFO Number of counters : 1
  | "n_PVs"                                         |      1000 |       5107 |     5.1070 |
 scifi_consolidate_seeds_matching       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "n_seed_tracks"                                 |      1000 |      81410 |     81.410 |
+ | "n_seed_tracks"                                 |      1000 |      81411 |     81.411 |
 velo_consolidate_tracks                INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "n_velo_tracks"                                 |      1000 |     249202 |     249.20 |
@@ -105,11 +105,11 @@ pv_beamline_cleanup                    INFO 1D histograms in directory "pv_beaml
  | pv_z                                          | "pv_z"                                        |       5101 |    0.44921 | 59.423     |  -0.037847 |   -0.10531 |
 scifi_consolidate_seeds_matching       INFO 1D histograms in directory "scifi_consolidate_seeds_matching" : 5
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | n_scifi_seeds_event                           | "n_scifi_seeds_event"                         |       1000 |      81.41 | 53.965     |     1.3147 |      2.534 |
- | scifi_track_eta                               | "#eta"                                        |      81410 |     2.6536 | 0.73499    |     0.6549 |     0.3687 |
- | scifi_track_nhits                             | "N. hits / track"                             |      81410 |     11.433 | 0.74658    |   -0.89392 |   -0.65947 |
- | scifi_track_phi                               | "#phi"                                        |      81410 |  0.0045676 | 2.0507     | -0.0032593 |    -1.0151 |
- | scifi_track_qop                               | "q/p"                                         |      81410 | -1.993e-06 | 0.00016279 |  0.0053288 |   -0.86142 |
+ | n_scifi_seeds_event                           | "n_scifi_seeds_event"                         |       1000 |     81.411 | 53.966     |     1.3146 |     2.5336 |
+ | scifi_track_eta                               | "#eta"                                        |      81411 |     2.6536 | 0.73500    |    0.65488 |    0.36866 |
+ | scifi_track_nhits                             | "N. hits / track"                             |      81411 |     11.433 | 0.74660    |   -0.89388 |   -0.65957 |
+ | scifi_track_phi                               | "#phi"                                        |      81411 |   0.004566 | 2.0507     |  -0.003257 |    -1.0151 |
+ | scifi_track_qop                               | "q/p"                                         |      81411 |-1.9903e-06 | 0.00016279 |  0.0053086 |   -0.86144 |
 velo_consolidate_tracks                INFO 1D histograms in directory "velo_consolidate_tracks" : 1
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | n_velo_tracks_event                           | "n_velo_tracks_event"                         |       1000 |      249.2 | 138.92     |    0.80213 |    0.76952 |
diff --git a/Hlt/RecoConf/tests/refs/compare_hlt1_hlt2_ut_decoding_with_mcchecking.ref b/Hlt/RecoConf/tests/refs/compare_hlt1_hlt2_ut_decoding_with_mcchecking.ref
index 74a5600f2b9255d6d378f5c39ca658cdb35f7681..228937c3fc2de03ab502a99980d6158f38cc0405 100644
--- a/Hlt/RecoConf/tests/refs/compare_hlt1_hlt2_ut_decoding_with_mcchecking.ref
+++ b/Hlt/RecoConf/tests/refs/compare_hlt1_hlt2_ut_decoding_with_mcchecking.ref
@@ -3,11 +3,11 @@ ApplicationMgr                         INFO Application Manager Terminated succe
 CompareRecAllenUTHits_7b388156         INFO Number of counters : 6
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"UT Adc max size 128: Allen-to-Rec LHCbID match"|   1088091 |    1088091 |( 100.0000 +- 0.000000)% |
- |*"UT Adc max size 128: Allen-to-Rec overlap"     |   1088091 |    1075983 |( 98.88723 +- 0.01005637)% |
+ |*"UT Adc max size 128: Allen-to-Rec overlap"     |   1088091 |    1075976 |( 98.88658 +- 0.01005924)% |
  | "UT Adc max size 128: Number of Allen Hit"      |   1088091 |
  | "UT Adc max size 128: Number of Rec Hit"        |   1088091 |
  |*"UT Adc max size 128: Rec-to-Allen LHCbID match"|   1088091 |    1088091 |( 100.0000 +- 0.000000)% |
- |*"UT Adc max size 128: Rec-to-Allen overlap"     |   1088091 |    1075983 |( 98.88723 +- 0.01005637)% |
+ |*"UT Adc max size 128: Rec-to-Allen overlap"     |   1088091 |    1075976 |( 98.88658 +- 0.01005924)% |
 CompareRecAllenUTHits_99f53d2b         INFO Number of counters : 6
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"UT Geo max size 4: Allen-to-Rec LHCbID match"  |   1064084 |    1064084 |( 100.0000 +- 0.000000)% |
@@ -35,11 +35,11 @@ CompareRecAllenUTHits_c80103d7         INFO Number of counters : 6
 CompareRecAllenUTHits_d73f6f8d         INFO Number of counters : 6
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  |*"UT Adc max size 4: Allen-to-Rec LHCbID match"  |   1064084 |    1064084 |( 100.0000 +- 0.000000)% |
- |*"UT Adc max size 4: Allen-to-Rec overlap"       |   1064084 |    1053523 |( 99.00750 +- 0.009609718)% |
+ |*"UT Adc max size 4: Allen-to-Rec overlap"       |   1064084 |    1053512 |( 99.00647 +- 0.009614672)% |
  | "UT Adc max size 4: Number of Allen Hit"        |   1064084 |
  | "UT Adc max size 4: Number of Rec Hit"          |   1064084 |
  |*"UT Adc max size 4: Rec-to-Allen LHCbID match"  |   1064084 |    1064084 |( 100.0000 +- 0.000000)% |
- |*"UT Adc max size 4: Rec-to-Allen overlap"       |   1064084 |    1053523 |( 99.00750 +- 0.009609718)% |
+ |*"UT Adc max size 4: Rec-to-Allen overlap"       |   1064084 |    1053512 |( 99.00647 +- 0.009614672)% |
 HLTControlFlowMgr                      INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "Processed events"                              |      1000 |
diff --git a/Hlt/RecoConf/tests/refs/hlt1_pvs_with_beamspotmoni_2023.ref b/Hlt/RecoConf/tests/refs/hlt1_pvs_with_beamspotmoni_2023.ref
index 288e1206d31b24d87b6e808b8b4b9ddb99a65aa2..b0e4b9ffae99ddbe82517eac6937dd6854e0f61b 100644
--- a/Hlt/RecoConf/tests/refs/hlt1_pvs_with_beamspotmoni_2023.ref
+++ b/Hlt/RecoConf/tests/refs/hlt1_pvs_with_beamspotmoni_2023.ref
@@ -4,9 +4,9 @@ BeamSpotMonitor                        INFO Number of counters : 6
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "PV x * y for covariance"                       |        92 |   169.6137 |     1.8436 |
  | "PV x position"                                 |        92 |   118.6231 |     1.2894 |   0.037580 |
- | "PV y * z for covariance"                       |        92 |     3338.8 |     36.291 |
- | "PV y position"                                 |        92 |   131.5179 |     1.4295 |   0.035012 |
- | "PV z * x for covariance"                       |        92 |   3041.191 |     33.056 |
+ | "PV y * z for covariance"                       |        92 |   3338.799 |     36.291 |
+ | "PV y position"                                 |        92 |   131.5179 |     1.4295 |   0.035013 |
+ | "PV z * x for covariance"                       |        92 |    3041.19 |     33.056 |
  | "PV z position"                                 |        92 |   2396.029 |     26.044 |     43.764 |
 DefaultGECFilter                       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
@@ -46,13 +46,13 @@ BeamSpotMonitor                        INFO 1D histograms in directory "BeamSpot
  | CondDelSpreadYZ                               | "Conditions IR Spread relative to publish..." |          2 |       0.05 | 0.0000     |          0 |          0 |
  | CondDelSpreadZX                               | "Conditions IR Spread relative to publish..." |          2 |       0.05 | 0.0000     |          0 |          0 |
  | CondDelSpreadZZ                               | "Conditions IR Spread relative to publish..." |          2 |         10 | 0.0000     |          0 |          0 |
- | CondPosX                                      | "Conditions IR Position X (published and ..." |          2 |       1.21 | 0.080000   |          0 |         -2 |
- | CondPosY                                      | "Conditions IR Position Y (published and ..." |          2 |       1.44 | 0.010000   |-8.8818e-10 |         -2 |
+ | CondPosX                                      | "Conditions IR Position X (published and ..." |          2 |       1.21 | 0.080000   |-2.0742e-12 |         -2 |
+ | CondPosY                                      | "Conditions IR Position Y (published and ..." |          2 |       1.44 | 0.010000   |-6.6972e-10 |         -2 |
  | CondPosZ                                      | "Conditions IR Position Z (published and ..." |          2 |         19 | 0.0000     |          0 |          0 |
  | CondSpreadXX                                  | "Conditions IR Spread XX (published and u..." |          2 |    0.00125 | 0.0000     |          0 |          0 |
  | CondSpreadXY                                  | "Conditions IR Spread XY (published and u..." |          2 |      0.001 | 0.0000     |          0 |          0 |
- | CondSpreadYY                                  | "Conditions IR Spread YY (published and u..." |          2 |    0.05125 | 0.050000   |          0 |         -2 |
- | CondSpreadYZ                                  | "Conditions IR Spread YZ (published and u..." |          2 |       -0.7 | 0.42500    |-1.4463e-15 |         -2 |
+ | CondSpreadYY                                  | "Conditions IR Spread YY (published and u..." |          2 |    0.05125 | 0.050000   | 4.1379e-16 |         -2 |
+ | CondSpreadYZ                                  | "Conditions IR Spread YZ (published and u..." |          2 |       -0.7 | 0.42500    | 7.5711e-16 |         -2 |
  | CondSpreadZX                                  | "Conditions IR Spread ZX (published and u..." |          2 |     -0.125 | 0.0000     |          0 |          0 |
  | CondSpreadZZ                                  | "Conditions IR Spread ZZ (published and u..." |          2 |       2075 | 20.000     |          0 |         -2 |
  | NumPrimaryVertices                            | "Primary vertices per event;Number of PVs..." |        500 |      0.984 | 0.68684    |    0.46495 |    0.45515 |