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

Address residual code review for Timing PRs #15938

Merged
merged 3 commits into from Oct 3, 2016

Conversation

lgray
Copy link
Contributor

@lgray lgray commented Sep 21, 2016

Follow up code review for #15710.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @lgray (Lindsey Gray) for CMSSW_8_1_X.

It involves the following packages:

DataFormats/VertexReco
RecoVertex/Configuration
RecoVertex/PrimaryVertexProducer

@cmsbuild, @cvuosalo, @slava77, @davidlange6 can you please review it and eventually sign? Thanks.
@makortel, @GiacomoSguazzoni, @dgulhan, @rovere, @VinInn this is something you requested to watch as well.
@slava77, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

@lgray
Copy link
Contributor Author

lgray commented Sep 21, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 21, 2016

@makortel
Copy link
Contributor

What about the incorrect placement of

eras.phase2_timing.toModify( quickTrackAssociatorByHits, ...)
eras.phase2_timing.toModify( tpClusterProducer, ...)

in RecoVertex/Configuration/python/RecoVertex_cff.py? (and I'm tempted to argue that both should be phase2_tracker)

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

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

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • 10424.0_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2017NewFPix_GenSimFull+DigiFull_2017NewFPix+RecoFull_2017NewFPix+HARVESTFull_2017NewFPix

@lgray
Copy link
Contributor Author

lgray commented Sep 22, 2016

@makortel Actually, since that modification gets used in a few places in different eras that are notionally independent of each other, I think it might be a good idea to write a centralize function to make the changes and then have each era call that function.

i.e. what if someone wants to run timing era without phase 2 tracker? or hgcal without phase2 tracker?

@makortel
Copy link
Contributor

@lgray For timing era with phase0/phase1 tracker, why the default parameters of quickTrackAssociatorByHits and tpClusterProducer would not work?

(anyway my main "problem" is with the wrong placement of the era customizations, they should be moved to corresponding _cfi's; ok, tpClusterProducer needs a bit more since the _cfi is auto-generated)

@lgray
Copy link
Contributor Author

lgray commented Sep 22, 2016

Uff, you are right. Too early here. Easy enough to make the changes.

@lgray
Copy link
Contributor Author

lgray commented Sep 22, 2016

@makortel Where's the code that generates the tpClusterProducer _cfi ?

@lgray
Copy link
Contributor Author

lgray commented Sep 22, 2016

Oh, fun, where would you prefer I put the era customization in that case?

On Thu, Sep 22, 2016 at 8:05 AM, Matti Kortelainen <notifications@github.com

wrote:

https://github.com/cms-sw/cmssw/blob/CMSSW_8_1_X/SimTracker/
TrackerHitAssociation/plugins/ClusterTPAssociationProducer.cc#L73


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#15938 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/ABBMOaCdPpCwTbw5rpgxR4vVjZGTywDtks5qsn0RgaJpZM4KDS9J
.

@makortel
Copy link
Contributor

By the way, if you're indeed making the tpClusterProducer customization with phase2_tracker, could you also remove the corresponding customizations from
https://github.com/cms-sw/cmssw/blob/CMSSW_8_1_X/SLHCUpgradeSimulations/Configuration/python/phase2TkFlat.py#L78
https://github.com/cms-sw/cmssw/blob/CMSSW_8_1_X/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted.py#L77
since you're essentially doing the era migration of those parts? :)

FYI @ebrondol

@makortel
Copy link
Contributor

@lgray Two options:

  1. make tpClusterProducer_cff that imports the _cfi and makes the customizations, and migrate everything already importing the _cfi to import _cff
  2. modify the .cc to generate e.g. tpClusterProducerDefault_cfi, and then make tpClusterProducer_cfi.py that imports the ..Default_cfi and makes the customization; no migration of importers needed

(nowadays my personal preference is on 2 since it's simpler to do)

@makortel
Copy link
Contributor

There is also an open issue on the matter #13326 :)

@cmsbuild
Copy link
Contributor

Pull request #15938 was updated. @civanch, @cvuosalo, @mdhildreth, @cmsbuild, @slava77, @davidlange6 can you please check and sign again.

@lgray
Copy link
Contributor Author

lgray commented Sep 29, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 29, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/15428/console

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

@slava77
Copy link
Contributor

slava77 commented Sep 29, 2016

+1

for #15938 8bc21be

  • re-signoff after rebase, needed to adjust after Better era imports #16001
  • jenkins tests pass and comparisons show no differences, which include D3Timing wf 22424.0

@civanch
Copy link
Contributor

civanch commented Oct 3, 2016

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2016

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_1_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @smuzaffar

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 5ee2bb8 into cms-sw:CMSSW_8_1_X Oct 3, 2016
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

7 participants