Commit d3811edf authored by Rosen Matev's avatar Rosen Matev 🌲
Browse files

Merge branch 'chasse_hlt2_pp_thor' into 'master'

add hyperon lines to hlt2_pp_thor and ensure the functor cache is build for this config

See merge request lhcb/Moore!1056
parents 8b40146f c9486d0c
Pipeline #3112011 passed with stages
in 3 minutes and 31 seconds
......@@ -19,6 +19,7 @@ from RecoConf.hlt2_global_reco import reconstruction as hlt2_reconstruction, mak
# fully converted to ThOr yet. The reasons for this are explained in
# https://gitlab.cern.ch/lhcb/Moore/-/merge_requests/1033
from Hlt2Conf.lines.b_to_open_charm import all_lines as b2oc_lines
from Hlt2Conf.lines.charm.hyperons import all_lines as hyperons_lines
b2oc_exclusions = [
# b_to_dhhh.py
......@@ -68,6 +69,8 @@ def make_lines():
if ('Ks' in name):
continue
lines.append(builder())
lines.extend([builder() for builder in hyperons_lines.values()])
return lines
......
<?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 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.
-->
<!--
Run reconstruction + ThOr selection.
-->
<extension class="GaudiTest.GaudiExeTest" kind="test">
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set>
<text>$MOOREROOT/options/force_functor_cache.py</text>
<text>$MOOREROOT/tests/options/mdf_input_and_conds_hlt2.py</text>
<text>$MOOREROOT/tests/options/download_mdf_input.py</text>
<text>$MOOREROOT/tests/options/set_evt_max_to_5.py</text>
<text>$HLT2CONFROOT/options/hlt2_pp_thor.py</text>
</set></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="error_reference"><text>../../../RecoConf/tests/refs/empty.ref</text></argument>
<argument name="validator"><text>
from Moore.qmtest.exclusions import remove_known_warnings
countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0},
stdout=remove_known_warnings(stdout))
# make sure that nobody configures and potentially uses the DetailedMaterialLocator
if 'DetailedMaterialLocator.OutputLevel' in result['job_opts_dump']:
causes.append("Found configured DetailedMaterialLocator in job_opts_dump")
</text></argument>
</extension>
###############################################################################
# (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. #
###############################################################################
# NOTE: This should be included in the qmt file **after** the download_mdf_input.py
from Moore import options
super(options.__class__, options).__setattr__('evt_max', 5)
......@@ -91,7 +91,6 @@ def make_fastest_reconstruction():
hlt2_tracks = make_hlt2_tracks(
light_reco=True, fast_reco=True, use_pr_kf=True)
velo_tracks = hlt2_tracks["Velo"]
print(hlt2_tracks)
merge_tracks = TrackContainerCopy(
name="CreateBestTrackContainer",
inputLocations=[
......
......@@ -33,7 +33,7 @@ endif()
set(LOKI_FUNCTORS_CACHE_POST_ACTION_OPTS)
list(APPEND hlt1_settings hlt1_pp_default hlt1_pp_comparison)
list(APPEND hlt2_settings options/hlt2_pp_default tests/options/thor/loki_comparison tests/options/hlt2_reco_plus_thor_selections)
list(APPEND hlt2_settings options/hlt2_pp_default options/hlt2_pp_thor tests/options/thor/loki_comparison tests/options/hlt2_reco_plus_thor_selections)
if(NOT DEFINED REC_ROOT_DIR)
# Rec uses new CMake configuration so we need a different way to locate
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment