Skip to content

Commit bac24a4

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#42726 from Prasant1993/Fall17V2_ElectronIDs_Iso_inRun2only_CMSSW_13_3_0_pre2
Fall17V2 Electron IDs and Isolations saved only in Run2
2 parents 3e81d54 + 46af7e8 commit bac24a4

File tree

1 file changed

+18
-49
lines changed

1 file changed

+18
-49
lines changed

‎PhysicsTools/NanoAOD/python/electrons_cff.py‎

Lines changed: 18 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -317,32 +317,17 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
317317
mvaNoIso = Var("userFloat('mvaNoIso')",float,doc="MVA noIso ID score, Winter22V1"),
318318
mvaNoIso_WP80 = Var("userInt('mvaNoIso_WP80')",bool,doc="MVA noIso ID WP80, Winter22V1"),
319319
mvaNoIso_WP90 = Var("userInt('mvaNoIso_WP90')",bool,doc="MVA noIso ID WP90, Winter22V1"),
320-
mvaIso_Fall17V2 = Var("userFloat('mvaIso_Fall17V2')",float,doc="MVA Iso ID score, Fall17V2"),
321-
mvaIso_Fall17V2_WP80 = Var("userInt('mvaIso_Fall17V2_WP80')",bool,doc="MVA Iso ID WP80, Fall17V2"),
322-
mvaIso_Fall17V2_WP90 = Var("userInt('mvaIso_Fall17V2_WP90')",bool,doc="MVA Iso ID WP90, Fall17V2"),
323-
mvaIso_Fall17V2_WPL = Var("userInt('mvaIso_Fall17V2_WPL')",bool,doc="MVA Iso ID loose WP, Fall17V2"),
324-
mvaNoIso_Fall17V2 = Var("userFloat('mvaNoIso_Fall17V2')",float,doc="MVA noIso ID score, Fall17V2"),
325-
mvaNoIso_Fall17V2_WP80 = Var("userInt('mvaNoIso_Fall17V2_WP80')",bool,doc="MVA noIso ID WP80, Fall17V2"),
326-
mvaNoIso_Fall17V2_WP90 = Var("userInt('mvaNoIso_Fall17V2_WP90')",bool,doc="MVA noIso ID WP90, Fall17V2"),
327-
mvaNoIso_Fall17V2_WPL = Var("userInt('mvaNoIso_Fall17V2_WPL')",bool,doc="MVA noIso ID loose WP, Fall17V2"),
328320
mvaHZZIso = Var("userFloat('mvaHZZIso')", float,doc="HZZ MVA Iso ID score"),
329321

330322
cutBased = Var("userInt('cutBasedID_veto')+userInt('cutBasedID_loose')+userInt('cutBasedID_medium')+userInt('cutBasedID_tight')", "uint8", doc="cut-based ID RunIII Winter22 (0:fail, 1:veto, 2:loose, 3:medium, 4:tight)"),
331-
cutBased_Fall17V2 = Var("userInt('cutBasedID_Fall17V2_veto')+userInt('cutBasedID_Fall17V2_loose')+userInt('cutBasedID_Fall17V2_medium')+userInt('cutBasedID_Fall17V2_tight')", "uint8", doc="cut-based ID Fall17V2 (0:fail, 1:veto, 2:loose, 3:medium, 4:tight)"),
332323
vidNestedWPBitmap = Var("userInt('VIDNestedWPBitmap')", int, doc=_bitmapVIDForEle_docstring),
333-
vidNestedWPBitmap_Fall17V2 = Var("userInt('VIDNestedWPBitmap_Fall17V2')", int, doc=_bitmapVIDForEleFall17V2_docstring),
334324
vidNestedWPBitmapHEEP = Var("userInt('VIDNestedWPBitmapHEEP')", int, doc=_bitmapVIDForEleHEEP_docstring),
335325
cutBased_HEEP = Var("userInt('cutBasedID_HEEP')",bool,doc="cut-based HEEP ID"),
336326
miniPFRelIso_chg = Var("userFloat('miniIsoChg')/pt",float,doc="mini PF relative isolation, charged component"),
337327
miniPFRelIso_all = Var("userFloat('miniIsoAll')/pt",float,doc="mini PF relative isolation, total (with scaled rho*EA PU Winter22V1 corrections)"),
338328
pfRelIso03_chg = Var("userFloat('PFIsoChg')/pt",float,doc="PF relative isolation dR=0.3, charged component"),
339-
pfRelIso03_all = Var("userFloat('PFIsoAll')/pt",float,doc="PF relative isolation dR=0.3, total (with rho*EA PU Winter22V1 corrections)"),
340-
miniPFRelIso_chg_Fall17V2 = Var("userFloat('miniIsoChg_Fall17V2')/pt",float,doc="mini PF relative isolation, charged component"),
341-
miniPFRelIso_all_Fall17V2 = Var("userFloat('miniIsoAll_Fall17V2')/pt",float,doc="mini PF relative isolation, total (with scaled rho*EA PU Fall17V2 corrections)"),
342-
pfRelIso03_chg_Fall17V2 = Var("userFloat('PFIsoChg_Fall17V2')/pt",float,doc="PF relative isolation dR=0.3 with 94 EffArea, charged component"),
343-
pfRelIso03_all_Fall17V2 = Var("userFloat('PFIsoAll_Fall17V2')/pt",float,doc="PF relative isolation dR=0.3 with 94 EffArea, total (with rho*EA PU corrections)"),
344-
jetRelIso = Var("?userCand('jetForLepJetVar').isNonnull()?(1./userFloat('ptRatio'))-1.:userFloat('PFIsoAll04')/pt",float,doc="Relative isolation in matched jet (1/ptRatio-1, pfRelIso04_all if no matched jet)",precision=8),
345-
jetRelIso_Fall17V2 = Var("?userCand('jetForLepJetVar').isNonnull()?(1./userFloat('ptRatio'))-1.:userFloat('PFIsoAll04_Fall17V2')/pt",float,doc="Relative isolation in matched jet (1/ptRatio-1, pfRelIso04_all if no matched jet)",precision=8),
329+
pfRelIso03_all = Var("userFloat('PFIsoAll')/pt",float,doc="PF relative isolation dR=0.3, total (with rho*EA PU Winter22V1 corrections)"),
330+
jetRelIso = Var("?userCand('jetForLepJetVar').isNonnull()?(1./userFloat('ptRatio'))-1.:userFloat('PFIsoAll04')/pt",float,doc="Relative isolation in matched jet (1/ptRatio-1, pfRelIso04_all if no matched jet)",precision=8),
346331
jetPtRelv2 = Var("?userCand('jetForLepJetVar').isNonnull()?userFloat('ptRel'):0",float,doc="Relative momentum of the lepton with respect to the closest jet after subtracting the lepton",precision=8),
347332
dr03TkSumPt = Var("?pt>35?dr03TkSumPt():0",float,doc="Non-PF track isolation within a delta R cone of 0.3 with electron pt > 35 GeV",precision=8),
348333
dr03TkSumPtHEEP = Var("?pt>35?dr03TkSumPtHEEP():0",float,doc="Non-PF track isolation within a delta R cone of 0.3 with electron pt > 35 GeV used in HEEP ID",precision=8),
@@ -375,38 +360,22 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
375360
dEscaleDown=Var("userFloat('ecalTrkEnergyPostCorrNew')-userFloat('energyScaleDownNew')", float, doc="ecal energy scale shifted 1 sigma down (adding gain/stat/syst in quadrature)", precision=8),
376361
dEsigmaUp=Var("userFloat('ecalTrkEnergyPostCorrNew')-userFloat('energySigmaUpNew')", float, doc="ecal energy smearing value shifted 1 sigma up", precision=8),
377362
dEsigmaDown=Var("userFloat('ecalTrkEnergyPostCorrNew')-userFloat('energySigmaDownNew')", float, doc="ecal energy smearing value shifted 1 sigma up", precision=8),
378-
379-
# switch default IDs back to Fall17V2 in Run2, remove Winter22V1 and quadratic iso
380-
cutBased = electronTable.variables.cutBased_Fall17V2,
381-
cutBased_Fall17V2 = None,
382-
mvaIso = electronTable.variables.mvaIso_Fall17V2,
383-
mvaIso_Fall17V2 = None,
384-
mvaIso_WP80 = electronTable.variables.mvaIso_Fall17V2_WP80,
385-
mvaIso_Fall17V2_WP80 = None,
386-
mvaIso_WP90 = electronTable.variables.mvaIso_Fall17V2_WP90,
387-
mvaIso_Fall17V2_WP90 = None,
388-
mvaIso_WPL = electronTable.variables.mvaIso_Fall17V2_WPL,
389-
mvaIso_Fall17V2_WPL = None,
390-
mvaNoIso = electronTable.variables.mvaNoIso_Fall17V2,
391-
mvaNoIso_Fall17V2 = None,
392-
mvaNoIso_WP80 = electronTable.variables.mvaNoIso_Fall17V2_WP80,
393-
mvaNoIso_Fall17V2_WP80 = None,
394-
mvaNoIso_WP90 = electronTable.variables.mvaNoIso_Fall17V2_WP90,
395-
mvaNoIso_Fall17V2_WP90 = None,
396-
mvaNoIso_WPL = electronTable.variables.mvaNoIso_Fall17V2_WPL,
397-
mvaNoIso_Fall17V2_WPL = None,
398-
vidNestedWPBitmap = electronTable.variables.vidNestedWPBitmap_Fall17V2,
399-
vidNestedWPBitmap_Fall17V2 = None,
400-
miniPFRelIso_chg = electronTable.variables.miniPFRelIso_chg_Fall17V2,
401-
miniPFRelIso_chg_Fall17V2 = None,
402-
miniPFRelIso_all = electronTable.variables.miniPFRelIso_all_Fall17V2,
403-
miniPFRelIso_all_Fall17V2 = None,
404-
pfRelIso03_chg = electronTable.variables.pfRelIso03_chg_Fall17V2,
405-
pfRelIso03_chg_Fall17V2 = None,
406-
pfRelIso03_all = electronTable.variables.pfRelIso03_all_Fall17V2,
407-
pfRelIso03_all_Fall17V2 = None,
408-
jetRelIso = electronTable.variables.jetRelIso_Fall17V2,
409-
jetRelIso_Fall17V2 = None,
363+
# Fall17V2 IDs and isolations are only for Run2. The names of these IDs and isolations are same as in Run3.
364+
mvaIso = Var("userFloat('mvaIso_Fall17V2')",float,doc="MVA Iso ID score, Fall17V2"),
365+
mvaIso_WP80 = Var("userInt('mvaIso_Fall17V2_WP80')",bool,doc="MVA Iso ID WP80, Fall17V2"),
366+
mvaIso_WP90 = Var("userInt('mvaIso_Fall17V2_WP90')",bool,doc="MVA Iso ID WP90, Fall17V2"),
367+
mvaIso_WPL = Var("userInt('mvaIso_Fall17V2_WPL')",bool,doc="MVA Iso ID loose WP, Fall17V2"),
368+
mvaNoIso = Var("userFloat('mvaNoIso_Fall17V2')",float,doc="MVA noIso ID score, Fall17V2"),
369+
mvaNoIso_WP80 = Var("userInt('mvaNoIso_Fall17V2_WP80')",bool,doc="MVA noIso ID WP80, Fall17V2"),
370+
mvaNoIso_WP90 = Var("userInt('mvaNoIso_Fall17V2_WP90')",bool,doc="MVA noIso ID WP90, Fall17V2"),
371+
mvaNoIso_WPL = Var("userInt('mvaNoIso_Fall17V2_WPL')",bool,doc="MVA noIso ID loose WP, Fall17V2"),
372+
cutBased = Var("userInt('cutBasedID_Fall17V2_veto')+userInt('cutBasedID_Fall17V2_loose')+userInt('cutBasedID_Fall17V2_medium')+userInt('cutBasedID_Fall17V2_tight')", "uint8", doc="cut-based ID Fall17V2 (0:fail, 1:veto, 2:loose, 3:medium, 4:tight)"),
373+
vidNestedWPBitmap = Var("userInt('VIDNestedWPBitmap_Fall17V2')", int, doc=_bitmapVIDForEleFall17V2_docstring),
374+
miniPFRelIso_chg = Var("userFloat('miniIsoChg_Fall17V2')/pt",float,doc="mini PF relative isolation, charged component in Run2"),
375+
miniPFRelIso_all = Var("userFloat('miniIsoAll_Fall17V2')/pt",float,doc="mini PF relative isolation, total (with scaled rho*EA Fall17V2 PU corrections) in Run2"),
376+
pfRelIso03_chg = Var("userFloat('PFIsoChg_Fall17V2')/pt",float,doc="PF relative isolation dR=0.3 with 94 EffArea, charged component in Run2"),
377+
pfRelIso03_all = Var("userFloat('PFIsoAll_Fall17V2')/pt",float,doc="PF relative isolation dR=0.3 with 94 EffArea, total (with rho*EA Fall17V2 PU corrections) in Run2"),
378+
jetRelIso = Var("?userCand('jetForLepJetVar').isNonnull()?(1./userFloat('ptRatio'))-1.:userFloat('PFIsoAll04_Fall17V2')/pt",float,doc="Relative isolation in matched jet (1/ptRatio-1, pfRelIso04_all if no matched jet in Run2)",precision=8),
410379
)
411380

412381
#############electron Table END#####################

0 commit comments

Comments
 (0)