Skip to content

Conversation

@aloeliger
Copy link
Contributor

PR description:

This PR duplicates and supersedes #40670, as @cecilecaillol has asked me to take it over.

Previous PR description:

This is an update of the correlator code

Includes:

p2l1pfp#92 by @thesps and @slaurila
p2l1pfp#94 by @thomreis and @cerminar (only adds a new feature to the emulator, doesn't change any of the existing emulated values)
p2l1pfp#96 by @thesps
p2l1pfp#97 by @drankincms
p2l1pfp#98 by @drankincms (not used by default)
p2l1pfp#100 by @thesps
p2l1pfp#101 by @gpetruc (not used in production)
p2l1pfp#105 by @gpetruc (not used in production)
p2l1pfp#107 by @gpetruc (transparent)

Local: cms-l1t-offline#1063

I will be updating this PR as requested in the original thread, as soon as I am able.

Dr15Jones and others added 30 commits March 7, 2023 11:35
This appears to avoid an ASAN error when used with LTO.
[CORE] Various fixes/improvements for unit test
…romDeposits

Use anonymous namespace in CandIsolatorFromDeposits
…LTPlugins-HLTDoubletSinglet

Add plugin to use existing HLTDoubleSinglet module with two PFJets and one RecoEcalCandidate
…ogorithm (PixelDigitizerAlgorithm) for 3D-pixel modules if needed. Hence intriduced usePseudoPixel3DAlgo parameter in the configuration
…-fix-unit-test3

[RECONSTRUCTION-UPGRADE] Various fixes/improvements for unit test
[CORE] Various fixes/improvements for unit test
Migrate consumesMany to GetterOfProducts in DQMServices
[DQM] Various fixes/improvements for unit test
…test

[DQM-GEOMETRY] Various fixes/improvements for unit test
…nit-test3

[GEOMETRY-UPGRADE] Various fixes/improvements for unit test
mkFit: technical fixes for standalone build only
@srimanob
Copy link
Contributor

srimanob commented Apr 4, 2023

By the way, @aloeliger, do you also open a PR for data external? Could you please mention it also in this PR? Thx.

@aloeliger
Copy link
Contributor Author

@srimanob I have not opened any PR for data externals. I've never actually opened a data PR. Where should that be opened?

Co-authored-by: Giovanni Petrucciani <giovanni.petrucciani@cern.ch>
Co-authored-by: Emyr Clement <emyr.john.clement@cern.ch>
@aloeliger
Copy link
Contributor Author

@aloeliger if one of the (rightful) concern of squashing is giving the right credits to authors, a partial solution could be to:

  • drop 0f12464 in the rebase process (the commit is only adding the .*pb file);
  • squash everything after a564daf (the commit for the ROOT file) in a single commit;
  • have this last commit co-authored by those involved in the original ones (see the guide here)

In this way you would still keep most of the history and would give credits to all the squashed authors.

@thesps @slaurila @thomreis @cerminar @drankincms & @gpetruc I believe i have prepared a version of the branch doing this (Giovanni and Emyr you should be listed as co-authors on squashed commits). Unless I hear from you by tomorrow morning Geneva time, I will for push that version of the branch and work on other comments for this PR.

@thesps
Copy link
Contributor

thesps commented Apr 4, 2023

@aloeliger I'm fine with the squash, thanks for preparing it

@aloeliger
Copy link
Contributor Author

@thesps @slaurila @thomreis @cerminar @drankincms & @gpetruc Would it be possible for you to provide the root and model file removed from these PRs? Do these need to be in the data externals? Please let me know so I can open a corresponding PR to provide this data.

@thesps
Copy link
Contributor

thesps commented Apr 4, 2023

You can fetch them from https://github.com/p2l1pfp/cmssw/tree/L1PF_12_5_X/L1Trigger/Phase2L1ParticleFlow/data
(Safer than if I just send you some files)

@srimanob
Copy link
Contributor

srimanob commented Apr 4, 2023

@srimanob I have not opened any PR for data externals. I've never actually opened a data PR. Where should that be opened?

I think the place to go is to https://github.com/cms-data. I don't see your root file anymore, so I can't say if you already have repository there already.

@aloeliger
Copy link
Contributor Author

@smuzaffar would it take anything special to get L1Trigger/Phase2L1ParticleFlow/data/modelTT_PUP_Off_dXY_XYCut_Graph.pb & L1Trigger/Phase2L1ParticleFlow/data/jecs/jecs_20220308.root integrated into https://github.com/cms-data? These would be the first of the data-files for L1Trigger-Phase2L1ParticleFlow. Is there anything special about creation of the repository or it's name?

@smuzaffar
Copy link
Contributor

@aloeliger , nothing special, I just need to create the new data repo. if L1Trigger/Phase2L1ParticleFlow is the right package from these data files then I can create data-L1Trigger-Phase2L1ParticleFlow

@gpetruc
Copy link
Contributor

gpetruc commented Apr 5, 2023

Isn't it already there? https://github.com/cms-data/L1Trigger-Phase2L1ParticleFlow

@smuzaffar
Copy link
Contributor

Isn't it already there? https://github.com/cms-data/L1Trigger-Phase2L1ParticleFlow

oops, you are right :-) @aloeliger repo is already there, you just need to open a PR with new data files there
thanks @gpetruc

@aloeliger
Copy link
Contributor Author

Dang. That messed up the history. Okay. Let me retry this.

@aloeliger aloeliger closed this Apr 5, 2023
@aloeliger
Copy link
Contributor Author

aloeliger commented Apr 5, 2023

My apologies to the combined authors, but I'm done trying to mess around with the git history on this when the PR has other necessary edits. I am simply going to squash the whole thing.

@gpetruc
Copy link
Contributor

gpetruc commented Apr 5, 2023 via email

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.