diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a11cc4eb1ebdef8686640338a21708a2f062e737..d1743d1fb8d0783ed851447de1f9753752da5e1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,8 +51,8 @@ python-linting: - cvmfs script: - . /cvmfs/lhcb.cern.ch/lib/LbEnv.sh - # Only run the pyflakes linter - - flake8 --select=F */python */options + # Only run the pyflakes linter and a few select pycodestyle errors + - flake8 --exclude '*.opts.py' --select=F,E71,E9,W1,W6 $(find {Hlt,PyConf} -name '*.py') build: stage: build diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 672458539a56df172d1f6bc69e4402bf5e5bee06..f7cd3db8cc5742c92d87637e140aae2a00f466ec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,8 +8,8 @@ will generate a patch you can apply if the checks fail. To simplify the workflow, you can format and lint locally using ```shell -lb-format path/to/file -flake8 path/to/file +lb-format --reference origin/master . +flake8 --exclude '*.opts.py' --select=F,E71,E9,W1,W6 $(find {Hlt,PyConf} -name '*.py') ``` Check [Git4LHCb](https://twiki.cern.ch/twiki/bin/view/LHCb/Git4LHCb) for more details. @@ -43,4 +43,4 @@ usual branch to open merge requests against. Some other branches track code from previous campaigns. Open an issue if you're unsure what branch to use. -[shifterpage]: https://twiki.cern.ch/twiki/bin/viewauth/LHCb/RealTimeAnalysisShifterChecklist \ No newline at end of file +[shifterpage]: https://twiki.cern.ch/twiki/bin/viewauth/LHCb/RealTimeAnalysisShifterChecklist diff --git a/Hlt/Hlt1Conf/options/allen_hlt1_pp_default.py b/Hlt/Hlt1Conf/options/allen_hlt1_pp_default.py index 1022ff7f5ac64119819d1ce8272a2cf671c902fb..7fa545215b2f4e90d3bef2cce4a9563ca84a0cee 100644 --- a/Hlt/Hlt1Conf/options/allen_hlt1_pp_default.py +++ b/Hlt/Hlt1Conf/options/allen_hlt1_pp_default.py @@ -8,9 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -import os, json - from Moore import options, run_allen -from Hlt1Conf.settings import allen_lines run_allen(options) diff --git a/Hlt/Hlt1Conf/options/hlt1_selreports_filtering.py b/Hlt/Hlt1Conf/options/hlt1_selreports_filtering.py index 7b78a7fe8e4e8d1be33cf43ecaacbe1a5007b571..457b8ca8f814b236eedf42c420be88607d011309 100644 --- a/Hlt/Hlt1Conf/options/hlt1_selreports_filtering.py +++ b/Hlt/Hlt1Conf/options/hlt1_selreports_filtering.py @@ -39,7 +39,7 @@ from Hlt1Conf.lines.track_mva import ( two_track_mva_line, ) -from Functors import ALL, FILTER +from Functors import ALL def make_selreports(): diff --git a/Hlt/Hlt1Conf/python/Hlt1Conf/algorithms.py b/Hlt/Hlt1Conf/python/Hlt1Conf/algorithms.py index 4d9c4551625c6b6f3c9b9b15a8fe1906155149f6..34df98b6fe05ac840577d97f6f503c33cc46051a 100644 --- a/Hlt/Hlt1Conf/python/Hlt1Conf/algorithms.py +++ b/Hlt/Hlt1Conf/python/Hlt1Conf/algorithms.py @@ -31,8 +31,6 @@ from PyConf.Algorithms import ( from Functors import (FILTER, POD) from Functors.utils import pack_dict -from PyConf.components import Algorithm - def require_all(*cuts): """Return a cut string that requires each of the argument strings. diff --git a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/high_pt_muon.py b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/high_pt_muon.py index 245109b1125774cf27ea923adf1a18a4d2d18983..256735d978c7e8413475d990d8648ad934cd04c2 100644 --- a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/high_pt_muon.py +++ b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/high_pt_muon.py @@ -9,20 +9,14 @@ # or submit itself to any jurisdiction. # ############################################################################### from __future__ import absolute_import, division, print_function -import math from GaudiKernel.SystemOfUnits import GeV from PyConf import configurable from Moore.config import HltLine -from RecoConf.hlt1_tracking import ( - require_gec, - require_pvs, - make_pvs, -) +from RecoConf.hlt1_tracking import require_gec from RecoConf.hlt1_muonid import make_fitted_tracks_with_muon_id from ..algorithms import Filter -from Functors import P, PT, CHI2DOF, MINIPCHI2, MINIPCHI2CUT, ISMUON -import Functors.math as fmath +from Functors import P, PT, ISMUON @configurable diff --git a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/low_pt_muon.py b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/low_pt_muon.py index 838daf9fa9c2fd91de25a5f99ae71ec9e5f9e24c..311a331a717aa2194d39da5a062725bfd7089bdc 100644 --- a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/low_pt_muon.py +++ b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/low_pt_muon.py @@ -12,7 +12,6 @@ from __future__ import absolute_import, division, print_function from GaudiKernel.SystemOfUnits import MeV, mm, GeV from PyConf import configurable from PyConf.Algorithms import VoidFilter -from PyConf.application import make_odin from Moore.config import HltLine from RecoConf.hlt1_tracking import ( require_gec, @@ -27,10 +26,8 @@ from RecoConf.hlt1_muonid import (make_muon_id, make_tracks_with_muon_id) from RecoConf.hlt1_muonmatch import make_tracks_with_muonmatch_ipcut from ..algorithms import (CombineTracks, Filter) -from Functors import (ISMUON, CHI2DOF, MASS, P, PT, CHI2DOF, MAXDOCACHI2, - MINIPCUT, MINIPCHI2CUT, RUNNUMBER, EVENTTYPE, - EVENTNUMBER, MINIP, BPVIPCHI2, MAXDOCA, SIZE) -from Functors.math import in_range +from Functors import (ISMUON, MASS, P, PT, CHI2DOF, MAXDOCACHI2, MINIPCUT, + MINIPCHI2CUT, MAXDOCA, SIZE) def make_fitted_tracks_with_muon_id(velo_track_min_ip, tracking_min_pt): diff --git a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/luminosity.py b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/luminosity.py index db67a9e1c1c0659bd9714d7281727168be5093d9..1f65802678c766f231f4e282a02af1ee8b28ee9d 100644 --- a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/luminosity.py +++ b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/luminosity.py @@ -11,7 +11,6 @@ """Lines that running luminosity counters on a fraction of all events.""" import cppyy -from Configurables import VoidFilter as _VoidFilter from PyConf.Algorithms import ( LumiCounterFromContainer__PrVeloTracks, LumiCounterFromContainer__RecVertex_v2, @@ -27,7 +26,7 @@ from RecoConf.hlt1_tracking import ( make_reco_pvs, ) -from Functors import EVENTTYPE, SIZE +from Functors import EVENTTYPE from Functors import math as fmath diff --git a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/minimum_bias.py b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/minimum_bias.py index 47737d7e7633d9fba65f10aeccc3589208e55f89..ec263942ef87a7175ce39fb5924fe28b65fbe75b 100644 --- a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/minimum_bias.py +++ b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/minimum_bias.py @@ -16,8 +16,6 @@ typically meant with respect to 'heavy flavour events'. """ import cppyy -from Configurables import VoidFilter as _VoidFilter - from PyConf.Algorithms import VoidFilter from PyConf.application import make_odin from Moore.config import HltLine diff --git a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/smog_lines.py b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/smog_lines.py index 380dde4710caddbe731a8abbc9b2a3afa4c6672c..b16c6bea989344bc5526f10c5b4c3e9ee85a8d4c 100644 --- a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/smog_lines.py +++ b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/smog_lines.py @@ -19,7 +19,7 @@ from ..algorithms import (Filter, CombineTracks) from Moore.config import HltLine from Functors import (CLOSESTTOBEAM, NHITS, P, PT, ISMUON, CHI2DOF, MAXDOCA, - ALL, MASS, ETA, Z, CHARGE) + MASS, Z, CHARGE) from Functors.math import in_range diff --git a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/track_muon.py b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/track_muon.py index 45533a3ce4989920c1f1ccc4ca6f2e2d5445e150..92cda50143688d50e2095de5b43dd7135d426f80 100644 --- a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/track_muon.py +++ b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/track_muon.py @@ -114,8 +114,6 @@ def high_mass_dimuon_line(name='Hlt1DiMuonHighMassLine', max_vertex_chi2=25., min_mass=2.7 * GeV): - pvs = make_pvs().location - tracks_with_muon_id = make_input_tracks() sel = (ISMUON) & (P > min_p) & (PT > min_pt) & (CHI2DOF < max_track_chi2dof) diff --git a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/track_mva.py b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/track_mva.py index fc111b127a56c489d6b85b8586f9ec593ebe4c61..0e5211e3c355a747702baa2e3868cb7760106546 100644 --- a/Hlt/Hlt1Conf/python/Hlt1Conf/lines/track_mva.py +++ b/Hlt/Hlt1Conf/python/Hlt1Conf/lines/track_mva.py @@ -10,9 +10,8 @@ ############################################################################### from __future__ import absolute_import, division, print_function import math -from GaudiKernel.SystemOfUnits import GeV +from GaudiKernel.SystemOfUnits import MeV, GeV from PyConf import configurable -from PyConf.application import make_odin from RecoConf.hlt1_tracking import ( require_gec, require_pvs, make_pvs, make_hlt1_tracks, make_hlt1_fitted_tracks, make_fitted_forward_tracks_with_pv_relations) @@ -21,7 +20,6 @@ from ..algorithms import (CombineTracks, Filter) from Moore.config import HltLine from Functors import ( - ALL, BPVDIRA, BPVCORRM, BPVETA, @@ -29,20 +27,13 @@ from Functors import ( BPVIPCHI2, CHI2DOF, COMB, - ETA, - EVENTNUMBER, - EVENTTYPE, MAXDOCACHI2, - MINIP, MVA, P, - PHI, PT, - RUNNUMBER, SUM, ) import Functors.math as fmath -from GaudiKernel.SystemOfUnits import MeV, GeV def make_tracks_mva_tracks(): diff --git a/Hlt/Hlt1Conf/python/Hlt1Conf/settings.py b/Hlt/Hlt1Conf/python/Hlt1Conf/settings.py index f620aefcd777e92cf5b2c7b03f25e20c4d671d3f..e56a23af6b819dcd88fcccf85d1a5408c9a39ad1 100644 --- a/Hlt/Hlt1Conf/python/Hlt1Conf/settings.py +++ b/Hlt/Hlt1Conf/python/Hlt1Conf/settings.py @@ -15,7 +15,7 @@ from Hlt1Conf.lines.track_mva import ( from Hlt1Conf.lines.track_muon import one_track_muon_mva_line, low_mass_dimuon_line, high_mass_dimuon_line from Hlt1Conf.lines.low_pt_muon import detached_low_pt_dimuon_line from Hlt1Conf.lines.high_pt_muon import one_track_muon_highpt_line -from Hlt1Conf.lines.gec_passthrough import gec_passthrough_line +# from Hlt1Conf.lines.gec_passthrough import gec_passthrough_line from Hlt1Conf.lines.smog_lines import smog_minimumbias_line, smog_dimuon_line from Hlt1Conf.lines.minimum_bias import ( low_multiplicity_velo_line, diff --git a/Hlt/Hlt2Conf/options/Hlt2DiMuonLines_test.py b/Hlt/Hlt2Conf/options/Hlt2DiMuonLines_test.py index f0e0e4294f7a467004a79cb3d92f3cbf1fac4987..8cb70997f1efcab00f30b647c1bdaa20691d4fcf 100644 --- a/Hlt/Hlt2Conf/options/Hlt2DiMuonLines_test.py +++ b/Hlt/Hlt2Conf/options/Hlt2DiMuonLines_test.py @@ -15,7 +15,6 @@ Run like any other options file: ./Moore/run gaudirun.py Moore/Hlt/Hlt2Conf/options/Hlt2DiMuonLines_test.py """ from __future__ import print_function -import sys from Moore import options, run_moore from RecoConf.global_tools import stateProvider_with_simplified_geom from Hlt2Conf.lines.onia import all_lines diff --git a/Hlt/Hlt2Conf/options/Hlt2IncDimuon.py b/Hlt/Hlt2Conf/options/Hlt2IncDimuon.py index 405e7179a19f99a4b3cc55700fa67e0f247390c4..48a39a426750260adc8508be1b04a56513bf7262 100644 --- a/Hlt/Hlt2Conf/options/Hlt2IncDimuon.py +++ b/Hlt/Hlt2Conf/options/Hlt2IncDimuon.py @@ -14,7 +14,6 @@ Run like any other options file: ./Moore/run gaudirun.py Moore/Hlt/Hlt2Conf/options/Hlt2IncDimuon.py """ -import sys from Moore import options, run_moore from RecoConf.global_tools import stateProvider_with_simplified_geom from Hlt2Conf.lines.InclusiveDetachedDilepton import all_lines diff --git a/Hlt/Hlt2Conf/options/dplus_hhh_example.py b/Hlt/Hlt2Conf/options/dplus_hhh_example.py index a58d3d97fd19fa179231cdd939e42eeeec6e437c..47838b28d3670e82619ffcb1722fdce651ca6725 100644 --- a/Hlt/Hlt2Conf/options/dplus_hhh_example.py +++ b/Hlt/Hlt2Conf/options/dplus_hhh_example.py @@ -10,7 +10,6 @@ ############################################################################### from Moore import options, run_moore from Hlt2Conf.lines.dplus_hhh_test import combiner_lines, filter_lines -from Hlt2Conf.lines.charm.d_to_hhh import all_lines from RecoConf.global_tools import stateProvider_with_simplified_geom # some other ldsts you might want to run over, to study phyics perforamnce for instance diff --git a/Hlt/Hlt2Conf/options/hlt2_persistreco_fromfile.py b/Hlt/Hlt2Conf/options/hlt2_persistreco_fromfile.py index 9a95ed9a524e8bdca68e2a3ca33d1cf6a29678ef..33bdaeb8e99ec89551f8e6dba9e8a920d9976cac 100644 --- a/Hlt/Hlt2Conf/options/hlt2_persistreco_fromfile.py +++ b/Hlt/Hlt2Conf/options/hlt2_persistreco_fromfile.py @@ -14,8 +14,6 @@ Run like any other options file: ./Moore/run gaudirun.py hlt2_persistreco_fromfile.py """ -import json - from Moore import options, run_moore from Moore.config import HltLine from Hlt2Conf.lines.charm.d0_to_hh import make_dzeros, make_charm_kaons diff --git a/Hlt/Hlt2Conf/options/hlt2_persistreco_realtime.py b/Hlt/Hlt2Conf/options/hlt2_persistreco_realtime.py index b8bc4a2fa047477668d3a3428f1594ce81daa0d6..b85242b9f4727da78921351d296d9a31fa0ddfc8 100644 --- a/Hlt/Hlt2Conf/options/hlt2_persistreco_realtime.py +++ b/Hlt/Hlt2Conf/options/hlt2_persistreco_realtime.py @@ -14,8 +14,6 @@ Run like any other options file: ./Moore/run gaudirun.py hlt2_persistreco_realtime.py """ -import json - from Moore import options, run_moore from Moore.config import HltLine from Hlt2Conf.lines.charm.d0_to_hh import make_dzeros, make_charm_kaons diff --git a/Hlt/Hlt2Conf/options/hlt2_qee_example.py b/Hlt/Hlt2Conf/options/hlt2_qee_example.py index c4177c77baea47792598556f139055be897fcd6e..02b8ae509a0e0acefdafa2e2bac6fca5d929dd89 100644 --- a/Hlt/Hlt2Conf/options/hlt2_qee_example.py +++ b/Hlt/Hlt2Conf/options/hlt2_qee_example.py @@ -57,7 +57,7 @@ def make_lines(): # Uncomment the following to increase the output verbosity -from Gaudi.Configuration import DEBUG +#from Gaudi.Configuration import DEBUG #options.output_level = DEBUG public_tools = [stateProvider_with_simplified_geom()] diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/algorithms.py b/Hlt/Hlt2Conf/python/Hlt2Conf/algorithms.py index fc8778e0a81bfc944a5a265234b8b6641220aa40..7e4c343809f44d5baf019b90499e2d43958cbb18 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/algorithms.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/algorithms.py @@ -20,8 +20,6 @@ functional algorithms. from __future__ import absolute_import, division, print_function import string -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond - from Configurables import ( LoKi__Hybrid__DictTransform_TMVATransform_ as TMVAtransform, LoKi__Hybrid__DictOfFunctors as DictOfFunctors, @@ -34,10 +32,10 @@ from PyConf.Algorithms import (CombineParticles, FilterDesktop, DaVinci__N4BodyDecays as N4BodyDecays) __all__ = [ - 'EmptyFilter', 'ParticleFilter', 'ParticleCombiner' + 'EmptyFilter', 'ParticleFilter', 'ParticleCombiner', 'ParticleFilterWithPVs', 'ParticleCombinerWithPVs', 'require_all', - 'N3BodyCombiner', 'N3BodyCombinerWithPVs' - 'N4BodyCombiner', 'N4BodyCombinerWithPVs', 'NeutralParticleCombiner', + 'N3BodyCombiner', 'N3BodyCombinerWithPVs', 'N4BodyCombiner', + 'N4BodyCombinerWithPVs', 'NeutralParticleCombiner', 'NeutralParticleCombinerWithPVs' ] @@ -197,7 +195,6 @@ def ParticleFilterWithTMVA(name, pvs=pvs, Code=mva_code.format(mva_name=mva_name), **kwargs) - filter_name = particlefiltered.producer.name #setup the names for the DictValue, TMVA and MVADict. #each tool needs to be named relative to its 'owner' @@ -210,9 +207,11 @@ def ParticleFilterWithTMVA(name, dv_source = "LoKi::Hybrid::DictTransform/TMVA" Options = {"XMLFile": xml_file, "Name": Key, "KeepVars": "0"} - TMVA = TMVAtransform(name=tmva_name, Options=Options, Source=tmva_source) - mvadict = DictOfFunctors(name=mvadict_name, Variables=bdt_vars) - dv = DictValue(name=dv_name, Key=Key, Source=dv_source) + # Just need to make sure each Configurable is instantied; don't need to + # assign them to anything + TMVAtransform(name=tmva_name, Options=Options, Source=tmva_source) + DictOfFunctors(name=mvadict_name, Variables=bdt_vars) + DictValue(name=dv_name, Key=Key, Source=dv_source) return particlefiltered diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/B2JpsiK.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/B2JpsiK.py index 75bc8ae8de029ab08cfa4113c16b95452ad77513..8c0e3b11d96bb4dc1e540802877a227bcf5bcfe4 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/B2JpsiK.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/B2JpsiK.py @@ -9,28 +9,26 @@ # or submit itself to any jurisdiction. # ############################################################################### """ -Definition of the prompt dimuon HLT2 lines +Definition of the exclusive B+->JpsiK+ HLT2 lines """ from __future__ import absolute_import, division, print_function -import math -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond -from RecoConf.hlt1_tracking import require_pvs -from RecoConf.reconstruction_objects import make_pvs, upfront_reconstruction +from RecoConf.reconstruction_objects import make_pvs -from ..algorithms import require_all, ParticleFilterWithPVs, ParticleCombinerWithPVs +from ..algorithms import require_all, ParticleCombinerWithPVs from PyConf import configurable from Moore.config import HltLine, register_line_builder # get the basic particles -from ..standard_particles import make_dimuon_base, make_has_rich_long_kaons +from ..standard_particles import make_has_rich_long_kaons # get the dimuon filters from .onia.builders.prefilters import make_prefilters -from .onia.builders.dimuon import make_detached_dimuon, make_jpsi +from .onia.builders.dimuon import make_jpsi all_lines = {} @@ -75,9 +73,6 @@ def B2JpsiK_line(name='Hlt2DiMuonBpToJpsiKpLine', prescale=1): # get the PVs pvs = make_pvs() - # get the basic dimuons and require that they are detached - detached_dimuons = make_detached_dimuon() - # make the detached Jpsi candidates without pt requirements Jpsi = make_jpsi( # name="JpsiMaker_B2JpsiK_line", diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/B2KsMuMu.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/B2KsMuMu.py index c8ec8258e337172556a6354f03bd2ab542746014..124f0f2803271a30e3f04993e8fcf628a5ea9cbe 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/B2KsMuMu.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/B2KsMuMu.py @@ -13,24 +13,22 @@ Definition of the B2KsMuMu exclusive lines, with LL and DD Ks """ from __future__ import absolute_import, division, print_function -import math -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV -from RecoConf.hlt1_tracking import require_pvs -from RecoConf.reconstruction_objects import (make_pvs, upfront_reconstruction) +from RecoConf.reconstruction_objects import make_pvs -from ..algorithms import require_all, ParticleFilterWithPVs, ParticleCombinerWithPVs +from ..algorithms import require_all, ParticleCombinerWithPVs from PyConf import configurable from Moore.config import HltLine, register_line_builder # get the basic particles -from ..standard_particles import make_dimuon_base, make_has_rich_long_pions, make_has_rich_down_pions, make_KsDD, make_KsLL +from ..standard_particles import make_KsDD, make_KsLL # get the dimuon filters from .onia.builders.prefilters import make_prefilters -from .onia.builders.dimuon import make_dimuon, make_detached_dimuon_geo +from .onia.builders.dimuon import make_detached_dimuon_geo all_lines = {} @@ -85,18 +83,12 @@ def make_b2ksmumu(name, def b2ksmumull_line(name="Hlt2DiMuonB2KSMuMuLLLine", prescale=1): """B0 --> Ks Jpsi LL line""" - # get the long pions - pions_long = make_has_rich_long_pions() - # form the Ks kaons_LL = make_KsLL() # get the PVs pvs = make_pvs() - # get the basic dimuons and filter them - filtered_dimuons = make_dimuon() - # get the detached dimuons detached_dimuons = make_detached_dimuon_geo() @@ -119,18 +111,12 @@ def b2ksmumull_line(name="Hlt2DiMuonB2KSMuMuLLLine", prescale=1): def b2ksmumudd_line(name="Hlt2DiMuonB2KSMuMuDDLine", prescale=1): """B0 --> Ks Jpsi DD line""" - # get the downstream pions - pions_down = make_has_rich_down_pions() - # fprm the DD Ks kaons_DD = make_KsDD() # get the PVs pvs = make_pvs() - # get the basic dimuons and filter them - filtered_dimuons = make_dimuon() - # get the detached dimuons detached_dimuons = make_detached_dimuon_geo() diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/Chic2JpsiMuMu.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/Chic2JpsiMuMu.py index 15cb63bbfb7cd5aa0bcc8d64dfd9aa65fa2f089f..b5fbf552429351108c8dfffae0ccfa3d5c6ec320 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/Chic2JpsiMuMu.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/Chic2JpsiMuMu.py @@ -13,24 +13,22 @@ Definition of the Chic2JpsiMuMu line """ from __future__ import absolute_import, division, print_function -import math -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV -from RecoConf.hlt1_tracking import require_pvs -from RecoConf.reconstruction_objects import (make_pvs, upfront_reconstruction) +from RecoConf.reconstruction_objects import make_pvs -from ..algorithms import require_all, ParticleFilterWithPVs, ParticleCombinerWithPVs +from ..algorithms import require_all, ParticleCombinerWithPVs from PyConf import configurable from Moore.config import HltLine, register_line_builder # get the basic particles -from ..standard_particles import make_dimuon_base, make_ismuon_long_muon +from ..standard_particles import make_ismuon_long_muon # get the dimuon filters from .onia.builders.prefilters import make_prefilters -from .onia.builders.dimuon import make_dimuon, make_jpsi +from .onia.builders.dimuon import make_jpsi all_lines = {} @@ -74,9 +72,6 @@ def chic2jpsimumu_line(name="Hlt2DiMuonChicJpsiDiMuonLine", prescale=1): # get the PVs pvs = make_pvs() - # get the basic dimuons and filter them - filtered_dimuons = make_dimuon() - # get the Jpsi, without pt requirements Jpsi = make_jpsi( name="JpsiMaker_ChicJpsiDiMuonLine", diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/InclusiveDetachedDilepton.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/InclusiveDetachedDilepton.py index c42bc43d05324afd4b4e40e95244b42df57bd0e7..aa4180d17f3c9059d4eaa23ea8d8e27a56299815 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/InclusiveDetachedDilepton.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/InclusiveDetachedDilepton.py @@ -11,16 +11,12 @@ """Definition of inclusive detached dilepton HLT2 lines. """ from __future__ import absolute_import, division, print_function -import math -from GaudiKernel.SystemOfUnits import GeV, MeV - -from RecoConf.hlt1_tracking import require_pvs, require_gec +from RecoConf.hlt1_tracking import require_pvs from Moore.config import HltLine, register_line_builder -from PyConf import configurable from RecoConf.reconstruction_objects import (make_pvs, upfront_reconstruction) -from .rd.builders.rdbuilder import make_detached_tracks, make_down_tracks, make_rd_photons, make_rd_merged_pi0s, make_rd_resolved_pi0s +from .rd.builders.rdbuilder import make_detached_tracks, make_down_tracks from .rd.builders.rdbuilder import filter_electron_muon, filter_dielectron, filter_dimuon all_lines = {} diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/Jets.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/Jets.py index 45307e82af1146d5273b2a0127a1cc3e5c22f763..d801dd79d55de5924113bd4f2e2226bc60ab6b2e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/Jets.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/Jets.py @@ -14,27 +14,18 @@ The missing steps are summarised in the HltJetBuilderRun3, HltParticleFlowRun3 c """ from __future__ import absolute_import, division, print_function -import string, math from GaudiKernel.SystemOfUnits import GeV from RecoConf.reconstruction_objects import upfront_reconstruction -from RecoConf.calorimeter_reconstruction import (make_calo as _make_calo) -from RecoConf.reconstruction_objects import (make_pvs as _make_pvs, make_tracks - as _make_tracks) - from ..algorithms import require_all, ParticleFilter, ParticleCombiner from PyConf import configurable -from PyConf.Algorithms import (ParticleMakerForParticleFlow, HltJetBuilderRun3, - HltParticleFlowRun3) - from PyConf.Algorithms import HltParticleFlowRun3 from Moore.config import HltLine, register_line_builder -from ..hacks import patched_hybrid_tool from ..standard_jets import (make_trackjets, make_pf_particles, tag_jets, particleflow_filter, build_jets) from ..standard_particles import ( @@ -44,7 +35,6 @@ from ..standard_particles import ( from ..standard_particles import ( get_long_track_selector, get_down_track_selector, - standard_protoparticle_filter, ) all_lines = {} diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/__init__.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/__init__.py index 42b4603f8b68510c836a14479d6391644d2a4760..47c648c5a1a0f59a8522f415a8cab4cbb709b23c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/__init__.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/__init__.py @@ -19,8 +19,7 @@ from Moore.config import add_line_to_registry from . import (B2JpsiK, Bs2JpsiPhi, b_to_open_charm, Chic2JpsiMuMu, B2KsMuMu, InclusiveDetachedDilepton, inclusive_radiative_b, onia, - topological_b, Jets, pid, qee, charm, b_to_charmonia, - semileptonic) + topological_b, pid, qee, charm, b_to_charmonia, semileptonic) from .jets import Hlt2Run2Jets diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/b_to_jpsix.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/b_to_jpsix.py index 7e371a23b026d80415e50a4dedc2f5fbf8eee859..6b025afc4dbf0a5226f393553e273f280369f01f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/b_to_jpsix.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/b_to_jpsix.py @@ -14,12 +14,6 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond - -from RecoConf.hlt1_tracking import require_pvs, require_gec -from RecoConf.reconstruction_objects import make_pvs - -from Hlt2Conf.algorithms import require_all, ParticleFilter, ParticleCombiner from PyConf import configurable from Hlt2Conf.standard_particles import make_mass_constrained_jpsi2mumu from Hlt2Conf.lines.b_to_charmonia.prefilters import b2cc_prefilters diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/b_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/b_builder.py index ae88d66ff094a89462b48ed472abada1fabf7914..6bc273dee93b6eef7b49f904bb15b9411c694fc9 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/b_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/b_builder.py @@ -12,12 +12,9 @@ Definition of Bu/Bd/Bs/... meson decays that are shared between many B2CC selections, and therefore are defined centrally. """ -import math -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, picosecond -from Hlt2Conf.algorithms import ( - require_all, ParticleFilter, ParticleCombiner, ParticleCombinerWithPVs, - ParticleFilterWithPVs, N3BodyCombinerWithPVs, N4BodyCombinerWithPVs) +from Hlt2Conf.algorithms import require_all, ParticleCombinerWithPVs from PyConf import configurable from RecoConf.reconstruction_objects import make_pvs diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py index 70e88373d50394136485d16487492e2aa4a9abd3..af79d42983cb24aa52fc8baac63b955a04f9344f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py @@ -11,20 +11,16 @@ """Definition of B2CC basic objects: pions, kaons, ... """ from __future__ import absolute_import, division, print_function -from functools import partial -import math -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import GeV, MeV from RecoConf.reconstruction_objects import make_pvs -from Hlt2Conf.algorithms import require_all, ParticleFilter, ParticleCombiner, ParticleCombinerWithPVs, ParticleFilterWithPVs +from Hlt2Conf.algorithms import require_all, ParticleCombinerWithPVs, ParticleFilterWithPVs from PyConf import configurable -from Hlt2Conf.standard_particles import ( - make_has_rich_long_pions, make_has_rich_long_kaons, - make_has_rich_long_protons, make_long_pions, make_down_pions, make_photons, - make_KsLL, make_KsDD, make_mass_constrained_jpsi2mumu, - make_long_cb_electrons, make_long_electrons_no_brem) +from Hlt2Conf.standard_particles import (make_has_rich_long_pions, + make_has_rich_long_kaons, + make_long_electrons_no_brem) #################################### # Track selections # diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dd.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dd.py index 0a10d5c694f8199c4da085fec1724bc8578a4c73..90d81d36481fdc37bde426d08e77a670e01251d7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dd.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dd.py @@ -14,7 +14,6 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.algorithms import ParticleFilter diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_ddh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_ddh.py index a08832e19951e5bd0185fb087951259c1717984d..f96ee86577a64828eecde83be80e641342d1d5d7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_ddh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_ddh.py @@ -14,7 +14,6 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dh.py index 9e18a10fa2e4c23377bef0e66babeffe6d792499..eec97331aecae64df53f89f15db70277335a740b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dh.py @@ -14,7 +14,7 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters from Hlt2Conf.lines.b_to_open_charm.filters import b_bdt_filter diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dhh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dhh.py index 702f2ae5ccdd811c7da678ac675518357ad243b9..eaa1577a0db9acb89e87ea519dd842c3ff85c3dc 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dhh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dhh.py @@ -14,7 +14,6 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dhhh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dhhh.py index 6ecea713197435432c9341d8dcc47df1961e05e2..41113b24a592892385beaa00b3fee1aa31991a6d 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dhhh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dhhh.py @@ -14,14 +14,13 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters from PyConf import configurable from RecoConf.reconstruction_objects import make_pvs -from Hlt2Conf.algorithms import (require_all, ParticleFilter) +from Hlt2Conf.algorithms import ParticleFilter from Hlt2Conf.lines.b_to_open_charm.builders import basic_builder from Hlt2Conf.lines.b_to_open_charm.builders import d_builder diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dx_ltu.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dx_ltu.py index 03e60f560fe9cc325f1f5bda44e2efe50a8f882a..3d5ae6528a6008afc7e0e6f98269b1354ddc7cd0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dx_ltu.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/b_to_dx_ltu.py @@ -14,7 +14,6 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_d.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_d.py index a4b752db71ee893d5d967c47964b3cc6edb65b2c..63727270097f48dae5e0914a9f9f98b5094e1277 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_d.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_d.py @@ -14,13 +14,11 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters from PyConf import configurable -from Hlt2Conf.lines.b_to_open_charm.builders import basic_builder from Hlt2Conf.lines.b_to_open_charm.builders import cbaryon_builder from Hlt2Conf.lines.b_to_open_charm.builders import b_builder from Hlt2Conf.lines.b_to_open_charm.builders import d_builder diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_dh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_dh.py index 20264f15e29018e37c58f773c84fd2dd312961c2..3e8e42543492dd517b8573458345219adc407dc9 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_dh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_dh.py @@ -14,7 +14,6 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_h.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_h.py index c11a2cf6bd8c460292a709fb895864bb1371e8b2..165564d89664ea07102e0ad9aba7d64000d37550 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_h.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_h.py @@ -14,7 +14,6 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_hh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_hh.py index 8dec6c7e408bcaef11a5ed352e0db4d2232bb7e5..736086218ffdab763bc27efe98b5e9900c1a83df 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_hh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_hh.py @@ -14,7 +14,6 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_hhh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_hhh.py index 31718f26ca23cc540c3566def8ee4c18f596e064..049d5cbb0365f83ae027687ca282e515b4c57079 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_hhh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_cbaryon_hhh.py @@ -14,13 +14,12 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters from PyConf import configurable -from Hlt2Conf.algorithms import (require_all, ParticleFilter) +from Hlt2Conf.algorithms import ParticleFilter from Hlt2Conf.lines.b_to_open_charm.builders import basic_builder from Hlt2Conf.lines.b_to_open_charm.builders import cbaryon_builder diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_d.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_d.py index 15bf143981724c1367cb60ba1daad6cadf97efe2..891e9c0b443ad141b192814e0c7bd5e9f319a046 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_d.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_d.py @@ -14,14 +14,12 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters from PyConf import configurable from Hlt2Conf.lines.b_to_open_charm.builders import basic_builder -from Hlt2Conf.lines.b_to_open_charm.builders import cbaryon_builder from Hlt2Conf.lines.b_to_open_charm.builders import b_builder from Hlt2Conf.lines.b_to_open_charm.builders import d_builder all_lines = {} diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_dd.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_dd.py index 045ecfd745e78c29632f03499520a2e4840c5026..cdf77be9c819c7641cd9b2361f92607690099623 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_dd.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_dd.py @@ -14,14 +14,12 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters from PyConf import configurable from Hlt2Conf.lines.b_to_open_charm.builders import basic_builder -from Hlt2Conf.lines.b_to_open_charm.builders import cbaryon_builder from Hlt2Conf.lines.b_to_open_charm.builders import b_builder from Hlt2Conf.lines.b_to_open_charm.builders import d_builder all_lines = {} diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_dh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_dh.py index a732fa1f37f2f2f0d02eb3072ef24a54e25d96a9..bab1edd20c0d513da8807883d67f38a365068907 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_dh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/bbaryon_to_lightbaryon_dh.py @@ -14,16 +14,12 @@ from __future__ import absolute_import, division, print_function from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond from Hlt2Conf.lines.b_to_open_charm.prefilters import b2oc_prefilters from PyConf import configurable -from Hlt2Conf.algorithms import (require_all, ParticleFilter) - from Hlt2Conf.lines.b_to_open_charm.builders import basic_builder -from Hlt2Conf.lines.b_to_open_charm.builders import cbaryon_builder from Hlt2Conf.lines.b_to_open_charm.builders import b_builder from Hlt2Conf.lines.b_to_open_charm.builders import d_builder all_lines = {} diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/b_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/b_builder.py index b27bcdf4ec8f148e34d461c50528ee0b0a742d8e..a7cfcdda88a4c052aec63c184f5038d27aef455b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/b_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/b_builder.py @@ -12,8 +12,8 @@ Builds B2OC B decays, and defines the common default cuts applied to the B2X combinations """ -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond -from Hlt2Conf.algorithms import require_all, ParticleFilter, ParticleCombiner, ParticleCombinerWithPVs, ParticleFilterWithPVs, N3BodyCombinerWithPVs, N4BodyCombinerWithPVs +from GaudiKernel.SystemOfUnits import GeV, MeV, mm, picosecond +from Hlt2Conf.algorithms import require_all, ParticleCombinerWithPVs, N3BodyCombinerWithPVs, N4BodyCombinerWithPVs from PyConf import configurable from RecoConf.reconstruction_objects import make_pvs diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py index 9cfaf0dedb14b1501a499dad1f5fc74fc343b96b..d4e7e8ac7d01a35d447d08fe0ed451734e27c048 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py @@ -11,20 +11,19 @@ """Definition of B2OC basic objects: pions, kaons, ... """ from __future__ import absolute_import, division, print_function -import math -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import GeV, MeV, mm from RecoConf.reconstruction_objects import make_pvs from Hlt2Conf.algorithms import ( - require_all, ParticleFilter, ParticleCombiner, ParticleCombinerWithPVs, + require_all, ParticleFilter, ParticleCombinerWithPVs, ParticleFilterWithPVs, N3BodyCombinerWithPVs, N4BodyCombinerWithPVs) from PyConf import configurable from Hlt2Conf.standard_particles import ( make_has_rich_long_pions, make_has_rich_long_kaons, - make_has_rich_long_protons, make_long_pions, make_down_pions, make_photons, - make_resolved_pi0s, make_merged_pi0s, make_KsLL, make_KsDD) + make_has_rich_long_protons, make_photons, make_resolved_pi0s, + make_merged_pi0s, make_KsLL, make_KsDD) #################################### # Track selections # diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/cbaryon_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/cbaryon_builder.py index d54f284accd840cd355ddebc77cc28d39eadee77..7902f5bff1a33522089bed5c4abc76bdcf79e120 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/cbaryon_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/cbaryon_builder.py @@ -13,15 +13,10 @@ Definition of detached charm baryon decays that are shared between many B2OC selections, and therefore are defined centrally. """ from __future__ import absolute_import, division, print_function -import math -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV -from RecoConf.reconstruction_objects import make_pvs - -from Hlt2Conf.algorithms import (require_all, ParticleFilter, ParticleCombiner, - ParticleCombinerWithPVs, - ParticleFilterWithPVs) +from Hlt2Conf.algorithms import ParticleFilter from PyConf import configurable from . import basic_builder diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/d_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/d_builder.py index 02ab3265a704a644dae63f54d6cafb4f69c693f4..132df88437a5d620cff05d6784bb1fb080e1a4c1 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/d_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/d_builder.py @@ -13,15 +13,13 @@ Definition of detached D/D0/Ds/... meson decays that are shared between many B2OC selections, and therefore are defined centrally. """ from __future__ import absolute_import, division, print_function -import math -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import MeV, mm from RecoConf.reconstruction_objects import make_pvs from Hlt2Conf.algorithms import (require_all, ParticleFilter, ParticleCombiner, - ParticleCombinerWithPVs, - ParticleFilterWithPVs) + ParticleCombinerWithPVs) from PyConf import configurable from . import basic_builder diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/filters.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/filters.py index b81736b219667d7dbc17a741e143626c85bce917..a7523c0e55d05ecc6fc71c93926cdb91a7c6c2d7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/filters.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/filters.py @@ -18,8 +18,6 @@ from __future__ import absolute_import, division, print_function from Hlt2Conf.algorithms import require_all, ParticleFilterWithTMVA -import math - def b_bdt_filter(particles, pvs, MVACut=-0.2): BDTWeightsFile = "$PARAMFILESROOT/data/Hlt2B2OC_B_BDTParams_Run3.xml" diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_lines.py index 34fca0a3e2029806b2977afb923147853df3d03e..1192cb2cec8df6e7f1e4e7d6847812567822a673 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_lines.py @@ -117,7 +117,13 @@ Lambda_c+ -> e+ e+ p~- , Lambda_c~- -> e- e- p+ [Hlt2RareCharmLc2PEESSLine] """ from __future__ import absolute_import, division, print_function -from .rare_charm_makers import * +from GaudiKernel.SystemOfUnits import MeV + +from Moore.config import HltLine, register_line_builder +from PyConf import configurable +from RecoConf.reconstruction_objects import upfront_reconstruction + +from . import rare_charm_makers as m _Mass_M_MIN_Control_HHll = 1765.0 * MeV _Mass_M_MAX_Control_HHll = 1965.0 * MeV @@ -136,12 +142,12 @@ Definition of the lines @configurable def dstar2dzeropi_dzero2mumu_line(name='Hlt2RareCharmDstp2D0Pip_D02MuMuLine', prescale=1): - pvs = make_pvs() - muons = make_rarecharm_muons_forTwoBodyDecays() - dzeros = make_rarecharm_d02ll_dzeros( + pvs = m.make_pvs() + muons = m.make_rarecharm_muons_forTwoBodyDecays() + dzeros = m.make_rarecharm_d02ll_dzeros( particles=[muons], descriptors=['D0 -> mu- mu+'], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, # descriptors=['[D*(2010)+ -> D0 pi+]cc'], @@ -149,7 +155,7 @@ def dstar2dzeropi_dzero2mumu_line(name='Hlt2RareCharmDstp2D0Pip_D02MuMuLine', pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -158,22 +164,22 @@ def dstar2dzeropi_dzero2mumu_line(name='Hlt2RareCharmDstp2D0Pip_D02MuMuLine', @configurable def dstar2dzeropi_dzero2mue_line(name='Hlt2RareCharmDstp2D0Pip_D02MuELine', prescale=1): - pvs = make_pvs() - electrons = make_rarecharm_electrons_forTwoBodyDecays() - muons = make_rarecharm_muons_forTwoBodyDecays() - dzeros = make_rarecharm_d02ll_dzeros( + pvs = m.make_pvs() + electrons = m.make_rarecharm_electrons_forTwoBodyDecays() + muons = m.make_rarecharm_muons_forTwoBodyDecays() + dzeros = m.make_rarecharm_d02ll_dzeros( particles=[electrons, muons], descriptors=['D0 -> mu- e+', 'D0 -> mu+ e-'], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -182,19 +188,19 @@ def dstar2dzeropi_dzero2mue_line(name='Hlt2RareCharmDstp2D0Pip_D02MuELine', @configurable def dstar2dzeropi_dzero2ee_line(name='Hlt2RareCharmDstp2D0Pip_D02EELine', prescale=1): - pvs = make_pvs() - electrons = make_rarecharm_electrons_forTwoBodyDecays() - dzeros = make_rarecharm_d02ll_dzeros( + pvs = m.make_pvs() + electrons = m.make_rarecharm_electrons_forTwoBodyDecays() + dzeros = m.make_rarecharm_d02ll_dzeros( particles=[electrons], descriptors=['D0 -> e- e+'], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -206,24 +212,24 @@ def dstar2dzeropi_dzero2ee_line(name='Hlt2RareCharmDstp2D0Pip_D02EELine', @configurable def dstar2dzeropi_dzero2pipimumu_line( name='Hlt2RareCharmDstp2D0Pip_D02PiPiMuMuLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions() - muons = make_rarecharm_muons() - dimuons = make_rarecharm_TwoMuons( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions() + muons = m.make_rarecharm_muons() + dimuons = m.make_rarecharm_TwoMuons( particles=muons, pvs=pvs) # the dimuon objects - dzeros = make_rarecharm_d02hhmumu_dzeros( + dzeros = m.make_rarecharm_d02hhmumu_dzeros( particles=[pions, dimuons], descriptors=['D0 -> pi- pi+ J/psi(1S)'], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -233,19 +239,19 @@ def dstar2dzeropi_dzero2pipimumu_line( def dstar2dzeropi_dzero2kpimumu_line( name='Hlt2RareCharmDstp2D0Pip_D02KPiMuMuLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - pions = make_rarecharm_pions() - muons = make_rarecharm_muons() # the dimuon objects - dimuons = make_rarecharm_TwoMuons( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + pions = m.make_rarecharm_pions() + muons = m.make_rarecharm_muons() # the dimuon objects + dimuons = m.make_rarecharm_TwoMuons( particles=muons, pvs=pvs) # the dimuon objects - dzeros = make_rarecharm_d02hhmumu_dzeros( + dzeros = m.make_rarecharm_d02hhmumu_dzeros( particles=[kaons, pions, dimuons], # descriptors=['[D0 -> K- pi+ J/psi(1S)]cc','[D0 -> K+ pi- J/psi(1S)]cc'], descriptors=['D0 -> K- pi+ J/psi(1S)', 'D0 -> K+ pi- J/psi(1S)'], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, # descriptors=['[D*(2010)+ -> D0 pi+]cc'], @@ -253,7 +259,7 @@ def dstar2dzeropi_dzero2kpimumu_line( pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -263,19 +269,19 @@ def dstar2dzeropi_dzero2kpimumu_line( def dzero2kpimumuuntagged_line(name='Hlt2RareCharmD02KPiMuMuUntagLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - pions = make_rarecharm_pions() - muons = make_rarecharm_muons() - dimuons = make_rarecharm_TwoMuons( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + pions = m.make_rarecharm_pions() + muons = m.make_rarecharm_muons() + dimuons = m.make_rarecharm_TwoMuons( particles=muons, pvs=pvs) # the dimuon objects - dzeros = make_rarecharm_d02hhmumu_dzeros( + dzeros = m.make_rarecharm_d02hhmumu_dzeros( particles=[kaons, pions, dimuons], descriptors=['[D0 -> K- pi+ J/psi(1S)]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dzeros], + algs=upfront_reconstruction() + m.charm_prefilters() + [dzeros], prescale=prescale, ) @@ -284,23 +290,23 @@ def dzero2kpimumuuntagged_line(name='Hlt2RareCharmD02KPiMuMuUntagLine', @configurable def dstar2dzeropi_dzero2kkmumu_line( name='Hlt2RareCharmDstp2D0Pip_D02KKMuMuLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - muons = make_rarecharm_muons() # the dimuon objects - dimuons = make_rarecharm_TwoMuons(particles=muons, pvs=pvs) - dzeros = make_rarecharm_d02hhmumu_dzeros( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + muons = m.make_rarecharm_muons() # the dimuon objects + dimuons = m.make_rarecharm_TwoMuons(particles=muons, pvs=pvs) + dzeros = m.make_rarecharm_d02hhmumu_dzeros( particles=[kaons, dimuons], descriptors=['D0 -> K- K+ J/psi(1S)'], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -312,23 +318,23 @@ def dstar2dzeropi_dzero2kkmumu_line( @configurable def dstar2dzeropi_dzero2pipiee_line( name='Hlt2RareCharmDstp2D0Pip_D02PiPiEELine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions() - electrons = make_rarecharm_electrons() - dielectrons = make_rarecharm_TwoElectrons(particles=electrons, pvs=pvs) - dzeros = make_rarecharm_d02hhel_dzeros( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions() + electrons = m.make_rarecharm_electrons() + dielectrons = m.make_rarecharm_TwoElectrons(particles=electrons, pvs=pvs) + dzeros = m.make_rarecharm_d02hhel_dzeros( particles=[pions, dielectrons], descriptors=['D0 -> pi- pi+ J/psi(1S)'], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -337,24 +343,24 @@ def dstar2dzeropi_dzero2pipiee_line( @configurable def dstar2dzeropi_dzero2kpiee_line(name='Hlt2RareCharmDstp2D0Pip_D02KPiEELine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions() - kaons = make_rarecharm_kaons() - electrons = make_rarecharm_electrons() - dielectrons = make_rarecharm_TwoElectrons(particles=electrons, pvs=pvs) - dzeros = make_rarecharm_d02hhel_dzeros( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions() + kaons = m.make_rarecharm_kaons() + electrons = m.make_rarecharm_electrons() + dielectrons = m.make_rarecharm_TwoElectrons(particles=electrons, pvs=pvs) + dzeros = m.make_rarecharm_d02hhel_dzeros( particles=[kaons, pions, dielectrons], descriptors=['D0 -> K- pi+ J/psi(1S)', 'D0 -> K+ pi- J/psi(1S)'], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -363,23 +369,23 @@ def dstar2dzeropi_dzero2kpiee_line(name='Hlt2RareCharmDstp2D0Pip_D02KPiEELine', @configurable def dstar2dzeropi_dzero2kkee_line(name='Hlt2RareCharmDstp2D0Pip_D02KKEELine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - electrons = make_rarecharm_electrons() - dielectrons = make_rarecharm_TwoElectrons(particles=electrons, pvs=pvs) - dzeros = make_rarecharm_d02hhel_dzeros( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + electrons = m.make_rarecharm_electrons() + dielectrons = m.make_rarecharm_TwoElectrons(particles=electrons, pvs=pvs) + dzeros = m.make_rarecharm_d02hhel_dzeros( particles=[kaons, dielectrons], descriptors=['D0 -> K- K+ J/psi(1S)'], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -391,25 +397,25 @@ def dstar2dzeropi_dzero2kkee_line(name='Hlt2RareCharmDstp2D0Pip_D02KKEELine', @configurable def dstar2dzeropi_dzero2pipimue_line( name='Hlt2RareCharmDstp2D0Pip_D02PiPiMuELine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions() - electrons = make_rarecharm_electrons() - muons = make_rarecharm_muons() - electronmuon = make_rarecharm_ElectronMuon( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions() + electrons = m.make_rarecharm_electrons() + muons = m.make_rarecharm_muons() + electronmuon = m.make_rarecharm_ElectronMuon( particles=[electrons, muons], pvs=pvs) - dzeros = make_rarecharm_d02hhel_dzeros( + dzeros = m.make_rarecharm_d02hhel_dzeros( particles=[pions, electronmuon], descriptors=['D0 -> pi- pi+ J/psi(1S)', 'D0 -> pi- pi+ phi(1020)'], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -418,25 +424,25 @@ def dstar2dzeropi_dzero2pipimue_line( @configurable def dstar2dzeropi_dzero2kkmue_line(name='Hlt2RareCharmDstp2D0Pip_D02KKMuELine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - electrons = make_rarecharm_electrons() - muons = make_rarecharm_muons() - electronmuon = make_rarecharm_ElectronMuon( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + electrons = m.make_rarecharm_electrons() + muons = m.make_rarecharm_muons() + electronmuon = m.make_rarecharm_ElectronMuon( particles=[electrons, muons], pvs=pvs) - dzeros = make_rarecharm_d02hhel_dzeros( + dzeros = m.make_rarecharm_d02hhel_dzeros( particles=[kaons, electronmuon], descriptors=['D0 -> K- K+ J/psi(1S)', 'D0 -> K- K+ phi(1020)'], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -445,29 +451,29 @@ def dstar2dzeropi_dzero2kkmue_line(name='Hlt2RareCharmDstp2D0Pip_D02KKMuELine', @configurable def dstar2dzeropi_dzero2kpimue_line( name='Hlt2RareCharmDstp2D0Pip_D02KPiMuELine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - pions = make_rarecharm_pions() - electrons = make_rarecharm_electrons() - muons = make_rarecharm_muons() - electronmuon = make_rarecharm_ElectronMuon( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + pions = m.make_rarecharm_pions() + electrons = m.make_rarecharm_electrons() + muons = m.make_rarecharm_muons() + electronmuon = m.make_rarecharm_ElectronMuon( particles=[electrons, muons], pvs=pvs) - dzeros = make_rarecharm_d02hhel_dzeros( + dzeros = m.make_rarecharm_d02hhel_dzeros( particles=[kaons, pions, electronmuon], descriptors=[ 'D0 -> K- pi+ J/psi(1S)', 'D0 -> K- pi+ phi(1020)', 'D0 -> K+ pi- J/psi(1S)', 'D0 -> K+ pi- phi(1020)' ], pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -479,17 +485,17 @@ def dstar2dzeropi_dzero2kpimue_line( @configurable def dstar2dzeropi_dzero2pipimumuss_line( name='Hlt2RareCharmDstp2D0Pip_D02PiPiMuMuSSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions() - muons = make_rarecharm_muons() - pionmuon = make_rarecharm_PionMuon(particles=[pions, muons], pvs=pvs) - dzeros = make_rarecharm_d02hhll_sslepton_dzeros( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions() + muons = m.make_rarecharm_muons() + pionmuon = m.make_rarecharm_PionMuon(particles=[pions, muons], pvs=pvs) + dzeros = m.make_rarecharm_d02hhll_sslepton_dzeros( particles=[pionmuon], descriptors=['D0 -> B0 B0', 'D0 -> B~0 B~0' ], # = D0 -> pi+mu- pi+mu-','D0 -> pi-mu+ pi-mu+' pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', @@ -497,7 +503,7 @@ def dstar2dzeropi_dzero2pipimumuss_line( pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -506,17 +512,17 @@ def dstar2dzeropi_dzero2pipimumuss_line( @configurable def dstar2dzeropi_dzero2kkmumuss_line( name='Hlt2RareCharmDstp2D0Pip_D02KKMuMuSSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - muons = make_rarecharm_muons() - kaonmuon = make_rarecharm_KaonMuon(particles=[kaons, muons], pvs=pvs) - dzeros = make_rarecharm_d02hhll_sslepton_dzeros( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + muons = m.make_rarecharm_muons() + kaonmuon = m.make_rarecharm_KaonMuon(particles=[kaons, muons], pvs=pvs) + dzeros = m.make_rarecharm_d02hhll_sslepton_dzeros( particles=[kaonmuon], descriptors=['D0 -> B0L B0L', 'D0 -> B0H B0H' ], # = D0 -> K+mu- K+mu-','D0 -> K-mu+ K-mu+' pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', @@ -524,7 +530,7 @@ def dstar2dzeropi_dzero2kkmumuss_line( pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -533,19 +539,19 @@ def dstar2dzeropi_dzero2kkmumuss_line( @configurable def dstar2dzeropi_dzero2kpimumuss_line( name='Hlt2RareCharmDstp2D0Pip_D02KPiMuMuSSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - pions = make_rarecharm_pions() - muons = make_rarecharm_muons() - kaonmuon = make_rarecharm_KaonMuon(particles=[kaons, muons], pvs=pvs) - pionmuon = make_rarecharm_PionMuon(particles=[pions, muons], pvs=pvs) - dzeros = make_rarecharm_d02hhll_sslepton_dzeros( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + pions = m.make_rarecharm_pions() + muons = m.make_rarecharm_muons() + kaonmuon = m.make_rarecharm_KaonMuon(particles=[kaons, muons], pvs=pvs) + pionmuon = m.make_rarecharm_PionMuon(particles=[pions, muons], pvs=pvs) + dzeros = m.make_rarecharm_d02hhll_sslepton_dzeros( particles=[kaonmuon, pionmuon], descriptors=['D0 -> B0 B0L ', 'D0 -> B~0 B0H' ], # = D0 -> pi+mu- K+mu-','D0 -> pi-mu+ K-mu+' pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', @@ -553,7 +559,7 @@ def dstar2dzeropi_dzero2kpimumuss_line( pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -562,18 +568,18 @@ def dstar2dzeropi_dzero2kpimumuss_line( @configurable def dstar2dzeropi_dzero2pipieess_line( name='Hlt2RareCharmDstp2D0Pip_D02PiPiEESSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions() - electrons = make_rarecharm_electrons() - pionelectron = make_rarecharm_PionElectron( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions() + electrons = m.make_rarecharm_electrons() + pionelectron = m.make_rarecharm_PionElectron( particles=[pions, electrons], pvs=pvs) - dzeros = make_rarecharm_d02hhll_sslepton_dzeros( + dzeros = m.make_rarecharm_d02hhll_sslepton_dzeros( particles=[pionelectron], descriptors=['D0 -> B_s0 B_s0', 'D0 -> B_s~0 B_s~0' ], # = D0 -> pi+e- pi+e-','D0 -> pi-e+ pi-e+' pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', @@ -581,7 +587,7 @@ def dstar2dzeropi_dzero2pipieess_line( pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -590,18 +596,18 @@ def dstar2dzeropi_dzero2pipieess_line( @configurable def dstar2dzeropi_dzero2kkeess_line( name='Hlt2RareCharmDstp2D0Pip_D02KKEESSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - electrons = make_rarecharm_electrons() - kaonelectron = make_rarecharm_KaonElectron( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + electrons = m.make_rarecharm_electrons() + kaonelectron = m.make_rarecharm_KaonElectron( particles=[kaons, electrons], pvs=pvs) - dzeros = make_rarecharm_d02hhll_sslepton_dzeros( + dzeros = m.make_rarecharm_d02hhll_sslepton_dzeros( particles=[kaonelectron], descriptors=['D0 -> B_s0L B_s0L', 'D0 -> B_s0H B_s0H' ], # = D0 -> K+e- K+e-','D0 -> K-e+ K-e+' pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', @@ -609,7 +615,7 @@ def dstar2dzeropi_dzero2kkeess_line( pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -618,21 +624,21 @@ def dstar2dzeropi_dzero2kkeess_line( @configurable def dstar2dzeropi_dzero2kpieess_line( name='Hlt2RareCharmDstp2D0Pip_D02KPiEESSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions() - kaons = make_rarecharm_kaons() - electrons = make_rarecharm_electrons() - kaonelectron = make_rarecharm_KaonElectron( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions() + kaons = m.make_rarecharm_kaons() + electrons = m.make_rarecharm_electrons() + kaonelectron = m.make_rarecharm_KaonElectron( particles=[kaons, electrons], pvs=pvs) - pionelectron = make_rarecharm_PionElectron( + pionelectron = m.make_rarecharm_PionElectron( particles=[pions, electrons], pvs=pvs) - dzeros = make_rarecharm_d02hhll_sslepton_dzeros( + dzeros = m.make_rarecharm_d02hhll_sslepton_dzeros( particles=[kaonelectron, pionelectron], descriptors=['D0 -> B_s0 B_s0L', 'D0 -> B_s~0 B_s0H' ], # = D0 -> pi+e- K+e-','D0 -> pi-e+ K-e+' pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', @@ -640,7 +646,7 @@ def dstar2dzeropi_dzero2kpieess_line( pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -652,22 +658,22 @@ def dstar2dzeropi_dzero2kpieess_line( @configurable def dstar2dzeropi_dzero2pipimuess_line( name='Hlt2RareCharmDstp2D0Pip_D02PiPiMuESSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions() - electrons = make_rarecharm_electrons() - pionelectron = make_rarecharm_PionElectron( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions() + electrons = m.make_rarecharm_electrons() + pionelectron = m.make_rarecharm_PionElectron( particles=[pions, electrons], pvs=pvs) - muons = make_rarecharm_muons() - pionmuon = make_rarecharm_PionMuon(particles=[pions, muons], pvs=pvs) + muons = m.make_rarecharm_muons() + pionmuon = m.make_rarecharm_PionMuon(particles=[pions, muons], pvs=pvs) - dzeros = make_rarecharm_d02hhll_sslepton_dzeros( + dzeros = m.make_rarecharm_d02hhll_sslepton_dzeros( particles=[pionelectron, pionmuon], descriptors=['D0 -> B0 B_s0', 'D0 -> B~0 B_s~0' ], # = D0 -> pi+mu- pi+e-','D0 -> pi-mu+ pi-e+' pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', @@ -675,7 +681,7 @@ def dstar2dzeropi_dzero2pipimuess_line( pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -684,20 +690,20 @@ def dstar2dzeropi_dzero2pipimuess_line( @configurable def dstar2dzeropi_dzero2kkmuess_line( name='Hlt2RareCharmDstp2D0Pip_D02KKMuESSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - electrons = make_rarecharm_electrons() - kaonelectron = make_rarecharm_KaonElectron( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + electrons = m.make_rarecharm_electrons() + kaonelectron = m.make_rarecharm_KaonElectron( particles=[kaons, electrons], pvs=pvs) - muons = make_rarecharm_muons() - kaonmuon = make_rarecharm_KaonMuon(particles=[kaons, muons], pvs=pvs) - dzeros = make_rarecharm_d02hhll_sslepton_dzeros( + muons = m.make_rarecharm_muons() + kaonmuon = m.make_rarecharm_KaonMuon(particles=[kaons, muons], pvs=pvs) + dzeros = m.make_rarecharm_d02hhll_sslepton_dzeros( particles=[kaonelectron, kaonmuon], descriptors=['D0 -> B0L B_s0L', 'D0 -> B0H B_s0H' ], # = D0 -> K+mu- K+e-','D0 -> K-mu+ K-e+' pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', @@ -705,7 +711,7 @@ def dstar2dzeropi_dzero2kkmuess_line( pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -714,21 +720,21 @@ def dstar2dzeropi_dzero2kkmuess_line( @configurable def dstar2dzeropi_dzero2kpimuess_line( name='Hlt2RareCharmDstp2D0Pip_D02KPiMuESSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - muons = make_rarecharm_muons() - kaonmuon = make_rarecharm_KaonMuon(particles=[kaons, muons], pvs=pvs) - electrons = make_rarecharm_electrons() - pions = make_rarecharm_pions() - pionelectron = make_rarecharm_PionElectron( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + muons = m.make_rarecharm_muons() + kaonmuon = m.make_rarecharm_KaonMuon(particles=[kaons, muons], pvs=pvs) + electrons = m.make_rarecharm_electrons() + pions = m.make_rarecharm_pions() + pionelectron = m.make_rarecharm_PionElectron( particles=[pions, electrons], pvs=pvs) - dzeros = make_rarecharm_d02hhll_sslepton_dzeros( + dzeros = m.make_rarecharm_d02hhll_sslepton_dzeros( particles=[kaonmuon, pionelectron], descriptors=['D0 -> B0 B_s0L', 'D0 -> B~0 B_s0H' ], # = D0 -> pi+mu- K+e-','D0 -> pi-mu+ K-e+' pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', @@ -736,7 +742,7 @@ def dstar2dzeropi_dzero2kpimuess_line( pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -748,16 +754,16 @@ def dstar2dzeropi_dzero2kpimuess_line( @register_line_builder(all_lines) @configurable def d2pimumuos_line(name='Hlt2RareCharmD2PiMuMuOSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions_tightSel() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions_tightSel() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[pions, muons], descriptors=['[D+ -> pi+ mu+ mu-]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -765,16 +771,16 @@ def d2pimumuos_line(name='Hlt2RareCharmD2PiMuMuOSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2pimumuss_line(name='Hlt2RareCharmD2PiMuMuSSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions_tightSel() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions_tightSel() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[pions, muons], descriptors=['[D+ -> pi- mu+ mu+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -782,16 +788,16 @@ def d2pimumuss_line(name='Hlt2RareCharmD2PiMuMuSSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2pimumuws_line(name='Hlt2RareCharmD2PiMuMuWSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions_tightSel() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions_tightSel() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[pions, muons], descriptors=['[D+ -> pi+ mu+ mu+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -802,16 +808,16 @@ def d2pimumuws_line(name='Hlt2RareCharmD2PiMuMuWSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2pieeos_line(name='Hlt2RareCharmD2PiEEOSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions_tightSel() - electrons = make_rarecharm_electrons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions_tightSel() + electrons = m.make_rarecharm_electrons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[pions, electrons], descriptors=['[D+ -> pi+ e+ e-]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -819,16 +825,16 @@ def d2pieeos_line(name='Hlt2RareCharmD2PiEEOSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2pimeess_line(name='Hlt2RareCharmD2PiEESSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions_tightSel() - electrons = make_rarecharm_electrons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions_tightSel() + electrons = m.make_rarecharm_electrons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[pions, electrons], descriptors=['[D+ -> pi- e+ e+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -836,16 +842,16 @@ def d2pimeess_line(name='Hlt2RareCharmD2PiEESSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2pimeews_line(name='Hlt2RareCharmD2PiEEWSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions_tightSel() - electrons = make_rarecharm_electrons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions_tightSel() + electrons = m.make_rarecharm_electrons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[pions, electrons], descriptors=['[D+ -> pi+ e+ e+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -854,16 +860,16 @@ def d2pimeews_line(name='Hlt2RareCharmD2PiEEWSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2kmumuos_line(name='Hlt2RareCharmD2KMuMuOSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons_tightSel() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons_tightSel() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[kaons, muons], descriptors=['[D+ -> K+ mu+ mu-]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -871,33 +877,33 @@ def d2kmumuos_line(name='Hlt2RareCharmD2KMuMuOSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2kmumuss_line(name='Hlt2RareCharmD2KMuMuSSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons_tightSel() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons_tightSel() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[kaons, muons], descriptors=['[D+ -> K- mu+ mu+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @register_line_builder(all_lines) @configurable -def d2pimumuws_line(name='Hlt2RareCharmD2KMuMuWSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons_tightSel() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( +def d2kmumuws_line(name='Hlt2RareCharmD2KMuMuWSLine', prescale=1): + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons_tightSel() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[kaons, muons], descriptors=['[D+ -> K+ mu+ mu+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -906,16 +912,16 @@ def d2pimumuws_line(name='Hlt2RareCharmD2KMuMuWSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2keeos_line(name='Hlt2RareCharmD2KEEOSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons_tightSel() - electrons = make_rarecharm_electrons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons_tightSel() + electrons = m.make_rarecharm_electrons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[kaons, electrons], descriptors=['[D+ -> K+ e+ e-]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -923,16 +929,16 @@ def d2keeos_line(name='Hlt2RareCharmD2KEEOSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2keess_line(name='Hlt2RareCharmD2KEESSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons_tightSel() - electrons = make_rarecharm_electrons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons_tightSel() + electrons = m.make_rarecharm_electrons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[kaons, electrons], descriptors=['[D+ -> K- e+ e+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -940,16 +946,16 @@ def d2keess_line(name='Hlt2RareCharmD2KEESSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2pieews_line(name='Hlt2RareCharmD2KEEWSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - electrons = make_rarecharm_electrons() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + electrons = m.make_rarecharm_electrons() + ds = m.make_rarecharm_d2hll_ds( particles=[kaons, electrons], descriptors=['[D+ -> K+ e+ e+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -958,17 +964,17 @@ def d2pieews_line(name='Hlt2RareCharmD2KEEWSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2kmueos_line(name='Hlt2RareCharmD2KMuEOSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons_tightSel() - electrons = make_rarecharm_electrons_tightSel() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons_tightSel() + electrons = m.make_rarecharm_electrons_tightSel() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[kaons, electrons, muons], descriptors=['[D+ -> K+ mu+ e-]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -976,17 +982,17 @@ def d2kmueos_line(name='Hlt2RareCharmD2KMuEOSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2kemuos_line(name='Hlt2RareCharmD2KEMuOSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - electrons = make_rarecharm_electrons() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + electrons = m.make_rarecharm_electrons() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[kaons, electrons, muons], descriptors=['[D+ -> K+ e+ mu-]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -994,35 +1000,35 @@ def d2kemuos_line(name='Hlt2RareCharmD2KEMuOSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2kmuess_line(name='Hlt2RareCharmD2KMuESSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons_tightSel() - electrons = make_rarecharm_electrons_tightSel() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons_tightSel() + electrons = m.make_rarecharm_electrons_tightSel() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[kaons, electrons, muons], descriptors=['[D+ -> K- mu+ e+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @register_line_builder(all_lines) @configurable -def d2pimuews_line(name='Hlt2RareCharmD2KMuEWSLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - electrons = make_rarecharm_electrons() - muons = make_rarecharm_muons() - ds = make_rarecharm_d2hll_ds( +def d2kmuews_line(name='Hlt2RareCharmD2KMuEWSLine', prescale=1): + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + electrons = m.make_rarecharm_electrons() + muons = m.make_rarecharm_muons() + ds = m.make_rarecharm_d2hll_ds( particles=[kaons, electrons, muons], descriptors=['[D+ -> K+ mu+ e+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -1031,17 +1037,17 @@ def d2pimuews_line(name='Hlt2RareCharmD2KMuEWSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2pimueos_line(name='Hlt2RareCharmD2PiMuEOSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions_tightSel() - electrons = make_rarecharm_electrons_tightSel() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions_tightSel() + electrons = m.make_rarecharm_electrons_tightSel() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[pions, electrons, muons], descriptors=['[D+ -> pi+ mu+ e-]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -1049,17 +1055,17 @@ def d2pimueos_line(name='Hlt2RareCharmD2PiMuEOSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2piemuos_line(name='Hlt2RareCharmD2PiEMuOSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions_tightSel() - electrons = make_rarecharm_electrons_tightSel() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions_tightSel() + electrons = m.make_rarecharm_electrons_tightSel() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[pions, electrons, muons], descriptors=['[D+ -> pi+ e+ mu-]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -1067,17 +1073,17 @@ def d2piemuos_line(name='Hlt2RareCharmD2PiEMuOSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2pimuess_line(name='Hlt2RareCharmD2PiMuESSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions_tightSel() - electrons = make_rarecharm_electrons_tightSel() - muons = make_rarecharm_muons_tightSel() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions_tightSel() + electrons = m.make_rarecharm_electrons_tightSel() + muons = m.make_rarecharm_muons_tightSel() + ds = m.make_rarecharm_d2hll_ds( particles=[pions, electrons, muons], descriptors=['[D+ -> pi- mu+ e+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -1085,17 +1091,17 @@ def d2pimuess_line(name='Hlt2RareCharmD2PiMuESSLine', prescale=1): @register_line_builder(all_lines) @configurable def d2pimuews_line(name='Hlt2RareCharmD2piMuEWSLine', prescale=1): - pvs = make_pvs() - pions = make_rarecharm_pions() - electrons = make_rarecharm_electrons() - muons = make_rarecharm_muons() - ds = make_rarecharm_d2hll_ds( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions() + electrons = m.make_rarecharm_electrons() + muons = m.make_rarecharm_muons() + ds = m.make_rarecharm_d2hll_ds( particles=[pions, electrons, muons], descriptors=['[D+ -> pi+ mu+ e+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [ds], + algs=upfront_reconstruction() + m.charm_prefilters() + [ds], prescale=prescale, ) @@ -1106,11 +1112,11 @@ def d2pimuews_line(name='Hlt2RareCharmD2piMuEWSLine', prescale=1): @register_line_builder(all_lines) @configurable def Lc2pmumu_line(name='Hlt2RareCharmLc2PMuMuLine', prescale=1): - pvs = make_pvs() - protons = make_rarecharm_protons() - muons = make_rarecharm_muons() - dimuons = make_rarecharm_TwoMuons(particles=muons, pvs=pvs) - lambdas = make_rarecharm_lambdacs2pmumu( + pvs = m.make_pvs() + protons = m.make_rarecharm_protons() + muons = m.make_rarecharm_muons() + dimuons = m.make_rarecharm_TwoMuons(particles=muons, pvs=pvs) + lambdas = m.make_rarecharm_lambdacs2pmumu( particles=[protons, dimuons], descriptors=[ 'Lambda_c+ -> J/psi(1S) p+', 'Lambda_c~- -> J/psi(1S) p~-' @@ -1118,7 +1124,7 @@ def Lc2pmumu_line(name='Hlt2RareCharmLc2PMuMuLine', prescale=1): pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [lambdas], + algs=upfront_reconstruction() + m.charm_prefilters() + [lambdas], prescale=prescale, ) @@ -1126,11 +1132,11 @@ def Lc2pmumu_line(name='Hlt2RareCharmLc2PMuMuLine', prescale=1): @register_line_builder(all_lines) @configurable def Lc2pmumuss_line(name='Hlt2RareCharmLc2PMuMuSSLine', prescale=1): - pvs = make_pvs() - protons = make_rarecharm_protons() - muons = make_rarecharm_muons() - dimuons = make_rarecharm_TwoMuons(particles=muons, pvs=pvs) - lambdas = make_rarecharm_lambdacs2pmumu( + pvs = m.make_pvs() + protons = m.make_rarecharm_protons() + muons = m.make_rarecharm_muons() + dimuons = m.make_rarecharm_TwoMuons(particles=muons, pvs=pvs) + lambdas = m.make_rarecharm_lambdacs2pmumu( particles=[protons, dimuons], descriptors=[ 'Lambda_c+ -> phi(1020) p~-', 'Lambda_c~- -> rho(770)0 p+' @@ -1138,7 +1144,7 @@ def Lc2pmumuss_line(name='Hlt2RareCharmLc2PMuMuSSLine', prescale=1): pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [lambdas], + algs=upfront_reconstruction() + m.charm_prefilters() + [lambdas], prescale=prescale, ) @@ -1146,13 +1152,13 @@ def Lc2pmumuss_line(name='Hlt2RareCharmLc2PMuMuSSLine', prescale=1): @register_line_builder(all_lines) @configurable def Lc2pmume_line(name='Hlt2RareCharmLc2PMuELine', prescale=1): - pvs = make_pvs() - protons = make_rarecharm_protons() - muons = make_rarecharm_muons() - electrons = make_rarecharm_electrons() - dileptons = make_rarecharm_ElectronMuon( + pvs = m.make_pvs() + protons = m.make_rarecharm_protons() + muons = m.make_rarecharm_muons() + electrons = m.make_rarecharm_electrons() + dileptons = m.make_rarecharm_ElectronMuon( particles=[muons, electrons], pvs=pvs) - lambdas = make_rarecharm_lambdacs2pel( + lambdas = m.make_rarecharm_lambdacs2pel( particles=[protons, dileptons], descriptors=[ 'Lambda_c+ -> J/psi(1S) p+', 'Lambda_c~- -> J/psi(1S) p~-', @@ -1161,7 +1167,7 @@ def Lc2pmume_line(name='Hlt2RareCharmLc2PMuELine', prescale=1): pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [lambdas], + algs=upfront_reconstruction() + m.charm_prefilters() + [lambdas], prescale=prescale, ) @@ -1169,10 +1175,10 @@ def Lc2pmume_line(name='Hlt2RareCharmLc2PMuELine', prescale=1): @register_line_builder(all_lines) @configurable def Lc2pee_line(name='Hlt2RareCharmLc2PEELine', prescale=1): - pvs = make_pvs() - protons = make_rarecharm_protons() - electrons = make_rarecharm_electrons() - lambdas = make_rarecharm_lambdacs2pel( + pvs = m.make_pvs() + protons = m.make_rarecharm_protons() + electrons = m.make_rarecharm_electrons() + lambdas = m.make_rarecharm_lambdacs2pel( particles=[protons, electrons], descriptors=[ 'Lambda_c+ -> J/psi(1S) p+', 'Lambda_c~- -> J/psi(1S) p~-' @@ -1180,19 +1186,19 @@ def Lc2pee_line(name='Hlt2RareCharmLc2PEELine', prescale=1): pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [lambdas], + algs=upfront_reconstruction() + m.charm_prefilters() + [lambdas], prescale=prescale, ) @register_line_builder(all_lines) @configurable -def Lc2pmumuss_line(name='Hlt2RareCharmLc2PEESSLine', prescale=1): - pvs = make_pvs() - protons = make_rarecharm_protons() - electrons = make_rarecharm_electrons() - dielectrons = make_rarecharm_TwoElectrons(particles=electrons, pvs=pvs) - lambdas = make_rarecharm_lambdacs2pel( +def Lc2peess_line(name='Hlt2RareCharmLc2PEESSLine', prescale=1): + pvs = m.make_pvs() + protons = m.make_rarecharm_protons() + electrons = m.make_rarecharm_electrons() + dielectrons = m.make_rarecharm_TwoElectrons(particles=electrons, pvs=pvs) + lambdas = m.make_rarecharm_lambdacs2pel( particles=[protons, dielectrons], descriptors=[ 'Lambda_c+ -> phi(1020) p~-', 'Lambda_c~- -> rho(770)0 p+' @@ -1200,7 +1206,7 @@ def Lc2pmumuss_line(name='Hlt2RareCharmLc2PEESSLine', prescale=1): pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [lambdas], + algs=upfront_reconstruction() + m.charm_prefilters() + [lambdas], prescale=prescale, ) @@ -1212,25 +1218,25 @@ def Lc2pmumuss_line(name='Hlt2RareCharmLc2PEESSLine', prescale=1): @configurable def dstar2dzeropi_dzero2pipipipicontrol_line( name='Hlt2RareCharmDstp2D0Pip_D02PiPiPiPiControlLine', prescale=0.02): - pvs = make_pvs() - noPID_pions = make_rarecharm_noPID_pions() - dipions = make_rarecharm_TwoPions( + pvs = m.make_pvs() + noPID_pions = m.make_rarecharm_noPID_pions() + dipions = m.make_rarecharm_TwoPions( particles=noPID_pions, pvs=pvs) # the dimuon objects - dzeros = make_rarecharm_d02hhmumu_dzeros( + dzeros = m.make_rarecharm_d02hhmumu_dzeros( particles=[noPID_pions, dipions], descriptors=['D0 -> pi- pi+ J/psi(1S)'], am_min=_Mass_M_MIN_Control_HHll, am_max=_Mass_M_MAX_Control_HHll, pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -1240,26 +1246,26 @@ def dstar2dzeropi_dzero2pipipipicontrol_line( def dstar2dzeropi_dzero2kpipipicontrol_line( name='Hlt2RareCharmDstp2D0Pip_D02KPiPiPiControlLine', prescale=0.01): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - noPID_pions = make_rarecharm_noPID_pions() - dipions = make_rarecharm_TwoPions( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + noPID_pions = m.make_rarecharm_noPID_pions() + dipions = m.make_rarecharm_TwoPions( particles=noPID_pions, pvs=pvs) # the dimuon objects - dzeros = make_rarecharm_d02hhmumu_dzeros( + dzeros = m.make_rarecharm_d02hhmumu_dzeros( particles=[kaons, noPID_pions, dipions], descriptors=['D0 -> K- pi+ J/psi(1S)', 'D0 -> K+ pi- J/psi(1S)'], am_min=_Mass_M_MIN_Control_HHll, am_max=_Mass_M_MAX_Control_HHll, pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -1268,25 +1274,25 @@ def dstar2dzeropi_dzero2kpipipicontrol_line( @configurable def dstar2dzeropi_dzero2kkpipicontrol_line( name='Hlt2RareCharmDstp2D0Pip_D02KKPiPiControlLine', prescale=0.02): - pvs = make_pvs() - kaons = make_rarecharm_kaons() - noPID_pions = make_rarecharm_noPID_pions() - dipions = make_rarecharm_TwoPions(particles=noPID_pions, pvs=pvs) - dzeros = make_rarecharm_d02hhmumu_dzeros( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons() + noPID_pions = m.make_rarecharm_noPID_pions() + dipions = m.make_rarecharm_TwoPions(particles=noPID_pions, pvs=pvs) + dzeros = m.make_rarecharm_d02hhmumu_dzeros( particles=[kaons, dipions], descriptors=['D0 -> K- K+ J/psi(1S)'], am_min=_Mass_M_MIN_Control_HHll, am_max=_Mass_M_MAX_Control_HHll, pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -1298,22 +1304,22 @@ def dstar2dzeropi_dzero2kkpipicontrol_line( @configurable def dstar2dzeropi_dzero2pipi_line(name='Hlt2RareCharmDstp2D0Pip_D02PiPiLine', prescale=0.02): - pvs = make_pvs() - pions = make_rarecharm_pions_forTwoBodyDecays() - dzeros = make_rarecharm_d02ll_dzeros( + pvs = m.make_pvs() + pions = m.make_rarecharm_pions_forTwoBodyDecays() + dzeros = m.make_rarecharm_d02ll_dzeros( particles=[pions], descriptors=['D0 -> pi- pi+'], adamass=_DMassWin_LL, pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -1322,23 +1328,23 @@ def dstar2dzeropi_dzero2pipi_line(name='Hlt2RareCharmDstp2D0Pip_D02PiPiLine', @configurable def dstar2dzeropi_dzero2Kmu_line(name='Hlt2RareCharmDstp2D0Pip_D02KMuLine', prescale=1): - pvs = make_pvs() - kaons = make_rarecharm_kaons_forTwoBodyDecays() - muons = make_rarecharm_muons_forTwoBodyDecays() - dzeros = make_rarecharm_d02ll_dzeros( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons_forTwoBodyDecays() + muons = m.make_rarecharm_muons_forTwoBodyDecays() + dzeros = m.make_rarecharm_d02ll_dzeros( particles=[kaons, muons], descriptors=['D0 -> K- mu+', 'D0 -> K+ mu-'], adamass=_DMassWin_LL, pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['D*(2010)+ -> D0 pi+', 'D*(2010)- -> D0 pi-'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) @@ -1347,22 +1353,22 @@ def dstar2dzeropi_dzero2Kmu_line(name='Hlt2RareCharmDstp2D0Pip_D02KMuLine', @configurable def dstar2dzeropi_dzero2kpi_line(name='Hlt2RareCharmDstp2D0Pip_D02KPiLine', prescale=0.01): - pvs = make_pvs() - kaons = make_rarecharm_kaons_forTwoBodyDecays() - pions = make_rarecharm_pions_forTwoBodyDecays() - dzeros = make_rarecharm_d02ll_dzeros( + pvs = m.make_pvs() + kaons = m.make_rarecharm_kaons_forTwoBodyDecays() + pions = m.make_rarecharm_pions_forTwoBodyDecays() + dzeros = m.make_rarecharm_d02ll_dzeros( particles=[kaons, pions], descriptors=['[D0 -> K- pi+]cc'], adamass=_DMassWin_LL, pvs=pvs) - soft_pions = make_selected_rarecharm_slowpions() - dstars = make_dstars( + soft_pions = m.make_selected_rarecharm_slowpions() + dstars = m.make_dstars( dzeros=dzeros, soft_pions=soft_pions, descriptors=['[D*(2010)+ -> D0 pi+]cc'], pvs=pvs) return HltLine( name=name, - algs=upfront_reconstruction() + charm_prefilters() + [dstars], + algs=upfront_reconstruction() + m.charm_prefilters() + [dstars], prescale=prescale, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py index 324e651a9d1f559dc5c5fed0a9442c3dea0607a4..87d7d3c2ef2c2c7973e1d378484e329995cbec41 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py @@ -24,16 +24,13 @@ Remarks: """ from __future__ import absolute_import, division, print_function -from math import * -from Moore.config import HltLine, register_line_builder - -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad +from GaudiKernel.SystemOfUnits import MeV, mm from RecoConf.hlt1_tracking import require_pvs, require_gec -from RecoConf.reconstruction_objects import (make_pvs, upfront_reconstruction) +from RecoConf.reconstruction_objects import make_pvs -from Hlt2Conf.algorithms import require_all, ParticleCombinerWithPVs, ParticleFilterWithPVs, ParticleCombiner +from Hlt2Conf.algorithms import require_all, ParticleCombinerWithPVs, ParticleFilterWithPVs from PyConf import configurable from Hlt2Conf.standard_particles import make_has_rich_long_pions, make_has_rich_long_kaons, make_ismuon_long_muon, make_long_electrons_no_brem, make_long_protons diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/dplus_hhh_test.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/dplus_hhh_test.py index 102dbd7e3919284f0f15cb730f64a0481a6641fe..b6af42ba2c0f73e8dbcad47b1ed3a3360e92ea6b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/dplus_hhh_test.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/dplus_hhh_test.py @@ -19,24 +19,22 @@ import math from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import GeV, MeV, mrad, picosecond -from RecoConf.hlt1_tracking import require_pvs, require_gec +from RecoConf.hlt1_tracking import require_pvs from RecoConf.reconstruction_objects import make_pvs, upfront_reconstruction, make_tracks from ..algorithms import require_all, ParticleCombinerWithPVs, ParticleFilterWithPVs, ParticleFilter, N3BodyCombinerWithPVs from PyConf.Algorithms import ( - BasicsPropertyDumper, ChargedBasicsFilter, CompositePropertyDumper, - FilterDesktop, FourBodyCombiner, LHCb__Converters__RangeToVectorParticle as + ChargedBasicsFilter, LHCb__Converters__RangeToVectorParticle as RangeToVector, LHCb__Converters__RecVertex__v2__fromVectorLHCbRecVertex as Vertex_v2_to_v1, LHCb__Converters__RecVertices__LHCbRecVerticesToVectorV2RecVertex as Vertex_v1_to_v2, LHCb__Converters__Track__v2__fromV1TrackV2Track as v2TrackConverter, LHCb__VectorToSelectionParticle as VectorToSelection, - LegacyParticlePropertyDumper, ParticleSelectionFilter, ThreeBodyCombiner, - TwoBodyCombiner, ThOrCombiner__3ChargedBasics, ThOrCombiner__3Particle, - ThOrCombinerSSE__3ChargedBasics, ThOrCombinerScalar__3ChargedBasics, - MakeZip__ChargedBasics_as_Particles) + ParticleSelectionFilter, ThreeBodyCombiner, ThOrCombiner__3ChargedBasics, + ThOrCombiner__3Particle, ThOrCombinerSSE__3ChargedBasics, + ThOrCombinerScalar__3ChargedBasics, MakeZip__ChargedBasics_as_Particles) from PyConf import configurable from ..standard_particles import ( @@ -44,9 +42,8 @@ from ..standard_particles import ( make_has_rich_long_pions, make_has_rich_long_kaons) from Functors.math import in_range -from Functors import (ALL, SUM, DOCACHI2, P, PT, BPVIPCHI2, MINIPCHI2, FILTER, - ISMUON, PID_K, COMPOSITEMASS, CHI2DOF, MAX, BPVFDCHI2, - BPVDIRA) +from Functors import (ALL, SUM, DOCACHI2, P, PT, MINIPCHI2, FILTER, ISMUON, + PID_K, COMPOSITEMASS, CHI2DOF, MAX, BPVFDCHI2, BPVDIRA) combiner_lines = {} filter_lines = {} @@ -328,7 +325,7 @@ def make_kaons(particles, pvs, pid='PIDK > 5'): @register_line_builder(filter_lines) -def HLT_filter_line(name="Hlt2_ThOrCBFilterISMUONLine"): +def HLT_thor_cb_muon_filter_line(name="Hlt2_ThOrCBFilterISMUONLine"): cbpions = select_ISMUON_pions(make_has_rich_long_cb_pions()) return HltLine( name=name, @@ -337,7 +334,7 @@ def HLT_filter_line(name="Hlt2_ThOrCBFilterISMUONLine"): @register_line_builder(filter_lines) -def HLT_filter_line(name="Hlt2_LoKiFilterISMUONLine"): +def HLT_loki_muon_filter_line(name="Hlt2_LoKiFilterISMUONLine"): lokipions = select_legacy_ismuon_pions(make_has_rich_long_pions()) return HltLine( name=name, @@ -345,7 +342,7 @@ def HLT_filter_line(name="Hlt2_LoKiFilterISMUONLine"): @register_line_builder(filter_lines) -def HLT_filter_line(name="Hlt2_ThOrFilterISMUONLine"): +def HLT_thor_muon_filter_line(name="Hlt2_ThOrFilterISMUONLine"): thorpions = select_LHCb_ISMUON_pions(make_has_rich_long_pions()) return HltLine( name=name, @@ -354,7 +351,7 @@ def HLT_filter_line(name="Hlt2_ThOrFilterISMUONLine"): # MORE COMPLICATED FILTERS @register_line_builder(filter_lines) -def HLT_filter_line(name="Hlt2_ThOrCBFilterCOMPLICATEDLine"): +def HLT_thor_cb_complex_filter_line(name="Hlt2_ThOrCBFilterCOMPLICATEDLine"): cbpions = select_pions(make_has_rich_long_cb_pions()) return HltLine( name=name, @@ -362,7 +359,7 @@ def HLT_filter_line(name="Hlt2_ThOrCBFilterCOMPLICATEDLine"): @register_line_builder(filter_lines) -def HLT_filter_line(name="Hlt2_LoKiFilterCOMPLICATEDLine"): +def HLT_loki_complex_filter_line(name="Hlt2_LoKiFilterCOMPLICATEDLine"): lokipions = make_pions(make_has_rich_long_pions(), make_pvs()) return HltLine( name=name, @@ -370,7 +367,7 @@ def HLT_filter_line(name="Hlt2_LoKiFilterCOMPLICATEDLine"): @register_line_builder(filter_lines) -def HLT_filter_line(name="Hlt2_ThOrFilterCOMPLICATEDLine"): +def HLT_thor_complex_filter_line(name="Hlt2_ThOrFilterCOMPLICATEDLine"): thorpions = select_LHCb_pions(make_has_rich_long_pions()) return HltLine( name=name, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic.py index c8e25b668ac6640376957778c46b067ea725fdb0..470c97056e559661931f59bbd72e7568e5670547 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic.py @@ -15,30 +15,25 @@ mainly to test consistency combiners and filters and estimate timing """ from __future__ import absolute_import, division, print_function -import math from Moore.config import HltLine, register_line_builder -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad - -from RecoConf.hlt1_tracking import require_pvs, require_gec from RecoConf.reconstruction_objects import make_pvs, upfront_reconstruction, make_tracks -from ..algorithms import require_all, ParticleCombiner, ParticleFilterWithPVs, ParticleFilter, N3BodyCombiner, N4BodyCombiner, make_dvalgorithm +from ..algorithms import ParticleCombiner, ParticleFilterWithPVs, ParticleFilter, N3BodyCombiner, N4BodyCombiner from PyConf.Algorithms import TwoBodyCombiner, ThreeBodyCombiner, FourBodyCombiner from PyConf.Algorithms import ChargedBasicsFilter from PyConf.Algorithms import LHCb__Converters__RecVertices__LHCbRecVerticesToVectorV2RecVertex as Vertex_v1_to_v2 from PyConf.Algorithms import LHCb__Converters__RecVertex__v2__fromVectorLHCbRecVertices as Vertex_v2_to_v1 from PyConf.Algorithms import LHCb__Converters__Track__v2__fromV1TrackV2Track as v2TrackConverter from PyConf.Algorithms import LHCb__Converters__RangeToVectorParticle as RangeToVector -from PyConf.Algorithms import BasicsPropertyDumper, CompositePropertyDumper, LegacyParticlePropertyDumper +from PyConf.Algorithms import CompositePropertyDumper, LegacyParticlePropertyDumper from PyConf import configurable -from ..standard_particles import make_long_pions, make_long_kaons, make_long_cb_muons, make_long_cb_pions, make_ismuon_long_muon +from ..standard_particles import make_long_pions, make_long_cb_pions, make_ismuon_long_muon -from Functors import (ALL, DOCACHI2, DOCA, NONE, MAXDOCACHI2CUT, PT, BPVIPCHI2, - MINIPCUT, MINIP, MINIPCHI2, FILTER, ISMUON, PID_MU, - PID_K, PID_E, PID_P, PID_PI, COMPOSITEMASS, CHI2DOF, POD) +from Functors import (ALL, MAXDOCACHI2CUT, PT, FILTER, ISMUON, COMPOSITEMASS, + CHI2DOF, POD) from Functors.utils import pack_dict as __transform_functor_dict two_body_dds = ['J/psi(1S) -> mu+ mu-'] @@ -69,9 +64,6 @@ def filter_new_particles(particles, ''' testing the new particle class with a filter ''' - - v2pvs = make_pvs() - # code = FILTER(PT>1000) # code = FILTER(MINIP(Vertices=v2pvs.location) > 3.) # code = FILTER(MINIPCHI2(v2pvs.location) > 8) @@ -276,14 +268,14 @@ def my_shiny_4combiner_line(name="Hlt2Shiny4CombinerLine"): ############# old nbody combination lines ############### @register_line_builder(new_lines) -def my_old_combiner_line_trg(name="Hlt2OldTrg2CombineLine"): +def my_old_2_combiner_line_trg(name="Hlt2OldTrg2CombineLine"): composites = combine_old_particles_trg( "Oldy2Body", two_body_dds, DaughtersCuts={"mu+": "ISMUON"}) return HltLine(name=name, algs=upfront_reconstruction() + [composites]) @register_line_builder(new_lines) -def my_old_combiner_line_trg(name="Hlt2OldTrg3CombineLine"): +def my_old_3_combiner_line_trg(name="Hlt2OldTrg3CombineLine"): return HltLine( name=name, algs=upfront_reconstruction() + [ @@ -293,7 +285,7 @@ def my_old_combiner_line_trg(name="Hlt2OldTrg3CombineLine"): @register_line_builder(new_lines) -def my_old_combiner_line_trg(name="Hlt2OldTrg4CombineLine"): +def my_old_4_combiner_line_trg(name="Hlt2OldTrg4CombineLine"): return HltLine( name=name, algs=upfront_reconstruction() + [ @@ -303,7 +295,7 @@ def my_old_combiner_line_trg(name="Hlt2OldTrg4CombineLine"): @register_line_builder(new_lines) -def my_old_combiner_line_trg(name="Hlt2OldTrg3CombineNBodyLine"): +def my_old_3_nbody_combiner_line_trg(name="Hlt2OldTrg3CombineNBodyLine"): return HltLine( name=name, algs=upfront_reconstruction() + [ @@ -317,7 +309,7 @@ def my_old_combiner_line_trg(name="Hlt2OldTrg3CombineNBodyLine"): @register_line_builder(new_lines) -def my_old_combiner_line_trg(name="Hlt2OldTrg4CombineNBodyLine"): +def my_old_4_nbody_combiner_line_trg(name="Hlt2OldTrg4CombineNBodyLine"): return HltLine( name=name, algs=upfront_reconstruction() + [ diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_radiative_b/b_to_hhgamma_gamma_to_ee.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_radiative_b/b_to_hhgamma_gamma_to_ee.py index 56c3bc6a8a5276446643a89bbb591899bd88eceb..67aac8556ad1aaa1003ec6d0ada58ad643d02665 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_radiative_b/b_to_hhgamma_gamma_to_ee.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_radiative_b/b_to_hhgamma_gamma_to_ee.py @@ -9,7 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### from Moore.config import HltLine, register_line_builder -from Hlt2Conf.standard_particles import make_long_electrons_no_brem, make_long_pions, make_photons +from Hlt2Conf.standard_particles import make_long_electrons_no_brem, make_long_pions from RecoConf.reconstruction_objects import make_pvs, upfront_reconstruction from Hlt2Conf.lines.inclusive_radiative_b.builders import basic_builder diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_radiative_b/b_to_hhhgamma_gamma_to_ee.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_radiative_b/b_to_hhhgamma_gamma_to_ee.py index fe5d677fb5c7e5bf91a30ef0efd94e667c091921..3982c6a59ce5bc06c5971295c248f58a058d2076 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_radiative_b/b_to_hhhgamma_gamma_to_ee.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_radiative_b/b_to_hhhgamma_gamma_to_ee.py @@ -9,7 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### from Moore.config import HltLine, register_line_builder -from Hlt2Conf.standard_particles import make_long_pions, make_long_electrons_no_brem, make_photons +from Hlt2Conf.standard_particles import make_long_pions, make_long_electrons_no_brem from RecoConf.reconstruction_objects import make_pvs, upfront_reconstruction from Hlt2Conf.lines.inclusive_radiative_b.builders import basic_builder diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/jets/Hlt2Run2Jets.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/jets/Hlt2Run2Jets.py index 2bd4bbacd86b10c097d22d641812e5c19a439863..e7de911edcb1c893c9c7b8e1445e46edc3b1938c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/jets/Hlt2Run2Jets.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/jets/Hlt2Run2Jets.py @@ -354,7 +354,7 @@ def trijetsv_line(name='Hlt2JetsTriJetSVLine', prescale=1): @register_line_builder(all_lines) @configurable -def trijetsv_line(name='Hlt2JetsTriJetSVSVLine', prescale=1): +def trijetsvsv_line(name='Hlt2JetsTriJetSVSVLine', prescale=1): jets = make_trijets(nsvjets_min=2, prod_pt_min=10 * GeV) return HltLine( name=name, algs=upfront_reconstruction() + [jets], prescale=prescale) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DetJpsiMuMuNegTagged.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DetJpsiMuMuNegTagged.py index 13df213f455729d10aea3e82ad36ca32a936abf1..50f024590b343d5e2f9a7d8c68030714db1ab81d 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DetJpsiMuMuNegTagged.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DetJpsiMuMuNegTagged.py @@ -13,7 +13,7 @@ Define HLT2 PID line for ``J/psi -> mu+ mu-`` with negative muon tagged. """ from __future__ import absolute_import -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from Moore.config import HltLine, register_line_builder @@ -25,7 +25,7 @@ from Hlt2Conf.standard_particles import ( ) from Hlt2Conf.algorithms import require_all, ParticleFilterWithPVs from Hlt2Conf.algorithms import ParticleCombinerWithPVs -from .constants import * +from . import constants as c all_lines = {} @@ -69,10 +69,10 @@ def make_probe_muons(particles, def make_jpsis(tag_muons, probe_muons, pvs, - am_min=JPSI_M - 210 * MeV, - am_max=JPSI_M + 160 * MeV, - m_min=JPSI_M - 200 * MeV, - m_max=JPSI_M + 150 * MeV, + am_min=c.JPSI_M - 210 * MeV, + am_max=c.JPSI_M + 160 * MeV, + m_min=c.JPSI_M - 200 * MeV, + m_max=c.JPSI_M + 150 * MeV, achi2doca_max=5.0): combination_code = require_all("in_range({am_min}, AM, {am_max})", "ACHI2DOCA(1,2) < {achi2doca_max}").format( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DetJpsiMuMuPosTagged.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DetJpsiMuMuPosTagged.py index 3ee08251c8f50d1d7353321df69e9a19b05d2bc5..a4e5a32c7a776bdf2078ae70fee018471ee7c2b3 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DetJpsiMuMuPosTagged.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DetJpsiMuMuPosTagged.py @@ -13,7 +13,7 @@ Define HLT2 PID line for ``J/psi -> mu+ mu-`` with positive muon tagged. """ from __future__ import absolute_import -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import GeV, MeV from Moore.config import HltLine, register_line_builder @@ -25,7 +25,7 @@ from Hlt2Conf.standard_particles import ( ) from Hlt2Conf.algorithms import require_all, ParticleFilterWithPVs from Hlt2Conf.algorithms import ParticleCombinerWithPVs -from .constants import * +from . import constants as c all_lines = {} @@ -68,10 +68,10 @@ def make_probe_muons(particles, def make_jpsis(tag_muons, probe_muons, pvs, - am_min=JPSI_M - 210 * MeV, - am_max=JPSI_M + 160 * MeV, - m_min=JPSI_M - 200 * MeV, - m_max=JPSI_M + 150 * MeV, + am_min=c.JPSI_M - 210 * MeV, + am_max=c.JPSI_M + 160 * MeV, + m_min=c.JPSI_M - 200 * MeV, + m_max=c.JPSI_M + 150 * MeV, achi2doca_max=5.0): combination_code = require_all("in_range({am_min}, AM, {am_max})", "ACHI2DOCA(1,2) < {achi2doca_max}").format( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/constants.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/constants.py index d934e49d409d68e113b7fe8374d7f10b493f06e1..e2a01db65ad28a982ec15dac833da05c65b39368 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/constants.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/constants.py @@ -8,8 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### - -from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from GaudiKernel.SystemOfUnits import MeV JPSI_M = 3096 * MeV D0_M = 1865 * MeV diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder.py index cf01b74e97a9efede526dcf5014e7572a19ffb76..335b95700cdb883938a2a29ece55b728680a00bb 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder.py @@ -26,9 +26,8 @@ from Hlt2Conf.standard_particles import ( make_has_rich_long_pions, make_has_rich_long_kaons, make_long_pions, make_long_kaons, make_long_muons, make_long_protons, make_long_electrons_no_brem, make_has_rich_long_protons, - make_has_rich_down_pions, make_down_pions, make_photons, - make_resolved_pi0s, make_merged_pi0s, make_detached_mumu, make_detached_ee, - make_detached_mue) + make_has_rich_down_pions, make_photons, make_resolved_pi0s, + make_merged_pi0s, make_detached_mumu, make_detached_ee, make_detached_mue) #################################### # Charged hadron selections # @@ -285,7 +284,6 @@ def filter_dimuon(mvacut=0.1): MVACode = "VALUE('LoKi::Hybrid::DictValue/{{mva_name}}') > {mvacut}".format( mvacut=mvacut) XMLFile = "$PARAMFILESROOT/data/Upgrade_InclusiveDetachedDimuon_weights.xml" - Key = "BDT" BDTVars = { "TwoBody_DIRA_OWNPV": "BPVDIRA()", "TwoBody_DOCAMAX": "PFUNA(ADOCAMAX(''))", @@ -325,7 +323,6 @@ def filter_dielectron(mvacut=0.1): MVACode = "VALUE('LoKi::Hybrid::DictValue/{{mva_name}}') > {mvacut}".format( mvacut=mvacut) XMLFile = "$PARAMFILESROOT/data/Upgrade_InclusiveDetachedDielectron_weights.xml" - Key = "BDT" BDTVars = { "TwoBody_DIRA_OWNPV": "BPVDIRA()", "TwoBody_DOCAMAX": "PFUNA(ADOCAMAX(''))", @@ -365,7 +362,6 @@ def filter_electron_muon(mvacut=0.1): MVACode = "VALUE('LoKi::Hybrid::DictValue/{{mva_name}}') > {mvacut}".format( mvacut=mvacut) XMLFile = "$PARAMFILESROOT/data/Upgrade_InclusiveDetachedElectronMuon_weights.xml" - Key = "BDT" BDTVars = { "TwoBody_DIRA_OWNPV": "BPVDIRA()", "TwoBody_DOCAMAX": "PFUNA(ADOCAMAX(''))", diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BcToD0MuNu_D0ToKPi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BcToD0MuNu_D0ToKPi.py index c51ee4fdad9fd4dfc1d77daa2624da0b504851ab..0912e0d5f1c0e0526315fa4c7f8cb5be72a96ee4 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BcToD0MuNu_D0ToKPi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BcToD0MuNu_D0ToKPi.py @@ -10,12 +10,7 @@ ############################################################################### from __future__ import absolute_import -import math -from GaudiKernel.SystemOfUnits import MeV, GeV, mm - from Moore.config import HltLine, register_line_builder -from RecoConf.reconstruction_objects import make_pvs -from PyConf import configurable from .builders.base_builder import make_bachelor_muons, make_pions, make_kaons from .builders.charm_hadron_builder import make_d0_tokpi @@ -27,7 +22,6 @@ all_lines = {} @register_line_builder(all_lines) def bctod0munu_d0tokpi_line(name="Hlt2BcToD0MuNu_D0ToKPiLine", prescale=1): - pvs = make_pvs() kaons = make_kaons() pions = make_pions() muons = make_bachelor_muons() diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BuToD0MuNu_D0ToKPi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BuToD0MuNu_D0ToKPi.py index df562964540e3440892b974d8931020451bdad9b..ecd1bdfe66c2d73eb064f1df705f077717cb8c90 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BuToD0MuNu_D0ToKPi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BuToD0MuNu_D0ToKPi.py @@ -10,12 +10,7 @@ ############################################################################### from __future__ import absolute_import -import math -from GaudiKernel.SystemOfUnits import MeV, GeV, mm - from Moore.config import HltLine, register_line_builder -from RecoConf.reconstruction_objects import make_pvs -from PyConf import configurable from .builders.base_builder import make_bachelor_muons, make_pions, make_kaons from .builders.charm_hadron_builder import make_d0_tokpi @@ -27,7 +22,6 @@ all_lines = {} @register_line_builder(all_lines) def butod0munu_d0tokpi_line(name="Hlt2BuToD0MuNu_D0ToKPiLine", prescale=1): - pvs = make_pvs() kaons = make_kaons() pions = make_pions() muons = make_bachelor_muons() diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BuToD0MuNu_D0ToKPi_FakeMuon.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BuToD0MuNu_D0ToKPi_FakeMuon.py index 04d677982587ba918f79917b78e5267ee2fcebbc..efe8acac32fc73edfdbcb29134019c9f296a306e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BuToD0MuNu_D0ToKPi_FakeMuon.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/BuToD0MuNu_D0ToKPi_FakeMuon.py @@ -10,12 +10,7 @@ ############################################################################### from __future__ import absolute_import -import math -from GaudiKernel.SystemOfUnits import MeV, GeV, mm - from Moore.config import HltLine, register_line_builder -from RecoConf.reconstruction_objects import make_pvs -from PyConf import configurable from .builders.base_builder import make_fake_muons, make_pions, make_kaons from .builders.charm_hadron_builder import make_d0_tokpi @@ -27,7 +22,6 @@ all_lines = {} @register_line_builder(all_lines) def butod0munu_d0tokpi_fakemuon_line( name="Hlt2BuToD0MuNu_D0ToKPi_FakeMuonLine", prescale=1): - pvs = make_pvs() kaons = make_kaons() pions = make_pions() muons = make_fake_muons() diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/LbToLcMuNu.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/LbToLcMuNu.py index f3dbc9f147dd24d8109dda6273f4cd4b87b12b29..3e63518e8de79fa0a3b0ba81dad798f1fdf9f5b1 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/LbToLcMuNu.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/LbToLcMuNu.py @@ -10,9 +10,6 @@ ############################################################################### from __future__ import absolute_import -import math -from GaudiKernel.SystemOfUnits import MeV, GeV, mm - from Moore.config import HltLine, register_line_builder from RecoConf.reconstruction_objects import make_pvs diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/LbToPMuNu.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/LbToPMuNu.py index 618beb6c80028b7a0ad6e0fa90eebb8d0544b928..5522edf2b602e4ec92385da0cffd0be2f713aad2 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/LbToPMuNu.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/LbToPMuNu.py @@ -10,13 +10,12 @@ ############################################################################### from __future__ import absolute_import -import math -from GaudiKernel.SystemOfUnits import MeV, GeV, mm +from GaudiKernel.SystemOfUnits import MeV from Moore.config import HltLine, register_line_builder from RecoConf.reconstruction_objects import upfront_reconstruction, make_pvs from Hlt2Conf.algorithms import require_all, ParticleCombinerWithPVs -from .builders.base_builder import make_bachelor_muons, make_protons, make_pions, make_kaons +from .builders.base_builder import make_bachelor_muons, make_protons from PyConf import configurable from Hlt2Conf.lines.topological_b import topo_2or3body_node from RecoConf.hlt1_tracking import require_pvs, require_gec @@ -34,7 +33,6 @@ def lbtopmunu_line_prefilter(): @register_line_builder(all_lines) def lbtopmunu_line(name="Hlt2LbToPMuNuLine", prescale=1): - pvs = make_pvs() protons = make_protons( p_min=15000 * MeV, pt_min=1000 * MeV, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py index 4aa26bb291461e14888ba8c632f08aa08a29ea55..4a5fb4a32d2c8267c80b3a5707a88fa4c8b4304c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py @@ -10,9 +10,8 @@ ############################################################################### """Semileptonic B builder, based on B2OC code. """ - -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond -from Hlt2Conf.algorithms import require_all, ParticleFilter, ParticleCombiner, ParticleCombinerWithPVs, ParticleFilterWithPVs, N3BodyCombinerWithPVs +from GaudiKernel.SystemOfUnits import GeV, MeV, mm +from Hlt2Conf.algorithms import require_all, ParticleCombinerWithPVs from PyConf import configurable from RecoConf.reconstruction_objects import make_pvs diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py index 57d1125937bc7c55b56ffab22dedc8482b4d7513..cf30511a953e47481da9ab8c18d17f9d8692956a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py @@ -12,15 +12,13 @@ """ # format imports according to conventions -import math from PyConf import configurable -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import GeV, MeV from RecoConf.reconstruction_objects import make_pvs -from Hlt2Conf.algorithms import (require_all, ParticleFilterWithPVs, - ParticleCombiner) +from Hlt2Conf.algorithms import require_all, ParticleFilterWithPVs from Hlt2Conf.standard_particles import ( make_has_rich_long_pions, make_has_rich_long_kaons, - make_has_rich_long_protons, make_ismuon_long_muon, make_long_muons) + make_has_rich_long_protons, make_long_muons, standard_protoparticle_filter) ################################### diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py index 8edc27825fb66a5714e2e0bcb82d4147769f6d3b..bcfdcd87cee50ee7b7f56fb98684b30d318f4907 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py @@ -13,14 +13,10 @@ """ from __future__ import absolute_import -import math -from GaudiKernel.SystemOfUnits import MeV, GeV, mm -from Hlt2Conf.algorithms import require_all, ParticleFilter, ParticleCombiner, ParticleCombinerWithPVs, ParticleFilterWithPVs, N3BodyCombinerWithPVs +from GaudiKernel.SystemOfUnits import MeV +from Hlt2Conf.algorithms import require_all, ParticleCombinerWithPVs from RecoConf.reconstruction_objects import make_pvs from PyConf import configurable -from Hlt2Conf.standard_particles import ( - make_has_rich_long_pions, make_has_rich_long_kaons, - make_has_rich_long_protons, make_ismuon_long_muon, make_long_muons) from .base_builder import make_kaons, make_pions diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py index f2a7b02a0ce52f79a6eac9b93e778eb4484e14a8..7e0dd76c09bc26a4baf42ac9384e5b11379dbaf2 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py @@ -12,15 +12,13 @@ """ from __future__ import absolute_import, division, print_function -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import GeV from PyConf.Algorithms import (ParticleMakerForParticleFlow, HltJetBuilderRun3, HltParticleFlowRun3, HltJetTag, HltParticleFlowFilter) -from PyConf.Tools import (LoKi__Hybrid__ProtoParticleFilter as - ProtoParticleFilter, LoKi__Hybrid__TrackSelector as - TrackSelector, LoKi__FastJetMaker as FastJet) +from PyConf.Tools import LoKi__FastJetMaker as FastJet from .standard_particles import (get_long_track_selector, get_down_track_selector, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py index 283803e0d0a0cdfdffcd47d7c3a9d502e1c97b91..a7daa177498918b969872d92ad0f485345130fd4 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py @@ -17,7 +17,7 @@ ProtoParticle objects, we just do the one step. """ from __future__ import absolute_import, division, print_function -from GaudiKernel.SystemOfUnits import GeV, MeV, mm, mrad, picosecond +from GaudiKernel.SystemOfUnits import GeV, MeV, mm, picosecond from PyConf.Algorithms import ( FunctionalParticleMaker, diff --git a/Hlt/Moore/python/Moore/__init__.py b/Hlt/Moore/python/Moore/__init__.py index cf5f1bff822ca95e47456d7779249ef4362e1aa3..bccfdacede322d0d8b58bd745f895d302c190bfc 100644 --- a/Hlt/Moore/python/Moore/__init__.py +++ b/Hlt/Moore/python/Moore/__init__.py @@ -10,7 +10,7 @@ ############################################################################### """ """ - +# Forward common imports to make available directly under Moore +# flake8: noqa from .config import (options, run_moore, run_reconstruction, - moore_control_flow, run_allen, - run_allen_reconstruction) # noqa + moore_control_flow, run_allen, run_allen_reconstruction) diff --git a/Hlt/Moore/python/Moore/config.py b/Hlt/Moore/python/Moore/config.py index 10e8ffd7d51b19ec2a5885117528260df5b384eb..9dd05ff6db100e617e3806c1a01c1192005bbacd 100644 --- a/Hlt/Moore/python/Moore/config.py +++ b/Hlt/Moore/python/Moore/config.py @@ -15,14 +15,13 @@ from Configurables import (LumiCounterMerger, ApplicationMgr, DumpUTGeometry, DumpFTGeometry, DumpMuonTable, DumpMuonGeometry, DumpVPGeometry, DumpMagneticField, DumpBeamline, DumpUTLookupTables, AllenUpdater) -from PyConf import ConfigurationError, configurable +from PyConf import configurable from PyConf.Algorithms import ( bankKiller, DeterministicPrescaler, ExecutionReportsWriter, HltDecReportsWriter, HltSelReportsWriter, Hlt__RoutingBitsWriter, HltLumiWriter, Gaudi__Hive__FetchLeavesFromFile, CopyInputStream) from PyConf.components import Algorithm, force_location, setup_component from PyConf.control_flow import CompositeNode, NodeLogic -from PyConf.dataflow import DataHandle from PyConf.application import (ROOT_KEY, ApplicationOptions, output_writers, make_odin, default_raw_event) @@ -219,7 +218,7 @@ def report_writers_node(lines, algs.extend([erw, drw]) locations_to_persist.append(drw.OutputRawEventLocation) - hlt_ann_svc = setup_component( + setup_component( "HltANNSvc", # Zero is an invalid DecReport ID, so start from 1 Hlt1SelectionID={ @@ -470,8 +469,7 @@ def setup_allen_Hlt1ANN(): """ Hlt1SelectionIDs = get_allen_hlt1_lines() - hlt_ann_svc = setup_component( - "HltANNSvc", Hlt1SelectionID=Hlt1SelectionIDs) + setup_component("HltANNSvc", Hlt1SelectionID=Hlt1SelectionIDs) return Hlt1SelectionIDs @@ -511,7 +509,7 @@ def allen_control_flow(options): algs.extend([drw]) locations_to_persist.append(drw.OutputRawEventLocation) - Hlt1SelectionIDs = setup_allen_Hlt1ANN() + setup_allen_Hlt1ANN() locations_to_persist.append(reports_raw_event) diff --git a/Hlt/Moore/python/Moore/persistence/__init__.py b/Hlt/Moore/python/Moore/persistence/__init__.py index 369d83b7c84470bfa8aecb56a0f6a074f0921de4..fcc5e110a2ca15941f4a946f0f475c2bf76dbea8 100644 --- a/Hlt/Moore/python/Moore/persistence/__init__.py +++ b/Hlt/Moore/python/Moore/persistence/__init__.py @@ -11,7 +11,7 @@ """Configuration for persisting HLT2 objects in output ROOT/MDF files.""" from __future__ import absolute_import import re -from Configurables import HltANNSvc, HltLinePersistenceSvc +from Configurables import HltLinePersistenceSvc from PyConf import configurable from PyConf.control_flow import CompositeNode, NodeLogic diff --git a/Hlt/Moore/python/Moore/persistence/packing.py b/Hlt/Moore/python/Moore/persistence/packing.py index 65d2a0a969c3c456cbacec8e2c4d9ce0c90f9f7e..a99f1982af738778fe7156aa527c14e12cc1fc5d 100644 --- a/Hlt/Moore/python/Moore/persistence/packing.py +++ b/Hlt/Moore/python/Moore/persistence/packing.py @@ -20,7 +20,6 @@ from PyConf.control_flow import CompositeNode, NodeLogic from PyConf.components import get_output -from .persistreco import persistreco_line_outputs from .PersistRecoConf import PersistRecoPacking log = logging.getLogger(__name__) diff --git a/Hlt/Moore/python/Moore/persistence/particle_moving.py b/Hlt/Moore/python/Moore/persistence/particle_moving.py index 843fc9c81c49470a8da32ea4106d7f5064eddf9c..86f23006440fd2ca5c27d8863a07977785dadb37 100644 --- a/Hlt/Moore/python/Moore/persistence/particle_moving.py +++ b/Hlt/Moore/python/Moore/persistence/particle_moving.py @@ -16,7 +16,6 @@ from PyConf.Algorithms import FilterDesktop from PyConf.components import force_location from PyConf.control_flow import CompositeNode, NodeLogic from PyConf.dataflow import DataHandle -from PyConf.utilities import ConfigurationError from RecoConf.reconstruction_objects import make_pvs diff --git a/Hlt/Moore/python/Moore/persistence/serialisation.py b/Hlt/Moore/python/Moore/persistence/serialisation.py index 91209a4b4311d943713bb6e5cf2efe4c24fa5570..15186aa57f77a2d151501da63042866ea608dcc3 100644 --- a/Hlt/Moore/python/Moore/persistence/serialisation.py +++ b/Hlt/Moore/python/Moore/persistence/serialisation.py @@ -34,3 +34,4 @@ def serialise_packed_containers(packed_locations): ContainerMap={}, OutputRawEventLocation="/Event/Trigger/RawEvent", ) + return bank_writer diff --git a/Hlt/Moore/python/Moore/persistence/truth_matching.py b/Hlt/Moore/python/Moore/persistence/truth_matching.py index b4b8d021169839c812cc95cab9177cf51a77ead5..eca22b1316b8d6bc399d1316185d10835d4b58fb 100644 --- a/Hlt/Moore/python/Moore/persistence/truth_matching.py +++ b/Hlt/Moore/python/Moore/persistence/truth_matching.py @@ -19,11 +19,7 @@ from __future__ import absolute_import import logging from PyConf.Algorithms import ( - CaloClusterMCTruth, - CaloFutureDigit2MCLinks2Table, ChargedProtoParticleAssociator, - CopyProtoParticle2MCRelations, - CopySignalMCParticles, MergeLinksByKeysToVector, MergeRelationsTablesPP2MCP, NeutralProtoParticleAssociator, diff --git a/Hlt/Moore/python/Moore/tests/test_truth_matching.py b/Hlt/Moore/python/Moore/tests/test_truth_matching.py index 559b4e48909d7ceb890ba2d808deab6e2c958c7c..023915273c42eb5d09a6d190cfabac5762ee2654 100644 --- a/Hlt/Moore/python/Moore/tests/test_truth_matching.py +++ b/Hlt/Moore/python/Moore/tests/test_truth_matching.py @@ -18,7 +18,6 @@ from Moore.persistence.truth_matching import ( _find_protoparticles, ) from PyConf.application import default_raw_event -from RecoConf.protoparticles import make_charged_protoparticles from RecoConf.reconstruction_objects import reconstruction diff --git a/Hlt/Moore/tests/options/default_input_and_conds_hlt1.py b/Hlt/Moore/tests/options/default_input_and_conds_hlt1.py index 28a6e56ec4a643f11b36bc6438b4bb7e52498e9b..283b05db353536921e169c38f9cc837b1bc51da2 100644 --- a/Hlt/Moore/tests/options/default_input_and_conds_hlt1.py +++ b/Hlt/Moore/tests/options/default_input_and_conds_hlt1.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import importOptions from Moore import options options.set_input_and_conds_from_testfiledb( diff --git a/Hlt/Moore/tests/options/default_input_and_conds_hlt1_FTv6.py b/Hlt/Moore/tests/options/default_input_and_conds_hlt1_FTv6.py index acd135af948914fb6673b25bae8fff54bc3db1ce..869e48898213577e77aca32b12c2ce602ac63f85 100644 --- a/Hlt/Moore/tests/options/default_input_and_conds_hlt1_FTv6.py +++ b/Hlt/Moore/tests/options/default_input_and_conds_hlt1_FTv6.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import importOptions from Moore import options from RecoConf.hlt1_tracking import default_ft_decoding_version diff --git a/Hlt/Moore/tests/options/default_input_and_conds_hlt2.py b/Hlt/Moore/tests/options/default_input_and_conds_hlt2.py index e3f2316ebc9e2ace912e3e74ad1d729d721007fc..e81cf5ff57d14fec5e504cae4bafd4df02ba4787 100644 --- a/Hlt/Moore/tests/options/default_input_and_conds_hlt2.py +++ b/Hlt/Moore/tests/options/default_input_and_conds_hlt2.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import importOptions from Moore import options from RecoConf.hlt1_tracking import default_ft_decoding_version diff --git a/Hlt/Moore/tests/options/default_input_and_conds_hlt2_MagUp.py b/Hlt/Moore/tests/options/default_input_and_conds_hlt2_MagUp.py index be63b6e701f3187ea0ef933288749e88d39014fa..c6f7a090e6adb1b3a1d7ab87f9a13213ea6b06a7 100644 --- a/Hlt/Moore/tests/options/default_input_and_conds_hlt2_MagUp.py +++ b/Hlt/Moore/tests/options/default_input_and_conds_hlt2_MagUp.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import importOptions from Moore import options from RecoConf.hlt1_tracking import default_ft_decoding_version diff --git a/Hlt/Moore/tests/options/dst_input_and_conds_calo_res_pi0.py b/Hlt/Moore/tests/options/dst_input_and_conds_calo_res_pi0.py index 85546ff24f8d9d1b30b5dfb3c5d7ac434d0af08c..ffb5c9ac25d9d2a47a14eb37871db819509f8812 100644 --- a/Hlt/Moore/tests/options/dst_input_and_conds_calo_res_pi0.py +++ b/Hlt/Moore/tests/options/dst_input_and_conds_calo_res_pi0.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import importOptions from Moore import options options.evt_max = 100 diff --git a/Hlt/Moore/tests/options/xdigi_input_and_conds_calo_res_gamma.py b/Hlt/Moore/tests/options/xdigi_input_and_conds_calo_res_gamma.py index 1cbe97b447d7809b8fc8f7c2306ccfc1ef3c8e49..1d161a68e8a13f26add289a5c8d1aed64b6c5efa 100644 --- a/Hlt/Moore/tests/options/xdigi_input_and_conds_calo_res_gamma.py +++ b/Hlt/Moore/tests/options/xdigi_input_and_conds_calo_res_gamma.py @@ -8,7 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Gaudi.Configuration import importOptions from Moore import options options.evt_max = 100 diff --git a/Hlt/RecoConf/options/hlt1_reco_allen_IPresolution.py b/Hlt/RecoConf/options/hlt1_reco_allen_IPresolution.py index 3eccd94a1e603b3f3c004d3e6dbb663c3282bedd..fe8fc4871eb4a64e5cda6fc6401284c9b4fdef21 100644 --- a/Hlt/RecoConf/options/hlt1_reco_allen_IPresolution.py +++ b/Hlt/RecoConf/options/hlt1_reco_allen_IPresolution.py @@ -13,7 +13,6 @@ from Moore.config import Reconstruction from RecoConf.hlt1_tracking import require_gec from RecoConf.hlt1_allen import make_allen_tracks, make_allen_pvs from RecoConf.mc_checking import monitor_IPresolution -from Configurables import NTupleSvc def hlt1_reco_allen_IPresolution(): diff --git a/Hlt/RecoConf/options/hlt1_reco_allen_track_reconstruction.py b/Hlt/RecoConf/options/hlt1_reco_allen_track_reconstruction.py index c43b3b0070ba21521067040a01c879465b439d52..21668ade6e405090ad544d7ffbacfd8c1d6674d3 100644 --- a/Hlt/RecoConf/options/hlt1_reco_allen_track_reconstruction.py +++ b/Hlt/RecoConf/options/hlt1_reco_allen_track_reconstruction.py @@ -13,7 +13,6 @@ from Moore.config import Reconstruction from RecoConf.hlt1_tracking import require_gec from RecoConf.hlt1_allen import make_allen_tracks, make_dumped_raw_banks from RecoConf.mc_checking import tracker_dumper, pv_dumper, get_track_checkers -from Configurables import RunAllen dumpBinaries = False outputDir = "dump/" diff --git a/Hlt/RecoConf/options/hlt1_reco_muonid_efficiency.py b/Hlt/RecoConf/options/hlt1_reco_muonid_efficiency.py index 6adf673e0146fda90038b69dd90b2e04e73c0d13..941d72ed35963957ab41774028ed95c0fd159f68 100644 --- a/Hlt/RecoConf/options/hlt1_reco_muonid_efficiency.py +++ b/Hlt/RecoConf/options/hlt1_reco_muonid_efficiency.py @@ -10,10 +10,7 @@ ############################################################################### from Moore import options, run_reconstruction from Moore.config import Reconstruction -from PyConf.application import configure_input, configure -from PyConf.control_flow import CompositeNode, NodeLogic -from RecoConf.hlt1_tracking import (require_gec, make_hlt1_tracks, - make_VeloClusterTrackingSIMD_hits) +from RecoConf.hlt1_tracking import require_gec, make_hlt1_tracks from RecoConf.mc_checking import monitor_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 RecoConf.hlt1_muonid import make_fitted_tracks_with_muon_id @@ -39,7 +36,6 @@ def hlt1_reco_muonid_efficiency(): full_sel)['PrFittedForwardWithMuonID'] # convert result to v1 (which is what the PrChecker needs) - velo_hits = make_VeloClusterTrackingSIMD_hits() v2_tracks = trackV2FromPrFittedForwardTrackWithMuonID( FittedTracks=track_filter) v1_tracks = trackV1FromV2TrackV1Track(InputTracksName=v2_tracks, ) diff --git a/Hlt/RecoConf/options/hlt1_reco_pvchecker.py b/Hlt/RecoConf/options/hlt1_reco_pvchecker.py index 9117561889712f0cebf819d6a5005faebf1d4baf..3064151a39ddc78a748364d5ea5498ef24d505b4 100644 --- a/Hlt/RecoConf/options/hlt1_reco_pvchecker.py +++ b/Hlt/RecoConf/options/hlt1_reco_pvchecker.py @@ -10,8 +10,8 @@ ############################################################################### from Moore import options, run_reconstruction from Moore.config import Reconstruction -from RecoConf.hlt1_tracking import require_gec, make_hlt1_tracks, make_VeloKalman_fitted_tracks, make_pvs -from RecoConf.mc_checking import get_pv_checkers, get_track_checkers +from RecoConf.hlt1_tracking import require_gec, make_hlt1_tracks, make_pvs +from RecoConf.mc_checking import get_pv_checkers from Configurables import ApplicationMgr from Configurables import NTupleSvc diff --git a/Hlt/RecoConf/options/hlt2_fastest_reco_with_mcchecking.py b/Hlt/RecoConf/options/hlt2_fastest_reco_with_mcchecking.py index e2f18a8e7d783d59091e84aaca512a3969a927c3..696c85d097d1e6499c121314b8005d76da6b5b1a 100644 --- a/Hlt/RecoConf/options/hlt2_fastest_reco_with_mcchecking.py +++ b/Hlt/RecoConf/options/hlt2_fastest_reco_with_mcchecking.py @@ -10,7 +10,6 @@ ############################################################################### from Moore import options, run_reconstruction from RecoConf.standalone import standalone_hlt2_light_reco -from PyConf.Tools import TrackMasterFitter from RecoConf.protoparticles import make_charged_protoparticles from RecoConf.hlt2_tracking import make_hlt2_tracks diff --git a/Hlt/RecoConf/options/hlt2_light_reco_pr_kf_with_mcchecking.py b/Hlt/RecoConf/options/hlt2_light_reco_pr_kf_with_mcchecking.py index 23408c851318e5bc68d8772f98bc04cb0a413e1f..36bb89899e2a8a1b378d7493974799be9b604b3d 100644 --- a/Hlt/RecoConf/options/hlt2_light_reco_pr_kf_with_mcchecking.py +++ b/Hlt/RecoConf/options/hlt2_light_reco_pr_kf_with_mcchecking.py @@ -10,7 +10,6 @@ ############################################################################### from Moore import options, run_reconstruction from RecoConf.standalone import standalone_hlt2_light_reco -from PyConf.Tools import TrackMasterFitter from RecoConf.protoparticles import make_charged_protoparticles from RecoConf.hlt2_tracking import make_hlt2_tracks diff --git a/Hlt/RecoConf/options/hlt2_particles_baseline.py b/Hlt/RecoConf/options/hlt2_particles_baseline.py index 4b99f2ca867e12c3def98f7df6f0090243e7d1f0..a810edb5cca049a3d8801b970323de053a148a0b 100644 --- a/Hlt/RecoConf/options/hlt2_particles_baseline.py +++ b/Hlt/RecoConf/options/hlt2_particles_baseline.py @@ -11,19 +11,16 @@ """Simple options file to demonstrate how to create basic particles and their combination from the output of the reconstruction.""" from Moore import options, run_reconstruction from Moore.config import Reconstruction -from RecoConf.hlt1_tracking import make_hlt1_tracks, require_gec, require_pvs +from RecoConf.hlt1_tracking import require_gec, require_pvs from RecoConf.protoparticles import make_charged_protoparticles as make_charged_protoparticles_from from RecoConf.global_tools import stateProvider_with_simplified_geom from RecoConf.hlt2_global_reco import ( reconstruction, make_charged_protoparticles, make_neutral_protoparticles, - make_pvs, - upfront_reconstruction, ) from Hlt2Conf.algorithms import ( ParticleCombiner, - ParticleCombinerWithPVs, ParticleFilter, ParticleFilterWithPVs, require_all, @@ -33,11 +30,7 @@ from Hlt2Conf.standard_particles import ( _make_particles, standard_protoparticle_filter, ) -from PyConf.Algorithms import ( - LHCb__Converters__RecVertex__v2__fromVectorLHCbRecVertices as - FromVectorLHCbRecVertices, - PrintProtoParticles, -) +from PyConf.Algorithms import PrintProtoParticles def make_KsLL(pions, pvs): diff --git a/Hlt/RecoConf/options/hlt2_reco_baseline_with_monitoring.py b/Hlt/RecoConf/options/hlt2_reco_baseline_with_monitoring.py index a2eba7678653e53347fc2b1688790622914e69fd..cd71abc083226e2ea316d1e0ba84399eb3c754f0 100644 --- a/Hlt/RecoConf/options/hlt2_reco_baseline_with_monitoring.py +++ b/Hlt/RecoConf/options/hlt2_reco_baseline_with_monitoring.py @@ -10,7 +10,6 @@ ############################################################################### from Moore import options, run_reconstruction from RecoConf.standalone import standalone_hlt2_reco -from Configurables import ApplicationMgr # save output file with histograms options.histo_file = 'hlt2_reco_baseline_with_monitoring.root' diff --git a/Hlt/RecoConf/options/mc_matching_example.py b/Hlt/RecoConf/options/mc_matching_example.py index eb3d220334d05d858877eb72748223096a6f2cf0..61a927154b18a6729eee1b72cf11cc743ff84995 100644 --- a/Hlt/RecoConf/options/mc_matching_example.py +++ b/Hlt/RecoConf/options/mc_matching_example.py @@ -12,8 +12,6 @@ from Moore import options, run_reconstruction from Moore.config import Reconstruction from RecoConf.hlt1_tracking import ( require_gec, - require_pvs, - make_pvs, make_hlt1_tracks, ) from RecoConf.mc_checking import monitor_tracking_efficiency, make_links_lhcbids_mcparticles_tracking_system, make_links_tracks_mcparticles diff --git a/Hlt/RecoConf/options/tracking_developments/mc_hit_resolution_monitor.py b/Hlt/RecoConf/options/tracking_developments/mc_hit_resolution_monitor.py index f45a47809ab4b3fa6396347e4d18265e30540c32..8f04e681a8180f3c810973e668244a6060c05ee9 100644 --- a/Hlt/RecoConf/options/tracking_developments/mc_hit_resolution_monitor.py +++ b/Hlt/RecoConf/options/tracking_developments/mc_hit_resolution_monitor.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from Moore import options, run_moore, run_reconstruction +from Moore import options, run_reconstruction from Moore.config import Reconstruction from PyConf.application import default_raw_event diff --git a/Hlt/RecoConf/options/tracking_developments/run_cheated_pattern_recognition.py b/Hlt/RecoConf/options/tracking_developments/run_cheated_pattern_recognition.py index a6412146885c7a8121c3be8d7e3d9e3a45c5939f..846d4ff866770257868592bff47dadc1cf8cb60b 100644 --- a/Hlt/RecoConf/options/tracking_developments/run_cheated_pattern_recognition.py +++ b/Hlt/RecoConf/options/tracking_developments/run_cheated_pattern_recognition.py @@ -16,11 +16,9 @@ from RecoConf.mc_checking import make_default_IdealStateCreator def run_cheated(): from Hlt2Conf.data_from_file import mc_unpackers from PyConf.application import make_data_with_FetchDataFromFile - from PyConf.Algorithms import PrCheatedLongTracking, TrackBestTrackCreator, MCParticle2MCHitAlg - from PyConf.Tools import IdealStateCreator + from PyConf.Algorithms import PrCheatedLongTracking, TrackBestTrackCreator from RecoConf.hlt1_tracking import make_PrStoreFTHit_hits, get_track_master_fitter, FromV2TrackV1Track from RecoConf.mc_checking import make_links_lhcbids_mcparticles_tracking_system, make_links_tracks_mcparticles - from PyConf.control_flow import CompositeNode, NodeLogic links_to_hits = make_links_lhcbids_mcparticles_tracking_system() diff --git a/Hlt/RecoConf/python/RecoConf/calorimeter_reconstruction.py b/Hlt/RecoConf/python/RecoConf/calorimeter_reconstruction.py index c156469654b901d0bf4028d0e6c21f35a65fa114..f6a9f58754e5bce6f4bdd5980bb2f780945261d3 100644 --- a/Hlt/RecoConf/python/RecoConf/calorimeter_reconstruction.py +++ b/Hlt/RecoConf/python/RecoConf/calorimeter_reconstruction.py @@ -21,10 +21,9 @@ from PyConf.Algorithms import ( FutureEcalPIDmuAlg, FutureHcalPIDmuAlg, LHCb__Calo__Asssociators__Hypo2Tracks as CaloHypo2Tracks, LHCb__Converters__Calo__Cluster__v1__fromV2 as ClusterConverter, - LHCb__Converters__Calo__Cluster2TrackTable__v1__fromV2 as - Cluster2TrackTableConverter, LHCb__Converters__Calo__Hypo__v1__fromV2 as - HypoConverter, LHCb__Converters__Calo__Hypo__v1__MergedPi0__fromV2 as - MergedPi0Converter, LHCb__Converters__Calo__Hypo2TrackTable__v1__fromV2 as + LHCb__Converters__Calo__Hypo__v1__fromV2 as HypoConverter, + LHCb__Converters__Calo__Hypo__v1__MergedPi0__fromV2 as MergedPi0Converter, + LHCb__Converters__Calo__Hypo2TrackTable__v1__fromV2 as Hypo2TrackTableConverter) from PyConf.Tools import (CaloFutureECorrection, CaloFutureSCorrection, @@ -438,9 +437,7 @@ def make_calo(best_tracks, pvs, make_raw=default_raw_event): def make_calo_reduced(make_raw=default_raw_event): rawEvent = make_raw(["HcalPacked", "EcalPacked"]) rawToDigitsOutput = make_digits(rawEvent) - adcEcal = rawToDigitsOutput["adcEcal"] digitsEcal = rawToDigitsOutput["digitsEcal"] - adcHcal = rawToDigitsOutput["adcHcal"] digitsHcal = rawToDigitsOutput["digitsHcal"] clusters = make_clusters(digitsEcal) diff --git a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py index 18e2b9aa087a1cca5a1086c2ca51f5ed2b651172..b998946a8b0093b2f94da01fe49788b4139f14e2 100644 --- a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py +++ b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py @@ -33,7 +33,6 @@ from PyConf.Algorithms import ( TracksToSelection, TrackSelectionMerger, TrackSelectionToContainer) from PyConf.Tools import PrAddUTHitsTool, UpgradeGhostId, LoKi__Hybrid__TrackSelector as LoKiTrackSelector -from GaudiKernel.SystemOfUnits import MeV, GeV @configurable @@ -370,7 +369,6 @@ def make_TrackBestTrackCreator_tracks( track_list = [ tracks[track_type][track_version] for track_type in get_tracklist() ] - outTrackTypes = ["Best"] outTracks["Best"] = TrackBestTrackCreator( TracksInContainers=track_list, Fitter=get_fitter_tool(), diff --git a/Hlt/RecoConf/python/RecoConf/mc_checking.py b/Hlt/RecoConf/python/RecoConf/mc_checking.py index aaf7124b7a6ab00361c622461c6ee91be628e493..68cb9a2640ab355538552719922ac72bd2b22686 100644 --- a/Hlt/RecoConf/python/RecoConf/mc_checking.py +++ b/Hlt/RecoConf/python/RecoConf/mc_checking.py @@ -12,12 +12,10 @@ from __future__ import absolute_import, division, print_function ''' In this file, algorithms needed to run the MC reconstruction checking (PrTrackChecker) are defined. ''' -from PyConf.tonic import (configurable) +from PyConf.tonic import configurable from PyConf.dataflow import DataHandle -from PyConf.components import Tool from PyConf.application import ( - default_raw_event, make_data_with_FetchDataFromFile, make_odin, ) @@ -26,8 +24,7 @@ from PyConf.Algorithms import ( VPFullCluster2MCParticleLinker, VPFullCluster2MCHitLinker, PrLHCbID2MCParticle, PrLHCbID2MCParticleVPUTFTMU, PrTrackAssociator, PrTrackChecker, PrUTHitChecker, TrackListRefiner, TrackResChecker, - TrackIPResolutionCheckerNT, DataPacking__Unpack_LHCb__MCVPHitPacker_, - MCParticle2MCHitAlg, PrTrackerDumper, PVDumper, + TrackIPResolutionCheckerNT, MCParticle2MCHitAlg, PrTrackerDumper, PVDumper, LHCb__Converters__RecVertex__v2__fromVectorLHCbRecVertices as FromVectorLHCbRecVertex) @@ -104,8 +101,7 @@ def make_links_lhcbids_mcparticles_tracking_and_muon_system(): FTLiteClustersLinkLocation=boole_links_digits_mcparticles() ["FTLiteClusters"], MuonHitsLocation=make_muon_hits(), - MuonHitsLinkLocation=boole_lboole_links_digits_mcparticlesinks() - ["MuonDigits"], + MuonHitsLinkLocation=boole_links_digits_mcparticles()["MuonDigits"], ).TargetName @@ -226,7 +222,7 @@ def get_track_checkers( ) efficiency_checkers.append(pr_checker) - if not track_type in uthit_efficiency_types: + if track_type not in uthit_efficiency_types: continue uthit_checker = monitor_uthit_efficiency( TrackType=track_type, diff --git a/Hlt/RecoConf/python/RecoConf/mc_checking_categories.py b/Hlt/RecoConf/python/RecoConf/mc_checking_categories.py index 69fb3a2e7a7ad245313bcb074ed2412ea32ea5f4..cddfdd6b6d3ce5426f9870364aeff7573feab489 100644 --- a/Hlt/RecoConf/python/RecoConf/mc_checking_categories.py +++ b/Hlt/RecoConf/python/RecoConf/mc_checking_categories.py @@ -9,9 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### from __future__ import print_function -from GaudiKernel.SystemOfUnits import mm, GeV -import collections -from collections import OrderedDict categories = { "Velo": { diff --git a/Hlt/RecoConf/python/RecoConf/protoparticles.py b/Hlt/RecoConf/python/RecoConf/protoparticles.py index feb583f428df0bd0e4499c3f44298b42e28a4e81..0993f66834f4e67069d26a4dae158d89e1d509ed 100644 --- a/Hlt/RecoConf/python/RecoConf/protoparticles.py +++ b/Hlt/RecoConf/python/RecoConf/protoparticles.py @@ -22,7 +22,6 @@ from PyConf.Tools import ( FutureGammaPi0XGBoostTool, FutureGammaPi0SeparationTool, FutureNeutralIDTool, - CaloFutureElectron, ChargedProtoParticleAddEcalInfo, ChargedProtoParticleAddHcalInfo, ChargedProtoParticleAddBremInfo, diff --git a/Hlt/RecoConf/python/RecoConf/reco_objects_from_file.py b/Hlt/RecoConf/python/RecoConf/reco_objects_from_file.py index 329fbbe062c6335742d42fce655b7ccac6ca6da2..2b9d853ac207c60b098bc71cc12e0756871ecd25 100644 --- a/Hlt/RecoConf/python/RecoConf/reco_objects_from_file.py +++ b/Hlt/RecoConf/python/RecoConf/reco_objects_from_file.py @@ -8,8 +8,6 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### - -from PyConf import configurable from Hlt2Conf.data_from_file import reco_unpackers diff --git a/Hlt/RecoConf/python/RecoConf/rich_mc_checking.py b/Hlt/RecoConf/python/RecoConf/rich_mc_checking.py index a154936480b49c51b5ec798073716d15bb4d0e1e..9ec9006b2e0f9fe84e7f2c44ca8d2ce7673b23e4 100644 --- a/Hlt/RecoConf/python/RecoConf/rich_mc_checking.py +++ b/Hlt/RecoConf/python/RecoConf/rich_mc_checking.py @@ -25,7 +25,6 @@ from .rich_reconstruction import (get_radiator_bool_opts, from .rich_data_monitoring import default_rich_monitoring_options from PyConf.Algorithms import ( - DataPacking__Unpack_LHCb__MCRichDigitSummaryPacker_ as RichSumUnPack, Rich__Future__MC__TrackToMCParticleRelations as TkToMCPRels, Rich__Future__Rec__MC__Moni__PIDQC as PIDQC, Rich__Future__Rec__MC__Moni__SIMDPhotonCherenkovAngles as MCCKAngles, @@ -144,9 +143,6 @@ def make_rich_checkers(conf, reco_opts, check_opts, moni_set="Standard"): "MaxP": (120.0 * GeV, 120.0 * GeV, 120.0 * GeV) } - # Bins for resolution parameterisation plots - resBins = (200, 200, 200) - # The dict of configured monitors to return results = {} diff --git a/Hlt/RecoConf/python/RecoConf/rich_reconstruction.py b/Hlt/RecoConf/python/RecoConf/rich_reconstruction.py index 4e35f085ac98089a1765d1289167b15e4da4cd0b..b1083a803bdd4c913af25df0846c16a0c7fd7601 100644 --- a/Hlt/RecoConf/python/RecoConf/rich_reconstruction.py +++ b/Hlt/RecoConf/python/RecoConf/rich_reconstruction.py @@ -235,7 +235,7 @@ def make_rich_pixels(options, make_raw=default_raw_event): """ # Configure the particle properties - part_props = configure_rich_particle_properties(options) + configure_rich_particle_properties(options) # The conf dict to return results = {} @@ -290,7 +290,7 @@ def make_rich_tracks(track_name, input_tracks, options): """ # Configure the particle properties - part_props = configure_rich_particle_properties(options) + configure_rich_particle_properties(options) # The conf map to return results = {} @@ -471,7 +471,7 @@ def make_rich_photons(track_name, """ # Configure the particle properties - part_props = configure_rich_particle_properties(options) + configure_rich_particle_properties(options) # The conf dict to return results = {} @@ -553,7 +553,7 @@ def make_rich_pids(track_name, """ # Configure the particle properties - part_props = configure_rich_particle_properties(options) + configure_rich_particle_properties(options) # conf dict to return results = {} diff --git a/Hlt/RecoConf/python/RecoConf/standalone.py b/Hlt/RecoConf/python/RecoConf/standalone.py index 5c1a7c9e6d98df0e771d8406f59126ca6c8db683..d36a39d9e232d4a767a4827901a743ddd75064ed 100644 --- a/Hlt/RecoConf/python/RecoConf/standalone.py +++ b/Hlt/RecoConf/python/RecoConf/standalone.py @@ -9,7 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### from PyConf.tonic import configurable -from PyConf.control_flow import CompositeNode, NodeLogic from .hlt1_tracking import ( require_gec, make_reco_pvs, make_pvs, make_hlt1_tracks, make_VeloKalman_fitted_tracks, make_PrForwardTracking_tracks, @@ -20,8 +19,7 @@ from .hlt1_muonid import make_muon_id, make_tracks_with_muon_id from .hlt2_muonid import make_muon_ids as make_muon_id_hlt2 from .hlt2_tracking import make_hlt2_tracks, make_TrackBestTrackCreator_tracks, get_default_tracks_for_calo, get_default_out_track_types_for_light_reco from .calorimeter_reconstruction import (make_calo, make_calo_resolution_gamma, - make_calo_resolution_pi0, - make_calo_raw_ecalclusters) + make_calo_resolution_pi0) from .calorimeter_mc_checking import ( monitor_calo_cluster_resolution, monitor_calo_future_cluster_resolution, monitor_calo_photon_resolution, monitor_calo_pi0_resolution, @@ -37,14 +35,6 @@ from PyConf.Algorithms import ( from .mc_checking import get_track_checkers, get_fitted_tracks_checkers, get_best_tracks_checkers from .reconstruction_objects import reconstruction from .protoparticles import make_charged_protoparticles, make_neutral_protoparticles -from PyConf.application import default_raw_event -from .rich_reconstruction import (make_all_rich_pids, make_merged_rich_pids, - make_rich_pids, make_rich_pixels, - default_rich_reco_options) -from .rich_data_monitoring import (make_rich_pixel_monitors, - make_rich_track_monitors, - default_rich_monitoring_options) -from .rich_mc_checking import make_rich_checkers, default_rich_checking_options from .calo_data_monitoring import monitor_calo_clusters from .track_data_monitoring import monitor_tracking @@ -203,9 +193,9 @@ def standalone_hlt2_reco(do_mc_checking=False, do_data_monitoring=False): do_mc_checking=do_mc_checking, do_data_monitoring=do_data_monitoring) data += [rich_reco["rich_pids"]] - if rich_reco["monitoring"] != None: + if rich_reco["monitoring"] is not None: data += rich_reco["monitoring"] - if rich_reco["mcchecking"] != None: + if rich_reco["mcchecking"] is not None: data += rich_reco["mcchecking"] # Add Calo @@ -299,9 +289,9 @@ def standalone_hlt2_light_reco(fast_reco=False, data += [ rich_reco["rich_pids"][key] for key in rich_reco["rich_pids"].keys() ] - if rich_reco["monitoring"] != None: + if rich_reco["monitoring"] is not None: data += rich_reco["monitoring"] - if rich_reco["mcchecking"] != None: + if rich_reco["mcchecking"] is not None: data += rich_reco["mcchecking"] trackSelections = {} diff --git a/Hlt/RecoConf/scripts/PrCheckerEfficiency_HLT1.py b/Hlt/RecoConf/scripts/PrCheckerEfficiency_HLT1.py index 482491abd693b69ab71b59f5a0042bf7e575b723..cf790b1f60b83bbeadc644b66b361f6b5ad7e548 100644 --- a/Hlt/RecoConf/scripts/PrCheckerEfficiency_HLT1.py +++ b/Hlt/RecoConf/scripts/PrCheckerEfficiency_HLT1.py @@ -27,13 +27,10 @@ from __future__ import division import os, sys import argparse -import ROOT -from ROOT import TMultiGraph, TMath, TAxis, TH1, TLatex, TGaxis, TROOT, TSystem, TCanvas, TFile, TTree, TObject -from ROOT import kDashed, kRed, kGreen, kBlue, kBlack, kAzure, kGray, kOrange, kMagenta, kCyan, kTRUE, kFALSE, gPad -from ROOT import gROOT, gStyle, TStyle, TPaveText -from ROOT import ROOT, vector, TGraphAsymmErrors, TEfficiency -import logging -import subprocess +from ROOT import TMultiGraph, TLatex, TCanvas, TFile +from ROOT import kGreen, kBlue, kBlack, kAzure, kGray, kOrange, kMagenta, kCyan, gPad +from ROOT import gROOT +from ROOT import TEfficiency gROOT.SetBatch(True) @@ -109,11 +106,6 @@ def argument_parser(): default=False, action='store_true', help='draw histogram of all files') - parser.add_argument( - '--plotelec', - default=False, - action='store_true', - help='draw eff of electron on the same canvas') parser.add_argument( '--savepdf', default=False, @@ -160,13 +152,12 @@ def get_eff(eff, hist, tf, histoName, label, var): return eff, hist -def PrCheckerEfficiency(filename, outfile, label, plotstyle, dist, plotelec, - savepdf): +def PrCheckerEfficiency(filename, outfile, label, plotstyle, dist, savepdf): sys.path.append(os.path.expandvars(plotstyle + "/utils/")) from LHCbStyle import setLHCbStyle, set_style from ConfigHistos import (efficiencyHistoDict, ghostHistoDict, categoriesDict, getCuts) - from Legend import place_legend + from Legend import place_legend # noqa decorate TPad setLHCbStyle() markers = get_markers() @@ -315,53 +306,6 @@ def PrCheckerEfficiency(filename, outfile, label, plotstyle, dist, plotelec, canvas_elec.SetRightMargin(0.05) canvas_elec.Write() - #draw them both - if plotelec: - canvas_com = TCanvas(name + "_combine", - title + "_combine") - i = 0 - mg_comb = TMultiGraph() - for lab in label: - mg_comb.Add(eff[lab]) - mg_comb.Add(eff_elec[lab]) - set_style(eff[lab], colors[i], markers[i], - styles[i]) - set_style(eff_elec[lab], colors[i + 1], - markers[i + 1], styles[i]) - set_style(hist_den[lab], colors[i] - 10, - markers[i], styles[i]) - set_style(hist_elec[lab], colors[i + 1] - 10, - markers[i + 1], styles[i]) - rightmax = 1.05 * hist_den[lab].GetMaximum() - scale = gPad.GetUymax() / rightmax - hist_den[lab].Scale(scale) - rightmax_elec = 1.05 * hist_elec[lab].GetMaximum() - scale_elec = gPad.GetUymax() / rightmax_elec - hist_elec[lab].Scale(scale_elec) - i = i + 2 - - mg_comb.Draw("ap") - mg_comb.GetYaxis().SetRangeUser(0, 1.05) - rightmax = 1.05 * hist_den[label[0]].GetMaximum() - mg_comb.GetXaxis().SetTitle(xtitle) - mg_comb.GetYaxis().SetTitle("Efficiency") - mg_comb.GetYaxis().SetRangeUser(0, 1.05) - mg_comb.SetTitle(tracker + " " + cut) - for lab in label: - hist_lab[lab].Draw("hist SAME") - hist_elec[lab].Draw("hist SAME") - - canvas_com.PlaceLegend() - for lab in label: - eff[lab].Draw("P SAME") - eff_elec[lab].Draw("P SAME") - latex.DrawLatex(0.7, 0.85, "LHCb simulation") - track_name = names[tracker] + " tracks" - latex.DrawLatex(0.7, 0.75, track_name) - latex.DrawLatex(0.35, 0.3, cutName) - canvas_com.SetRightMargin(0.05) - canvas_com.Write() - # calculate ghost rate histoBaseName = "Track/" + folder + tracker + "/" for histo in ghostHistos[tracker]: diff --git a/Hlt/RecoConf/scripts/PrCheckerIPresolution.py b/Hlt/RecoConf/scripts/PrCheckerIPresolution.py index 43369e5838d6ec5888885bbd0f5a755bf4c31f5d..5731f41231c3810f223844bfd85e6acef336df9d 100644 --- a/Hlt/RecoConf/scripts/PrCheckerIPresolution.py +++ b/Hlt/RecoConf/scripts/PrCheckerIPresolution.py @@ -22,11 +22,10 @@ from __future__ import division import os, sys import argparse -import ROOT -from ROOT import TMultiGraph, TMath, TAxis, TH1, TLatex, TGaxis, TROOT, TSystem, TCanvas, TFile, TTree, TObject -from ROOT import kDashed, kRed, kGreen, kBlue, kCyan, kMagenta, kBlack, kOrange, kAzure, kTRUE, kFALSE, gPad, TH1F, TH2F, TF1 -from ROOT import gDirectory, gROOT, gStyle, TStyle, TPaveText, TString -from ROOT import ROOT, vector, TGraphAsymmErrors, TObjArray +from ROOT import TLatex, TCanvas, TFile +from ROOT import kGreen, kBlue, kCyan, kMagenta, kBlack, kOrange, TH1F, TH2F, TF1 +from ROOT import gROOT +from ROOT import TObjArray gROOT.SetBatch(True) @@ -88,9 +87,6 @@ def get_resolution(resx, resy, tr, label): resIPy = {} resIPx_1 = {} resIPy_1 = {} - markers = get_markers() - colors = get_colors() - styles = get_fillstyles() cutAcc = "trueeta<5 && trueeta>2 && typeofprefix==0" print("Velo track from PV in acceptance: " + cutAcc) arrx = TObjArray() @@ -116,18 +112,19 @@ def get_resolution(resx, resy, tr, label): resIPx_1[lab] = arrx[1] resIPy_1[lab] = arry[1] for i in range(1, resIPx_1[lab].GetNbinsX()): - print( - lab + ": in 1/pT region: (" + - format(resIPx_1[lab].GetBinLowEdge(i), '.2f') + ", " + format( - resIPx_1[lab].GetBinLowEdge(i) + - resIPx_1[lab].GetBinWidth(i), '.2f') + ") [c/GeV]" + - " ---- " + "resIPx for mean : " + - format(resIPx_1[lab].GetBinContent(i), '.2f') + - "[\mum] width : " + format(resx[lab].GetBinContent(i), '.2f') + - "[\mum] ---- " + "resIPy for mean : " + - format(resIPy_1[lab].GetBinContent(i), '.2f') + - "[\mum] width : " + format(resy[lab].GetBinContent(i), '.2f') + - "[\mum]") + print(lab + ": in 1/pT region: (" + + format(resIPx_1[lab].GetBinLowEdge(i), '.2f') + ", " + + format( + resIPx_1[lab].GetBinLowEdge(i) + + resIPx_1[lab].GetBinWidth(i), '.2f') + ") [c/GeV]" + + " ---- " + "resIPx for mean : " + + format(resIPx_1[lab].GetBinContent(i), '.2f') + + r"[\mum] width : " + + format(resx[lab].GetBinContent(i), '.2f') + r"[\mum] ---- " + + "resIPy for mean : " + + format(resIPy_1[lab].GetBinContent(i), '.2f') + + r"[\mum] width : " + + format(resy[lab].GetBinContent(i), '.2f') + r"[\mum]") return resx, resy arrx.Delete() @@ -147,7 +144,6 @@ def PrCheckerIPresolution(filename, label, outfile, savepdf, plotstyle): markers = get_markers() colors = get_colors() - styles = get_fillstyles() tf = {} tr = {} tf = get_files(tf, filename, label) diff --git a/Hlt/RecoConf/scripts/PrCheckerMuonIDEff.py b/Hlt/RecoConf/scripts/PrCheckerMuonIDEff.py index 00449f6c739c4b8f40af8f4102fc41725ced7e57..1289e87ff78e4d71f63d773ab38e97d70886b640 100644 --- a/Hlt/RecoConf/scripts/PrCheckerMuonIDEff.py +++ b/Hlt/RecoConf/scripts/PrCheckerMuonIDEff.py @@ -27,13 +27,10 @@ from __future__ import division import os, sys import argparse -import ROOT -from ROOT import TMultiGraph, TMath, TAxis, TH1, TLatex, TGaxis, TROOT, TSystem, TCanvas, TFile, TTree, TObject -from ROOT import kDashed, kGray, kOrange, kMagenta, kRed, kGreen, kCyan, kBlue, kBlack, kAzure, kTRUE, kFALSE, gPad, TPad -from ROOT import gROOT, gStyle, TStyle, TPaveText, TH1F -from ROOT import ROOT, TH1D, TH1F, TGraphAsymmErrors, TEfficiency -import logging -import subprocess +from ROOT import TMultiGraph, TLatex, TCanvas, TFile +from ROOT import kGray, kOrange, kMagenta, kGreen, kCyan, kBlue, kBlack, gPad +from ROOT import gROOT +from ROOT import TEfficiency gROOT.SetBatch(True) @@ -147,7 +144,7 @@ def PrCheckerMuonIDEff(filename, outfile, label, plotstyle, savepdf, printval): sys.path.append(os.path.expandvars(plotstyle + "/utils/")) from LHCbStyle import setLHCbStyle, set_style from ConfigHistos import (efficiencyHistoDict, categoriesDict, getCuts) - from Legend import place_legend + from Legend import place_legend # noqa decorate TPad setLHCbStyle() markers = get_markers() diff --git a/Hlt/RecoConf/scripts/PrCheckerTrackResolution.py b/Hlt/RecoConf/scripts/PrCheckerTrackResolution.py index b57a3485265393800e1bb56ed847ff7a0de880c8..3ea51759f0b65ae3202e2d761d12d5a7eec09f77 100644 --- a/Hlt/RecoConf/scripts/PrCheckerTrackResolution.py +++ b/Hlt/RecoConf/scripts/PrCheckerTrackResolution.py @@ -20,13 +20,10 @@ from __future__ import division import os, sys import argparse -import ROOT -from ROOT import TMultiGraph, TMath, TAxis, TH2F, TH2, TH1, TLatex, TGaxis, TROOT, TSystem, TCanvas, TFile, TTree, TObject -from ROOT import kDashed, kOrange, kGray, kMagenta, kCyan, kRed, kGreen, kBlue, kBlack, kAzure, kTRUE, kFALSE, gPad, TH1, TH2, TF1 -from ROOT import gROOT, gDirectory, gStyle, TStyle, TPaveText, TString -from ROOT import ROOT, vector, TGraphAsymmErrors, TObjArray - -from collections import defaultdict +from ROOT import TLatex, TCanvas, TFile +from ROOT import kOrange, kGray, kMagenta, kCyan, kGreen, kBlue, kBlack, gPad, TF1 +from ROOT import gROOT +from ROOT import TObjArray gROOT.SetBatch(True) @@ -79,7 +76,7 @@ def PrCheckerTrackResolution(filename, label, outfile, savepdf, plotstyle): sys.path.append(os.path.expandvars(plotstyle + "/utils/")) from LHCbStyle import setLHCbStyle, set_style - from Legend import place_legend + from Legend import place_legend # noqa decorate TPad setLHCbStyle() latex = TLatex() diff --git a/Hlt/RecoConf/scripts/utils/LHCbStyle.py b/Hlt/RecoConf/scripts/utils/LHCbStyle.py index f5dd4fceeee103f7e91a5b29453de1d73ea75eef..a42cd8dbd4658b8f7732f1c7ca88bb3e5f54f0dd 100644 --- a/Hlt/RecoConf/scripts/utils/LHCbStyle.py +++ b/Hlt/RecoConf/scripts/utils/LHCbStyle.py @@ -9,7 +9,6 @@ # or submit itself to any jurisdiction. # ############################################################################### -from ROOT import gStyle from ROOT import gROOT, TH1, TH1F, TH1D from ROOT import TStyle diff --git a/Hlt/RecoConf/scripts/utils/Legend.py b/Hlt/RecoConf/scripts/utils/Legend.py index f6fd563e62323ff4441497c58405917c6e9a1473..39c2ddf13eaab8039abc9a46771c367152aaae35 100644 --- a/Hlt/RecoConf/scripts/utils/Legend.py +++ b/Hlt/RecoConf/scripts/utils/Legend.py @@ -10,7 +10,6 @@ ############################################################################### from __future__ import division import ROOT -import itertools from ROOT import gStyle # Some convenience function to easily iterate over the parts of the collections diff --git a/PyConf/python/PyConf/control_flow.py b/PyConf/python/PyConf/control_flow.py index 8a88d2aefcc4778abf606f1d19b62351a5bb93f3..d91caef17200940429b681ed9a549e7502cfe6fe 100644 --- a/PyConf/python/PyConf/control_flow.py +++ b/PyConf/python/PyConf/control_flow.py @@ -56,8 +56,8 @@ class CompositeNode(object): forceOrder=True): if not isinstance(combineLogic, NodeLogic): raise TypeError('combineLogic must take an instance of NodeLogic') - if forceOrder == False and combineLogic in (NodeLogic.LAZY_OR, - NodeLogic.LAZY_AND): + if not forceOrder and combineLogic in (NodeLogic.LAZY_OR, + NodeLogic.LAZY_AND): raise ValueError( "If you want lazy evaluation, please fix the order (forceOrder=True)" ) diff --git a/PyConf/python/PyConf/utilities.py b/PyConf/python/PyConf/utilities.py index d06159b6483339067758015446f7b312480ab98f..4baec88e37b400e93f8404ad73e485ed38b4e61e 100644 --- a/PyConf/python/PyConf/utilities.py +++ b/PyConf/python/PyConf/utilities.py @@ -255,7 +255,7 @@ def diff_options(old_options, def normalize_components(pkl_options, other_options): short_names = {} for k in pkl_options: - m = re.match('^(.*) \(.*\)$', k) + m = re.match(r'^(.*) \(.*\)$', k) if not m: raise ValueError('unexpected name in pkl options') short_names[m.group(1)] = k