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

CHS and PUPPI track-vertex-association for Run3 #36639

Merged
merged 7 commits into from Jan 25, 2022

Conversation

ahinzmann
Copy link
Contributor

@ahinzmann ahinzmann commented Jan 6, 2022

PR description:

Followup from #33885 and #35583.

  1. Update track-vertex-association optimized for Run3 using uniform criteria for CHS jets, CHS MET, PUPPI jets and PUPPI MET.
  2. Avoid running dedicated track-vertex-association module for JME to address issue slowdown in PFCandidatePrimaryVertexSorter in CMSSW_12_1_0_pre2 -> CMSSW_12_1_0_pre3 #35986. Instead use original modules for JME-specific track-vertex-association in PFPileUp.cc (CHS jets in AOD), PuppiProducer.cc (PUPPI jets in AOD) and CandPtrSelector (CHS MET in MiniAOD), taking parameter values from a single configuration file pfNoPileUpJME_cff.py.

PR validation:

scram b runtests
runTheMatrix -l limited

Validation on Run3 RelVal samples to be presented at JMAR on Jan 11th:
https://indico.cern.ch/event/1110013/

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

No. Only meant for Run3.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2022

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36639/27656

  • This PR adds an extra 68KB to repository

  • There are other open Pull requests which might conflict with changes you have proposed:

Code check has found code style and quality issues which could be resolved by applying following patch(s)

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2022

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36639/27657

ERROR: Build errors found during clang-tidy run.

CommonTools/ParticleFlow/plugins/PFPileUp.cc:180:58: error: expected unqualified-id [clang-diagnostic-error]
            (!(fNumOfPUVtxsForCharged_ > 0 && !vertices->->empty() && PVOrig.key() <= fNumOfPUVtxsForCharged_ &&
                                                         ^
Suppressed 1323 warnings (1319 in non-user code, 3 NOLINT, 1 with check filters).
--
gmake: *** [config/SCRAM/GMake/Makefile.coderules:129: code-checks] Error 2
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

@ahinzmann
Copy link
Contributor Author

ahinzmann commented Jan 6, 2022

For the record, code-checks didn't work in this case, it proposed "->->", not sure if this can be fixed in code-checks.

`diff --git a/CommonTools/ParticleFlow/plugins/PFPileUp.cc b/CommonTools/ParticleFlow/plugins/PFPileUp.cc
index a473439807d4..a47f1965f2b7 100644
--- a/CommonTools/ParticleFlow/plugins/PFPileUp.cc
+++ b/CommonTools/ParticleFlow/plugins/PFPileUp.cc
@@ -177,7 +177,7 @@ void PFPileUp::produce(Event& iEvent, const EventSetup& iSetup) {
const reco::VertexRef& PVOrig = associatedPV[p];
int quality = associationQuality[p];
if ((PVOrig.isNonnull() && PVOrig.key() > 0 && PVOrig->ndof() > 4.0 && quality >= vertexAssociationQuality_) &&

  •        (!(fNumOfPUVtxsForCharged_ > 0 && vertices->size() > 0 && PVOrig.key() <= fNumOfPUVtxsForCharged_ &&
    
  •        (!(fNumOfPUVtxsForCharged_ > 0 && !vertices->->empty() && PVOrig.key() <= fNumOfPUVtxsForCharged_ &&
              std::abs(p->vertex().z() - vertices->at(0).z()) < fDzCutForChargedFromPUVtxs_)))
         pfCandidatesFromPU.push_back(p);
     }
    

`

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2022

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36639/27658

  • This PR adds an extra 16KB to repository

  • There are other open Pull requests which might conflict with changes you have proposed:

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2022

A new Pull Request was created by @ahinzmann for master.

It involves the following packages:

  • CommonTools/ParticleFlow (reconstruction)
  • CommonTools/PileupAlgos (reconstruction)
  • CommonTools/RecoAlgos (reconstruction)
  • PhysicsTools/PatAlgos (reconstruction)
  • PhysicsTools/PatUtils (reconstruction)
  • RecoMET/Configuration (reconstruction)

@jpata, @cmsbuild, @clacaputo, @slava77 can you please review it and eventually sign? Thanks.
@rappoccio, @gouskos, @abbiendi, @emilbols, @mbluj, @demuller, @seemasharmafnal, @mmarionncern, @missirol, @jhgoh, @jdolen, @azotz, @schoef, @jdamgov, @nhanvtran, @gkasieczka, @hatakeyamak, @mariadalfonso, @AlexDeMoor, @JyothsnaKomaragiri, @gpetruc, @andrzejnovak this is something you requested to watch as well.
@perrotta, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@jpata
Copy link
Contributor

jpata commented Jan 6, 2022

enable profiling

@jpata
Copy link
Contributor

jpata commented Jan 6, 2022

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2022

-1

Failed Tests: RelVals RelVals-INPUT AddOn
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-11f204/21555/summary.html
COMMIT: 01f7cf7
CMSSW: CMSSW_12_3_X_2022-01-06-1100/slc7_amd64_gcc10
Additional Tests: PROFILING
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/36639/21555/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals

----- Begin Fatal Exception 06-Jan-2022 17:16:39 CET-----------------------
An exception of category 'ProductNotFound' occurred while
   [0] Processing  Event run: 1 lumi: 1 event: 1 stream: 0
   [1] Running path 'prevalidation_step'
   [2] Prefetching for module JetFlavourClustering/'myak4JetFlavourInfos'
   [3] Prefetching for module FastjetJetProducer/'ak4PFJetsCHS'
   [4] Prefetching for module TPPFCandidatesOnPFCandidates/'pfNoPileUpJME'
   [5] Calling method for module PFPileUp/'pfPileUpJME'
Exception Message:
Principal::getByToken: Found zero products matching all criteria
Looking for type: edm::Association<std::vector<reco::Vertex> >
Looking for module label: primaryVertexAssociation
Looking for productInstanceName: original

   Additional Info:
      [a] If you wish to continue processing events after a ProductNotFound exception,
add "SkipEvent = cms.untracked.vstring('ProductNotFound')" to the "options" PSet in the configuration.

----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 06-Jan-2022 17:16:41 CET-----------------------
An exception of category 'ProductNotFound' occurred while
   [0] Processing  Event run: 1 lumi: 1 event: 1 stream: 0
   [1] Running path 'prevalidation_step'
   [2] Prefetching for module JetFlavourClustering/'myak4JetFlavourInfos'
   [3] Prefetching for module FastjetJetProducer/'ak4PFJetsCHS'
   [4] Prefetching for module TPPFCandidatesOnPFCandidates/'pfNoPileUpJME'
   [5] Calling method for module PFPileUp/'pfPileUpJME'
Exception Message:
Principal::getByToken: Found zero products matching all criteria
Looking for type: edm::Association<std::vector<reco::Vertex> >
Looking for module label: primaryVertexAssociation
Looking for productInstanceName: original

   Additional Info:
      [a] If you wish to continue processing events after a ProductNotFound exception,
add "SkipEvent = cms.untracked.vstring('ProductNotFound')" to the "options" PSet in the configuration.

----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 06-Jan-2022 17:22:22 CET-----------------------
An exception of category 'ProductNotFound' occurred while
   [0] Processing  Event run: 1 lumi: 1 event: 1 stream: 0
   [1] Running path 'prevalidation_step'
   [2] Prefetching for module JetFlavourClustering/'myak4JetFlavourInfos'
   [3] Prefetching for module FastjetJetProducer/'ak4PFJetsCHS'
   [4] Prefetching for module TPPFCandidatesOnPFCandidates/'pfNoPileUpJME'
   [5] Calling method for module PFPileUp/'pfPileUpJME'
Exception Message:
Principal::getByToken: Found zero products matching all criteria
Looking for type: edm::Association<std::vector<reco::Vertex> >
Looking for module label: primaryVertexAssociation
Looking for productInstanceName: original

   Additional Info:
      [a] If you wish to continue processing events after a ProductNotFound exception,
add "SkipEvent = cms.untracked.vstring('ProductNotFound')" to the "options" PSet in the configuration.

----- End Fatal Exception -------------------------------------------------
Expand to see more relval errors ...

RelVals-INPUT

  • 138.4138.4_PromptCollisions+RunMinimumBias2021+ALCARECOPROMPTR3+HARVESTDPROMPTR3/step2_PromptCollisions+RunMinimumBias2021+ALCARECOPROMPTR3+HARVESTDPROMPTR3.log
  • 138.5138.5_ExpressCollisions+RunMinimumBias2021+TIER0EXPRUN3+ALCARECOEXPR3+HARVESTDEXPR3/step2_ExpressCollisions+RunMinimumBias2021+TIER0EXPRUN3+ALCARECOEXPR3+HARVESTDEXPR3.log
  • 140.54140.54_RunPA2013+RunPA2013+RECO_PPbData+HARVEST_PPbData/step2_RunPA2013+RunPA2013+RECO_PPbData+HARVEST_PPbData.log
Expand to see more relval errors ...

AddOn Tests

----- Begin Fatal Exception 06-Jan-2022 17:16:59 CET-----------------------
An exception of category 'ProductNotFound' occurred while
   [0] Processing  Event run: 1 lumi: 1 event: 3 stream: 3
   [1] Running path 'prevalidation_step'
   [2] Prefetching for module JetFlavourClustering/'myak4JetFlavourInfos'
   [3] Prefetching for module FastjetJetProducer/'ak4PFJetsCHS'
   [4] Prefetching for module TPPFCandidatesOnPFCandidates/'pfNoPileUpJME'
   [5] Calling method for module PFPileUp/'pfPileUpJME'
Exception Message:
Principal::getByToken: Found zero products matching all criteria
Looking for type: edm::Association<std::vector<reco::Vertex> >
Looking for module label: primaryVertexAssociation
Looking for productInstanceName: original

   Additional Info:
      [a] If you wish to continue processing events after a ProductNotFound exception,
add "SkipEvent = cms.untracked.vstring('ProductNotFound')" to the "options" PSet in the configuration.

----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 06-Jan-2022 17:16:59 CET-----------------------
An exception of category 'ProductNotFound' occurred while
   [0] Processing  Event run: 1 lumi: 1 event: 2 stream: 3
   [1] Running path 'prevalidation_step'
   [2] Prefetching for module JetFlavourClustering/'myak4JetFlavourInfos'
   [3] Prefetching for module FastjetJetProducer/'ak4PFJetsCHS'
   [4] Prefetching for module TPPFCandidatesOnPFCandidates/'pfNoPileUpJME'
   [5] Calling method for module PFPileUp/'pfPileUpJME'
Exception Message:
Principal::getByToken: Found zero products matching all criteria
Looking for type: edm::Association<std::vector<reco::Vertex> >
Looking for module label: primaryVertexAssociation
Looking for productInstanceName: original

   Additional Info:
      [a] If you wish to continue processing events after a ProductNotFound exception,
add "SkipEvent = cms.untracked.vstring('ProductNotFound')" to the "options" PSet in the configuration.

----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 06-Jan-2022 17:17:02 CET-----------------------
An exception of category 'ProductNotFound' occurred while
   [0] Processing  Event run: 1 lumi: 1 event: 1 stream: 1
   [1] Running path 'prevalidation_step'
   [2] Prefetching for module JetFlavourClustering/'myak4JetFlavourInfos'
   [3] Prefetching for module FastjetJetProducer/'ak4PFJetsCHS'
   [4] Prefetching for module TPPFCandidatesOnPFCandidates/'pfNoPileUpJME'
   [5] Calling method for module PFPileUp/'pfPileUpJME'
Exception Message:
Principal::getByToken: Found zero products matching all criteria
Looking for type: edm::Association<std::vector<reco::Vertex> >
Looking for module label: primaryVertexAssociation
Looking for productInstanceName: original

   Additional Info:
      [a] If you wish to continue processing events after a ProductNotFound exception,
add "SkipEvent = cms.untracked.vstring('ProductNotFound')" to the "options" PSet in the configuration.

----- End Fatal Exception -------------------------------------------------
Expand to see more addon errors ...

@cmsbuild
Copy link
Contributor

Pull request #36639 was updated. @jpata, @cmsbuild, @clacaputo, @slava77 can you please check and sign again.

@jpata
Copy link
Contributor

jpata commented Jan 17, 2022

@cmsbuild enable none

@jpata
Copy link
Contributor

jpata commented Jan 17, 2022

@cmsbuild please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-11f204/21754/summary.html
COMMIT: 692bae3
CMSSW: CMSSW_12_3_X_2022-01-16-2300/slc7_amd64_gcc10
Additional Tests: PROFILING
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/36639/21754/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 7355 differences found in the comparisons
  • DQMHistoTests: Total files compared: 43
  • DQMHistoTests: Total histograms compared: 3464734
  • DQMHistoTests: Total failures: 5800
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 3458911
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.004 KiB( 42 files compared)
  • DQMHistoSizes: changed ( 312.0 ): 0.004 KiB MessageLogger/Warnings
  • Checked 181 log files, 42 edm output root files, 43 DQM output files
  • TriggerResults: found differences in 1 / 42 workflows

@jpata
Copy link
Contributor

jpata commented Jan 18, 2022

+reconstruction

@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 now be reviewed by the release team before it's merged. @perrotta, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

@qliphy
Copy link
Contributor

qliphy commented Jan 24, 2022

please test
to refresh the results

@cmsbuild
Copy link
Contributor

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-11f204/21950/summary.html
COMMIT: 692bae3
CMSSW: CMSSW_12_3_X_2022-01-23-2300/slc7_amd64_gcc10
Additional Tests: PROFILING
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/36639/21950/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

  • 4.764.76_ZMuSkim2012D+ZMuSkim2012D+HLTDSKIM2+RECODR1reHLT2+HARVESTDR1reHLT/step2_ZMuSkim2012D+ZMuSkim2012D+HLTDSKIM2+RECODR1reHLT2+HARVESTDR1reHLT.log

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 7668 differences found in the comparisons
  • DQMHistoTests: Total files compared: 43
  • DQMHistoTests: Total histograms compared: 3449324
  • DQMHistoTests: Total failures: 5056
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3444246
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 42 files compared)
  • Checked 181 log files, 42 edm output root files, 43 DQM output files
  • TriggerResults: found differences in 1 / 42 workflows

@qliphy
Copy link
Contributor

qliphy commented Jan 25, 2022

merge
addressing #35583 (comment)

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

8 participants