diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py index 108fb0a6afb14f6c0168e3b6be0de48941ebbe8d..db7b6642f7508edf67a1b0a6fb43fcbb43e634bc 100644 --- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py +++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py @@ -12,9 +12,9 @@ B-> X Gamma selections ''' -__author__ = ['Cedric Potterat','Zhirui Xu','Pablo Ruiz Valls', 'Albert Puig', 'Violaine Bellee'] -__date__ = '11/07/2014' -__version__ = '$Revision: 3.0 $' +__author__ = ['Cedric Potterat','Zhirui Xu','Pablo Ruiz Valls', 'Albert Puig', 'Violaine Bellee', 'Fionn Bishop'] +__date__ = '12/07/2023' +__version__ = '$Revision: 4.0 $' __all__ = ( 'Beauty2XGammaConf', 'makeDiTrackList', @@ -561,9 +561,7 @@ class Beauty2XGammaConf(LineBuilder) : VtxChi2DOFCut = config['B2XGBVtxChi2DOF'], MinSumPtCut = config['B2XGBSumPtMin'], MinBPVDIRACut = config['B2XGBMinBPVDIRA'], - VtxMaxIPChi2Cut = config['B2XGBVtxMaxIPChi2'], - Hlt1Dict = config['Hlt1TISTOSLinesDict'], - Hlt2Dict = config['Hlt2TISTOSLinesDict']) + VtxMaxIPChi2Cut = config['B2XGBVtxMaxIPChi2']) self.B2XG2piCNVLLLine = StrippingLine( B2XG2piCNVLLName+"Line", prescale = config['B2XG2piCNVLLPrescale'], @@ -584,9 +582,7 @@ class Beauty2XGammaConf(LineBuilder) : VtxChi2DOFCut = config['B2XGBVtxChi2DOF'], MinSumPtCut = config['B2XGBSumPtMin'], MinBPVDIRACut = config['B2XGBMinBPVDIRA'], - VtxMaxIPChi2Cut = config['B2XGBVtxMaxIPChi2'], - Hlt1Dict = config['Hlt1TISTOSLinesDict'], - Hlt2Dict = config['Hlt2TISTOSLinesDict']) + VtxMaxIPChi2Cut = config['B2XGBVtxMaxIPChi2']) self.B2XG2piCNVDDLine = StrippingLine( B2XG2piCNVDDName+"Line", prescale = config['B2XG2piCNVDDPrescale'], @@ -678,9 +674,7 @@ class Beauty2XGammaConf(LineBuilder) : VtxChi2DOFCut = config['B2XGBVtxChi2DOF'], MinSumPtCut = config['B2XGBSumPtMin'], MinBPVDIRACut = config['B2XGBMinBPVDIRA'], - VtxMaxIPChi2Cut = config['B2XGBVtxMaxIPChi2'], - Hlt1Dict = config['Hlt1TISTOSLinesDict'], - Hlt2Dict = config['Hlt2TISTOSLinesDict']) + VtxMaxIPChi2Cut = config['B2XGBVtxMaxIPChi2']) self.B2XG3piCNVLLLine = StrippingLine( B2XG3piCNVLLName+"Line", prescale = config['B2XG3piCNVLLPrescale'], @@ -701,9 +695,7 @@ class Beauty2XGammaConf(LineBuilder) : VtxChi2DOFCut = config['B2XGBVtxChi2DOF'], MinSumPtCut = config['B2XGBSumPtMin'], MinBPVDIRACut = config['B2XGBMinBPVDIRA'], - VtxMaxIPChi2Cut = config['B2XGBVtxMaxIPChi2'], - Hlt1Dict = config['Hlt1TISTOSLinesDict'], - Hlt2Dict = config['Hlt2TISTOSLinesDict']) + VtxMaxIPChi2Cut = config['B2XGBVtxMaxIPChi2']) self.B2XG3piCNVDDLine = StrippingLine( B2XG3piCNVDDName+"Line", prescale = config['B2XG3piCNVDDPrescale'], @@ -1463,9 +1455,7 @@ def makeB2B2XG2piGammaCNV( name, VtxChi2DOFCut, MinSumPtCut, MinBPVDIRACut, - VtxMaxIPChi2Cut, - Hlt1Dict, - Hlt2Dict) : + VtxMaxIPChi2Cut) : """ Charmless B2XG to 2pi and cobnverted photon selection with missing mass """ @@ -1483,9 +1473,9 @@ def makeB2B2XG2piGammaCNV( name, CombinationCut = _B2B2XG2piPreVertexCuts ) - return fullTisTosSelection(Selection(name, + return Selection(name, Algorithm = _combineB2B2XG2pi, - RequiredSelections = [ diTrkList,photons ] ), Hlt1Dict, Hlt2Dict) + RequiredSelections = [ diTrkList,photons ] ) def makeB2B2XGpiKsGamma( name, @@ -1595,9 +1585,7 @@ def makeB2B2XG3piGammaCNV( name, VtxChi2DOFCut, MinSumPtCut, MinBPVDIRACut, - VtxMaxIPChi2Cut, - Hlt1Dict, - Hlt2Dict) : + VtxMaxIPChi2Cut) : """ Charmless B2XG to 3pi selection with missing mass """ @@ -1615,9 +1603,9 @@ def makeB2B2XG3piGammaCNV( name, CombinationCut = _B2B2XG3piPreVertexCuts ) - return fullTisTosSelection(Selection(name, + return Selection(name, Algorithm = _combineB2B2XG3pi, - RequiredSelections = [ triTrkList, photons ] ), Hlt1Dict, Hlt2Dict) + RequiredSelections = [ triTrkList, photons ] ) def makeB2B2XG2piKsGamma( name, triTrkList, @@ -1980,4 +1968,4 @@ def get_vtxisol_relinfo_radiative(selection): return {'Type' : 'RelInfoVertexIsolationRadiative', 'Variables' : ['NEWVTXISONUMVTX', 'NEWVTXISOTRKRELD0', 'NEWVTXISOTRKDCHI2', 'NEWVTXISODCHI2MASS'], 'Location' : 'VertexIsoInfoRadiative', - 'TopSelection': selection} \ No newline at end of file + 'TopSelection': selection}