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.

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

NanoAOD developments: 190508 version, part 1 for UL #26703

Merged
merged 68 commits into from May 12, 2019

Conversation

peruzzim
Copy link
Contributor

@peruzzim peruzzim commented May 8, 2019

PR description:

This PR contains the developments accumulated so far for NanoAOD in 10_6_X, for UL and full Run2 analyses. No change is expected outside of NANOAOD content.

Main updates:

  • Add low-pt jets to recalculate T1 MET correction (exc. uncertainties)
  • Updated QGL, jet ID bits
  • MET covariance and significance re-added
  • New DeepBoostedJet training (V2), more discriminators stored
  • Added DeepJet c-tagger
  • Added gain of seed crystal for energy calibration studies and systematics
  • New lepton MVA training for electrons and muons (using DeepJet)
  • Pre-calculated L1 pre-firing weights
  • Higgs simplified template cross sections re-added
  • Bugfixes: correct trigger objects for 2016, added L1 trigger bit decisions, correct tau generator-level information

Depends on cms-sw/cmsdist#4937 for updated lepton MVA weights.

Further optimization (in particular, using some added content to 10_6_X MINIAOD instead of recalculating the same information) will come as a future PR, together with what depends on still-open items for the UL, and minor additions if available in time.

Please test all available NANOAOD workflows with #26672.

Includes a new feature (deactivated by default) in the JetCleanerForType1METT class, to produce a ValueMap with the muon-subtracted raw jet pt as it is used inside the T1 MET correction algorithm. This feature is used in NANOAOD production.

PR validation:

The base branch was tested in several releases as a part of the integration in the cms-nanoAOD repository, and in a subset of them for the branch merged with a recent IB.

makortel and others added 30 commits January 4, 2019 16:45
Update master-cmsswmaster to CMSSW_10_4_0
…ions

Fix module label in IsFromLostTrackMapProducer::fillDescriptions()
[RFC] Call nanoAOD_runMETfixEE2017() only if the modifiers are chosen
Don't leave nCuts in VIDNestedWPBitmapProducer uninitialized
Fix for trigger objects for muons in 2016 NanoAOD [104X]
Update master branch to 10_6_0_pre3
To make it more clear that the plugins are actually specializations of SimpleFlatTableProducer templates.
3 more deepTag scores so that the raw values for W, Z, H, T, QCDbc, and QCDudsg can be calculated
`GenParticle::isPrompt` does not exist.
@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • ROOTFileChecks: Some differences in event products or their sizes found
  • Reco comparison results: 294 differences found in the comparisons
  • DQMHistoTests: Total files compared: 33
  • DQMHistoTests: Total histograms compared: 3211957
  • DQMHistoTests: Total failures: 5
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3211748
  • DQMHistoTests: Total skipped: 204
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.639 KiB( 32 files compared)
  • DQMHistoSizes: changed ( 1325.7 ): -0.639 KiB Physics/NanoAODDQM
  • Checked 137 log files, 14 edm output root files, 33 DQM output files

@peruzzim
Copy link
Contributor Author

+xpog

runs for all NANOAOD validation workflows

@perrotta
Copy link
Contributor

Which is the purpose within this PR of the modifications in JetMETCorrections/Type1MET/interface/JetCleanerForType1METT.h, i.e. the calculation of muon-subtracted raw pt? They are disbled by default, and they would also need a further addition to the event content to become effective, but I wonder how do they relate with the other nanoAOD related updates,
Please add a line in the PR description to explain it.

@peruzzim
Copy link
Contributor Author

peruzzim commented May 11, 2019

The feature is used in nanoAOD production to store that definition of raw pt for jets, so they can be used for T1 MET correction. I update the description.

calcMuonSubtrRawPtAsValueMap = cms.bool(True),

@perrotta
Copy link
Contributor

+1

  • Changes in reco are limited to JetMETCorrections/Type1MET/interface/JetCleanerForType1METT.h:
  • Jenkins tests pass and show no differences nor new products in reco or miniAOD outputs, as expected

@perrotta
Copy link
Contributor

@smuzaffar FYI

There is a long list od header checks error. They are real but do not refer to this PR:

  • Usage of obsolete CommonTools/Utils/interface/deltaPhi.h in CommonTools/Utils/interface/MasslessInvariantMass.h
  • Usage of obsolete CommonTools/Utils/interface/deltaR.h in CommonTools/Utils/interface/MaxObjectPairSelector.h
  • Issues with DataFormats/Math/interface/AVXVec.h
  • Non existent PhysicsTools/Utilities/interface/Math.h included in PhysicsTools/IsolationUtils/interface/CalIsolationAlgoNoExp.h and PhysicsTools/IsolationUtils/interface/TauConeIsolationAlgo.h
  • Issue with DataFormats/Candidate/interface/Candidate.h and DataFormats/Candidate/interface/VertexCompositePtrCandidate.h
  • CommonTools/UtilAlgos/interface/TFileDirectory.h is obsolete and to be removed
  • CommonTools/UtilAlgos/interface/ChargeSelector.h is obsolete and to be removed
  • Issue with SimG4Core/PhysicsLists/interface/G4Version.h
  • Issues with OnlineDB/EcalCondDB/interface/FEConfigFgrEEStripDat.h and OnlineDB/EcalCondDB/interface/ITimeIOV.h
  • PhysicsTools/Utilities/interface/Likelihood.h: PhysicsTools/Utilities/interface/Selector.h has moved to PhysicsTools/SelectorUtil
  • Same in PhysicsTools/Utilities/interface/Product.h
  • Issues with SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h
  • Non-existent (since a while) ConvGaussZLineShape.h included in ElectroWeakAnalysis/ZMuMu/interface/ZMuTrackFunction.h
  • Wrong includes in Validation/EventGenerator/interface/TauDecay_GenParticle.h
  • ​CondFormats/​GeometryObjects/​interface/​GeometryFile.h should be removed, as well as all references to it in cmssw
  • FastSimulation/Utilities/interface/RandomEngine.h to be removed as obsolete
  • Non existent MCCandMatcher linked from PhysicsTools/HepMCCandAlgos/interface/MCTruthCompositeMatcher.h
  • Non existent CondCore/DBCommon/interface/Time.h linked from CondCore/PopCon/interface/VerifyState.h
  • Remove obsloete CondFormats/Calibration/interface/EfficiencyPayloads.h and all references to it
  • Issues in CondFormats/SiPixelObjects/interface/SerializationManual.h
  • Non existent PhysicsTools/Utilities/interface/Math.h included in PhysicsTools/IsolationUtils/interface/CalIsolationAlgoNoExp.h
  • Remove usages of deprecated GenericJetfwd.h, BasicJetfwd.h, GenJetfwd.h
  • Remove usages of deprecated DF/BTau/JTA
  • Issues with DQMOffline/PFTau/interface/MatchCandidateBenchmark.h
  • Usage of non supported classes in JetMETCorrections/Modules/interface/JetCorrectionProducer.h
  • Non existent CommonTools/Utilities/interface/cutParser.h included in CommonTools/CandAlgos/interface/NamedCandCombiner.h
  • Issues with CommonTools/ParticleFlow/interface/TopProjectors.h
  • Issues with hysicsTools/UtilAlgos/interface/NullPostProcessor.h
  • Non existent EGamma/EGammaAnalysisTools/src/PFIsolationEstimator.cc included in PhysicsTools/UtilAlgos/interface/AdHocNTupler.h
  • Issues with SelectorUtils/interface/Expressions.h
  • Non existent ElectronVPlusJetsIDSelectionFunctor.h included In PhysicsTools/PatUtils/interface/ElectronVPlusJetsIDSelectionFunctor.h
  • Issues with RecoVertex/LinearizationPointFinders/interface/GenericLinearizationPointFinder.h
  • Non existent WPlusJetsEventSelector.h used in PhysicsTools/PatExamples/interface/WPlusJetsEventSelector.h
  • Issues with RecoVertex/GhostTrackFitter/interface/AnnealingGhostTrackFitter.h
  • Issues with Alignment/MillePedeAlignmentAlgorithm/interface/MillePedeMonitor.h
  • CondFormats/Serialization/interface/Equal.h:1:9: warning: #pragma once in main file

@fabiocos fabiocos mentioned this pull request May 12, 2019
36 tasks
@fabiocos
Copy link
Contributor

+1

@fabiocos
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit 5d7c99f into cms-sw:master May 12, 2019
@santocch
Copy link

+1

@cmsbuild
Copy link
Contributor

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.

@VinInn
Copy link
Contributor

VinInn commented May 14, 2019

if

Non existent CommonTools/Utilities/interface/cutParser.h included in CommonTools/CandAlgos/interface/NamedCandCombiner.h

and similar

does this mean that

CommonTools/CandAlgos/interface/NamedCandCombiner.h

is actually never references an shall be removed?

@perrotta
Copy link
Contributor

if

Non existent CommonTools/Utilities/interface/cutParser.h included in CommonTools/CandAlgos/interface/NamedCandCombiner.h

and similar

does this mean that

CommonTools/CandAlgos/interface/NamedCandCombiner.h

is actually never references an shall be removed?

See #26663

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet