From 5539562676cbfb32af1adde67e5fdf44a51b3db8 Mon Sep 17 00:00:00 2001 From: Valeriia Lukashenko <valeriia.lukashenko@cern.ch> Date: Tue, 15 Aug 2023 16:52:15 +0200 Subject: [PATCH 1/3] fix lost cut in IPChi2 of tracks and Jpsi veretex chi2 --- .../StrippingRD/StrippingBeauty2MajoLep.py | 108 +++++++++++------- .../LineConfigDictionaries_RD.py | 21 ++-- 2 files changed, 74 insertions(+), 55 deletions(-) diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py index bf1141cce..4639dedfc 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py @@ -41,14 +41,14 @@ default_config = { 'STREAMS' : ['BhadronCompleteEvent'], 'BUILDERTYPE' : 'Beauty2MajoLepConf', 'CONFIG' : { - 'Lep_IPChi2min' : 16.0, + 'Lep_IPChi2min' : 11.0, 'Lep_PTmin' : 300., 'Trk_GhostProb' : 0.5, 'Trk_Chi2NDOF' : 5.0, 'Majo_AMhigh' : 7000.0, 'Majo_AMlow' : 0., 'Majo_PTmin' : 700.0, - 'Majo_Bach_PTmin' : 550.0, + 'Majo_Bach_PTmin' : 500.0, 'Majo_DocaChi2' : 16.0, 'Majo_VtxChi2' : 9.0, 'AM_Mlow' : 0., @@ -58,20 +58,19 @@ default_config = { 'B_IPCHI2wrtPV' : 16.0, 'BVtxChi2' : 9.0, 'B_DLS' : 5.0, - 'Bach_PTmin' : 750.0, + 'Bach_PTmin' : 700.0, 'Jpsi_pdg' : 400., 'Jpsi_electron_pdg' : 800., 'D0_pdg' : 100., - 'Ks_pdg_DD' : 50., + 'Ks_pdg_DD' : 100., 'B_pdg_Ks_DD' : 200.0, - 'Ks_Bach_PT' : 800.0, - 'B_Bach_PT_DD' : 1000.0, - 'Ks_pdg' : 80., - 'B_pdg' : 400.0, + 'Ks_Bach_PT' : 500.0, + 'B_Bach_PT_DD' : 700.0, + 'Ks_pdg' : 100., + 'B_pdg' : 500.0, 'B_electron_pdg' : 800.0, - 'Prescale1' : 0.05, - 'Prescale2' : 0.1, - 'Prescale3' : 0.2, + 'Prescale1' : 0.075, + 'Prescale2' : 0.15, 'Postscale' : 1.0, 'RequiredRawEvents' : ["Trigger", "Muon", "Calo", "Rich", "Velo", "Tracker"] }, @@ -101,6 +100,8 @@ class Beauty2MajoLepConf(LineBuilder) : Beauty2MajoEDDName = dd_name.replace("Beauty2MajoLep","Beauty2MajoE") Beauty2MajoELLName = ll_name.replace("Beauty2MajoLep","Beauty2MajoE") + Beauty2MajoWSName = 'Beauty2WS' + B2KsPiPiDDName = "Bu2KsPiPiDD" B2KsPiPiLLName = "Bu2KsPiPiLL" @@ -140,7 +141,8 @@ class Beauty2MajoLepConf(LineBuilder) : self.selMajo2EPiDDOS = self.makeMajo2EPiDDOS( 'Majofor'+Beauty2MajoMuDDName+"OS", config ) self.selMajo2EPiDDSS = self.makeMajo2EPiDDSS( 'Majofor'+Beauty2MajoMuDDName+"SS", config ) - + + self.Beauty2MajoMuLL = self.makeBeauty2MajoMu2LL( Beauty2MajoMuLLName, config ) self.Beauty2MajoEDD = self.makeBeauty2MajoE2DD( Beauty2MajoEDDName, config ) @@ -149,6 +151,8 @@ class Beauty2MajoLepConf(LineBuilder) : self.Beauty2MajoMuDDOS = self.makeBeauty2MajoMu2DDOS( Beauty2MajoMuDDName+"OS", config ) self.Beauty2MajoMuDDSS = self.makeBeauty2MajoMu2DDSS( Beauty2MajoMuDDName+"SS", config ) + + self.B2MajoMuDDOSLine = StrippingLine(Beauty2MajoMuDDName+"OSLine", prescale = 1.0, postscale = 1.0, @@ -231,7 +235,7 @@ class Beauty2MajoLepConf(LineBuilder) : self.B2MajoEDDLinePr = StrippingLine(Beauty2MajoEDDName+"Line"+'Prescale', - prescale = config['Prescale2'], + prescale = config['Prescale1'], postscale = config['Postscale'], selection = self.Beauty2MajoEDDPr, RequiredRawEvents = config['RequiredRawEvents'], @@ -240,7 +244,7 @@ class Beauty2MajoLepConf(LineBuilder) : self.B2MajoMuLLLinePr = StrippingLine(Beauty2MajoMuLLName+"Line"+'Prescale', - prescale = config['Prescale3'], + prescale = config['Prescale1'], postscale = config['Postscale'], selection = self.Beauty2MajoMuLLPr, RequiredRawEvents = config['RequiredRawEvents'], @@ -396,7 +400,8 @@ class Beauty2MajoLepConf(LineBuilder) : _trkGPCut = "(TRGHOSTPROB<%s)" % config['Trk_GhostProb'] _trkChi2 = "(TRCHI2DOF<%s)" % config['Trk_Chi2NDOF'] - _allCuts = _trkGPCut + '&' + _bachPtCut + '&' + _bachIPChi2Cut + '&' + _trkChi2 + _allCuts = _trkGPCut + '&' + _bachPtCut + '&' + _trkChi2 + '&' + _bachIPChi2Cut + # make the filter _filterH = FilterDesktop( Code = _allCuts ) @@ -431,7 +436,7 @@ class Beauty2MajoLepConf(LineBuilder) : _trkGPCut = "(TRGHOSTPROB<%s)" % config['Trk_GhostProb'] _trkChi2 = "(TRCHI2DOF<%s)" % config['Trk_Chi2NDOF'] - _allCuts = _trkGPCut + '&' + _bachPtCut + '&' + _trkChi2 + _allCuts = _trkGPCut + '&' + _bachPtCut + '&' + _trkChi2 + '&' + _bachIPChi2Cut # make the filter _filterH = FilterDesktop( Code = _allCuts ) @@ -457,7 +462,9 @@ class Beauty2MajoLepConf(LineBuilder) : self.selKaon = Selection( name, Algorithm = _filterH, RequiredSelections = [self.kaons] ) + ################################SIGNALLINES################################# + #For DD def makeMajo2EPiDDSS( self, name, config, prescale=False ) : """ @@ -481,7 +488,7 @@ class Beauty2MajoLepConf(LineBuilder) : _motherCuts = _ptCut+'&'+_vtxChi2Cut _pidCut_electron = "(PIDe>0.)" - _pidCut_pion = "((PIDe)<0.0)&((PIDK)<0.)" + _pidCut_pion = "(PIDe<0.0)&(PIDK<0.)" @@ -521,7 +528,7 @@ class Beauty2MajoLepConf(LineBuilder) : _motherCuts = _ptCut+'&'+_vtxChi2Cut _pidCut_electron = "(PIDe>0.)" - _pidCut_pion = "((PIDe)<0.0)&((PIDK)<0.)" + _pidCut_pion = "(PIDe<0.0)&(PIDK<0.)" _Majo = CombineParticles() _Majo.DecayDescriptors = [ "[Lambda0 -> pi+ e-]cc" ] @@ -641,7 +648,7 @@ class Beauty2MajoLepConf(LineBuilder) : return Selection (name, Algorithm = _Majo, RequiredSelections = [ self.selPi, self.selMu ]) -#for LL + #for LL def makeBeauty2MajoMu2LL( self, name, config, prescale=False ) : """ Create and store a Bu -> KS(LL) mu+ Selection object. @@ -678,7 +685,7 @@ class Beauty2MajoLepConf(LineBuilder) : return Selection (name, Algorithm = _B, RequiredSelections = [ self.selMu, self.selMajo2EPiLL ]) else: return Selection (name, Algorithm = _B, RequiredSelections = [ self.selMu, self.selMajo2EPiLLPr ]) - + def makeBeauty2MajoMu2DDOS( self, name, config, prescale=False ) : """ Create and store a Bu -> KS(DD) mu+ Selection object. @@ -739,7 +746,7 @@ class Beauty2MajoLepConf(LineBuilder) : _fdChi2Cut = "(BPVDLS>%s)" % config['B_DLS'] _massCutLow2 = "(M>(%s*MeV))" % config['B_Mlow'] _massCutHigh2 = "(M<(%s*MeV))" % config['B_Mhigh'] - _pidCut_muons = "(PIDmu>0.)&((PIDmu-PIDK)>0.)" + _pidCut_muons = "(PIDmu>0.)" _motherCuts = _vtxChi2Cut+'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCutLow2+'&'+_massCutHigh2 @@ -806,7 +813,7 @@ class Beauty2MajoLepConf(LineBuilder) : -# For DD + # For DD def makeBeauty2MajoE2DD( self, name, config, prescale=False ) : """ @@ -871,7 +878,8 @@ class Beauty2MajoLepConf(LineBuilder) : _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Majo_VtxChi2'] _massKsCut1 = "(ADMASS('KS0') < %s)" % config['Ks_pdg_DD'] - + _pidCut_pion = "(PIDK<0.)" + _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_massKsCut1 _Majo = CombineParticles() @@ -879,7 +887,7 @@ class Beauty2MajoLepConf(LineBuilder) : _Majo.DecayDescriptors = [ "KS0 -> pi- pi+" ] - _daughterCuts = { "pi+" : "(PT>%s*MeV)" % config['Ks_Bach_PT'], "pi-" : "(PT>%s*MeV)" % config['Ks_Bach_PT']} + _daughterCuts = { "pi+" : "(PT>%s*MeV)" % config['Ks_Bach_PT']+'&'+_pidCut_pion, "pi-" : "(PT>%s*MeV)" % config['Ks_Bach_PT']+'&'+_pidCut_pion} _Majo.DaughtersCuts = _daughterCuts _Majo.CombinationCut = _combCuts @@ -908,9 +916,10 @@ class Beauty2MajoLepConf(LineBuilder) : _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_massKsCut1 _Majo = CombineParticles() - + _pidCut_pion = "(PIDK<0.)" + _Majo.DecayDescriptors = ["KS0 -> pi- pi+" ] - _daughterCuts = { "pi+" : "(PT>%s*MeV)" % config['Ks_Bach_PT'], "pi-" : "(PT>%s*MeV)" % config['Ks_Bach_PT']} + _daughterCuts = { "pi+" : "(PT>%s*MeV)" % config['Ks_Bach_PT']+'&'+_pidCut_pion, "pi-" : "(PT>%s*MeV)" % config['Ks_Bach_PT']+'&'+_pidCut_pion} _Majo.DaughtersCuts = _daughterCuts @@ -939,8 +948,10 @@ class Beauty2MajoLepConf(LineBuilder) : _combCuts = _massCutLow +'&'+_massCutHigh _motherCuts = _vtxChi2Cut +'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCut - - _daughterCuts = { "pi+" : "(PT>%s)"% config['B_Bach_PT_DD']} + _pidCut_pion = "(PIDK<0.)" + + + _daughterCuts = { "pi+" : "(PT>%s)"% config['B_Bach_PT_DD']+'&'+_pidCut_pion} _B = CombineParticles() @@ -972,8 +983,12 @@ class Beauty2MajoLepConf(LineBuilder) : _combCuts = _massCutLow+'&'+_massCutHigh _motherCuts = _vtxChi2Cut +'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCut + + _pidCut_pion = "(PIDK<0.)" + - _daughterCuts = { "pi+" : "(PT>%s)"% (config['Majo_Bach_PTmin'])} + + _daughterCuts = { "pi+" : "(PT>%s)"% (config['Majo_Bach_PTmin'])+'&'+_pidCut_pion} _B = CombineParticles() @@ -1001,19 +1016,21 @@ class Beauty2MajoLepConf(LineBuilder) : _combCuts = _massCutLow + '&'+ _massCutHigh +'&'+_docaCut _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin'] - _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['BVtxChi2'] + _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Majo_VtxChi2'] _massCut1 = "(ADMASS('D0') < %s)" % config['D0_pdg'] - + + _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_massCut1 _Majo = CombineParticles() _Majo.DecayDescriptors = [ "[D0 -> K- pi+]cc" ] - + _pidCut_pion = "(PIDe<0.)&(PIDK<0.)" + - _daughterCuts = { "pi+" : "(PT>%s*MeV)" % config["Majo_Bach_PTmin"], "K-" : "(PT>%s*MeV)" % config["Majo_Bach_PTmin"]} + _daughterCuts = { "pi+" : "(PT>%s*MeV)" % config["Majo_Bach_PTmin"]+'&'+_pidCut_pion, "K-" : "(PT>%s*MeV)" % config["Majo_Bach_PTmin"]} _Majo.DaughtersCuts = _daughterCuts @@ -1070,13 +1087,14 @@ class Beauty2MajoLepConf(LineBuilder) : """ _massCut = "(AM<%s*MeV)" % config['Majo_AMhigh'] _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] + _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Majo_VtxChi2'] + - _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin'] _massCutJpsi = "(ADMASS('J/psi(1S)') < %s)" % config['Jpsi_pdg'] - _motherCuts = _ptCut+'&'+_massCutJpsi - _combCuts = _massCut + '&' + _docaCut + _motherCuts = _ptCut+'&'+_massCutJpsi + '&' + _vtxChi2Cut + _combCuts = _massCut + '&' + _docaCut _Majo = CombineParticles() @@ -1101,22 +1119,24 @@ class Beauty2MajoLepConf(LineBuilder) : """ _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2'] _massCut = "(AM<%s*MeV)" % config['Majo_AMhigh'] - - + _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Majo_VtxChi2'] + + + _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin'] _massCutJpsi = "(M>%s*MeV)" % (3096.9 - config['Jpsi_electron_pdg']) + '&' + "(M<%s*MeV)" % (3096.9 + config['Jpsi_pdg']) _pidCut_electron = "(PIDe>-5.)" + _motherCuts = _ptCut+'&'+_massCutJpsi + '&' + _vtxChi2Cut - _motherCuts = _ptCut+'&'+_massCutJpsi - _combCuts = _massCut + '&' + _docaCut + _combCuts = _massCut + '&' + _docaCut _Majo = CombineParticles() _Majo.DecayDescriptors = [ "J/psi(1S) -> e+ e-" ] - - _daughterCuts = { "e-" : "(PT>%s*MeV)" % config["Majo_Bach_PTmin"] + '&' + _pidCut_electron, "e+" : "(PT>%s*MeV)" % config["Majo_Bach_PTmin"] + '&' + _pidCut_electron} - + + _daughterCuts = { "e-" : "(PT>%s*MeV)" % config["Majo_Bach_PTmin"] + '&' + _pidCut_electron, "e+" : "(PT>%s*MeV)" % config["Majo_Bach_PTmin"] + '&' + _pidCut_electron} + _Majo.DaughtersCuts = _daughterCuts _Majo.CombinationCut = _combCuts _Majo.MotherCut = _motherCuts @@ -1182,7 +1202,7 @@ class Beauty2MajoLepConf(LineBuilder) : _motherCuts = _vtxChi2Cut +'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCut - + _B = CombineParticles() _B.DecayDescriptors = [ "B+ -> K+ J/psi(1S)", "B- -> K- J/psi(1S)" ] diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p3/LineConfigDictionaries_RD.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p3/LineConfigDictionaries_RD.py index 11e8338ac..6decea848 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p3/LineConfigDictionaries_RD.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p3/LineConfigDictionaries_RD.py @@ -1984,33 +1984,32 @@ Beauty2MajoLep = { "AM_Mhigh": 7200.0, "AM_Mlow": 0.0, "BVtxChi2": 9.0, - "B_Bach_PT_DD": 1000.0, + "B_Bach_PT_DD": 700.0, "B_DLS": 5.0, "B_IPCHI2wrtPV": 16.0, "B_Mhigh": 6800.0, "B_Mlow": 4500.0, "B_electron_pdg": 800.0, - "B_pdg": 400.0, + "B_pdg": 500.0, "B_pdg_Ks_DD": 200.0, - "Bach_PTmin": 750.0, + "Bach_PTmin": 700.0, "D0_pdg": 100.0, "Jpsi_electron_pdg": 800.0, "Jpsi_pdg": 400.0, - "Ks_Bach_PT": 800.0, - "Ks_pdg": 80.0, - "Ks_pdg_DD": 50.0, - "Lep_IPChi2min": 16.0, + "Ks_Bach_PT": 500.0, + "Ks_pdg": 100.0, + "Ks_pdg_DD": 100.0, + "Lep_IPChi2min": 11.0, "Lep_PTmin": 300.0, "Majo_AMhigh": 7000.0, "Majo_AMlow": 0.0, - "Majo_Bach_PTmin": 550.0, + "Majo_Bach_PTmin": 500.0, "Majo_DocaChi2": 16.0, "Majo_PTmin": 700.0, "Majo_VtxChi2": 9.0, "Postscale": 1.0, - "Prescale1": 0.05, - "Prescale2": 0.1, - "Prescale3": 0.2, + "Prescale1": 0.075, + "Prescale2": 0.15, "RequiredRawEvents": [ "Trigger", "Muon", -- GitLab From 19e419fd550e1625d737a05fd5c2eddf81c19fe7 Mon Sep 17 00:00:00 2001 From: Valeriia Lukashenko <valeriia.lukashenko@cern.ch> Date: Mon, 21 Aug 2023 03:07:55 +0200 Subject: [PATCH 2/3] PIDK -> PIDp --- .../StrippingRD/StrippingBeauty2MajoLep.py | 99 +++++++++---------- .../LineConfigDictionaries_RD.py | 35 ++++--- .../LineConfigDictionaries_RD.py | 35 ++++--- .../LineConfigDictionaries_RD.py | 20 ++-- 4 files changed, 91 insertions(+), 98 deletions(-) diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py index 4639dedfc..20d3375c2 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py @@ -43,8 +43,8 @@ default_config = { 'CONFIG' : { 'Lep_IPChi2min' : 11.0, 'Lep_PTmin' : 300., - 'Trk_GhostProb' : 0.5, - 'Trk_Chi2NDOF' : 5.0, + 'Trk_GhostProb' : 0.4, + 'Trk_Chi2NDOF' : 4.0, 'Majo_AMhigh' : 7000.0, 'Majo_AMlow' : 0., 'Majo_PTmin' : 700.0, @@ -59,16 +59,16 @@ default_config = { 'BVtxChi2' : 9.0, 'B_DLS' : 5.0, 'Bach_PTmin' : 700.0, - 'Jpsi_pdg' : 400., - 'Jpsi_electron_pdg' : 800., - 'D0_pdg' : 100., - 'Ks_pdg_DD' : 100., - 'B_pdg_Ks_DD' : 200.0, + 'Jpsi_MLow' : 2100., + 'Jpsi_MHigh' : 3500., + 'D0_pdg' : 85., + 'B_Ks_Low' : 5000.0, + 'B_Ks_High' : 5500.0, 'Ks_Bach_PT' : 500.0, 'B_Bach_PT_DD' : 700.0, - 'Ks_pdg' : 100., - 'B_pdg' : 500.0, - 'B_electron_pdg' : 800.0, + 'Ks_MLow' : 430., + 'Ks_MHigh' : 550., + 'B_electron_High' : 6080, 'Prescale1' : 0.075, 'Prescale2' : 0.15, 'Postscale' : 1.0, @@ -100,8 +100,6 @@ class Beauty2MajoLepConf(LineBuilder) : Beauty2MajoEDDName = dd_name.replace("Beauty2MajoLep","Beauty2MajoE") Beauty2MajoELLName = ll_name.replace("Beauty2MajoLep","Beauty2MajoE") - Beauty2MajoWSName = 'Beauty2WS' - B2KsPiPiDDName = "Bu2KsPiPiDD" B2KsPiPiLLName = "Bu2KsPiPiLL" @@ -369,7 +367,7 @@ class Beauty2MajoLepConf(LineBuilder) : _trkGPCut = "(TRGHOSTPROB<%s)" % config['Trk_GhostProb'] _trkChi2 = "(TRCHI2DOF<%s)" % config['Trk_Chi2NDOF'] - _pidCut = "(~(ISMUON))" + _pidCut = "(~(ISMUON))&(PIDe<0.)" _allCuts = _trkGPCut + '&' + _bachPtCut + '&' + _pidCut + '&' + _trkChi2 # make the filter @@ -488,7 +486,7 @@ class Beauty2MajoLepConf(LineBuilder) : _motherCuts = _ptCut+'&'+_vtxChi2Cut _pidCut_electron = "(PIDe>0.)" - _pidCut_pion = "(PIDe<0.0)&(PIDK<0.)" + _pidCut_pion = "(PIDe<0.0)&(PIDp<0.)" @@ -528,7 +526,7 @@ class Beauty2MajoLepConf(LineBuilder) : _motherCuts = _ptCut+'&'+_vtxChi2Cut _pidCut_electron = "(PIDe>0.)" - _pidCut_pion = "(PIDe<0.0)&(PIDK<0.)" + _pidCut_pion = "(PIDe<0.0)&(PIDp<0.)" _Majo = CombineParticles() _Majo.DecayDescriptors = [ "[Lambda0 -> pi+ e-]cc" ] @@ -596,13 +594,14 @@ class Beauty2MajoLepConf(LineBuilder) : _motherCuts = _ptCut+'&'+_vtxChi2Cut _pidCut_electron = "(PIDe>0.)" - + _pidCut_pion = "(PIDe<0.)" + _Majo = CombineParticles() _Majo.DecayDescriptors = [ "KS0 -> pi+ e-", "KS0 -> pi- e+" ] if not prescale: - _daughterCuts = { "pi+": "(PT>%s*MeV)" % config["Majo_Bach_PTmin"], "e-": _pidCut_electron+"&"+"(PT>%s*MeV)" % config["Majo_Bach_PTmin"]} + _daughterCuts = { "pi+": "(PT>%s*MeV)" % config["Majo_Bach_PTmin"]+'&'+_pidCut_pion, "e-": _pidCut_electron+"&"+"(PT>%s*MeV)" % config["Majo_Bach_PTmin"]} else: _daughterCuts = { "pi+": "(PT>%s*MeV)" % config["Majo_Bach_PTmin"], "e-": "(PT>%s*MeV)" % config["Majo_Bach_PTmin"]} @@ -630,14 +629,14 @@ class Beauty2MajoLepConf(LineBuilder) : _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Majo_VtxChi2'] _motherCuts = _ptCut+'&'+_vtxChi2Cut - _pidCut_muon = "(PIDmu>0.)" + _Majo = CombineParticles() _Majo.DecayDescriptors = [ "KS0 -> pi+ mu-", "KS0 -> pi- mu+" ] if not prescale: - _daughterCuts = { "pi+": "(PT>%s*MeV)" % config["Majo_Bach_PTmin"], "mu-": _pidCut_muon+"&"+"(PT>%s*MeV)" % config["Majo_Bach_PTmin"]} + _daughterCuts = { "pi+": "(PT>%s*MeV)" % config["Majo_Bach_PTmin"], "mu-": "(PT>%s*MeV)" % config["Majo_Bach_PTmin"]} else: _daughterCuts = { "pi+": "(PT>%s*MeV)" % config["Majo_Bach_PTmin"], "mu-": "(PT>%s*MeV)" % config["Majo_Bach_PTmin"]} @@ -670,11 +669,11 @@ class Beauty2MajoLepConf(LineBuilder) : _motherCuts = _vtxChi2Cut+'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCutLow2+'&'+_massCutHigh2 _B = CombineParticles() - _pidCut_muons = "(PIDmu>0.)" + _B.DecayDescriptors = [ "B+ -> mu+ KS0", "B- -> mu- KS0"] if not prescale: - _daughterCuts = { "mu+" : "(PT>%s)"% (config['Bach_PTmin'])+"&"+_pidCut_muons } + _daughterCuts = { "mu+" : "(PT>%s)"% (config['Bach_PTmin'])} else: _daughterCuts = { "mu+" : "(PT>%s)"% (config['Bach_PTmin']) } _B.DaughtersCuts = _daughterCuts @@ -705,16 +704,14 @@ class Beauty2MajoLepConf(LineBuilder) : _fdChi2Cut = "(BPVDLS>%s)" % config['B_DLS'] _massCutLow2 = "(M>(%s*MeV))" % config['B_Mlow'] _massCutHigh2 = "(M<(%s*MeV))" % config['B_Mhigh'] - _pidCut_muons = "(PIDmu>0.)" - - _motherCuts = _vtxChi2Cut+'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCutLow2+'&'+_massCutHigh2 + _motherCuts = _vtxChi2Cut+'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCutLow2+'&'+_massCutHigh2 _B = CombineParticles() _B.DecayDescriptors = [ "[B+ -> mu+ Lambda0]cc"] if not prescale: - _daughterCuts = { "mu+" : _pidCut_muons+"&"+"(PT>%s*MeV)" % (config['Bach_PTmin'])} + _daughterCuts = { "mu+" : "(PT>%s*MeV)" % (config['Bach_PTmin'])} else: _daughterCuts = { "mu+" : "(PT>%s)" % (config['Bach_PTmin'])} @@ -746,7 +743,6 @@ class Beauty2MajoLepConf(LineBuilder) : _fdChi2Cut = "(BPVDLS>%s)" % config['B_DLS'] _massCutLow2 = "(M>(%s*MeV))" % config['B_Mlow'] _massCutHigh2 = "(M<(%s*MeV))" % config['B_Mhigh'] - _pidCut_muons = "(PIDmu>0.)" _motherCuts = _vtxChi2Cut+'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCutLow2+'&'+_massCutHigh2 @@ -755,7 +751,7 @@ class Beauty2MajoLepConf(LineBuilder) : _B.DecayDescriptors = [ "[B- -> mu- Lambda0]cc"] if not prescale: - _daughterCuts = { "mu+" : _pidCut_muons+"&"+"(PT>%s*MeV)" % (config['Bach_PTmin'])} + _daughterCuts = { "mu+" : "(PT>%s*MeV)" % (config['Bach_PTmin'])} else: _daughterCuts = { "mu+" : "(PT>%s)" % (config['Bach_PTmin'])} @@ -876,9 +872,9 @@ class Beauty2MajoLepConf(LineBuilder) : _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin'] _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Majo_VtxChi2'] - _massKsCut1 = "(ADMASS('KS0') < %s)" % config['Ks_pdg_DD'] + _massKsCut1 = "(M>%s*MeV)" % config['Ks_MLow'] + '&' + "(M<%s*MeV)" % config["Ks_MHigh"] - _pidCut_pion = "(PIDK<0.)" + _pidCut_pion = "(PIDe<0.)&(PIDp<0.)" _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_massKsCut1 @@ -910,13 +906,13 @@ class Beauty2MajoLepConf(LineBuilder) : _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin'] _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Majo_VtxChi2'] - _massKsCut1 = "(ADMASS('KS0') < %s)" % config['Ks_pdg'] + _massKsCut1 = "(M>%s*MeV)" % config['Ks_MLow'] + '&' + "(M<%s*MeV)" % config["Ks_MHigh"] _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_massKsCut1 _Majo = CombineParticles() - _pidCut_pion = "(PIDK<0.)" + _pidCut_pion = "(PIDe<0.)" _Majo.DecayDescriptors = ["KS0 -> pi- pi+" ] _daughterCuts = { "pi+" : "(PT>%s*MeV)" % config['Ks_Bach_PT']+'&'+_pidCut_pion, "pi-" : "(PT>%s*MeV)" % config['Ks_Bach_PT']+'&'+_pidCut_pion} @@ -943,12 +939,13 @@ class Beauty2MajoLepConf(LineBuilder) : _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Majo_VtxChi2'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['B_IPCHI2wrtPV'] _fdChi2Cut = "(BPVDLS>%s)" % config['B_DLS'] - _massCut = "(ADMASS('B+') < %s)" % config['B_pdg_Ks_DD'] + _massCut = "(M>%s*MeV)" % config['B_Ks_Low'] + '&' + "(M<%s*MeV)" % config['B_Ks_High'] + _combCuts = _massCutLow +'&'+_massCutHigh _motherCuts = _vtxChi2Cut +'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCut - _pidCut_pion = "(PIDK<0.)" + _pidCut_pion = "(PIDe<0.)" _daughterCuts = { "pi+" : "(PT>%s)"% config['B_Bach_PT_DD']+'&'+_pidCut_pion} @@ -979,16 +976,16 @@ class Beauty2MajoLepConf(LineBuilder) : _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['BVtxChi2'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['B_IPCHI2wrtPV'] _fdChi2Cut = "(BPVDLS>%s)" % config['B_DLS'] - _massCut = "(ADMASS('B+') < %s)" % config['B_pdg'] - + _massCut = "(M>%s*MeV)" % config['B_Ks_Low'] + '&' + "(M<%s*MeV)" % config['B_Ks_High'] + _combCuts = _massCutLow+'&'+_massCutHigh _motherCuts = _vtxChi2Cut +'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCut - _pidCut_pion = "(PIDK<0.)" + - _daughterCuts = { "pi+" : "(PT>%s)"% (config['Majo_Bach_PTmin'])+'&'+_pidCut_pion} + _daughterCuts = { "pi+" : "(PT>%s)"% (config['Majo_Bach_PTmin'])} _B = CombineParticles() @@ -1027,9 +1024,8 @@ class Beauty2MajoLepConf(LineBuilder) : _Majo = CombineParticles() _Majo.DecayDescriptors = [ "[D0 -> K- pi+]cc" ] - _pidCut_pion = "(PIDe<0.)&(PIDK<0.)" - - + _pidCut_pion = "(PIDe<0.)" + _daughterCuts = { "pi+" : "(PT>%s*MeV)" % config["Majo_Bach_PTmin"]+'&'+_pidCut_pion, "K-" : "(PT>%s*MeV)" % config["Majo_Bach_PTmin"]} _Majo.DaughtersCuts = _daughterCuts @@ -1058,18 +1054,17 @@ class Beauty2MajoLepConf(LineBuilder) : _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['BVtxChi2'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['B_IPCHI2wrtPV'] _fdChi2Cut = "(BPVDLS>%s)" % config['B_DLS'] - _massCut = "(ADMASS('B+') < %s)" % config['B_pdg'] - - - - + + _massCut = "(M>%s*MeV)" % config['B_Ks_Low'] + '&' + "(M<%s*MeV)" % config['B_electron_High'] + + _motherCuts = _vtxChi2Cut +'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCut _B = CombineParticles() _B.DecayDescriptors = [ "B+ -> pi+ D~0", "B- -> pi- D0" ] - _daughterCuts = { "pi+" : "(PT>%s)"% (config['Majo_Bach_PTmin'])} + _daughterCuts = { "pi+" : "(PT>%s)"% (config['Majo_Bach_PTmin']) } _B.DaughtersCuts = _daughterCuts _B.CombinationCut = _combCuts @@ -1091,7 +1086,7 @@ class Beauty2MajoLepConf(LineBuilder) : _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin'] - _massCutJpsi = "(ADMASS('J/psi(1S)') < %s)" % config['Jpsi_pdg'] + _massCutJpsi = "(M>%s*MeV)" % config['Jpsi_MLow'] + '&' + "(M<%s*MeV)" % config['Jpsi_MHigh'] _motherCuts = _ptCut+'&'+_massCutJpsi + '&' + _vtxChi2Cut _combCuts = _massCut + '&' + _docaCut @@ -1124,7 +1119,7 @@ class Beauty2MajoLepConf(LineBuilder) : _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin'] - _massCutJpsi = "(M>%s*MeV)" % (3096.9 - config['Jpsi_electron_pdg']) + '&' + "(M<%s*MeV)" % (3096.9 + config['Jpsi_pdg']) + _massCutJpsi = "(M>%s*MeV)" % config['Jpsi_MLow'] + '&' + "(M<%s*MeV)" % config['Jpsi_MHigh'] _pidCut_electron = "(PIDe>-5.)" _motherCuts = _ptCut+'&'+_massCutJpsi + '&' + _vtxChi2Cut @@ -1163,8 +1158,8 @@ class Beauty2MajoLepConf(LineBuilder) : _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['BVtxChi2'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['B_IPCHI2wrtPV'] _fdChi2Cut = "(BPVDLS>%s)" % config['B_DLS'] - _massCut = "(ADMASS('B+') < %s)" % config['B_electron_pdg'] - + _massCut = "(M>%s*MeV)" % config['B_Mlow'] + '&' + "(M<%s*MeV)" % config['B_electron_High'] + _motherCuts = _vtxChi2Cut +'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCut @@ -1197,8 +1192,8 @@ class Beauty2MajoLepConf(LineBuilder) : _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['BVtxChi2'] _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['B_IPCHI2wrtPV'] _fdChi2Cut = "(BPVDLS>%s)" % config['B_DLS'] - _massCut = "(ADMASS('B+') < %s)" % config['B_electron_pdg'] - + _massCut = "(M>%s*MeV)" % config['B_Mlow'] + '&' + "(M<%s*MeV)" % config['B_electron_High'] + _motherCuts = _vtxChi2Cut +'&'+_ipChi2Cut+'&'+_fdChi2Cut+'&'+_massCut diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p2/LineConfigDictionaries_RD.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p2/LineConfigDictionaries_RD.py index a006e21a0..f93e1a874 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p2/LineConfigDictionaries_RD.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p2/LineConfigDictionaries_RD.py @@ -1984,33 +1984,32 @@ Beauty2MajoLep = { "AM_Mhigh": 7200.0, "AM_Mlow": 0.0, "BVtxChi2": 9.0, - "B_Bach_PT_DD": 1000.0, + "B_Bach_PT_DD": 700.0, "B_DLS": 5.0, "B_IPCHI2wrtPV": 16.0, + "B_Ks_High" : 5500., + "B_Ks_Low" : 5000., "B_Mhigh": 6800.0, "B_Mlow": 4500.0, - "B_electron_pdg": 800.0, - "B_pdg": 400.0, - "B_pdg_Ks_DD": 200.0, - "Bach_PTmin": 750.0, - "D0_pdg": 100.0, - "Jpsi_electron_pdg": 800.0, - "Jpsi_pdg": 400.0, - "Ks_Bach_PT": 800.0, - "Ks_pdg": 80.0, - "Ks_pdg_DD": 50.0, - "Lep_IPChi2min": 16.0, + "B_electron_High": 6080.0, + "Bach_PTmin": 700.0, + "D0_pdg": 85.0, + "Jpsi_MLow" : 2100., + "Jpsi_MHigh" : 3500., + "Ks_Bach_PT": 500.0, + "Ks_MLow": 430.0, + "Ks_MHigh": 550.0, + "Lep_IPChi2min": 11.0, "Lep_PTmin": 300.0, "Majo_AMhigh": 7000.0, "Majo_AMlow": 0.0, - "Majo_Bach_PTmin": 550.0, + "Majo_Bach_PTmin": 500.0, "Majo_DocaChi2": 16.0, "Majo_PTmin": 700.0, "Majo_VtxChi2": 9.0, "Postscale": 1.0, - "Prescale1": 0.05, - "Prescale2": 0.1, - "Prescale3": 0.2, + "Prescale1": 0.075, + "Prescale2": 0.15, "RequiredRawEvents": [ "Trigger", "Muon", @@ -2019,8 +2018,8 @@ Beauty2MajoLep = { "Velo", "Tracker" ], - "Trk_Chi2NDOF": 5.0, - "Trk_GhostProb": 0.5 + "Trk_Chi2NDOF": 4.0, + "Trk_GhostProb": 0.4 }, "STREAMS": [ "BhadronCompleteEvent" ], "WGs": [ "RD" ] diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping29r2p3/LineConfigDictionaries_RD.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping29r2p3/LineConfigDictionaries_RD.py index 6e02a4bac..4080f5c8b 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping29r2p3/LineConfigDictionaries_RD.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping29r2p3/LineConfigDictionaries_RD.py @@ -1983,33 +1983,32 @@ Beauty2MajoLep = { "AM_Mhigh": 7200.0, "AM_Mlow": 0.0, "BVtxChi2": 9.0, - "B_Bach_PT_DD": 1000.0, + "B_Bach_PT_DD": 700.0, "B_DLS": 5.0, "B_IPCHI2wrtPV": 16.0, + "B_Ks_High" : 5500., + "B_Ks_Low" : 5000., "B_Mhigh": 6800.0, "B_Mlow": 4500.0, - "B_electron_pdg": 800.0, - "B_pdg": 400.0, - "B_pdg_Ks_DD": 200.0, - "Bach_PTmin": 750.0, - "D0_pdg": 100.0, - "Jpsi_electron_pdg": 800.0, - "Jpsi_pdg": 400.0, - "Ks_Bach_PT": 800.0, - "Ks_pdg": 80.0, - "Ks_pdg_DD": 50.0, - "Lep_IPChi2min": 16.0, + "B_electron_High": 6080.0, + "Bach_PTmin": 700.0, + "D0_pdg": 85.0, + "Jpsi_MLow" : 2100., + "Jpsi_MHigh" : 3500., + "Ks_Bach_PT": 500.0, + "Ks_MLow": 430.0, + "Ks_MHigh": 550.0, + "Lep_IPChi2min": 11.0, "Lep_PTmin": 300.0, "Majo_AMhigh": 7000.0, "Majo_AMlow": 0.0, - "Majo_Bach_PTmin": 550.0, + "Majo_Bach_PTmin": 500.0, "Majo_DocaChi2": 16.0, "Majo_PTmin": 700.0, "Majo_VtxChi2": 9.0, "Postscale": 1.0, - "Prescale1": 0.05, - "Prescale2": 0.1, - "Prescale3": 0.2, + "Prescale1": 0.075, + "Prescale2": 0.15, "RequiredRawEvents": [ "Trigger", "Muon", @@ -2018,8 +2017,8 @@ Beauty2MajoLep = { "Velo", "Tracker" ], - "Trk_Chi2NDOF": 5.0, - "Trk_GhostProb": 0.5 + "Trk_Chi2NDOF": 4.0, + "Trk_GhostProb": 0.4 }, "STREAMS": [ "BhadronCompleteEvent" ], "WGs": [ "RD" ] diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p3/LineConfigDictionaries_RD.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p3/LineConfigDictionaries_RD.py index 6decea848..a725e5309 100644 --- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p3/LineConfigDictionaries_RD.py +++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p3/LineConfigDictionaries_RD.py @@ -1987,18 +1987,18 @@ Beauty2MajoLep = { "B_Bach_PT_DD": 700.0, "B_DLS": 5.0, "B_IPCHI2wrtPV": 16.0, + "B_Ks_High" : 5500., + "B_Ks_Low" : 5000., "B_Mhigh": 6800.0, "B_Mlow": 4500.0, - "B_electron_pdg": 800.0, - "B_pdg": 500.0, - "B_pdg_Ks_DD": 200.0, + "B_electron_High": 6080.0, "Bach_PTmin": 700.0, - "D0_pdg": 100.0, - "Jpsi_electron_pdg": 800.0, - "Jpsi_pdg": 400.0, + "D0_pdg": 85.0, + "Jpsi_MLow" : 2100., + "Jpsi_MHigh" : 3500., "Ks_Bach_PT": 500.0, - "Ks_pdg": 100.0, - "Ks_pdg_DD": 100.0, + "Ks_MLow": 430.0, + "Ks_MHigh": 550.0, "Lep_IPChi2min": 11.0, "Lep_PTmin": 300.0, "Majo_AMhigh": 7000.0, @@ -2018,8 +2018,8 @@ Beauty2MajoLep = { "Velo", "Tracker" ], - "Trk_Chi2NDOF": 5.0, - "Trk_GhostProb": 0.5 + "Trk_Chi2NDOF": 4.0, + "Trk_GhostProb": 0.4 }, "STREAMS": [ "BhadronCompleteEvent" ], "WGs": [ "RD" ] -- GitLab From a32502151a8bf3bab07d70298ab927bbf4167d26 Mon Sep 17 00:00:00 2001 From: Valeriia Lukashenko <valeriia.lukashenko@cern.ch> Date: Mon, 21 Aug 2023 15:26:13 +0200 Subject: [PATCH 3/3] remove PIDe from down pi definition as obsolete --- .../StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py index 20d3375c2..b46321aee 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py @@ -367,7 +367,7 @@ class Beauty2MajoLepConf(LineBuilder) : _trkGPCut = "(TRGHOSTPROB<%s)" % config['Trk_GhostProb'] _trkChi2 = "(TRCHI2DOF<%s)" % config['Trk_Chi2NDOF'] - _pidCut = "(~(ISMUON))&(PIDe<0.)" + _pidCut = "(~(ISMUON))" _allCuts = _trkGPCut + '&' + _bachPtCut + '&' + _pidCut + '&' + _trkChi2 # make the filter -- GitLab