Skip to content
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.

Sign up for GitHub

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

Jump to bottom

NanoAOD update #23445

Merged
merged 60 commits into from Jul 10, 2018
Merged

NanoAOD update #23445

merged 60 commits into from Jul 10, 2018

Conversation

arizzi
Copy link
Contributor

@arizzi arizzi commented Jun 4, 2018

This PR is the equivalent of
cms-nanoAOD#175
but with stripped out data files that should be included via:
needs: cms-sw/cmsdist#4078

Features:

  • Soft Activity bug fix, wrong input tag used
  • Fixing GenWeightsTable producer for MG26X samples
  • Updating triggerObjects_cff.py to include physics based HLT trigger filter bit scheme
  • 80X MET Filters - bad muon flags
  • Added b-tag SF EDProducer to get event weights
  • New b-jet energy regression
  • run deepCSV on the fly for 80X input

@gpetruc

arizzi and others added 30 commits April 9, 2018 09:55
@arizzi
fix dqm
e92f5d4
@arizzi
Merge pull request cms-sw#156 from cms-nanoAOD/masterMergedAndNoData-…
b01ec5e 
…integration

Add deep flavour of MiniAOD v2 to nanoaod
BadGlobalMuonTagger -> add a boolean flagging the event as good or bad
403f30f
NanoAOD file to run the bad muon / bad charged hadron modules + a tab…
45b4e0b 
…le to add these to the nanoAOD event trees
Add the extra flags producers and table to 80X for nanoaod (flags pre…
3c1899b 
…sent in 92X and beyond)
Use the correct bad charged hadron module for the full 2016 dataset
fea5159
Rename bad charged hadron flag for consistency with 94X flags
ee8af39
Add a flag for the BadPFMuonFilter module in 80X nanoAOD
c74456a
@gpetruc
Merge pull request cms-sw#160 from shane-breeze/nanoAOD-80XbadMuons
04c80e4 
80X MET Filters - bad muon flags
@arizzi
Merge commit nanoaod up to PR 160, excluding 120 commit '04c80e47598a…
871a09d 
…a9aa4171bb24b361c6c421a937ef' into central
@rdewanje @arizzi
Added my own version of triggerObjects_cff.py witn modified e and mu …
4d92d44 
…filterbits
@rdewanje @arizzi
Updated e, mu and tau sections triggerObjects_cff.py for better reada…
9e4116e 
…bility
@ktht @arizzi
Fix syntax errors in HLT filter expressions
efe201c 
My suspicion is that the ternary operator (??:) cannot be inlined; it
gave completely bogus results. Fortunately, correct trigger bits were
recovered with max() function, which serves as logical OR operator in
this context.
@rdewanje @arizzi
Added the new HLT filter logic for e/mu/tau
18b6cae
@rdewanje @arizzi
Added the latest changes to the HLT bit masks for e, mu and tau objects
5338d62
@rdewanje @arizzi
Corrected the qualityBitsDoc line FOR Electron setting bits: 2 = 1e (…
ae11e8c 
…WPTight), 4 = 1e (WPLoose)
@rdewanje @arizzi
Minor modifications in qualityBits for Electron to make them have the…
6cec12c 
… same pattern as Muon
@arizzi
Added b-tag SF EDProducer to get event weights, configs in nano_cff, …
4633861 
…w/o b-tag SF .csv files, updated BuildFile
@arizzi
Modified BTagSFProducer and config to produce one weight table for mu…
f3e3f01 
…ltiple discriminators, added separate measType configs for B/C/UDSG, patched minor cmssw incompatibility
@arizzi
Added era switches, added default output of 1.0 for the eras where SF…
3e9b425 
…s are unavailable
@arizzi
Minor change
bf7e85d
@arizzi
Edited BTagSFProducer to not produce any branch for b-taggers marked …
d7c581d 
…as unavailable
@arizzi
Saving Discriminator Reshaping weights; added latest SF .csv files
1007c4b
@arizzi
Using jet.hadronFlavour() instead of jet.partonFlavour()
129a013
@adewit @arizzi
Adapting GenWeightsTableProducer to work with new header file format …
976b253 
…from MG26X systematics module
@adewit @arizzi
Assigning bools with explicit true/false instead of 0/1
9a16144
@adewit @arizzi
Reducing code duplication in GenWeightsTableProducer
430acfb
@adewit @arizzi
Perform all bracket replacements in initial loop
59a73fe
@adewit @arizzi
Removing redundant if statement
e389a52
@arizzi
bug fix, wrong input tag used
853e01c
@gpetruc
Copy link
Contributor

gpetruc commented Jul 5, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 5, 2018 •
edited

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/29022/console Started: 2018/07/05 18:13

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 5, 2018

+1
Tested at: 4b7b96e
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23445/29022/summary.html

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
4b7b96e
871a09d
04c80e4
b01ec5e
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23445/29022/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23445/29022/git-merge-result

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 5, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 5, 2018

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

Comparison Summary:

  • No significant changes to the logs found
  • ROOTFileChecks: Some differences in event products or their sizes found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 27
  • DQMHistoTests: Total histograms compared: 2721493
  • DQMHistoTests: Total failures: 114
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2721217
  • DQMHistoTests: Total skipped: 162
  • DQMHistoTests: Total Missing objects: 0

@gpetruc
Copy link
Contributor

gpetruc commented Jul 6, 2018

+1
no significant change since before

@gpetruc gpetruc mentioned this pull request Jul 6, 2018
Closed
@slava77
Copy link
Contributor

slava77 commented Jul 8, 2018

backport of #23446

@slava77
Copy link
Contributor

slava77 commented Jul 8, 2018

+1

for #23445 4b7b96e

  • "backport" from the master version appears correct. This PR affects only nanoAOD workflows; the standard reco/miniAOD are not affected
  • jenkins tests pass and comparisons with the baseline point to somewhat expected differences
    • only the additional btagWeightTable and genWeightsTable_PS are clearly visible

See more notes in connection with
#23446 (comment)

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 8, 2018

This pull request is fully signed and it will be integrated in one of the next CMSSW_9_4_X IBs (tests are also fine) and once validation in the development release cycle CMSSW_10_2_X is complete. This pull request will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

cmsbuild added a commit that referenced this pull request Jul 9, 2018
@cmsbuild
Merge pull request #23446 from arizzi/nanoAODrebasedMasterWithoutData…
2fd4547 
…10XY

NanoAOD update 10XY version (master version of #23445)
@fabiocos
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit f26d758 into cms-sw:CMSSW_9_4_X Jul 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
analysis-approved backport-ok comparison-available fully-signed orp-approved reconstruction-approved tests-approved
Projects
None yet
Milestone
CMSSW_9_4_X
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@arizzi @cmsbuild @slava77 @fabiocos @gpetruc @rdewanje @ktht @adewit @leonardogiannini @nadya-chernyavskaya