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

Migrate module config in RecoHI to use default cfipython #34480

Merged
merged 2 commits into from
Jul 17, 2021

Conversation

jeongeun
Copy link
Contributor

PR description:

Optimization of the python configurations: Improve maintainability by cleaning up the duplicated and cloning from the default/reference configurations. (The previous PRs : PR#33207, PR#33307, PR#33352, PR#33543, PR#33563, PR#33671, PR#34007, PR#34091, PR#34009, PR#34155, PR#34371)
Updates:

  • Replace explicit configuration with a reference from cfipython. (migrating EDProducer("type", .. -> typeDefaylt.clone() )
  • Remove the type specifications already presented in cfipython/fillDescriptions reference for improved syntax safety.
  • Remove the duplicated parameters that are exactly the same value in cfipython reference.

In this PR, 11 files were changed.
1) clone pixelTracks module from cfipython/​RecoPixelVertexing/​PixelTrackFitting/​pixelTracks_cfi.py

    modified:   RecoHI/HiJetAlgos/python/IterativeConePu5Jets_PbPb_cff.py
    modified:   RecoHI/HiTracking/python/HILowPtConformalPixelTracks_cfi.py
    modified:   RecoHI/HiTracking/python/HIPixel3PrimTracks_cfi.py
    modified:   RecoHI/HiTracking/python/HIPixel3ProtoTracks_cfi.py
    modified:   RecoHI/HiTracking/python/HIPixelAdaptiveVertex_cfi.py
    modified:   RecoHI/HiTracking/python/hiDetachedQuadStep_cff.py
    modified:   RecoHI/HiTracking/python/hiDetachedTripletStep_cff.py
    modified:   RecoHI/HiTracking/python/hiHighPtTripletStep_cff.py

2) clone seedingLayersEDProducer module from cfipython/​RecoTracker/​TkSeedingLayers/​seedingLayersEDProducer_cfi.py

    modified:   RecoHI/HiTracking/python/hiJetCoreRegionalStep_cff.py

3) clone primaryVertexProducer module from cfipython/​RecoVertex/​PrimaryVertexProducer/​primaryVertexProducer_cfi.py

    modified:   RecoHI/HiTracking/python/hiLowPtQuadStep_cff.py

4) clone FastjetJetProducer module from cfipython/​RecoJets/​JetProducers/​FastjetJetProducer_cfi.py

    modified:   RecoHI/HiTracking/python/hiLowPtTripletStep_cff.py

PR validation:

Event Content comparison check was also done and there is no change with these updates.
Tested in CMSSW_12_0_X, the basic test all passed in the CMSSW PR instructions.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34480/23938

  • This PR adds an extra 24KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @jeongeun (JeongEun Lee) for master.

It involves the following packages:

  • RecoHI/HiJetAlgos (reconstruction)
  • RecoHI/HiTracking (reconstruction)

@perrotta, @jpata, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@yslai, @jazzitup, @yenjie, @kurtejung, @mandrenguyen, @dgulhan, @yetkinyilmaz this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy, @perrotta you are the release manager for this.

cms-bot commands are listed here

useBeamConstraint = cms.bool(False),
maxDistanceToBeam = cms.double(0.1),
minNdof = cms.double(0.0)
vertexCollections = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The vertexCollections VPSet has two PSets in it, the second one being labeled "withBS"
I suspect that as such you clone the VPSet with both PSet's, modify the first one and let the second one unchanged, while in the previous config only one PSet was in: could you please verify with a dump?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@perrotta Thanks for your comment. Yes, you are right.
I have to modify this file to use VPSet and PSet as it was.
The comparison results are :

edmParameterSetDump updated step2.py (wf 140.53)

 vertexCollections: VPSet tracked = ({
    {
      algorithm: string tracked  = 'AdaptiveVertexFitter'
      chi2cutoff: double tracked  = 3
      label: string tracked  = ''
      maxDistanceToBeam: double tracked  = 0.1
      minNdof: double tracked  = 0
      useBeamConstraint: bool tracked  = false
    },
    {
      algorithm: string tracked  = 'AdaptiveVertexFitter'
      chi2cutoff: double tracked  = 2.5
      label: string tracked  = 'WithBS'
      maxDistanceToBeam: double tracked  = 1
      minNdof: double tracked  = 2
      useBeamConstraint: bool tracked  = true
    }
    })
  })
edmParameterSetDump original step2.py (wf 140.53)

  vertexCollections: VPSet tracked = ({
    {
      algorithm: string tracked  = 'AdaptiveVertexFitter'
      chi2cutoff: double tracked  = 3
      label: string tracked  = ''
      maxDistanceToBeam: double tracked  = 0.1
      minNdof: double tracked  = 0
      useBeamConstraint: bool tracked  = false
    }
    })
  })

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34480/23969

  • This PR adds an extra 12KB to repository

@cmsbuild
Copy link
Contributor

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

@perrotta
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-5d513a/16835/summary.html
COMMIT: 7dc61f5
CMSSW: CMSSW_12_0_X_2021-07-14-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34480/16835/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: 2 differences found in the comparisons
  • DQMHistoTests: Total files compared: 38
  • DQMHistoTests: Total histograms compared: 2786302
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2786279
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 37 files compared)
  • Checked 160 log files, 37 edm output root files, 38 DQM output files
  • TriggerResults: no differences found

@perrotta
Copy link
Contributor

+reconstruction

  • Technical, following what declared in the PR description
  • Jenkins tests pass, with no differences wrt baseline

@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. @silviodonato, @dpiparo, @qliphy, @perrotta (and backports should be raised in the release meeting by the corresponding L2)

@qliphy
Copy link
Contributor

qliphy commented Jul 17, 2021

+1

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

4 participants