-
Notifications
You must be signed in to change notification settings - Fork 4.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update tau anti electron discriminators in RECO and MiniAOD (10_6_X) #31065
Changes from all commits
601a5ff
f6c56da
e14ec0e
e64bca6
ef784dd
7cfdeaa
c554314
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -55,7 +55,7 @@ def _tauId8WPMask(pattern,doc): | |
variables = cms.PSet() # PSet defined below in era dependent way | ||
) | ||
_tauVarsBase = cms.PSet(P4Vars, | ||
charge = Var("charge", int, doc="electric charge"), | ||
charge = Var("charge", int, doc="electric charge"), | ||
jetIdx = Var("?hasUserCand('jet')?userCand('jet').key():-1", int, doc="index of the associated jet (-1 if none)"), | ||
decayMode = Var("decayMode()",int), | ||
idDecayMode = Var("tauID('decayModeFinding')", bool), | ||
|
@@ -76,11 +76,8 @@ def _tauId8WPMask(pattern,doc): | |
puCorr = Var( "tauID('puCorrPtSum')", float, doc = "pileup correction", precision=10), | ||
photonsOutsideSignalCone = Var( "tauID('photonPtSumOutsideSignalCone')", float, doc = "sum of photons outside signal cone", precision=10), | ||
|
||
rawAntiEle = Var("tauID('againstElectronMVA6Raw')", float, doc= "Anti-electron MVA discriminator V6 raw output discriminator", precision=10), | ||
rawAntiEleCat = Var("tauID('againstElectronMVA6category')", int, doc="Anti-electron MVA discriminator V6 category"), | ||
|
||
idAntiMu = _tauId2WPMask("againstMuon%s3", doc= "Anti-muon discriminator V3: "), | ||
idAntiEle = _tauId5WPMask("againstElectron%sMVA6", doc= "Anti-electron MVA discriminator V6"), | ||
idAntiEleDeadECal = Var("tauID('againstElectronDeadECALForNano')", bool, doc = "Anti-electron dead-ECal discriminator"), | ||
|
||
# isoCI3hit = Var( "tauID("byCombinedIsolationDeltaBetaCorrRaw3Hits")" doc="byCombinedIsolationDeltaBetaCorrRaw3Hits raw output discriminator"), | ||
# photonOutsideSigCone = Var( "tauID("photonPtSumOutsideSignalCone")" doc="photonPtSumOutsideSignalCone raw output discriminator"), | ||
|
@@ -111,10 +108,18 @@ def _tauId8WPMask(pattern,doc): | |
idMVAoldDM2017v2 = _tauId7WPMask( "by%sIsolationMVArun2v1DBoldDMwLT2017v2", doc="IsolationMVArun2v1DBoldDMwLT ID working point (2017v2)"), | ||
idMVAoldDMdR032017v2 = _tauId7WPMask( "by%sIsolationMVArun2v1DBdR03oldDMwLT2017v2", doc="IsolationMVArun2v1DBoldDMdR0p3wLT ID working point (2017v2)") | ||
) | ||
_mvaAntiEVars2018 = cms.PSet( | ||
_mvaAntiEVars = cms.PSet( | ||
rawAntiEle2018 = Var("tauID('againstElectronMVA6Raw2018')", float, doc= "Anti-electron MVA discriminator V6 raw output discriminator (2018)", precision=10), | ||
rawAntiEleCat2018 = Var("tauID('againstElectronMVA6category2018')", int, doc="Anti-electron MVA discriminator V6 category (2018)"), | ||
idAntiEle2018 = _tauId5WPMask("againstElectron%sMVA62018", doc= "Anti-electron MVA discriminator V6 (2018)"), | ||
rawAntiEle = Var("tauID('againstElectronMVA6Raw')", float, doc= "Anti-electron MVA discriminator V6 raw output discriminator (2015)", precision=10), | ||
rawAntiEleCat = Var("tauID('againstElectronMVA6category')", int, doc="Anti-electron MVA discriminator V6 category (2015)"), | ||
idAntiEle = _tauId5WPMask("againstElectron%sMVA6", doc= "Anti-electron MVA discriminator V6 (2015)"), | ||
) | ||
_mvaAntiEVars2015 = cms.PSet( | ||
rawAntiEle = Var("tauID('againstElectronMVA6Raw')", float, doc= "Anti-electron MVA discriminator V6 raw output discriminator (2015)", precision=10), | ||
rawAntiEleCat = Var("tauID('againstElectronMVA6category')", int, doc="Anti-electron MVA discriminator V6 category (2015)"), | ||
idAntiEle = _tauId5WPMask("againstElectron%sMVA6", doc= "Anti-electron MVA discriminator V6 (2015)") | ||
) | ||
_deepTauVars2017v2 = cms.PSet( | ||
rawDeepTau2017v2VSe = Var("tauID('byDeepTau2017v2VSeraw')", float, doc="byDeepTau2017v2VSe raw output discriminator (deepTau2017v2)", precision=10), | ||
|
@@ -135,7 +140,7 @@ def _tauId8WPMask(pattern,doc): | |
|
||
_variablesMiniV2 = cms.PSet( | ||
_tauVarsBase, | ||
_mvaAntiEVars2018, | ||
_mvaAntiEVars, | ||
_mvaIsoVars2015Reduced, | ||
_mvaIsoVars2017v1, | ||
_mvaIsoVars2017v2, | ||
|
@@ -148,6 +153,7 @@ def _tauId8WPMask(pattern,doc): | |
_variablesMiniV1.idMVAoldDM2017v1 = _tauId7WPMask( "by%sIsolationMVArun2v1DBoldDMwLT2017v1", doc="IsolationMVArun2v1DBoldDMwLT ID working point (2017v1)") | ||
_variables80X = cms.PSet( | ||
_tauVarsBase, | ||
_mvaAntiEVars2015, | ||
_mvaIsoVars2015 | ||
) | ||
|
||
|
@@ -160,7 +166,19 @@ def _tauId8WPMask(pattern,doc): | |
run2_miniAOD_80XLegacy.toModify(tauTable, | ||
variables = _variables80X | ||
) | ||
run2_miniAOD_80XLegacy.toModify(tauTable.variables, | ||
idAntiEleDeadECal = None | ||
) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @mbluj There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In my understanding in There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. for reco and miniAOD holds what you said " (no changing policy as for other data-tiers)" So worth to add the idAntiEleDeadECal for the EOY and UL106v1. |
||
|
||
run2_miniAOD_devel.toModify(tauTable.variables, | ||
idAntiEleDeadECal = Var("tauID('againstElectronDeadECAL')", bool, doc = "Anti-electron dead-ECal discriminator"), | ||
rawAntiEle2018 = Var("tauID('againstElectronMVA6Raw')", float, doc= "Anti-electron MVA discriminator V6 raw output discriminator (2018)", precision=10), | ||
rawAntiEleCat2018 = Var("tauID('againstElectronMVA6category')", int, doc="Anti-electron MVA discriminator V6 category (2018)"), | ||
idAntiEle2018 = _tauId5WPMask("againstElectron%sMVA6", doc= "Anti-electron MVA discriminator V6 (2018)"), | ||
rawAntiEle = Var("tauID('againstElectronMVA6Raw2015')", float, doc= "Anti-electron MVA discriminator V6 raw output discriminator (2015)", precision=10), | ||
rawAntiEleCat = Var("tauID('againstElectronMVA6category2015')", int, doc="Anti-electron MVA discriminator V6 category (2015"), | ||
idAntiEle = _tauId5WPMask("againstElectron%sMVA62015", doc= "Anti-electron MVA discriminator V6 (2015)") | ||
) | ||
|
||
tauGenJets.GenParticles = cms.InputTag("prunedGenParticles") | ||
tauGenJets.includeNeutrinos = cms.bool(False) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is not 1:1 backport
the labelling of 2015 and 2018 is done differently between here and master.
is this intended ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am surprised as I think it is OK, but let me check - a bug is not excluded. I will back to it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I checked it again and it is correct as it is. Difference wrt master is caused by the fact that here in "default workflows", i.e. other than
run2_miniAOD_devel
, it is expected that anti-e tauIDs 2015 are not labeled by year in patTaus, while 2018 ones are rerun as a part of nanoAOD sequences and labelled by 2018 in patTaus. The order is swapped in case ofrun2_miniAOD_devel
with 106X as well as in default workflows with master.