feat: switch to DDXv2 as baseline #31618

andrzejnovak · 2020-09-29T22:20:49Z

PR description:

Follow-up on the proposed BTV changes in
https://indico.cern.ch/event/951991/contributions/3999401/attachments/2107928/3545219/BTV_XPOG_meeting_23-09-2020.pdf

switch to DDXv2 as primary fatjet tagger for BTV.
Nano changes
- Deprecate DDX (v1) in Nano after 106
- Include DDXv2 starting 106
- Add "hadronFlavour for subjets
- Handle DeepCSV defaults correctly (individual probabilties default to -1 creating weird composite scores)
- Protect Deepjet composite scores against 0 denominator
- Deprecate CMVA for jets/fatjets/subjets

@smoortga @XavierAtCERN

PR validation:

if this PR is a backport please specify the original PR and why you need to backport that PR:

Before submitting your pull requests, make sure you followed this checklist:

verify that the PR is really intended for the chosen branch
verify that changes follow CMS Naming, Coding, And Style Rules
verify that the PR passes the basic test procedure suggested in the CMSSW PR instructions

cmsbuild · 2020-09-29T22:21:12Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-09-29T22:27:56Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-31618/18684

This PR adds an extra 16KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File PhysicsTools/PatAlgos/python/slimming/applyDeepBtagging_cff.py modified in PR(s): Switch to heavy-ion jets in HI miniAOD #30898

cmsbuild · 2020-09-29T22:28:20Z

A new Pull Request was created by @andrzejnovak (Andrzej Novak) for master.

It involves the following packages:

PhysicsTools/PatAlgos

@perrotta, @jpata, @cmsbuild, @santocch, @slava77 can you please review it and eventually sign? Thanks.
@jdamgov, @rappoccio, @gouskos, @jdolen, @ahinzmann, @smoortga, @riga, @schoef, @emilbols, @mariadalfonso, @JyothsnaKomaragiri, @nhanvtran, @gkasieczka, @clelange, @hatakeyamak, @ferencek, @gpetruc, @andrzejnovak, @peruzzim, @seemasharmafnal, @mmarionncern this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

slava77 · 2020-09-29T22:52:57Z

@cmsbuild please test

cmsbuild · 2020-09-29T22:53:22Z

The tests are being triggered in jenkins.

CMSSW_11_2_X_2020-09-29-1100/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/9653/console Started: 2020/09/30 00:55

cmsbuild · 2020-09-30T00:16:55Z

+1
Tested at: 5bbb39e
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ce1e59/9653/summary.html
CMSSW: CMSSW_11_2_X_2020-09-29-1100
SCRAM_ARCH: slc7_amd64_gcc820

cmsbuild · 2020-09-30T00:17:01Z

Comparison job queued.

cmsbuild · 2020-09-30T01:44:13Z

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ce1e59/9653/summary.html

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 3476 differences found in the comparisons
DQMHistoTests: Total files compared: 35
DQMHistoTests: Total histograms compared: 2542225
DQMHistoTests: Total failures: 1
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2542202
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
Checked 149 log files, 22 edm output root files, 35 DQM output files

mariadalfonso · 2020-09-30T07:51:55Z

@andrzejnovak

to complete this migration also the nano files should be updated

cmssw/PhysicsTools/NanoAOD/python/nano_cff.py

Lines 254 to 257 in 90e1e17

    
           _btagDiscriminators += ['pfDeepDoubleBvLJetTags:probHbb', \ 
        
               'pfDeepDoubleCvLJetTags:probHcc', \ 
        
               'pfDeepDoubleCvBJetTags:probHcc', \ 
        
               'pfMassIndependentDeepDoubleBvLJetTags:probHbb', 'pfMassIndependentDeepDoubleCvLJetTags:probHcc', 'pfMassIndependentDeepDoubleCvBJetTags:probHcc']

cmssw/PhysicsTools/NanoAOD/python/jets_cff.py

Lines 429 to 434 in d8780f6

    
           btagDDBvL_noMD = Var("bDiscriminator('pfDeepDoubleBvLJetTags:probHbb')",float,doc="DeepDoubleX discriminator (no mass-decorrelation) for H(Z)->bb vs QCD",precision=10), 
        
           btagDDCvL_noMD = Var("bDiscriminator('pfDeepDoubleCvLJetTags:probHcc')",float,doc="DeepDoubleX discriminator (no mass-decorrelation) for H(Z)->cc vs QCD",precision=10), 
        
           btagDDCvB_noMD = Var("bDiscriminator('pfDeepDoubleCvBJetTags:probHcc')",float,doc="DeepDoubleX discriminator (no mass-decorrelation) for H(Z)->cc vs H(Z)->bb",precision=10), 
        
           btagDDBvL = Var("bDiscriminator('pfMassIndependentDeepDoubleBvLJetTags:probHbb')",float,doc="DeepDoubleX (mass-decorrelated) discriminator for H(Z)->bb vs QCD",precision=10), 
        
           btagDDCvL = Var("bDiscriminator('pfMassIndependentDeepDoubleCvLJetTags:probHcc')",float,doc="DeepDoubleX (mass-decorrelated) discriminator for H(Z)->cc vs QCD",precision=10), 
        
           btagDDCvB = Var("bDiscriminator('pfMassIndependentDeepDoubleCvBJetTags:probHcc')",float,doc="DeepDoubleX (mass-decorrelated) discriminator for H(Z)->cc vs H(Z)->bb",precision=10),

Note we need to keep the OLD taggers for the EOY miniAOD

cmssw/PhysicsTools/NanoAOD/python/nano_cff.py

Line 312 in 90e1e17

    
           (run2_nanoAOD_94X2016 | run2_nanoAOD_94XMiniAODv1 | run2_nanoAOD_94XMiniAODv2 | run2_nanoAOD_102Xv1).toModify(

but switch to the new one for the 'run2_nanoAOD_106Xv1' and master

cmssw/PhysicsTools/NanoAOD/python/nano_cff.py

Line 319 in 90e1e17

run2_nanoAOD_106Xv1.toModify(

andrzejnovak · 2020-09-30T07:55:19Z

@mariadalfonso This is expected along with few other btag changes. Should it be done in the same PR?

mariadalfonso · 2020-09-30T07:57:01Z

@mariadalfonso This is expected along with few other btag changes. Should it be done in the same PR?

I think will make easier the review/backport if done simultaneously

andrzejnovak · 2020-09-30T07:58:48Z

I thought, in general, the process of proposing changes to nano was to use the dedicated repo which gets merged to cmssw/master periodically in bulk, is that not the case anymore?

mariadalfonso · 2020-09-30T08:07:00Z

I thought, in general, the process of proposing changes to nano was to use the dedicated repo which gets merged to cmssw/master periodically in bulk, is that not the case anymore?

@andrzejnovak
the cms-nano has been deprecated at the end of summer and the PRs go directly to cms-sw (master first and then 10_6). Now the nano format is well established and objects are developed that require change in both mini and nano
All the v8 nano features already followed this new path cms-nanoAOD#533

andrzejnovak · 2020-10-08T14:51:51Z

@mariadalfonso it seems to work as expected locally

The baseline is blue right? Is it possible the scale between the two is off due to the -2 bin not being in the range of the DQM hist? It looks to me a bit like the 0-1 range difference is just an overall factor of ~2 without differences to the shape, which would be strange result in the context of the change introduced here.

mariadalfonso · 2020-10-08T20:05:49Z

+xpog
changes inline with the description

slava77 · 2020-10-09T14:07:11Z

+1

for #31618 49d2379

changes since the last reco signoff were not in reco category (only xpog) https://github.com/cms-sw/cmssw/pull/31618/files/ba6ac6933890e76219dd49d1f6e5381c8e7b1a9d..49d2379ce6859c74d5781895d31bfc5cc6043185

mariadalfonso · 2020-10-12T06:34:26Z

@andrzejnovak
consider back porting this PR to 10_6_X

andrzejnovak · 2020-10-12T13:20:23Z

Is this waiting for the backport to be opened?

slava77 · 2020-10-12T17:30:33Z

@silviodonato @qliphy
please check this PR and consider for merging without the analysis signature
Thank you.

silviodonato · 2020-10-12T20:54:35Z

+1

silviodonato · 2020-10-12T20:55:04Z

merge

silviodonato · 2020-10-13T13:19:03Z

@andrzejnovak please look at #31768

fix: adjust jme_nano cff for changes in #31618

mariadalfonso · 2020-10-16T15:04:21Z

@andrzejnovak
please go ahead with the backport of this and #31786

santocch · 2020-10-17T10:22:57Z

+1

cmsbuild · 2020-10-17T10:23:20Z

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will be automatically merged.

[10_6_X] DDXv2 and BTV changes in Nano #31618, #31786

cmsbuild added this to the CMSSW_11_2_X milestone Sep 29, 2020

cmsbuild added analysis-pending code-checks-pending comparison-pending orp-pending pending-signatures reconstruction-pending tests-pending labels Sep 29, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Sep 29, 2020

cmsbuild added tests-started and removed tests-pending labels Sep 29, 2020

cmsbuild added tests-approved and removed tests-started labels Sep 30, 2020

cmsbuild added comparison-available and removed comparison-pending labels Sep 30, 2020

cmsbuild removed the code-checks-approved label Sep 30, 2020

cmsbuild added xpog-approved and removed xpog-pending labels Oct 8, 2020

cmsbuild added reconstruction-approved and removed reconstruction-pending labels Oct 9, 2020

cmsbuild added orp-approved and removed orp-pending labels Oct 12, 2020

cmsbuild merged commit 540da10 into cms-sw:master Oct 12, 2020

silviodonato mentioned this pull request Oct 13, 2020

'PSet' object has no attribute 'btagCMVA' #31768

Closed

andrzejnovak added a commit to andrzejnovak/cmssw that referenced this pull request Oct 14, 2020

fix: adjust jme_nano cff for changes in cms-sw#31618

7a351e2

cmsbuild added a commit that referenced this pull request Oct 14, 2020

Merge pull request #31786 from andrzejnovak/fixjmenano

b8127ba

fix: adjust jme_nano cff for changes in #31618

cmsbuild mentioned this pull request Oct 15, 2020

Add ParticleNetAK4 to JME custom NanoAOD #31714

Merged

cmsbuild added analysis-approved fully-signed and removed analysis-pending pending-signatures labels Oct 17, 2020

andrzejnovak added a commit to andrzejnovak/cmssw that referenced this pull request Oct 19, 2020

fix: adjust jme_nano cff for changes in cms-sw#31618

e8cfd56

andrzejnovak mentioned this pull request Oct 19, 2020

[10_6_X] DDXv2 and BTV changes in Nano #31618, #31786 #31847

Merged

cmsbuild added a commit that referenced this pull request Nov 4, 2020

Merge pull request #31847 from andrzejnovak/backportBTV

704dd7d

[10_6_X] DDXv2 and BTV changes in Nano #31618, #31786

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: switch to DDXv2 as baseline #31618

feat: switch to DDXv2 as baseline #31618

andrzejnovak commented Sep 29, 2020 •

edited

Loading

cmsbuild commented Sep 29, 2020

cmsbuild commented Sep 29, 2020

cmsbuild commented Sep 29, 2020

slava77 commented Sep 29, 2020

cmsbuild commented Sep 29, 2020 •

edited

Loading

cmsbuild commented Sep 30, 2020

cmsbuild commented Sep 30, 2020

cmsbuild commented Sep 30, 2020

mariadalfonso commented Sep 30, 2020 •

edited

Loading

andrzejnovak commented Sep 30, 2020

mariadalfonso commented Sep 30, 2020

andrzejnovak commented Sep 30, 2020

mariadalfonso commented Sep 30, 2020

andrzejnovak commented Oct 8, 2020 •

edited

Loading

mariadalfonso commented Oct 8, 2020

slava77 commented Oct 9, 2020 •

edited

Loading

mariadalfonso commented Oct 12, 2020

andrzejnovak commented Oct 12, 2020

slava77 commented Oct 12, 2020

silviodonato commented Oct 12, 2020

silviodonato commented Oct 12, 2020

silviodonato commented Oct 13, 2020

mariadalfonso commented Oct 16, 2020

santocch commented Oct 17, 2020

cmsbuild commented Oct 17, 2020

feat: switch to DDXv2 as baseline #31618

feat: switch to DDXv2 as baseline #31618

Conversation

andrzejnovak commented Sep 29, 2020 • edited Loading

PR description:

PR validation:

if this PR is a backport please specify the original PR and why you need to backport that PR:

cmsbuild commented Sep 29, 2020

cmsbuild commented Sep 29, 2020

cmsbuild commented Sep 29, 2020

slava77 commented Sep 29, 2020

cmsbuild commented Sep 29, 2020 • edited Loading

cmsbuild commented Sep 30, 2020

cmsbuild commented Sep 30, 2020

cmsbuild commented Sep 30, 2020

mariadalfonso commented Sep 30, 2020 • edited Loading

andrzejnovak commented Sep 30, 2020

mariadalfonso commented Sep 30, 2020

andrzejnovak commented Sep 30, 2020

mariadalfonso commented Sep 30, 2020

andrzejnovak commented Oct 8, 2020 • edited Loading

mariadalfonso commented Oct 8, 2020

slava77 commented Oct 9, 2020 • edited Loading

mariadalfonso commented Oct 12, 2020

andrzejnovak commented Oct 12, 2020

slava77 commented Oct 12, 2020

silviodonato commented Oct 12, 2020

silviodonato commented Oct 12, 2020

silviodonato commented Oct 13, 2020

mariadalfonso commented Oct 16, 2020

santocch commented Oct 17, 2020

cmsbuild commented Oct 17, 2020

andrzejnovak commented Sep 29, 2020 •

edited

Loading

cmsbuild commented Sep 29, 2020 •

edited

Loading

mariadalfonso commented Sep 30, 2020 •

edited

Loading

andrzejnovak commented Oct 8, 2020 •

edited

Loading

slava77 commented Oct 9, 2020 •

edited

Loading