From f94951065c93f3dd88fa5d7329c1c71ddb433aab Mon Sep 17 00:00:00 2001
From: Rosen Matev <rosen.matev@cern.ch>
Date: Wed, 28 Sep 2022 22:53:30 +0200
Subject: [PATCH] Revert "Merge branch 'mstahl_gaudiallentests' into 'master'"
This reverts commit db0b8a47a0c633bd796718a80aeaa99fdb471e4f, reversing
changes made to 5dd841265aa8f19e0531ea6eb9a1324e335bc43d.
---
Hlt/RecoConf/options/allen_gaudi_forward.py | 43 +++++--
.../options/allen_gaudi_seed_and_match.py | 55 ---------
Hlt/RecoConf/options/allen_gaudi_velo_ut.py | 53 --------
.../hlt1_reco_allen_track_reconstruction.py | 45 +++++++
Hlt/RecoConf/python/RecoConf/hlt1_allen.py | 115 ++----------------
Hlt/RecoConf/python/RecoConf/mc_checking.py | 21 +---
.../allen_gaudi_forward_with_mcchecking.qmt | 1 -
.../allen_gaudi_velo_ut_with_mcchecking.qmt | 35 ------
...cchecking.qmt => hlt1_reco_allen_xdst.qmt} | 17 ++-
.../allen_gaudi_forward_with_mcchecking.ref | 29 ++---
..._forward_with_mcchecking.ref.x86_64_v3-opt | 29 ++---
...n_gaudi_seed_and_match_with_mcchecking.ref | 33 -----
...nd_match_with_mcchecking.ref.x86_64_v3-opt | 33 -----
.../allen_gaudi_velo_ut_with_mcchecking.ref | 42 -------
..._velo_ut_with_mcchecking.ref.x86_64_v3-opt | 42 -------
15 files changed, 123 insertions(+), 470 deletions(-)
delete mode 100644 Hlt/RecoConf/options/allen_gaudi_seed_and_match.py
delete mode 100644 Hlt/RecoConf/options/allen_gaudi_velo_ut.py
create mode 100644 Hlt/RecoConf/options/hlt1_reco_allen_track_reconstruction.py
delete mode 100644 Hlt/RecoConf/tests/qmtest/allen_gaudi_velo_ut_with_mcchecking.qmt
rename Hlt/RecoConf/tests/qmtest/{allen_gaudi_seed_and_match_with_mcchecking.qmt => hlt1_reco_allen_xdst.qmt} (65%)
delete mode 100644 Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_mcchecking.ref
delete mode 100644 Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_mcchecking.ref.x86_64_v3-opt
delete mode 100644 Hlt/RecoConf/tests/refs/allen_gaudi_velo_ut_with_mcchecking.ref
delete mode 100644 Hlt/RecoConf/tests/refs/allen_gaudi_velo_ut_with_mcchecking.ref.x86_64_v3-opt
diff --git a/Hlt/RecoConf/options/allen_gaudi_forward.py b/Hlt/RecoConf/options/allen_gaudi_forward.py
index 26fc77eab45..8b4f9e360bb 100644
--- a/Hlt/RecoConf/options/allen_gaudi_forward.py
+++ b/Hlt/RecoConf/options/allen_gaudi_forward.py
@@ -8,21 +8,28 @@
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
-from PyConf.Algorithms import VPRetinaFullClustering
from Moore.config import Reconstruction
from Moore.config import run_allen_reconstruction
from Moore import options
-from RecoConf.hlt1_allen import make_allen_forward_tracks
-from RecoConf.hlt1_tracking import make_velo_full_clusters
-from RecoConf.event_filters import require_gec
-from RecoConf.mc_checking import (
- check_tracking_efficiency, make_links_tracks_mcparticles,
- make_links_lhcbids_mcparticles_tracking_system)
-from RecoConf.mc_checking_categories import (get_mc_categories,
- get_hit_type_mask)
+
+
+def make_allen_forward_tracks():
+ from PyConf.Algorithms import (
+ LHCb__Converters__Track__v1__fromV2TrackV1Track as FromV2TrackV1Track)
+ import RecoConf.hlt1_allen
+
+ default_tracks = RecoConf.hlt1_allen.make_allen_forward_tracks()
+
+ forward_tracks_v1 = FromV2TrackV1Track(
+ InputTracksName=default_tracks['v2']).OutputTracksName
+
+ return {'v2': default_tracks['v2'], 'v1': forward_tracks_v1}
def make_reconstruction():
+ from RecoConf.event_filters import require_gec
+ from RecoConf.mc_checking import check_tracking_efficiency, make_links_tracks_mcparticles, make_links_lhcbids_mcparticles_tracking_system
+ from RecoConf.mc_checking_categories import get_mc_categories, get_hit_type_mask
forward_tracks = make_allen_forward_tracks()
@@ -31,14 +38,14 @@ def make_reconstruction():
# build the PrChecker algorihm for forward track
links_to_forward_tracks = make_links_tracks_mcparticles(
- InputTracks=forward_tracks["v1keyed"], LinksToLHCbIDs=links_to_lhcbids)
+ InputTracks=forward_tracks, LinksToLHCbIDs=links_to_lhcbids)
pr_checker_for_forward_track = check_tracking_efficiency(
TrackType="Forward",
- InputTracks=forward_tracks["v1keyed"],
+ InputTracks=forward_tracks,
LinksToTracks=links_to_forward_tracks,
LinksToLHCbIDs=links_to_lhcbids,
- MCCategories=get_mc_categories("BestLong"),
+ MCCategories=get_mc_categories("MuonMatch"),
HitTypesToCheck=get_hit_type_mask("BestLong"),
)
@@ -46,8 +53,18 @@ def make_reconstruction():
[require_gec()])
+options.set_input_from_testfiledb('upgrade_DC19_01_MinBiasMD')
+options.set_conds_from_testfiledb('upgrade_DC19_01_MinBiasMD')
+
options.evt_max = 100
+from RecoConf.decoders import default_ft_decoding_version
+default_ft_decoding_version.global_bind(value=6)
+
+from PyConf.application import configure_input
+config = configure_input(options)
+
options.histo_file = "Hlt1ForwardTrackingResolutionAllen.root"
-with make_velo_full_clusters.bind(make_full_cluster=VPRetinaFullClustering):
+from AllenConf.velo_reconstruction import decode_velo
+with decode_velo.bind(retina_decoding=False):
run_allen_reconstruction(options, make_reconstruction)
diff --git a/Hlt/RecoConf/options/allen_gaudi_seed_and_match.py b/Hlt/RecoConf/options/allen_gaudi_seed_and_match.py
deleted file mode 100644
index 747d07b249e..00000000000
--- a/Hlt/RecoConf/options/allen_gaudi_seed_and_match.py
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration #
-# #
-# This software is distributed under the terms of the GNU General Public #
-# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
-# #
-# In applying this licence, CERN does not waive the privileges and immunities #
-# granted to it by virtue of its status as an Intergovernmental Organization #
-# or submit itself to any jurisdiction. #
-###############################################################################
-from PyConf.Algorithms import VPRetinaFullClustering
-from Moore.config import Reconstruction
-from Moore.config import run_allen_reconstruction
-from Moore import options
-from RecoConf.hlt1_allen import make_allen_seed_and_match_tracks
-from RecoConf.hlt1_tracking import make_velo_full_clusters
-from RecoConf.event_filters import require_gec
-from RecoConf.mc_checking import (check_tracking_efficiency,
- make_links_tracks_mcparticles,
- make_links_lhcbids_mcparticles_VP_FT)
-from RecoConf.mc_checking_categories import (get_mc_categories,
- get_hit_type_mask)
-
-
-def make_reconstruction():
-
- seed_and_match_tracks = make_allen_seed_and_match_tracks()
-
- # make links to lhcb id for mc matching
- links_to_lhcbids = make_links_lhcbids_mcparticles_VP_FT()
-
- # build the PrChecker algorihm for forward track
- links_to_seed_and_match_tracks = make_links_tracks_mcparticles(
- InputTracks=seed_and_match_tracks["v1keyed"],
- LinksToLHCbIDs=links_to_lhcbids)
-
- pr_checker_for_seed_and_match_track = check_tracking_efficiency(
- TrackType="SeedAndMatch",
- InputTracks=seed_and_match_tracks["v1keyed"],
- LinksToTracks=links_to_seed_and_match_tracks,
- LinksToLHCbIDs=links_to_lhcbids,
- MCCategories=get_mc_categories("BestLong"),
- HitTypesToCheck=get_hit_type_mask("BestLong"),
- )
-
- return Reconstruction("track_efficiency",
- [pr_checker_for_seed_and_match_track],
- [require_gec()])
-
-
-options.evt_max = 100
-options.histo_file = "Hlt1SeedAndMatchTrackingResolutionAllen.root"
-
-with make_velo_full_clusters.bind(make_full_cluster=VPRetinaFullClustering):
- run_allen_reconstruction(options, make_reconstruction)
diff --git a/Hlt/RecoConf/options/allen_gaudi_velo_ut.py b/Hlt/RecoConf/options/allen_gaudi_velo_ut.py
deleted file mode 100644
index 426f1a10a46..00000000000
--- a/Hlt/RecoConf/options/allen_gaudi_velo_ut.py
+++ /dev/null
@@ -1,53 +0,0 @@
-###############################################################################
-# (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration #
-# #
-# This software is distributed under the terms of the GNU General Public #
-# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
-# #
-# In applying this licence, CERN does not waive the privileges and immunities #
-# granted to it by virtue of its status as an Intergovernmental Organization #
-# or submit itself to any jurisdiction. #
-###############################################################################
-from PyConf.Algorithms import VPRetinaFullClustering
-from Moore.config import Reconstruction
-from Moore.config import run_allen_reconstruction
-from Moore import options
-from RecoConf.hlt1_allen import make_allen_velo_ut_tracks
-from RecoConf.hlt1_tracking import make_velo_full_clusters
-from RecoConf.event_filters import require_gec
-from RecoConf.mc_checking import (check_tracking_efficiency,
- make_links_tracks_mcparticles,
- make_links_lhcbids_mcparticles_VP_UT)
-from RecoConf.mc_checking_categories import (get_mc_categories,
- get_hit_type_mask)
-
-
-def make_reconstruction():
-
- velo_ut_tracks = make_allen_velo_ut_tracks()
-
- # make links to lhcb id for mc matching
- links_to_lhcbids = make_links_lhcbids_mcparticles_VP_UT()
-
- # build the PrChecker algorihm for forward track
- links_to_velo_ut_tracks = make_links_tracks_mcparticles(
- InputTracks=velo_ut_tracks["v1keyed"], LinksToLHCbIDs=links_to_lhcbids)
-
- pr_checker_for_velo_ut_track = check_tracking_efficiency(
- TrackType="VeloUT",
- InputTracks=velo_ut_tracks["v1keyed"],
- LinksToTracks=links_to_velo_ut_tracks,
- LinksToLHCbIDs=links_to_lhcbids,
- MCCategories=get_mc_categories("Upstream"),
- HitTypesToCheck=get_hit_type_mask("Upstream"),
- )
-
- return Reconstruction("track_efficiency", [pr_checker_for_velo_ut_track],
- [require_gec()])
-
-
-options.evt_max = 100
-options.histo_file = "Hlt1VeloUTTrackingResolutionAllen.root"
-
-with make_velo_full_clusters.bind(make_full_cluster=VPRetinaFullClustering):
- run_allen_reconstruction(options, make_reconstruction)
diff --git a/Hlt/RecoConf/options/hlt1_reco_allen_track_reconstruction.py b/Hlt/RecoConf/options/hlt1_reco_allen_track_reconstruction.py
new file mode 100644
index 00000000000..9d917e04138
--- /dev/null
+++ b/Hlt/RecoConf/options/hlt1_reco_allen_track_reconstruction.py
@@ -0,0 +1,45 @@
+###############################################################################
+# (c) Copyright 2019 CERN for the benefit of the LHCb Collaboration #
+# #
+# This software is distributed under the terms of the GNU General Public #
+# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
+# #
+# In applying this licence, CERN does not waive the privileges and immunities #
+# granted to it by virtue of its status as an Intergovernmental Organization #
+# or submit itself to any jurisdiction. #
+###############################################################################
+from Moore import options, run_allen_reconstruction
+from Moore.config import Reconstruction
+from RecoConf.event_filters import require_gec
+from RecoConf.hlt1_allen import make_allen_forward_tracks
+from RecoConf.mc_checking import check_tracking_efficiency, make_links_tracks_mcparticles, make_links_lhcbids_mcparticles_tracking_system
+from RecoConf.mc_checking_categories import get_mc_categories, get_hit_type_mask
+from AllenConf.velo_reconstruction import decode_velo
+
+
+def hlt1_reco_allen_tracks():
+
+ # make links to lhcb id for mc matching
+ links_to_lhcbids = make_links_lhcbids_mcparticles_tracking_system()
+
+ # build the PrChecker algorihm for forward track
+ forward_tracks = make_allen_forward_tracks()
+ links_to_forward_tracks = make_links_tracks_mcparticles(
+ InputTracks=forward_tracks['v1keyed'], LinksToLHCbIDs=links_to_lhcbids)
+
+ pr_checker_for_forward_track = check_tracking_efficiency(
+ TrackType="Forward",
+ InputTracks=forward_tracks['v1keyed'],
+ LinksToTracks=links_to_forward_tracks,
+ LinksToLHCbIDs=links_to_lhcbids,
+ MCCategories=get_mc_categories("MuonMatch"),
+ HitTypesToCheck=get_hit_type_mask("BestLong"),
+ )
+
+ return Reconstruction('allen_reco', [pr_checker_for_forward_track],
+ [require_gec()])
+
+
+options.histo_file = "hlt1_allen_track_reconstruction.root"
+with decode_velo.bind(retina_decoding=False):
+ run_allen_reconstruction(options, hlt1_reco_allen_tracks)
diff --git a/Hlt/RecoConf/python/RecoConf/hlt1_allen.py b/Hlt/RecoConf/python/RecoConf/hlt1_allen.py
index 1c557ef9673..249166a07be 100644
--- a/Hlt/RecoConf/python/RecoConf/hlt1_allen.py
+++ b/Hlt/RecoConf/python/RecoConf/hlt1_allen.py
@@ -12,14 +12,8 @@ import importlib
from PyConf import configurable
from PyConf.components import Algorithm
from PyConf.control_flow import CompositeNode
-from PyConf.Algorithms import (
- LHCb__Converters__Track__v1__fromVectorLHCbTrack as
- TrkConvVecV1ToKeyContV1,
- LHCb__Converters__Track__v1__fromV2TrackV1TrackVector as
- FromV2TrackV1Track)
-from AllenConf.hlt1_reconstruction import (hlt1_reconstruction,
- hlt1_reconstruction_matching)
+from AllenConf.hlt1_reconstruction import hlt1_reconstruction
@configurable
@@ -163,7 +157,12 @@ def make_allen_velo_tracks():
Configures the adaptor between the velo tracks reconstructed in
Allen and Gaudi-LHCb tracks.
"""
- from PyConf.Algorithms import GaudiAllenVeloToV2Tracks
+ from PyConf.Algorithms import (
+ GaudiAllenVeloToV2Tracks,
+ LHCb__Converters__Track__v1__fromVectorLHCbTrack as
+ TrkConvVecV1ToKeyContV1,
+ LHCb__Converters__Track__v1__fromV2TrackV1TrackVector as
+ FromV2TrackV1Track)
allen_gaudi_node_barriers() # Configure Allen sequence and apply bindings
@@ -194,58 +193,17 @@ def make_allen_velo_tracks():
}
-def make_allen_velo_ut_tracks():
- """
- Configures the adaptor between the velo tracks reconstructed in
- Allen and Gaudi-LHCb tracks.
- """
- from PyConf.Algorithms import GaudiAllenUTToV2Tracks
-
- allen_gaudi_node_barriers() # Configure Allen sequence and apply bindings
-
- allen_reco = hlt1_reconstruction()
-
- # Velo reconstruction
- velo_tracks = allen_reco["velo_tracks"]
- velo_states = allen_reco["velo_states"]
- # UT reconstruction
- ut_tracks = allen_reco["ut_tracks"]
-
- ut_tracks_v2 = GaudiAllenUTToV2Tracks(
- offsets_all_velo_tracks=velo_tracks["dev_offsets_all_velo_tracks"],
- offsets_velo_track_hit_number=velo_tracks[
- "dev_offsets_velo_track_hit_number"],
- velo_track_hits=velo_tracks["dev_velo_track_hits"],
- velo_kalman_beamline_states=velo_states[
- "dev_velo_kalman_beamline_states"],
- velo_kalman_endvelo_states=velo_states[
- "dev_velo_kalman_endvelo_states"],
- atomics_ut=ut_tracks["dev_offsets_ut_tracks"],
- ut_track_hit_number=ut_tracks["dev_offsets_ut_track_hit_number"],
- ut_qop=ut_tracks["dev_ut_qop"],
- ut_track_velo_indices=ut_tracks["dev_ut_track_velo_indices"],
- ut_track_hits=ut_tracks["dev_ut_track_hits"],
- ).OutputTracks
-
- ut_tracks_v1 = FromV2TrackV1Track(
- InputTracksName=ut_tracks_v2).OutputTracksName
-
- ut_tracks_v1_keyed = TrkConvVecV1ToKeyContV1(
- InputTracksName=ut_tracks_v1).OutputTracksName
-
- return {
- "v2": ut_tracks_v2,
- "v1": ut_tracks_v1,
- "v1keyed": ut_tracks_v1_keyed
- }
-
-
def make_allen_forward_tracks():
"""
Configures the adaptor between the forward tracks reconstructed in
Allen and Gaudi-LHCb tracks.
"""
- from PyConf.Algorithms import GaudiAllenForwardToV2Tracks
+ from PyConf.Algorithms import (
+ GaudiAllenForwardToV2Tracks,
+ LHCb__Converters__Track__v1__fromVectorLHCbTrack as
+ TrkConvVecV1ToKeyContV1,
+ LHCb__Converters__Track__v1__fromV2TrackV1TrackVector as
+ FromV2TrackV1Track)
allen_gaudi_node_barriers() # Configure Allen sequence and apply bindings
@@ -294,53 +252,6 @@ def make_allen_forward_tracks():
}
-def make_allen_seed_and_match_tracks():
- """
- Configures the adaptor between the seed and match tracks reconstructed in
- Allen and Gaudi-LHCb tracks.
- """
- from PyConf.Algorithms import GaudiAllenSeedAndMatchNoUTToV2Tracks
-
- allen_gaudi_node_barriers() # Configure Allen sequence and apply bindings
-
- allen_reco = hlt1_reconstruction_matching()
-
- # Velo reconstruction
- velo_tracks = allen_reco["velo_tracks"]
- # SciFi reconstruction
- seed_tracks = allen_reco["seeding_tracks"]
- seed_and_match_tracks = allen_reco["long_tracks"]
- # Kalman forward output
- kalman_velo_only = allen_reco["kalman_velo_only"]
-
- seed_and_match_tracks_v2 = GaudiAllenSeedAndMatchNoUTToV2Tracks(
- offsets_all_velo_tracks=velo_tracks["dev_offsets_all_velo_tracks"],
- offsets_velo_track_hit_number=velo_tracks[
- "dev_offsets_velo_track_hit_number"],
- velo_track_hits=velo_tracks["dev_velo_track_hits"],
- atomics_scifi=seed_and_match_tracks["dev_offsets_long_tracks"],
- scifi_track_hit_number=seed_and_match_tracks[
- "dev_offsets_scifi_track_hit_number"],
- scifi_track_hits=seed_and_match_tracks["dev_scifi_track_hits"],
- scifi_track_velo_indices=seed_and_match_tracks[
- "dev_scifi_track_ut_indices"], # sic: see comment in AllenConf/matching_reconstruction.py: naming convention same as in forward so that hlt1 sequence works
- scifi_qop=seed_tracks["dev_seeding_qop"],
- scifi_states=seed_and_match_tracks["dev_scifi_states"],
- kf_tracks=kalman_velo_only["dev_kf_tracks"]).OutputTracks
-
- seed_and_match_tracks_v1 = FromV2TrackV1Track(
- InputTracksName=seed_and_match_tracks_v2).OutputTracksName
-
- seed_and_match_tracks_v1_keyed = TrkConvVecV1ToKeyContV1(
- InputTracksName=seed_and_match_tracks_v1).OutputTracksName
-
- return {
- "v2": seed_and_match_tracks_v2,
- "v1": seed_and_match_tracks_v1,
- "v1keyed": seed_and_match_tracks_v1_keyed
- }
-
-
def make_allen_secondary_vertices():
"""
Configures the adaptor between the secondary vertices reconstructed in
diff --git a/Hlt/RecoConf/python/RecoConf/mc_checking.py b/Hlt/RecoConf/python/RecoConf/mc_checking.py
index 1e2a846907c..0cc85176e8a 100644
--- a/Hlt/RecoConf/python/RecoConf/mc_checking.py
+++ b/Hlt/RecoConf/python/RecoConf/mc_checking.py
@@ -20,11 +20,11 @@ from PyConf.application import (
)
from PyConf.Algorithms import (
VPFullCluster2MCParticleLinker, VPFullCluster2MCHitLinker,
- PrLHCbID2MCParticle, PrLHCbID2MCParticleVP, PrLHCbID2MCParticleVPUT,
- PrLHCbID2MCParticleVPFT, PrLHCbID2MCParticleVPUTFTMU, PrTrackAssociator,
- PrTrackChecker, PrUTHitChecker, TrackListRefiner, TrackResChecker,
- PrMultiplicityChecker, TrackIPResolutionCheckerNT, MCParticle2MCHitAlg,
- PrimaryVertexChecker, PrVPHitsChecker, PrUTHitsChecker, PrFTHitsChecker,
+ PrLHCbID2MCParticle, PrLHCbID2MCParticleVP, PrLHCbID2MCParticleVPUTFTMU,
+ PrLHCbID2MCParticleVPFT, PrTrackAssociator, PrTrackChecker, PrUTHitChecker,
+ TrackListRefiner, TrackResChecker, PrMultiplicityChecker,
+ TrackIPResolutionCheckerNT, MCParticle2MCHitAlg, PrimaryVertexChecker,
+ PrVPHitsChecker, PrUTHitsChecker, PrFTHitsChecker,
TriggerObjectsCompatibilityProfileChecker,
LHCb__Converters__RecVertex__v2__fromVectorLHCbRecVertices as
FromVectorLHCbRecVertex, GaudiAllenPVsToRecVertexV2, PrTrackConverter)
@@ -82,17 +82,6 @@ def make_links_lhcbids_mcparticles_VP():
).TargetName
-@configurable
-def make_links_lhcbids_mcparticles_VP_UT():
- return PrLHCbID2MCParticleVPUT(
- MCParticlesLocation=mc_unpackers()["MCParticles"],
- VPFullClustersLocation=make_velo_full_clusters(),
- VPFullClustersLinkLocation=make_links_veloclusters_mcparticles(),
- UTHitsLocation=make_PrStoreUTHit_hits(),
- UTHitsLinkLocation=boole_links_digits_mcparticles()["UTClusters"],
- ).TargetName
-
-
@configurable
def make_links_lhcbids_mcparticles_VP_FT():
return PrLHCbID2MCParticleVPFT(
diff --git a/Hlt/RecoConf/tests/qmtest/allen_gaudi_forward_with_mcchecking.qmt b/Hlt/RecoConf/tests/qmtest/allen_gaudi_forward_with_mcchecking.qmt
index 5be54bb5162..e6e3f73b2ab 100644
--- a/Hlt/RecoConf/tests/qmtest/allen_gaudi_forward_with_mcchecking.qmt
+++ b/Hlt/RecoConf/tests/qmtest/allen_gaudi_forward_with_mcchecking.qmt
@@ -16,7 +16,6 @@
<extension class="GaudiTest.GaudiExeTest" kind="test">
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set>
- <text>$MOOREROOT/tests/options/default_input_and_conds_hlt1_retinacluster_FTv6.py</text>
<text>$RECOCONFROOT/options/allen_gaudi_forward.py</text>
</set></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
diff --git a/Hlt/RecoConf/tests/qmtest/allen_gaudi_velo_ut_with_mcchecking.qmt b/Hlt/RecoConf/tests/qmtest/allen_gaudi_velo_ut_with_mcchecking.qmt
deleted file mode 100644
index e0262ac4de2..00000000000
--- a/Hlt/RecoConf/tests/qmtest/allen_gaudi_velo_ut_with_mcchecking.qmt
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
-
- This software is distributed under the terms of the GNU General Public
- Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
- In applying this licence, CERN does not waive the privileges and immunities
- granted to it by virtue of its status as an Intergovernmental Organization
- or submit itself to any jurisdiction.
--->
-<!--
- Run Allen VeloUT tracking and apply PrTrackChecker MC tracking efficiency
- checker.
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
-<argument name="program"><text>gaudirun.py</text></argument>
-<argument name="args"><set>
- <text>$MOOREROOT/tests/options/default_input_and_conds_hlt1_retinacluster_FTv6.py</text>
- <text>$RECOCONFROOT/options/allen_gaudi_velo_ut.py</text>
-</set></argument>
-<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
-<argument name="reference"><text>../refs/allen_gaudi_velo_ut_with_mcchecking.ref</text></argument>
-<argument name="error_reference"><text>../refs/empty.ref</text></argument>
-<argument name="validator"><text>
-
-from Moore.qmtest.exclusions import ref_preprocessor
-validateWithReference(preproc = ref_preprocessor)
-
-from Moore.qmtest.exclusions import remove_known_warnings
-countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0},
- stdout=remove_known_warnings(stdout))
-
-</text></argument>
-</extension>
diff --git a/Hlt/RecoConf/tests/qmtest/allen_gaudi_seed_and_match_with_mcchecking.qmt b/Hlt/RecoConf/tests/qmtest/hlt1_reco_allen_xdst.qmt
similarity index 65%
rename from Hlt/RecoConf/tests/qmtest/allen_gaudi_seed_and_match_with_mcchecking.qmt
rename to Hlt/RecoConf/tests/qmtest/hlt1_reco_allen_xdst.qmt
index 34cbcd6ae9f..897b3384d3e 100644
--- a/Hlt/RecoConf/tests/qmtest/allen_gaudi_seed_and_match_with_mcchecking.qmt
+++ b/Hlt/RecoConf/tests/qmtest/hlt1_reco_allen_xdst.qmt
@@ -10,26 +10,25 @@
or submit itself to any jurisdiction.
-->
<!--
- Run Allen VeloUT tracking and apply PrTrackChecker MC tracking efficiency
- checker.
+Run reconstruction + ThOr selection.
-->
<extension class="GaudiTest.GaudiExeTest" kind="test">
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set>
- <text>$MOOREROOT/tests/options/default_input_and_conds_hlt1_retinacluster_FTv6.py</text>
- <text>$RECOCONFROOT/options/allen_gaudi_seed_and_match.py</text>
+ <text>$MOOREROOT/tests/options/xdst_input_and_conds_muons.py</text>
+ <text>$RECOCONFROOT/options/hlt1_reco_allen_track_reconstruction.py</text>
</set></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
-<argument name="reference"><text>../refs/allen_gaudi_seed_and_match_with_mcchecking.ref</text></argument>
-<argument name="error_reference"><text>../refs/empty.ref</text></argument>
+<argument name="reference"><text>../refs/hlt1_reco_allen_track_reconstruction.ref</text></argument>
+<argument name="error_reference"><text>../../../RecoConf/tests/refs/empty.ref</text></argument>
<argument name="validator"><text>
-from Moore.qmtest.exclusions import ref_preprocessor
-validateWithReference(preproc = ref_preprocessor)
-
from Moore.qmtest.exclusions import remove_known_warnings
countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0},
stdout=remove_known_warnings(stdout))
+from Moore.qmtest.exclusions import ref_preprocessor, remove_known_fluctuating_counters
+validateWithReference(preproc=ref_preprocessor, counter_preproc = remove_known_fluctuating_counters)
+
</text></argument>
</extension>
diff --git a/Hlt/RecoConf/tests/refs/allen_gaudi_forward_with_mcchecking.ref b/Hlt/RecoConf/tests/refs/allen_gaudi_forward_with_mcchecking.ref
index b0088319a32..3e177b316e0 100644
--- a/Hlt/RecoConf/tests/refs/allen_gaudi_forward_with_mcchecking.ref
+++ b/Hlt/RecoConf/tests/refs/allen_gaudi_forward_with_mcchecking.ref
@@ -1,36 +1,29 @@
ForwardTrackChecker INFO Results
-ForwardTrackChecker INFO **** Forward 3249 tracks including 108 ghosts [ 3.32 %], Event average 2.53 % ****
-ForwardTrackChecker INFO 01_long : 2973 from 4960 [ 59.94 %] 18 clones [ 0.60 %], purity: 99.24 %, hitEff: 97.87 %
-ForwardTrackChecker INFO 02_long_P>5GeV : 2526 from 3420 [ 73.86 %] 17 clones [ 0.67 %], purity: 99.29 %, hitEff: 98.02 %
-ForwardTrackChecker INFO 03_long_strange : 129 from 299 [ 43.14 %] 0 clones [ 0.00 %], purity: 99.06 %, hitEff: 97.14 %
-ForwardTrackChecker INFO 04_long_strange_P>5GeV : 91 from 146 [ 62.33 %] 0 clones [ 0.00 %], purity: 99.12 %, hitEff: 97.39 %
-ForwardTrackChecker INFO 05_long_fromB : 6 from 7 [ 85.71 %] 0 clones [ 0.00 %], purity: 99.44 %, hitEff: 99.44 %
-ForwardTrackChecker INFO 05_long_fromD : 44 from 65 [ 67.69 %] 0 clones [ 0.00 %], purity: 99.08 %, hitEff: 97.76 %
-ForwardTrackChecker INFO 06_long_fromB_P>5GeV : 6 from 7 [ 85.71 %] 0 clones [ 0.00 %], purity: 99.44 %, hitEff: 99.44 %
-ForwardTrackChecker INFO 06_long_fromD_P>5GeV : 38 from 47 [ 80.85 %] 0 clones [ 0.00 %], purity: 99.04 %, hitEff: 97.64 %
-ForwardTrackChecker INFO 07_long_electrons : 76 from 472 [ 16.10 %] 1 clones [ 1.30 %], purity: 98.77 %, hitEff: 97.06 %
-ForwardTrackChecker INFO 10_long_fromB_P>3GeV_Pt>0.5GeV : 5 from 6 [ 83.33 %] 0 clones [ 0.00 %], purity: 99.33 %, hitEff:100.00 %
-ForwardTrackChecker INFO 10_long_fromD_P>3GeV_Pt>0.5GeV : 36 from 43 [ 83.72 %] 0 clones [ 0.00 %], purity: 98.98 %, hitEff: 97.57 %
-ForwardTrackChecker INFO 10_long_strange_P>3GeV_Pt>0.5GeV : 61 from 78 [ 78.21 %] 0 clones [ 0.00 %], purity: 99.22 %, hitEff: 97.45 %
-ForwardTrackChecker INFO 11_UT_long_fromB_P>3GeV_Pt>0.5GeV : 5 from 6 [ 83.33 %] 0 clones [ 0.00 %], purity: 99.33 %, hitEff:100.00 %
+ForwardTrackChecker INFO **** Forward 3248 tracks including 105 ghosts [ 3.23 %], Event average 2.42 % ****
+ForwardTrackChecker INFO 01_long : 2976 from 4960 [ 60.00 %] 16 clones [ 0.53 %], purity: 99.25 %, hitEff: 97.88 %
+ForwardTrackChecker INFO 02_long_muon : 8 from 14 [ 57.14 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff: 99.48 %
+ForwardTrackChecker INFO 02_long_muon_P>3GeV_Pt>0.5GeV : 3 from 3 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
+ForwardTrackChecker INFO 03_long_muon_from_strange : 3 from 3 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
+ForwardTrackChecker INFO 04_long_pion : 2326 from 4022 [ 57.83 %] 14 clones [ 0.60 %], purity: 99.23 %, hitEff: 97.83 %
+ForwardTrackChecker INFO 04_long_pion_P>3GeV_Pt>0.5GeV : 1697 from 1994 [ 85.11 %] 9 clones [ 0.53 %], purity: 99.29 %, hitEff: 98.04 %
ForwardTrackChecker INFO
ToolSvc INFO Removing all tools created by ToolSvc
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
ForwardTrackChecker.LoKi::Hybrid... INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# loaded from PYTHON" | 16 |
+ | "# loaded from PYTHON" | 7 |
PrGECFilter INFO Number of counters : 2
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "Nb Events Processed" | 100 |
| "Nb events removed" | 3 |
PrLHCbID2MCParticle INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "#removed null MCParticles" | 606109 | 0 | 0.0000 |
+ | "#removed null MCParticles" | 602173 | 0 | 0.0000 |
PrStoreUTHit INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "#banks" | 97 | 17460 | 180.00 |
PrTrackAssociator INFO Number of counters : 2
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- |*"Efficiency" | 3249 | 3141 |( 96.67590 +- 0.3145005)% |
- | "MC particles per track" | 3141 | 3742 | 1.1913 |
+ |*"Efficiency" | 3248 | 3143 |( 96.76724 +- 0.3103436)% |
+ | "MC particles per track" | 3143 | 3744 | 1.1912 |
diff --git a/Hlt/RecoConf/tests/refs/allen_gaudi_forward_with_mcchecking.ref.x86_64_v3-opt b/Hlt/RecoConf/tests/refs/allen_gaudi_forward_with_mcchecking.ref.x86_64_v3-opt
index c7c4912b9a7..c12ff053ee2 100644
--- a/Hlt/RecoConf/tests/refs/allen_gaudi_forward_with_mcchecking.ref.x86_64_v3-opt
+++ b/Hlt/RecoConf/tests/refs/allen_gaudi_forward_with_mcchecking.ref.x86_64_v3-opt
@@ -1,36 +1,29 @@
ForwardTrackChecker INFO Results
-ForwardTrackChecker INFO **** Forward 3233 tracks including 96 ghosts [ 2.97 %], Event average 2.33 % ****
-ForwardTrackChecker INFO 01_long : 2967 from 4960 [ 59.82 %] 17 clones [ 0.57 %], purity: 99.26 %, hitEff: 97.91 %
-ForwardTrackChecker INFO 02_long_P>5GeV : 2521 from 3420 [ 73.71 %] 16 clones [ 0.63 %], purity: 99.30 %, hitEff: 98.04 %
-ForwardTrackChecker INFO 03_long_strange : 128 from 299 [ 42.81 %] 0 clones [ 0.00 %], purity: 99.10 %, hitEff: 97.34 %
-ForwardTrackChecker INFO 04_long_strange_P>5GeV : 91 from 146 [ 62.33 %] 0 clones [ 0.00 %], purity: 99.24 %, hitEff: 97.53 %
-ForwardTrackChecker INFO 05_long_fromB : 7 from 7 [100.00 %] 0 clones [ 0.00 %], purity: 99.52 %, hitEff: 99.52 %
-ForwardTrackChecker INFO 05_long_fromD : 45 from 65 [ 69.23 %] 0 clones [ 0.00 %], purity: 99.10 %, hitEff: 97.81 %
-ForwardTrackChecker INFO 06_long_fromB_P>5GeV : 7 from 7 [100.00 %] 0 clones [ 0.00 %], purity: 99.52 %, hitEff: 99.52 %
-ForwardTrackChecker INFO 06_long_fromD_P>5GeV : 39 from 47 [ 82.98 %] 0 clones [ 0.00 %], purity: 99.06 %, hitEff: 97.70 %
-ForwardTrackChecker INFO 07_long_electrons : 77 from 472 [ 16.31 %] 1 clones [ 1.28 %], purity: 98.64 %, hitEff: 96.91 %
-ForwardTrackChecker INFO 10_long_fromB_P>3GeV_Pt>0.5GeV : 6 from 6 [100.00 %] 0 clones [ 0.00 %], purity: 99.44 %, hitEff:100.00 %
-ForwardTrackChecker INFO 10_long_fromD_P>3GeV_Pt>0.5GeV : 37 from 43 [ 86.05 %] 0 clones [ 0.00 %], purity: 99.01 %, hitEff: 97.64 %
-ForwardTrackChecker INFO 10_long_strange_P>3GeV_Pt>0.5GeV : 62 from 78 [ 79.49 %] 0 clones [ 0.00 %], purity: 99.17 %, hitEff: 97.44 %
-ForwardTrackChecker INFO 11_UT_long_fromB_P>3GeV_Pt>0.5GeV : 6 from 6 [100.00 %] 0 clones [ 0.00 %], purity: 99.44 %, hitEff:100.00 %
+ForwardTrackChecker INFO **** Forward 3230 tracks including 95 ghosts [ 2.94 %], Event average 2.31 % ****
+ForwardTrackChecker INFO 01_long : 2967 from 4960 [ 59.82 %] 15 clones [ 0.50 %], purity: 99.27 %, hitEff: 97.92 %
+ForwardTrackChecker INFO 02_long_muon : 8 from 14 [ 57.14 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff: 99.48 %
+ForwardTrackChecker INFO 02_long_muon_P>3GeV_Pt>0.5GeV : 3 from 3 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
+ForwardTrackChecker INFO 03_long_muon_from_strange : 3 from 3 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
+ForwardTrackChecker INFO 04_long_pion : 2315 from 4022 [ 57.56 %] 13 clones [ 0.56 %], purity: 99.24 %, hitEff: 97.86 %
+ForwardTrackChecker INFO 04_long_pion_P>3GeV_Pt>0.5GeV : 1689 from 1994 [ 84.70 %] 9 clones [ 0.53 %], purity: 99.31 %, hitEff: 98.06 %
ForwardTrackChecker INFO
ToolSvc INFO Removing all tools created by ToolSvc
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
ForwardTrackChecker.LoKi::Hybrid... INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# loaded from PYTHON" | 16 |
+ | "# loaded from PYTHON" | 7 |
PrGECFilter INFO Number of counters : 2
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "Nb Events Processed" | 100 |
| "Nb events removed" | 3 |
PrLHCbID2MCParticle INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "#removed null MCParticles" | 606109 | 0 | 0.0000 |
+ | "#removed null MCParticles" | 602173 | 0 | 0.0000 |
PrStoreUTHit INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "#banks" | 97 | 17460 | 180.00 |
PrTrackAssociator INFO Number of counters : 2
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- |*"Efficiency" | 3233 | 3137 |( 97.03062 +- 0.2985275)% |
- | "MC particles per track" | 3137 | 3732 | 1.1897 |
+ |*"Efficiency" | 3230 | 3135 |( 97.05882 +- 0.2972876)% |
+ | "MC particles per track" | 3135 | 3730 | 1.1898 |
diff --git a/Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_mcchecking.ref b/Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_mcchecking.ref
deleted file mode 100644
index 955b3c88403..00000000000
--- a/Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_mcchecking.ref
+++ /dev/null
@@ -1,33 +0,0 @@
-SeedAndMatchTrackChecker INFO Results
-SeedAndMatchTrackChecker INFO **** SeedAndMatch 4351 tracks including 10 ghosts [ 0.23 %], Event average 0.25 % ****
-SeedAndMatchTrackChecker INFO 01_long : 3787 from 4960 [ 76.35 %] 1 clones [ 0.03 %], purity: 89.79 %, hitEff: 44.55 %
-SeedAndMatchTrackChecker INFO 02_long_P>5GeV : 3109 from 3420 [ 90.91 %] 0 clones [ 0.00 %], purity: 89.88 %, hitEff: 44.77 %
-SeedAndMatchTrackChecker INFO 03_long_strange : 177 from 299 [ 59.20 %] 0 clones [ 0.00 %], purity: 85.77 %, hitEff: 36.67 %
-SeedAndMatchTrackChecker INFO 04_long_strange_P>5GeV : 127 from 146 [ 86.99 %] 0 clones [ 0.00 %], purity: 85.62 %, hitEff: 36.43 %
-SeedAndMatchTrackChecker INFO 05_long_fromB : 6 from 7 [ 85.71 %] 0 clones [ 0.00 %], purity: 91.91 %, hitEff: 51.35 %
-SeedAndMatchTrackChecker INFO 05_long_fromD : 48 from 65 [ 73.85 %] 0 clones [ 0.00 %], purity: 90.10 %, hitEff: 46.14 %
-SeedAndMatchTrackChecker INFO 06_long_fromB_P>5GeV : 6 from 7 [ 85.71 %] 0 clones [ 0.00 %], purity: 91.91 %, hitEff: 51.35 %
-SeedAndMatchTrackChecker INFO 06_long_fromD_P>5GeV : 41 from 47 [ 87.23 %] 0 clones [ 0.00 %], purity: 90.90 %, hitEff: 47.20 %
-SeedAndMatchTrackChecker INFO 07_long_electrons : 228 from 472 [ 48.31 %] 3 clones [ 1.30 %], purity: 83.77 %, hitEff: 34.20 %
-SeedAndMatchTrackChecker INFO 10_long_fromB_P>3GeV_Pt>0.5GeV : 5 from 6 [ 83.33 %] 0 clones [ 0.00 %], purity: 91.63 %, hitEff: 50.85 %
-SeedAndMatchTrackChecker INFO 10_long_fromD_P>3GeV_Pt>0.5GeV : 36 from 43 [ 83.72 %] 0 clones [ 0.00 %], purity: 90.11 %, hitEff: 45.27 %
-SeedAndMatchTrackChecker INFO 10_long_strange_P>3GeV_Pt>0.5GeV : 59 from 78 [ 75.64 %] 0 clones [ 0.00 %], purity: 85.50 %, hitEff: 36.88 %
-SeedAndMatchTrackChecker INFO 11_UT_long_fromB_P>3GeV_Pt>0.5GeV : 5 from 6 [ 83.33 %] 0 clones [ 0.00 %], purity: 91.63 %, hitEff: 50.85 %
-SeedAndMatchTrackChecker INFO
-ToolSvc INFO Removing all tools created by ToolSvc
-ApplicationMgr INFO Application Manager Finalized successfully
-ApplicationMgr INFO Application Manager Terminated successfully
-PrGECFilter INFO Number of counters : 2
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "Nb Events Processed" | 100 |
- | "Nb events removed" | 3 |
-PrLHCbID2MCParticleVPFT INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "#removed null MCParticles" | 513120 | 0 | 0.0000 |
-PrTrackAssociator INFO Number of counters : 2
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- |*"Efficiency" | 4351 | 4341 |( 99.77017 +- 0.07259576)% |
- | "MC particles per track" | 4341 | 4371 | 1.0069 |
-SeedAndMatchTrackChecker.LoKi::H... INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# loaded from PYTHON" | 16 |
diff --git a/Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_mcchecking.ref.x86_64_v3-opt b/Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_mcchecking.ref.x86_64_v3-opt
deleted file mode 100644
index ec531c24598..00000000000
--- a/Hlt/RecoConf/tests/refs/allen_gaudi_seed_and_match_with_mcchecking.ref.x86_64_v3-opt
+++ /dev/null
@@ -1,33 +0,0 @@
-SeedAndMatchTrackChecker INFO Results
-SeedAndMatchTrackChecker INFO **** SeedAndMatch 4352 tracks including 10 ghosts [ 0.23 %], Event average 0.25 % ****
-SeedAndMatchTrackChecker INFO 01_long : 3788 from 4960 [ 76.37 %] 1 clones [ 0.03 %], purity: 89.78 %, hitEff: 44.54 %
-SeedAndMatchTrackChecker INFO 02_long_P>5GeV : 3111 from 3420 [ 90.96 %] 0 clones [ 0.00 %], purity: 89.86 %, hitEff: 44.76 %
-SeedAndMatchTrackChecker INFO 03_long_strange : 177 from 299 [ 59.20 %] 0 clones [ 0.00 %], purity: 85.77 %, hitEff: 36.67 %
-SeedAndMatchTrackChecker INFO 04_long_strange_P>5GeV : 127 from 146 [ 86.99 %] 0 clones [ 0.00 %], purity: 85.62 %, hitEff: 36.43 %
-SeedAndMatchTrackChecker INFO 05_long_fromB : 6 from 7 [ 85.71 %] 0 clones [ 0.00 %], purity: 91.91 %, hitEff: 51.35 %
-SeedAndMatchTrackChecker INFO 05_long_fromD : 48 from 65 [ 73.85 %] 0 clones [ 0.00 %], purity: 90.10 %, hitEff: 46.14 %
-SeedAndMatchTrackChecker INFO 06_long_fromB_P>5GeV : 6 from 7 [ 85.71 %] 0 clones [ 0.00 %], purity: 91.91 %, hitEff: 51.35 %
-SeedAndMatchTrackChecker INFO 06_long_fromD_P>5GeV : 41 from 47 [ 87.23 %] 0 clones [ 0.00 %], purity: 90.90 %, hitEff: 47.20 %
-SeedAndMatchTrackChecker INFO 07_long_electrons : 225 from 472 [ 47.67 %] 3 clones [ 1.32 %], purity: 83.81 %, hitEff: 34.22 %
-SeedAndMatchTrackChecker INFO 10_long_fromB_P>3GeV_Pt>0.5GeV : 5 from 6 [ 83.33 %] 0 clones [ 0.00 %], purity: 91.63 %, hitEff: 50.85 %
-SeedAndMatchTrackChecker INFO 10_long_fromD_P>3GeV_Pt>0.5GeV : 36 from 43 [ 83.72 %] 0 clones [ 0.00 %], purity: 90.11 %, hitEff: 45.27 %
-SeedAndMatchTrackChecker INFO 10_long_strange_P>3GeV_Pt>0.5GeV : 59 from 78 [ 75.64 %] 0 clones [ 0.00 %], purity: 85.50 %, hitEff: 36.88 %
-SeedAndMatchTrackChecker INFO 11_UT_long_fromB_P>3GeV_Pt>0.5GeV : 5 from 6 [ 83.33 %] 0 clones [ 0.00 %], purity: 91.63 %, hitEff: 50.85 %
-SeedAndMatchTrackChecker INFO
-ToolSvc INFO Removing all tools created by ToolSvc
-ApplicationMgr INFO Application Manager Finalized successfully
-ApplicationMgr INFO Application Manager Terminated successfully
-PrGECFilter INFO Number of counters : 2
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "Nb Events Processed" | 100 |
- | "Nb events removed" | 3 |
-PrLHCbID2MCParticleVPFT INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "#removed null MCParticles" | 513120 | 0 | 0.0000 |
-PrTrackAssociator INFO Number of counters : 2
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- |*"Efficiency" | 4352 | 4342 |( 99.77022 +- 0.07257910)% |
- | "MC particles per track" | 4342 | 4372 | 1.0069 |
-SeedAndMatchTrackChecker.LoKi::H... INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# loaded from PYTHON" | 16 |
diff --git a/Hlt/RecoConf/tests/refs/allen_gaudi_velo_ut_with_mcchecking.ref b/Hlt/RecoConf/tests/refs/allen_gaudi_velo_ut_with_mcchecking.ref
deleted file mode 100644
index 1578b21a09f..00000000000
--- a/Hlt/RecoConf/tests/refs/allen_gaudi_velo_ut_with_mcchecking.ref
+++ /dev/null
@@ -1,42 +0,0 @@
-VeloUTTrackChecker INFO Results
-VeloUTTrackChecker INFO **** VeloUT 4724 tracks including 217 ghosts [ 4.59 %], Event average 3.83 % ****
-VeloUTTrackChecker INFO 01_velo : 4244 from 8414 [ 50.44 %] 28 clones [ 0.66 %], purity: 99.55 %, hitEff: 96.52 %
-VeloUTTrackChecker INFO 02_velo+UT : 4238 from 7288 [ 58.15 %] 28 clones [ 0.66 %], purity: 99.56 %, hitEff: 96.52 %
-VeloUTTrackChecker INFO 03_velo+UT_P>5GeV : 3225 from 4129 [ 78.11 %] 23 clones [ 0.71 %], purity: 99.64 %, hitEff: 96.97 %
-VeloUTTrackChecker INFO 04_velo+notLong : 806 from 3454 [ 23.34 %] 5 clones [ 0.62 %], purity: 99.32 %, hitEff: 95.88 %
-VeloUTTrackChecker INFO 05_velo+UT+notLong : 802 from 2374 [ 33.78 %] 5 clones [ 0.62 %], purity: 99.36 %, hitEff: 95.90 %
-VeloUTTrackChecker INFO 06_velo+UT+notLong_P>5GeV : 479 from 747 [ 64.12 %] 4 clones [ 0.83 %], purity: 99.55 %, hitEff: 97.28 %
-VeloUTTrackChecker INFO 07_long : 3438 from 4960 [ 69.31 %] 23 clones [ 0.66 %], purity: 99.60 %, hitEff: 96.67 %
-VeloUTTrackChecker INFO 07_long_strange : 153 from 299 [ 51.17 %] 1 clones [ 0.65 %], purity: 99.13 %, hitEff: 95.90 %
-VeloUTTrackChecker INFO 08_long_P>5GeV : 2747 from 3420 [ 80.32 %] 19 clones [ 0.69 %], purity: 99.65 %, hitEff: 96.91 %
-VeloUTTrackChecker INFO 08_long_strange_P>5GeV : 100 from 146 [ 68.49 %] 0 clones [ 0.00 %], purity: 99.35 %, hitEff: 96.92 %
-VeloUTTrackChecker INFO 09_long_fromB : 7 from 7 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
-VeloUTTrackChecker INFO 09_long_fromD : 49 from 65 [ 75.38 %] 0 clones [ 0.00 %], purity: 99.59 %, hitEff: 97.82 %
-VeloUTTrackChecker INFO 10_long_fromB_P>5GeV : 7 from 7 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
-VeloUTTrackChecker INFO 10_long_fromD_P>5GeV : 40 from 47 [ 85.11 %] 0 clones [ 0.00 %], purity: 99.67 %, hitEff: 97.83 %
-VeloUTTrackChecker INFO 11_long_electrons : 97 from 472 [ 20.55 %] 1 clones [ 1.02 %], purity: 98.28 %, hitEff: 94.85 %
-VeloUTTrackChecker INFO 14_long_fromB_P>3GeV_Pt>0.5GeV : 6 from 6 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
-VeloUTTrackChecker INFO 14_long_fromD_P>3GeV_Pt>0.5GeV : 40 from 43 [ 93.02 %] 0 clones [ 0.00 %], purity: 99.67 %, hitEff: 98.17 %
-VeloUTTrackChecker INFO 14_long_strange_P>3GeV_Pt>0.5GeV : 70 from 78 [ 89.74 %] 0 clones [ 0.00 %], purity: 99.53 %, hitEff: 96.78 %
-VeloUTTrackChecker INFO 15_UT_long_fromB_P>3GeV_Pt>0.5GeV : 6 from 6 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
-VeloUTTrackChecker INFO
-ToolSvc INFO Removing all tools created by ToolSvc
-ApplicationMgr INFO Application Manager Finalized successfully
-ApplicationMgr INFO Application Manager Terminated successfully
-PrGECFilter INFO Number of counters : 2
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "Nb Events Processed" | 100 |
- | "Nb events removed" | 3 |
-PrLHCbID2MCParticleVPUT INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "#removed null MCParticles" | 246186 | 0 | 0.0000 |
-PrStoreUTHit INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "#banks" | 97 | 17460 | 180.00 |
-PrTrackAssociator INFO Number of counters : 2
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- |*"Efficiency" | 4724 | 4507 |( 95.40644 +- 0.3045852)% |
- | "MC particles per track" | 4507 | 4507 | 1.0000 |
-VeloUTTrackChecker.LoKi::Hybrid:... INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# loaded from PYTHON" | 22 |
diff --git a/Hlt/RecoConf/tests/refs/allen_gaudi_velo_ut_with_mcchecking.ref.x86_64_v3-opt b/Hlt/RecoConf/tests/refs/allen_gaudi_velo_ut_with_mcchecking.ref.x86_64_v3-opt
deleted file mode 100644
index dd2ecf3e26e..00000000000
--- a/Hlt/RecoConf/tests/refs/allen_gaudi_velo_ut_with_mcchecking.ref.x86_64_v3-opt
+++ /dev/null
@@ -1,42 +0,0 @@
-VeloUTTrackChecker INFO Results
-VeloUTTrackChecker INFO **** VeloUT 4713 tracks including 214 ghosts [ 4.54 %], Event average 3.81 % ****
-VeloUTTrackChecker INFO 01_velo : 4238 from 8414 [ 50.37 %] 27 clones [ 0.63 %], purity: 99.54 %, hitEff: 96.50 %
-VeloUTTrackChecker INFO 02_velo+UT : 4232 from 7288 [ 58.07 %] 27 clones [ 0.63 %], purity: 99.56 %, hitEff: 96.50 %
-VeloUTTrackChecker INFO 03_velo+UT_P>5GeV : 3219 from 4129 [ 77.96 %] 22 clones [ 0.68 %], purity: 99.64 %, hitEff: 96.94 %
-VeloUTTrackChecker INFO 04_velo+notLong : 806 from 3454 [ 23.34 %] 5 clones [ 0.62 %], purity: 99.32 %, hitEff: 95.88 %
-VeloUTTrackChecker INFO 05_velo+UT+notLong : 802 from 2374 [ 33.78 %] 5 clones [ 0.62 %], purity: 99.36 %, hitEff: 95.90 %
-VeloUTTrackChecker INFO 06_velo+UT+notLong_P>5GeV : 479 from 747 [ 64.12 %] 4 clones [ 0.83 %], purity: 99.55 %, hitEff: 97.28 %
-VeloUTTrackChecker INFO 07_long : 3432 from 4960 [ 69.19 %] 22 clones [ 0.64 %], purity: 99.60 %, hitEff: 96.64 %
-VeloUTTrackChecker INFO 07_long_strange : 153 from 299 [ 51.17 %] 1 clones [ 0.65 %], purity: 99.13 %, hitEff: 95.90 %
-VeloUTTrackChecker INFO 08_long_P>5GeV : 2741 from 3420 [ 80.15 %] 18 clones [ 0.65 %], purity: 99.65 %, hitEff: 96.89 %
-VeloUTTrackChecker INFO 08_long_strange_P>5GeV : 100 from 146 [ 68.49 %] 0 clones [ 0.00 %], purity: 99.35 %, hitEff: 96.92 %
-VeloUTTrackChecker INFO 09_long_fromB : 7 from 7 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
-VeloUTTrackChecker INFO 09_long_fromD : 49 from 65 [ 75.38 %] 0 clones [ 0.00 %], purity: 99.59 %, hitEff: 97.82 %
-VeloUTTrackChecker INFO 10_long_fromB_P>5GeV : 7 from 7 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
-VeloUTTrackChecker INFO 10_long_fromD_P>5GeV : 40 from 47 [ 85.11 %] 0 clones [ 0.00 %], purity: 99.67 %, hitEff: 97.83 %
-VeloUTTrackChecker INFO 11_long_electrons : 97 from 472 [ 20.55 %] 1 clones [ 1.02 %], purity: 98.36 %, hitEff: 94.85 %
-VeloUTTrackChecker INFO 14_long_fromB_P>3GeV_Pt>0.5GeV : 6 from 6 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
-VeloUTTrackChecker INFO 14_long_fromD_P>3GeV_Pt>0.5GeV : 40 from 43 [ 93.02 %] 0 clones [ 0.00 %], purity: 99.67 %, hitEff: 98.17 %
-VeloUTTrackChecker INFO 14_long_strange_P>3GeV_Pt>0.5GeV : 70 from 78 [ 89.74 %] 0 clones [ 0.00 %], purity: 99.53 %, hitEff: 96.78 %
-VeloUTTrackChecker INFO 15_UT_long_fromB_P>3GeV_Pt>0.5GeV : 6 from 6 [100.00 %] 0 clones [ 0.00 %], purity:100.00 %, hitEff:100.00 %
-VeloUTTrackChecker INFO
-ToolSvc INFO Removing all tools created by ToolSvc
-ApplicationMgr INFO Application Manager Finalized successfully
-ApplicationMgr INFO Application Manager Terminated successfully
-PrGECFilter INFO Number of counters : 2
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "Nb Events Processed" | 100 |
- | "Nb events removed" | 3 |
-PrLHCbID2MCParticleVPUT INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "#removed null MCParticles" | 246186 | 0 | 0.0000 |
-PrStoreUTHit INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "#banks" | 97 | 17460 | 180.00 |
-PrTrackAssociator INFO Number of counters : 2
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- |*"Efficiency" | 4713 | 4499 |( 95.45937 +- 0.3032625)% |
- | "MC particles per track" | 4499 | 4499 | 1.0000 |
-VeloUTTrackChecker.LoKi::Hybrid:... INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# loaded from PYTHON" | 22 |
--
GitLab