From 46cd6264c02acd941bfeef571b12807b1072f47c Mon Sep 17 00:00:00 2001 From: jrharris <jonathan.harrison@manchester.ac.uk> Date: Wed, 27 Apr 2016 16:20:45 +0200 Subject: [PATCH 1/3] Removing LoKi::TrgDistanceCalculator from RareCharm lines --- .../python/Hlt2Lines/RareCharm/Stages.py | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Hlt/Hlt2Lines/python/Hlt2Lines/RareCharm/Stages.py b/Hlt/Hlt2Lines/python/Hlt2Lines/RareCharm/Stages.py index afe3a57fa..86d188fc7 100644 --- a/Hlt/Hlt2Lines/python/Hlt2Lines/RareCharm/Stages.py +++ b/Hlt/Hlt2Lines/python/Hlt2Lines/RareCharm/Stages.py @@ -96,7 +96,7 @@ class TwoMuonForD2XXHCombiner(Hlt2Combiner): twoMuonCombCut = "(AM<2100)" \ "& ((APT1+APT2)> %(Pair_SumAPT_MIN_mumuX)s)" \ - "& (AMINDOCA('LoKi::TrgDistanceCalculator') < %(Pair_AMINDOCA_MAX_mumuX)s )" \ + "& (AMINDOCA('') < %(Pair_AMINDOCA_MAX_mumuX)s )" \ "& (AALLSAMEBPV)" twoMuonMotherCut = "(BPVVD> %(Pair_BPVVD_MIN_mumuX)s )" \ @@ -126,7 +126,7 @@ class TwoElectronForD2XXHCombiner(Hlt2Combiner): twoElectronCombCut = "(AM<2100)" \ "& ((APT1+APT2)> %(Pair_SumAPT_MIN_eeX)s)" \ - "& (AMINDOCA('LoKi::TrgDistanceCalculator') < %(Pair_AMINDOCA_MAX_eeX)s )" \ + "& (AMINDOCA('') < %(Pair_AMINDOCA_MAX_eeX)s )" \ "& (AALLSAMEBPV)" twoElectronMotherCut = "(BPVVD> %(Pair_BPVVD_MIN_eeX)s )" \ @@ -156,7 +156,7 @@ class TwoMuElForD2XXHCombiner(Hlt2Combiner): twoMuElCombCut = "(AM<2100)" \ "& ((APT1+APT2)> %(Pair_SumAPT_MIN_mueX)s)" \ - "& (AMINDOCA('LoKi::TrgDistanceCalculator') < %(Pair_AMINDOCA_MAX_mueX)s )" \ + "& (AMINDOCA('') < %(Pair_AMINDOCA_MAX_mueX)s )" \ "& (AALLSAMEBPV)" twoMuElMotherCut = "(BPVVD> %(Pair_BPVVD_MIN_mueX)s )" \ @@ -274,8 +274,8 @@ class Lc2PXXCombiner(Hlt2Combiner): combcuts = "(AM<2400)" \ "& (AMAXCHILD(PT) > %(TrkPtMAX_Hmumu)s) " \ "& ((APT1+APT2+APT3) > %(DSumPt_Hmumu)s)" \ - "& (AMINDOCA('LoKi::TrgDistanceCalculator') < %(PairMinDoca_Hmumu)s)" \ - "& (AMAXDOCA('LoKi::TrgDistanceCalculator') < %(PairMaxDoca_Hmumu)s)" \ + "& (AMINDOCA('') < %(PairMinDoca_Hmumu)s)" \ + "& (AMAXDOCA('') < %(PairMaxDoca_Hmumu)s)" \ "& (AALLSAMEBPV)" mothercuts = Lambda_c_masscut + \ "& (VFASPF(VCHI2PDOF) < %(VtxChi2_Hmumu)s) " \ @@ -302,8 +302,8 @@ class Lc2PXX_Ele_Combiner(Hlt2Combiner): combcuts = "(AM<2400)" \ "& (AMAXCHILD(PT) > %(TrkPtMAX_Hmumu)s) " \ "& ((APT1+APT2+APT3) > %(DSumPt_Hmumu)s)" \ - "& (AMINDOCA('LoKi::TrgDistanceCalculator') < %(PairMinDoca_Hmumu)s)" \ - "& (AMAXDOCA('LoKi::TrgDistanceCalculator') < %(PairMaxDoca_Hmumu)s)" \ + "& (AMINDOCA('') < %(PairMinDoca_Hmumu)s)" \ + "& (AMAXDOCA('') < %(PairMaxDoca_Hmumu)s)" \ "& (AALLSAMEBPV)" mothercuts = Lambda_c_masscut + \ "& (VFASPF(VCHI2PDOF) < %(VtxChi2_Hmumu)s) " \ @@ -341,8 +341,8 @@ class D02HHXXCombiner(Hlt2Combiner): combcuts = "(AM<2100)" \ "& (AMAXCHILD(PT) > %(TrkPtMAX_HHmumu)s) " \ "& ((APT1+APT2+APT3+APT4) > %(DSumPt_HHmumu)s)" \ - "& (AMINDOCA('LoKi::TrgDistanceCalculator') < %(PairMinDoca_HHmumu)s)" \ - "& (AMAXDOCA('LoKi::TrgDistanceCalculator') < %(PairMaxDoca_HHmumu)s)" \ + "& (AMINDOCA('') < %(PairMinDoca_HHmumu)s)" \ + "& (AMAXDOCA('') < %(PairMaxDoca_HHmumu)s)" \ "& (AALLSAMEBPV)" mothercuts = masscut + \ "& (VFASPF(VCHI2PDOF) < %(VtxChi2_HHmumu)s) " \ @@ -373,8 +373,8 @@ class D02HHXX_Ele_Combiner(Hlt2Combiner): "& (AMAXCHILD(PT) > %(TrkPtMAX_HHmumu)s) " \ "& (AMINCHILD( MIPCHI2DV(PRIMARY) ) > %(TrkPVIPChi2_XeeORmue)s ) " \ "& ((APT1+APT2+APT3+APT4) > %(DSumPt_HHmumu)s)" \ - "& (AMINDOCA('LoKi::TrgDistanceCalculator') < %(PairMinDoca_HHmumu)s)" \ - "& (AMAXDOCA('LoKi::TrgDistanceCalculator') < %(PairMaxDoca_HHmumu)s)" \ + "& (AMINDOCA('') < %(PairMinDoca_HHmumu)s)" \ + "& (AMAXDOCA('') < %(PairMaxDoca_HHmumu)s)" \ "& (AALLSAMEBPV)" mothercuts = masscut + \ "& (VFASPF(VCHI2PDOF) < %(VtxChi2_HHmumu)s) " \ -- GitLab From 2360b7510d5070de7941de86587bc52a1b581532 Mon Sep 17 00:00:00 2001 From: Maarten Van Veghel <mveghel@cern.ch> Date: Tue, 3 May 2016 16:02:16 +0200 Subject: [PATCH 2/3] Corrected regular expressions in HltOutput.py for routing bits 85 (TURBORAW) and 88 (TURBO) --- Hlt/HltConf/python/HltConf/HltOutput.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hlt/HltConf/python/HltConf/HltOutput.py b/Hlt/HltConf/python/HltConf/HltOutput.py index 451ff68d9..0df55c605 100644 --- a/Hlt/HltConf/python/HltConf/HltOutput.py +++ b/Hlt/HltConf/python/HltConf/HltOutput.py @@ -326,14 +326,14 @@ class HltOutputConf(LHCbConfigurableUser): , 57 : "HLT_PASS('Hlt1Tell1ErrorDecision')" # 64--96: Hlt2 # RB 85 Turbo stream with full raw event - , 85 : "HLT_TURBOPASS_RE('^Hlt2.*(?!TurboCalib)Decision$')" + , 85 : "HLT_TURBOPASS_RE('^Hlt2(?!.*TurboCalibDecision$).*Decision$')" # RB 86 BEAMGAS stream , 86 : "HLT_PASS_SUBSTR('Hlt2BeamGas')" # RB 87 for the full (non-turbo(calib)) stream , 87 : "HLT_NONTURBOPASS_RE('Hlt2(?!BeamGas)(?!Lumi).*Decision')" # RB 88 for Turbo stream, includes lumi events. # this now excludes turbocalib events which have their own stream/routing bit - , 88 : "HLT_TURBOPASS_RE('^Hlt2.*(?!TurboCalib)Decision$')" + , 88 : "HLT_TURBOPASS_RE('^Hlt2(?!.*TurboCalibDecision$).*Decision$')" # RB 89 for the parked stream; reserved but not set for now # RB 90 for TurboCalib stream, includes lumi events. , 90 : "HLT_TURBOPASS_RE('^Hlt2.*TurboCalibDecision$')" -- GitLab From 8e43f482261ea36fecce08441ce2b07b86d96153 Mon Sep 17 00:00:00 2001 From: Maarten Van Veghel <mveghel@cern.ch> Date: Wed, 4 May 2016 14:30:36 +0200 Subject: [PATCH 3/3] made regular expressions a bit cleaner in routing bit 85 and 88 in HltOutput --- Hlt/HltConf/python/HltConf/HltOutput.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hlt/HltConf/python/HltConf/HltOutput.py b/Hlt/HltConf/python/HltConf/HltOutput.py index 0df55c605..5d3683e84 100644 --- a/Hlt/HltConf/python/HltConf/HltOutput.py +++ b/Hlt/HltConf/python/HltConf/HltOutput.py @@ -326,14 +326,14 @@ class HltOutputConf(LHCbConfigurableUser): , 57 : "HLT_PASS('Hlt1Tell1ErrorDecision')" # 64--96: Hlt2 # RB 85 Turbo stream with full raw event - , 85 : "HLT_TURBOPASS_RE('^Hlt2(?!.*TurboCalibDecision$).*Decision$')" + , 85 : "HLT_TURBOPASS_RE('^Hlt2.*(?<!TurboCalib)Decision$')" # RB 86 BEAMGAS stream , 86 : "HLT_PASS_SUBSTR('Hlt2BeamGas')" # RB 87 for the full (non-turbo(calib)) stream , 87 : "HLT_NONTURBOPASS_RE('Hlt2(?!BeamGas)(?!Lumi).*Decision')" # RB 88 for Turbo stream, includes lumi events. # this now excludes turbocalib events which have their own stream/routing bit - , 88 : "HLT_TURBOPASS_RE('^Hlt2(?!.*TurboCalibDecision$).*Decision$')" + , 88 : "HLT_TURBOPASS_RE('^Hlt2.*(?<!TurboCalib)Decision$')" # RB 89 for the parked stream; reserved but not set for now # RB 90 for TurboCalib stream, includes lumi events. , 90 : "HLT_TURBOPASS_RE('^Hlt2.*TurboCalibDecision$')" -- GitLab