From 331e6e9a4917e5c7a29931d8c8ac9ede1680d484 Mon Sep 17 00:00:00 2001 From: jpriscia <jessica.prisciandaro@cern.ch> Date: Thu, 12 May 2016 15:15:51 +0200 Subject: [PATCH 01/13] Strange settings --- .../Strange/Strange_25ns_June2016.py | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 Hlt/HltSettings/python/HltSettings/Strange/Strange_25ns_June2016.py diff --git a/Hlt/HltSettings/python/HltSettings/Strange/Strange_25ns_June2016.py b/Hlt/HltSettings/python/HltSettings/Strange/Strange_25ns_June2016.py new file mode 100644 index 000000000..189fbc135 --- /dev/null +++ b/Hlt/HltSettings/python/HltSettings/Strange/Strange_25ns_June2016.py @@ -0,0 +1,59 @@ +# ============================================================================= +# @file Strange_25ns_June2016.py +# @author Carla Marin, Jessica Prisciandaro (jessica.prisciandaro@cern.ch) +# @date 12.05.2016 +# ============================================================================= +"""Threshold settings for Hlt2 Strange lines for 2016. +WARNING :: DO NOT EDIT WITHOUT PERMISSION OF THE AUTHORS +""" + +from GaudiKernel.SystemOfUnits import GeV, mm, MeV , picosecond + +class Strange_25ns_June2016(object) : + + __all__ = ( 'ActiveHlt2Lines' ) + + + def ActiveHlt2Lines(self) : + """ + Returns a list of active lines + """ + + lines = [ + + 'Hlt2StrangeKPiPiPiTurbo' + ] + + return lines + + + def Thresholds(self) : + """ + Returns a dictionary of cuts + """ + + # keep pass through thresholds + d = { } + + from Hlt2Lines.Strange.Lines import StrangeLines + d.update({StrangeLines : + {'Common' : {'TrChi2' : 3, + 'TrGP' : 0.3 + }, + 'KPiPiPiTurbo' : { 'piMinIpChi2' : 25. , + 'KMassWin' : 100 * MeV , + 'KMaxDOCA' : 2. * mm , + 'KVtxChi2' : 25. , # adimensional + 'KMinPt' : 300 * MeV , + 'KMinDIRA' : 0.999 , # adimensional + 'KMaxIpChi2' : 25 , # adimensional + 'KMinTauPs' : 10 * picosecond + } + + } + }) + + return d + + + -- GitLab From 2aff967121106cda72865d656acdf27a3d7f26e9 Mon Sep 17 00:00:00 2001 From: Carla Marin <cmarin@ecm.ub.edu> Date: Thu, 12 May 2016 15:40:29 +0200 Subject: [PATCH 02/13] Adding RareStrange settings for June 2016 --- .../RareStrange/RareStrange_25ns_June2016.py | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 Hlt/HltSettings/python/HltSettings/RareStrange/RareStrange_25ns_June2016.py diff --git a/Hlt/HltSettings/python/HltSettings/RareStrange/RareStrange_25ns_June2016.py b/Hlt/HltSettings/python/HltSettings/RareStrange/RareStrange_25ns_June2016.py new file mode 100644 index 000000000..07126b9d8 --- /dev/null +++ b/Hlt/HltSettings/python/HltSettings/RareStrange/RareStrange_25ns_June2016.py @@ -0,0 +1,64 @@ +# ============================================================================= +# @file RareStrange_25ns_June2016.py +# @author Jessica Prisciandaro (jessica.prisciandaro@cern.ch) +# @date 12.05.2016 +# ============================================================================= +"""Threshold settings for Hlt2 Rare Strange lines for June 2016.""" + +from GaudiKernel.SystemOfUnits import mm, MeV, picosecond + + +class RareStrange_25ns_June2016(object): + __all__ = ('ActiveHlt2Lines', 'Thresholds') + + def ActiveHlt2Lines(self): + """Returns a list of active lines.""" + + lines = ['Hlt2RareStrangeSigmaPMuMu', + 'Hlt2RareStrangeKPiMuMu', + 'Hlt2RareStrangeKPiMuMuSS' + ] + + return lines + + def Thresholds(self): + """Returns the line thresholds.""" + thresholds = {'Common': {'TrChi2': 3, + 'TrGP' : 0.3}, + 'SigmaPMuMu': {'muonMinIpChi2' : 25., + 'pPIDp' : 5., + 'pMinIpChi2' : 25., + 'SigmaMassWin' : 500 * MeV, + 'SigmaMaxDOCA' : 2. * mm, + 'SigmaVtxChi2' : 25, # adimensional + 'SigmaMinPt' : 500 * MeV, + 'SigmaMinDIRA' : 0.9, # adimensional + 'SigmaMaxIpChi2': 36, # adimensional + 'SigmaMinTauPs' : 6 * picosecond}, + 'KPiMuMu': {'muonMinIpChi2': 25., + 'piMinIpChi2' : 25., + 'KMassWin' : 500 * MeV, + 'KMaxDOCA' : 2. * mm, + 'KVtxChi2' : 25., # adimensional + 'KMinPt' : 500 * MeV, + 'KMinDIRA' : 0.9, # adimensional + 'KMaxIpChi2' : 36, # adimensional + 'KMinTauPs' : 10 * picosecond}, + 'KPiMuMuSS' : { 'muonMinIpChi2' : 25. , + 'piMinIpChi2' : 25. , + 'KMassWin' : 500 * MeV , + 'KMaxDOCA' : 2. * mm , + 'KVtxChi2' : 25. , # adimensional + 'KMinPt' : 500 * MeV , + 'KMinDIRA' : 0.9 , # adimensional + 'KMaxIpChi2' : 36 , # adimensional + 'KMinTauPs' : 10 * picosecond + } + } + # Noew build the final dictionary + from Hlt2Lines.RareStrange.Lines import RareStrangeLines + + return {RareStrangeLines: thresholds} + +# EOF + -- GitLab From c5e2d50dd466061049e234e47ac8d15fad9d7557 Mon Sep 17 00:00:00 2001 From: jpriscia <jessica.prisciandaro@cern.ch> Date: Thu, 12 May 2016 20:11:03 +0200 Subject: [PATCH 03/13] ProbNN added to Hlt2DiMuonSoft - Settings updated --- Hlt/Hlt2Lines/python/Hlt2Lines/DiMuon/Lines.py | 3 ++- Hlt/Hlt2Lines/python/Hlt2Lines/DiMuon/Stages.py | 1 + .../python/HltSettings/DiMuon/DiMuon_25ns_Draft2016.py | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Hlt/Hlt2Lines/python/Hlt2Lines/DiMuon/Lines.py b/Hlt/Hlt2Lines/python/Hlt2Lines/DiMuon/Lines.py index b49906d50..43533c267 100644 --- a/Hlt/Hlt2Lines/python/Hlt2Lines/DiMuon/Lines.py +++ b/Hlt/Hlt2Lines/python/Hlt2Lines/DiMuon/Lines.py @@ -61,10 +61,11 @@ class DiMuonLines(Hlt2LinesConfigurableUser) : 'DLS' : 7}, 'Soft' : {'IP' : 0.3 * mm , 'IPChi2Min' : 1.5, - 'IPChi2Max' : 1500, + 'IPChi2Max' : 10000000000000, 'TTHits' : -1, 'TRACK_TRGHOSTPROB_MAX': 0.4, 'MaxMass' : 1000 * MeV, + 'MuProbNNmu' : 0.05, 'VertexChi2' : 25, 'Rho' : 3, 'SVZ' : 650, diff --git a/Hlt/Hlt2Lines/python/Hlt2Lines/DiMuon/Stages.py b/Hlt/Hlt2Lines/python/Hlt2Lines/DiMuon/Stages.py index 88d01f65e..c5ba59ce9 100644 --- a/Hlt/Hlt2Lines/python/Hlt2Lines/DiMuon/Stages.py +++ b/Hlt/Hlt2Lines/python/Hlt2Lines/DiMuon/Stages.py @@ -42,6 +42,7 @@ class SoftDiMuonFilter(Hlt2ParticleFilter): " & (CHILDCUT((TRGHOSTPROB < %(TRACK_TRGHOSTPROB_MAX)s),2))" + " & (MINTREE('mu-' == ABSID, MIPCHI2DV(PRIMARY)) > %(IPChi2Min)s)" + " & (MAXTREE('mu-' == ABSID, MIPCHI2DV(PRIMARY)) < %(IPChi2Max)s)" + + " & (MINTREE('mu+'==ABSID,PROBNNmu) > %(MuProbNNmu)s)" + " & ( VFASPF (sqrt(VX*VX+VY*VY)) > %(Rho)s) " + " & ( VFASPF ( VZ ) < %(SVZ)s) " + " & ((MIPDV(PRIMARY)/BPVVDZ)< %(MaxIpDistRatio)s)"+ diff --git a/Hlt/HltSettings/python/HltSettings/DiMuon/DiMuon_25ns_Draft2016.py b/Hlt/HltSettings/python/HltSettings/DiMuon/DiMuon_25ns_Draft2016.py index 807dda0f2..5d6348be2 100644 --- a/Hlt/HltSettings/python/HltSettings/DiMuon/DiMuon_25ns_Draft2016.py +++ b/Hlt/HltSettings/python/HltSettings/DiMuon/DiMuon_25ns_Draft2016.py @@ -98,12 +98,13 @@ class DiMuon_25ns_Draft2016(object) : 'IPChi2' : 0, 'DLS' : 5}, 'Soft' : {'IP' : 0.3 * mm , - 'IPChi2Min' : 1.5, - 'IPChi2Max' : 1500, + 'IPChi2Min' : 9, + 'IPChi2Max' : 1000000000000, 'TTHits' : -1, 'TRACK_TRGHOSTPROB_MAX': 0.4, 'MaxMass' : 1000 * MeV, 'VertexChi2' : 25, + 'MuProbNNmu' : 0.05, 'Rho' : 3, 'SVZ' : 650, 'doca' : 0.3, -- GitLab From 1b256e1506a394c23a6bbbff492efe50f86155d6 Mon Sep 17 00:00:00 2001 From: jpriscia <jessica.prisciandaro@cern.ch> Date: Sat, 14 May 2016 11:19:32 +0200 Subject: [PATCH 04/13] ProbNN added to DiElectron --- Hlt/Hlt2Lines/python/Hlt2Lines/DiElectron/Lines.py | 9 +++++---- Hlt/Hlt2Lines/python/Hlt2Lines/DiElectron/Stages.py | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Hlt/Hlt2Lines/python/Hlt2Lines/DiElectron/Lines.py b/Hlt/Hlt2Lines/python/Hlt2Lines/DiElectron/Lines.py index dc4231b3b..a19eebee1 100644 --- a/Hlt/Hlt2Lines/python/Hlt2Lines/DiElectron/Lines.py +++ b/Hlt/Hlt2Lines/python/Hlt2Lines/DiElectron/Lines.py @@ -15,13 +15,14 @@ class DiElectronLines(Hlt2LinesConfigurableUser) : 'ElSoft' : { 'VDZ' : 0, 'CosAngle' : 0.999997, - 'IpDzRatio' : 0.02, - 'IpProd' : 0.5 * mm * mm, + 'IpDzRatio' : 0.01, + 'IpProd' : 0.8 * mm * mm, 'SumGP' : 0.1, - 'MinIpChi2' : 6, + 'MinProbNNe': 0.1, + 'MinIpChi2' : 16, 'IpChi2Prod': 2000, 'Rho2' : 64 * mm * mm, - 'DOCA' : 0.3 * mm, + 'DOCA' : 0.2 * mm, 'MaxIpChi2' : 1000, 'SVZ' : 600 * mm, 'Mass' : 1000 * MeV, diff --git a/Hlt/Hlt2Lines/python/Hlt2Lines/DiElectron/Stages.py b/Hlt/Hlt2Lines/python/Hlt2Lines/DiElectron/Stages.py index 19569d1c8..064e6b66e 100644 --- a/Hlt/Hlt2Lines/python/Hlt2Lines/DiElectron/Stages.py +++ b/Hlt/Hlt2Lines/python/Hlt2Lines/DiElectron/Stages.py @@ -13,7 +13,8 @@ from HltTracking.HltPVs import PV3D class SoftDiElectronCombiner(Hlt2Combiner): def __init__(self, name, decay, inputs): - dc = { 'e+': "(MIPCHI2DV(PRIMARY) < %(MaxIpChi2)s)" } + dc = { 'e+': ("(MIPCHI2DV(PRIMARY) < %(MaxIpChi2)s)"+ + " & (PROBNNe > %(MinProbNNe)s)" )} cc = ( "(ACHILD(MIPDV(PRIMARY),1) * ACHILD(MIPDV(PRIMARY),2) > %(IpProd)s)" + " & (ACHILD(TRGHOSTPROB,1) + ACHILD(TRGHOSTPROB,2) < %(SumGP)s)" + -- GitLab From a9d57e5359929643596a6b766ef65a5dca8d608b Mon Sep 17 00:00:00 2001 From: jpriscia <jessica.prisciandaro@cern.ch> Date: Sat, 14 May 2016 15:34:31 +0200 Subject: [PATCH 05/13] StrangeLFV added --- .../StrangeLFV/StrangeLFV_25ns_Draft2016.py | 67 +++++++++++++++++++ .../StrangeLFV/StrangeLFV_pp_May2016.py | 66 ++++++++++++++++++ .../python/HltSettings/StrangeLFV/__init__.py | 0 3 files changed, 133 insertions(+) create mode 100644 Hlt/HltSettings/python/HltSettings/StrangeLFV/StrangeLFV_25ns_Draft2016.py create mode 100644 Hlt/HltSettings/python/HltSettings/StrangeLFV/StrangeLFV_pp_May2016.py create mode 100644 Hlt/HltSettings/python/HltSettings/StrangeLFV/__init__.py diff --git a/Hlt/HltSettings/python/HltSettings/StrangeLFV/StrangeLFV_25ns_Draft2016.py b/Hlt/HltSettings/python/HltSettings/StrangeLFV/StrangeLFV_25ns_Draft2016.py new file mode 100644 index 000000000..ad2077fdd --- /dev/null +++ b/Hlt/HltSettings/python/HltSettings/StrangeLFV/StrangeLFV_25ns_Draft2016.py @@ -0,0 +1,67 @@ +# ============================================================================= +# @file StrangeLFV_25ns_Draft2016.py +# @author Jessica Prisciandaro (jessica.prisciandaro@cern.ch) +# @date 22.04.2016 +# ============================================================================= +"""Threshold settings for Hlt2 DiElectron lines for 2016. +WARNING :: DO NOT EDIT WITHOUT PERMISSION OF THE AUTHORS +""" + +from GaudiKernel.SystemOfUnits import GeV, mm, MeV + +class StrangeLFV_25ns_Draft2016(object) : + + __all__ = ( 'ActiveHlt2Lines' ) + + + def ActiveHlt2Lines(self) : + """ + Returns a list of active lines + """ + + lines = [ + + 'Hlt2StrangeLFVMuonElectronSoft' + ] + + return lines + + + def Thresholds(self) : + """ + Returns a dictionary of cuts + """ + + # keep pass through thresholds + d = { } + + from Hlt2Lines.StrangeLFV.Lines import StrangeLFVLines + d.update({StrangeLFVLines : + { 'MuonElectronSoft' : { 'VDZ' : 0, + 'CosAngle' : 0.999997, + 'IpDzRatio' : 0.015, + 'SumGP' : 0.4, + 'Rho2' : 36 * mm * mm, + 'VertexChi2' : 25, + 'DOCA' : 0.3 * mm, + 'MaxMuGP' : 0.3, + 'MaxElGP' : 0.3, + 'MinMuIp' : 0.2 * mm, + 'MinElIp' : 0.2 * mm, + 'MinMuIpChi2' : 6, + 'MinElIpChi2' : 6, + 'MinProbNNe' : 0.1, + 'MinProbNNmu' : 0.1, + 'MinPT' : 80 * MeV, + 'SVZ' : 650 * mm, + 'Mass' : 1000 * MeV, + 'Dira' : 0 + } + + } + }) + + return d + + + diff --git a/Hlt/HltSettings/python/HltSettings/StrangeLFV/StrangeLFV_pp_May2016.py b/Hlt/HltSettings/python/HltSettings/StrangeLFV/StrangeLFV_pp_May2016.py new file mode 100644 index 000000000..1c2b7b219 --- /dev/null +++ b/Hlt/HltSettings/python/HltSettings/StrangeLFV/StrangeLFV_pp_May2016.py @@ -0,0 +1,66 @@ +# ============================================================================= +# @file StrangeLFV_pp_May2016.py +# @author Jessica Prisciandaro (jessica.prisciandaro@cern.ch) +# @date 22.04.2016 +# ============================================================================= +"""Threshold settings for Hlt2 DiElectron lines for 2016. +WARNING :: DO NOT EDIT WITHOUT PERMISSION OF THE AUTHORS +""" + +from GaudiKernel.SystemOfUnits import GeV, mm, MeV + +class StrangeLFV_pp_May2016(object) : + + __all__ = ( 'ActiveHlt2Lines' ) + + + def ActiveHlt2Lines(self) : + """ + Returns a list of active lines + """ + + lines = [ + + 'Hlt2StrangeLFVMuonElectronSoft' + ] + + return lines + + + def Thresholds(self) : + """ + Returns a dictionary of cuts + """ + + # keep pass through thresholds + d = { } + + from Hlt2Lines.StrangeLFV.Lines import StrangeLFVLines + d.update({StrangeLFVLines : + { 'MuonElectronSoft' : {'VDZ' : 0, + 'CosAngle' : 0.999997, + 'IpDzRatio' : 0.02, + 'SumGP' : 0.5, + 'Rho2' : 64 * mm * mm, + 'VertexChi2' : 25, + 'DOCA' : 0.2 * mm, + 'MaxMuGP' : 0.4, + 'MaxElGP' : 0.15, + 'MinMuIp' : 0.3 * mm, + 'MinElIp' : 0.4 * mm, + 'MinMuIpChi2' : 1.5, + 'MinElIpChi2' : 6, + 'MaxIpChi2' : 1500, + 'MinPT' : 80 * MeV, + 'SVZ' : 650 * mm, + 'Mass' : 1000 * MeV, + 'Dira' : 0 + } + + } + }) + + return d + + + diff --git a/Hlt/HltSettings/python/HltSettings/StrangeLFV/__init__.py b/Hlt/HltSettings/python/HltSettings/StrangeLFV/__init__.py new file mode 100644 index 000000000..e69de29bb -- GitLab From 3434b618c1f4dd73fecb06901806a2a533ceccfa Mon Sep 17 00:00:00 2001 From: jpriscia <jessica.prisciandaro@cern.ch> Date: Sat, 14 May 2016 15:35:20 +0200 Subject: [PATCH 06/13] DiElectron settings --- .../DiElectron/DiElectron_25ns_Draft2016.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Hlt/HltSettings/python/HltSettings/DiElectron/DiElectron_25ns_Draft2016.py b/Hlt/HltSettings/python/HltSettings/DiElectron/DiElectron_25ns_Draft2016.py index 13a3b7768..4c5d5e42d 100644 --- a/Hlt/HltSettings/python/HltSettings/DiElectron/DiElectron_25ns_Draft2016.py +++ b/Hlt/HltSettings/python/HltSettings/DiElectron/DiElectron_25ns_Draft2016.py @@ -37,9 +37,21 @@ class DiElectron_25ns_Draft2016(object) : from Hlt2Lines.DiElectron.Lines import DiElectronLines d.update({DiElectronLines : - {'ElSoft' : {'MaxMass' : 1000 * MeV, - 'MinVDZ' : 0, - 'MinBPVDira' : 0 + {'ElSoft' : {'VDZ' : 0, + 'CosAngle' : 0.999997, + 'IpDzRatio' : 0.02, + 'IpProd' : 0.8 * mm * mm, + 'SumGP' : 0.2, + 'MinIpChi2' : 6, + 'IpChi2Prod': 2000, + 'Rho2' : 36 * mm * mm, + 'DOCA' : 0.3 * mm, + 'MaxIpChi2' : 1000000000000, + 'MinProbNNe' : 0.1, + 'SVZ' : 600 * mm, + 'Mass' : 1000 * MeV, + 'Dira' : 0 + } } }) @@ -47,4 +59,3 @@ class DiElectron_25ns_Draft2016(object) : return d - -- GitLab From e8e32d7b43cb8b487935d664446125dee4487868 Mon Sep 17 00:00:00 2001 From: Carla Marin <cmarin@ecm.ub.edu> Date: Sun, 15 May 2016 13:05:00 +0200 Subject: [PATCH 07/13] Update Majorana settings (pre-scale) --- .../python/HltSettings/Majorana/Majorana_25ns_Draft2016.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py b/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py index 6934ea8bf..be178bda8 100644 --- a/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py +++ b/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py @@ -23,7 +23,8 @@ class Majorana_25ns_Draft2016(object): """Set thresholds for the lines.""" from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm - thresholds = {'Prescale' : {}, + thresholds = {'Prescale' : {'Hlt2MajoranaBLambdaMuLL': 0.1, + 'Hlt2MajoranaBLambdaMuDD': 0.0}, 'Common' : {'TrChi2' : 3, 'TrGP' : 0.3}, 'LambdaMuPi': {"MuonGHOSTPROB" : 0.5 ,#adimensional -- GitLab From c207375ca05d15b99ef5f27af3b52f015518231a Mon Sep 17 00:00:00 2001 From: Carla Marin <cmarin@ecm.ub.edu> Date: Sun, 15 May 2016 13:05:20 +0200 Subject: [PATCH 08/13] Add settings for new LFV lines --- .../HltSettings/LFV/LFV_25ns_Draft2016.py | 53 +++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/Hlt/HltSettings/python/HltSettings/LFV/LFV_25ns_Draft2016.py b/Hlt/HltSettings/python/HltSettings/LFV/LFV_25ns_Draft2016.py index 703211070..4d69f8cb2 100644 --- a/Hlt/HltSettings/python/HltSettings/LFV/LFV_25ns_Draft2016.py +++ b/Hlt/HltSettings/python/HltSettings/LFV/LFV_25ns_Draft2016.py @@ -1,7 +1,7 @@ # ============================================================================= # @file LFV_25ns_Draft2016.py # @author Carla Marin (carla.marin@cern.ch) -# @date 12.02.2016 +# @date 15.05.2016 # ============================================================================= """Threshold settings for Hlt2 LFV lines for 2016. """ @@ -14,7 +14,10 @@ class LFV_25ns_Draft2016(object): def ActiveHlt2Lines(self): """Returns a list of active lines.""" - lines = ['Hlt2LFVJpsiMuETurbo'] + lines = ['Hlt2LFVJpsiMuETurbo', + 'Hlt2LFVPhiMuETurbo', + 'Hlt2LFVPromptPhiMuETurbo', + 'Hlt2LFVUpsilonMuETurbo'] return lines @@ -23,6 +26,8 @@ class LFV_25ns_Draft2016(object): from GaudiKernel.SystemOfUnits import MeV m_jpsi = 3096 + m_phi = 1020 + thresholds = {'Prescale': {}, 'Common': {}, 'JpsiMuE': {'CombMassHigh': (m_jpsi + 550) * MeV, @@ -36,7 +41,49 @@ class LFV_25ns_Draft2016(object): 'MuonTrChi2DoF': 3, 'MuonTrGhostProb': 0.1, 'VertexChi2DoF': 3}, - 'SpdCut': {'NSPD': 250}} + + 'PhiMuE' : {'CombMassHigh': (m_phi + 550) * MeV, + 'CombMassLow': (m_phi - 850) * MeV, + 'ElectronProbNn': 0.97, + 'ElectronTrChi2DoF': 3, + 'ElectronTrGhostProb': 0.2, + 'MassHigh': (m_phi + 500) * MeV, + 'MassLow': (m_phi - 800) * MeV, + 'MuonProbNn': 0.95, + 'MuonTrChi2DoF': 3, + 'MuonTrGhostProb': 0.15, + 'VertexChi2DoF': 3, + 'IPCHI2_Min': 16, + 'BPVVDCHI2_Min': 100}, + + 'PromptPhiMuE' : {'CombMassHigh': (m_phi + 550) * MeV, + 'CombMassLow': (m_phi - 850) * MeV, + 'ElectronProbNn': 0.97, + 'ElectronTrChi2DoF': 3, + 'ElectronTrGhostProb': 0.2, + 'MassHigh': (m_phi + 500) * MeV, + 'MassLow': (m_phi - 800) * MeV, + 'MuonProbNn': 0.95, + 'MuonTrChi2DoF': 3, + 'MuonTrGhostProb': 0.15, + 'VertexChi2DoF': 3}, + + 'UpsilonMuE' : {'CombMassHigh': (13000) * MeV, + 'CombMassLow': (7000) * MeV, + 'ElectronProbNn': 0.2, + 'ElectronTrChi2DoF': 3, + 'ElectronTrGhostProb': 0.3, + 'MassHigh': (13000) * MeV, + 'MassLow': (7000) * MeV, + 'MuonProbNn': 0.2, + 'MuonTrChi2DoF': 3, + 'MuonTrGhostProb': 0.2, + 'VertexChi2DoF': 3}, + + 'SpdCut' : {'NSPD': 200}, + 'PromptSpdCut': {'NSPD': 100} + } + from Hlt2Lines.LFV.Lines import LFVLines -- GitLab From 1ca56718609c12c29281563cfc0ddb602c29e241 Mon Sep 17 00:00:00 2001 From: Carla Marin <cmarin@ecm.ub.edu> Date: Sun, 15 May 2016 13:05:35 +0200 Subject: [PATCH 09/13] update release notes --- Hlt/HltSettings/doc/release.notes | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Hlt/HltSettings/doc/release.notes b/Hlt/HltSettings/doc/release.notes index 39c9dee7c..d28c70d4e 100644 --- a/Hlt/HltSettings/doc/release.notes +++ b/Hlt/HltSettings/doc/release.notes @@ -4,6 +4,23 @@ ! Purpose : All trigger threshold settings !----------------------------------------------------------------------------- +! 2016-05-15 - Carla Marin + - Update settings for Majorana lines (pre-scale them) + - Update settings for LFV (added new lines) + +! 2016-05-14 - Jessica Prisciandaro + - StrangeLFV added + - DiElectron updated + +! 2016-05-12 - Jessica Prisciandaro + - ProbNN added to Hlt2DiMuonSoft - Settings updated + +! 2016-05-12 - Carla Marin + - Adding RareStrange settings for June 2016 + +! 2016-05-12 - Jessica Prisciandaro + - Add June settings for Strange module + !========================= HltSettings v7r9 2016-04-20 ========================= ! 2016-04-19 - Roel Aaij -- GitLab From dd2e96e70c7701ee8ffa78666eedcd3c2cc09b54 Mon Sep 17 00:00:00 2001 From: Carla Marin Benito <carla.marin.benito@cern.ch> Date: Mon, 16 May 2016 17:55:27 +0200 Subject: [PATCH 10/13] Include back DD Majorana line --- .../python/HltSettings/Majorana/Majorana_25ns_Draft2016.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py b/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py index be178bda8..ed10e7b23 100644 --- a/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py +++ b/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py @@ -24,7 +24,7 @@ class Majorana_25ns_Draft2016(object): from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm thresholds = {'Prescale' : {'Hlt2MajoranaBLambdaMuLL': 0.1, - 'Hlt2MajoranaBLambdaMuDD': 0.0}, + 'Hlt2MajoranaBLambdaMuDD': 1.0}, 'Common' : {'TrChi2' : 3, 'TrGP' : 0.3}, 'LambdaMuPi': {"MuonGHOSTPROB" : 0.5 ,#adimensional -- GitLab From 34a9dbe214127ace526a5e1e8014f03894fdf21a Mon Sep 17 00:00:00 2001 From: Carla Marin Benito <carla.marin.benito@cern.ch> Date: Mon, 16 May 2016 17:58:16 +0200 Subject: [PATCH 11/13] Update release notes --- Hlt/HltSettings/doc/release.notes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hlt/HltSettings/doc/release.notes b/Hlt/HltSettings/doc/release.notes index d28c70d4e..a566ef627 100644 --- a/Hlt/HltSettings/doc/release.notes +++ b/Hlt/HltSettings/doc/release.notes @@ -4,6 +4,9 @@ ! Purpose : All trigger threshold settings !----------------------------------------------------------------------------- +! 2016-05-16 - Carla Marin + - Include back DD Majorana line (update settings) + ! 2016-05-15 - Carla Marin - Update settings for Majorana lines (pre-scale them) - Update settings for LFV (added new lines) -- GitLab From 5fc21a097fa7657560eba829414439a612ca22e8 Mon Sep 17 00:00:00 2001 From: Carla Marin <cmarin@ecm.ub.edu> Date: Thu, 19 May 2016 15:40:48 +0200 Subject: [PATCH 12/13] Update Hlt2Lines release notes --- Hlt/Hlt2Lines/doc/release.notes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hlt/Hlt2Lines/doc/release.notes b/Hlt/Hlt2Lines/doc/release.notes index f9d8e97aa..180cfaf90 100644 --- a/Hlt/Hlt2Lines/doc/release.notes +++ b/Hlt/Hlt2Lines/doc/release.notes @@ -9,7 +9,8 @@ !---------------------------------------------------------------------------- ! 2016-05-15 - Jessica Prisciandaro - - ProbNNe added to StrangeLFVMuonElectronSoft + - ProbNNe added to StrangeLFVMuonElectronSoft and DiElectron, other cuts adjusted + - ProbNNmu added to DiMuon, other cuts adjusted ! 2016-04-29 - Miguel Ramos Pernas - Added StrangeLFVMuonElectronSoft line -- GitLab From c8a2290690debce8671b0fbf5a28ba8d1eb673f9 Mon Sep 17 00:00:00 2001 From: Carla Marin <cmarin@ecm.ub.edu> Date: Thu, 19 May 2016 22:52:22 +0200 Subject: [PATCH 13/13] Pre-scale Majorana DD line to 0.2 --- Hlt/HltSettings/doc/release.notes | 3 +++ .../python/HltSettings/Majorana/Majorana_25ns_Draft2016.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Hlt/HltSettings/doc/release.notes b/Hlt/HltSettings/doc/release.notes index ad6118a19..0861876e9 100644 --- a/Hlt/HltSettings/doc/release.notes +++ b/Hlt/HltSettings/doc/release.notes @@ -4,6 +4,9 @@ ! Purpose : All trigger threshold settings !----------------------------------------------------------------------------- +! 2016-05-19 - Carla Marin + - Pre-scale DD Majorana line to 0.2 + ! 2016-05-16 - Carla Marin - Include back DD Majorana line (update settings) diff --git a/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py b/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py index ed10e7b23..5e8b1f01d 100644 --- a/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py +++ b/Hlt/HltSettings/python/HltSettings/Majorana/Majorana_25ns_Draft2016.py @@ -24,7 +24,7 @@ class Majorana_25ns_Draft2016(object): from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm thresholds = {'Prescale' : {'Hlt2MajoranaBLambdaMuLL': 0.1, - 'Hlt2MajoranaBLambdaMuDD': 1.0}, + 'Hlt2MajoranaBLambdaMuDD': 0.2}, 'Common' : {'TrChi2' : 3, 'TrGP' : 0.3}, 'LambdaMuPi': {"MuonGHOSTPROB" : 0.5 ,#adimensional -- GitLab