Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
LHCb
MooreAnalysis
Commits
fdc2df8f
Commit
fdc2df8f
authored
Nov 22, 2021
by
Rosen Matev
Browse files
Merge branch 'enable_muonID_MooreAnalysis' into 'master'
Cleanup code following
Moore!1108
See merge request
!62
parents
dcc77e17
150edd93
Pipeline
#3271565
passed with stage
in 18 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
HltEfficiencyChecker/options/hlt1_and_hlt2_eff_example.py
View file @
fdc2df8f
...
...
@@ -12,7 +12,6 @@ from Moore import options
from
HltEfficiencyChecker.config
import
run_chained_hlt_with_tuples
from
RecoConf.hlt1_allen
import
sequence
as
allen_sequence
from
RecoConf.reconstruction_objects
import
reconstruction
from
RecoConf.protoparticles
import
make_charged_protoparticles
from
Hlt2Conf.lines.topological_b
import
all_lines
decay
=
(
"[${B_s0}B_s0 => "
...
...
@@ -37,7 +36,6 @@ default_ft_decoding_version.global_bind(value=4)
from
RecoConf.global_tools
import
stateProvider_with_simplified_geom
with
allen_sequence
.
bind
(
sequence
=
"hlt1_pp_default"
),
reconstruction
.
bind
(
from_file
=
False
),
make_charged_protoparticles
.
bind
(
enable_muon_id
=
True
):
from_file
=
False
):
run_chained_hlt_with_tuples
(
options
,
decay
,
public_tools
=
[
stateProvider_with_simplified_geom
()])
HltEfficiencyChecker/options/hlt1_and_hlt2_rate_example.py
View file @
fdc2df8f
...
...
@@ -11,7 +11,6 @@
from
Moore
import
options
from
HltEfficiencyChecker.config
import
run_chained_hlt_with_tuples
from
RecoConf.reconstruction_objects
import
reconstruction
from
RecoConf.protoparticles
import
make_charged_protoparticles
from
Hlt2Conf.lines.topological_b
import
all_lines
...
...
@@ -29,7 +28,6 @@ default_ft_decoding_version.global_bind(value=6)
# TODO stateProvider_with_simplified_geom must go away from option files
from
RecoConf.global_tools
import
stateProvider_with_simplified_geom
with
reconstruction
.
bind
(
from_file
=
False
),
\
make_charged_protoparticles
.
bind
(
enable_muon_id
=
True
):
with
reconstruction
.
bind
(
from_file
=
False
):
run_chained_hlt_with_tuples
(
options
,
public_tools
=
[
stateProvider_with_simplified_geom
()])
HltEfficiencyChecker/options/hlt2_eff_example.py
View file @
fdc2df8f
...
...
@@ -11,7 +11,6 @@
from
Moore
import
options
from
HltEfficiencyChecker.config
import
run_moore_with_tuples
from
RecoConf.reconstruction_objects
import
reconstruction
from
RecoConf.protoparticles
import
make_charged_protoparticles
decay
=
(
"${Bs}[B_s0 => ( J/psi(1S) => ${mup}mu+ ${mum}mu- ) ( phi(1020) => ${Kp}K+ ${Km}K- )]CC"
...
...
@@ -49,8 +48,7 @@ default_ft_decoding_version.global_bind(value=2)
# TODO stateProvider_with_simplified_geom must go away from option files
from
RecoConf.global_tools
import
stateProvider_with_simplified_geom
with
reconstruction
.
bind
(
from_file
=
False
),
make_charged_protoparticles
.
bind
(
enable_muon_id
=
True
):
with
reconstruction
.
bind
(
from_file
=
False
):
run_moore_with_tuples
(
options
,
False
,
...
...
HltEfficiencyChecker/options/hlt2_rate_example.py
View file @
fdc2df8f
...
...
@@ -11,7 +11,6 @@
from
Moore
import
options
from
HltEfficiencyChecker.config
import
run_moore_with_tuples
from
RecoConf.reconstruction_objects
import
reconstruction
from
RecoConf.protoparticles
import
make_charged_protoparticles
options
.
set_input_and_conds_from_testfiledb
(
'upgrade_minbias_hlt1_filtered'
)
options
.
input_raw_format
=
4.3
...
...
@@ -24,7 +23,6 @@ default_ft_decoding_version.global_bind(value=2)
# TODO stateProvider_with_simplified_geom must go away from option files
from
RecoConf.global_tools
import
stateProvider_with_simplified_geom
with
reconstruction
.
bind
(
from_file
=
False
),
\
make_charged_protoparticles
.
bind
(
enable_muon_id
=
True
):
with
reconstruction
.
bind
(
from_file
=
False
):
run_moore_with_tuples
(
options
,
False
,
public_tools
=
[
stateProvider_with_simplified_geom
()])
HltEfficiencyChecker/options/hlt2_tos_eff_example.py
View file @
fdc2df8f
...
...
@@ -11,7 +11,6 @@
from
Moore
import
options
from
HltEfficiencyChecker.config
import
run_moore_with_tuples
from
RecoConf.reconstruction_objects
import
reconstruction
from
RecoConf.protoparticles
import
make_charged_protoparticles
from
Hlt2Conf.lines.Bs2JpsiPhi
import
all_lines
decay
=
(
"[${B_s0}B_s0 => "
...
...
@@ -55,8 +54,7 @@ from RecoConf.hlt1_tracking import default_ft_decoding_version
default_ft_decoding_version
.
global_bind
(
value
=
2
)
from
RecoConf.global_tools
import
stateProvider_with_simplified_geom
with
reconstruction
.
bind
(
from_file
=
False
),
make_charged_protoparticles
.
bind
(
enable_muon_id
=
True
):
with
reconstruction
.
bind
(
from_file
=
False
):
run_moore_with_tuples
(
options
,
False
,
...
...
HltEfficiencyChecker/options/options_template.py.jinja
View file @
fdc2df8f
...
...
@@ -3,7 +3,6 @@ from HltEfficiencyChecker.config import run_moore_with_tuples
from HltEfficiencyChecker.config import run_allen_in_moore_with_tuples
from HltEfficiencyChecker.config import run_chained_hlt_with_tuples
from RecoConf.reconstruction_objects import reconstruction
from RecoConf.protoparticles import make_charged_protoparticles
from RecoConf.hlt1_allen import sequence as allen_sequence
{% if annotated_decay_descriptor is defined %}
...
...
@@ -78,8 +77,7 @@ run_reconstruction = False
if level == "2":
if run_reconstruction:
with reconstruction.bind(from_file={{ not job.run_reconstruction }}),\
make_charged_protoparticles.bind(enable_muon_id=True):
with reconstruction.bind(from_file={{ not job.run_reconstruction }}):
run_moore_with_tuples(
options, False, decay, public_tools=[stateProvider_with_simplified_geom()])
else:
...
...
@@ -99,14 +97,12 @@ else:
assert use_allen, "Chained HLT1 and HLT2 should only be used for Allen HLT1."
{% if job.allen_sequence is defined %}
with allen_sequence.bind(sequence={{ "{!r}".format(job.allen_sequence) }}),\
reconstruction.bind(from_file={{ not job.run_reconstruction }}),\
make_charged_protoparticles.bind(enable_muon_id=True):
reconstruction.bind(from_file={{ not job.run_reconstruction }}):
run_chained_hlt_with_tuples(
options, decay, public_tools=[stateProvider_with_simplified_geom()])
{% else %}
with reconstruction.bind(from_file={{ not job.run_reconstruction }}),\
make_charged_protoparticles.bind(enable_muon_id=True):
with reconstruction.bind(from_file={{ not job.run_reconstruction }}):
run_chained_hlt_with_tuples(
options, decay, public_tools=[stateProvider_with_simplified_geom()])
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment