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

Revisit usage of HitPattern in DataFormats/Scouting #37149

Merged
merged 6 commits into from Mar 8, 2022

Conversation

mmasciov
Copy link
Contributor

@mmasciov mmasciov commented Mar 5, 2022

PR description:

This PR is meant to address issue #32219 and supersedes PR #35685.
It is introducing a new Run3ScoutingHitPatternPOD class in DataFormats/Scouting, to be used for Run-3 scouting (in Run3ScoutingMuon). The class is a POD-like version of reco::HitPattern.
A function is defined in reco::HitPattern to fill Run3ScoutingHitPatternPOD, together with a reco::HitPattern constructor from Run3ScoutingHitPatternPOD.

FYI @dsperka, @makortel

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2022

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37149/28695

  • This PR adds an extra 36KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2022

A new Pull Request was created by @mmasciov (Mario Masciovecchio) for master.

It involves the following packages:

  • DataFormats/Scouting (core)
  • DataFormats/TrackReco (reconstruction)
  • HLTrigger/Muon (hlt)

@smuzaffar, @Dr15Jones, @makortel, @clacaputo, @cmsbuild, @missirol, @Martin-Grunewald, @slava77, @jpata can you please review it and eventually sign? Thanks.
@sscruz, @Fedespring, @missirol, @silviodonato, @trocino, @abbiendi, @JanFSchulte, @jhgoh, @VinInn, @Martin-Grunewald, @calderona, @HuguesBrun, @rovere, @CeliaFernandez, @gpetruc, @mmusich, @mtosi, @cericeci 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

DataFormats/Scouting/interface/Run3ScoutingHitPatternPOD.h Outdated Show resolved Hide resolved
DataFormats/Scouting/src/classes_def.xml Outdated Show resolved Hide resolved
DataFormats/TrackReco/src/HitPattern.cc Outdated Show resolved Hide resolved
DataFormats/TrackReco/src/HitPattern.cc Outdated Show resolved Hide resolved
@missirol
Copy link
Contributor

missirol commented Mar 5, 2022

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2022

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37149/28697

  • This PR adds an extra 36KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 5, 2022

Pull request #37149 was updated. @smuzaffar, @Dr15Jones, @makortel, @clacaputo, @cmsbuild, @missirol, @Martin-Grunewald, @slava77, @jpata can you please check and sign again.

@missirol
Copy link
Contributor

missirol commented Mar 5, 2022

please test

@missirol
Copy link
Contributor

missirol commented Mar 8, 2022

+hlt

@clacaputo
Copy link
Contributor

+reconstruction

  • technical
  • no reco changes expected or observed

trk_hitPattern_(trk_hitPattern),
vtxIndx_(std::move(vtxIndx)) {}
vtxIndx_(std::move(vtxIndx)),
trk_hitPattern_(trk_hitPattern) {}
Copy link
Contributor

Choose a reason for hiding this comment

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

Given the std::vector member this would avoid one copy of it with std::move

Suggested change
trk_hitPattern_(trk_hitPattern) {}
trk_hitPattern_(std::move(trk_hitPattern)) {}

(sorry for noticing only now, I'm fine with a follow-up PR for that given the time pressure)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can update this PR right away, if it works too

Copy link
Contributor

Choose a reason for hiding this comment

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

@qliphy @perrotta Do you have preferences (or shall we wait for ORP)?

Copy link
Contributor

Choose a reason for hiding this comment

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

Let have this PR merged now.
Please @mmasciov prepare a follow-up one-line PR with the proposed fix as soon as you can (even right after this one is merged on top of the master HEAD).

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, @makortel: done in PR #37176

@makortel
Copy link
Contributor

makortel commented Mar 8, 2022

+core

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 8, 2022

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)

@mmasciov
Copy link
Contributor Author

mmasciov commented Mar 8, 2022

@silviodonato, @dsperka, @missirol: as this is now fully signed, should I also submit a backport PR to 122X?

@missirol
Copy link
Contributor

missirol commented Mar 8, 2022

should I also submit a backport PR to 122X?

I'd say no; I don't think we want to change the DataFormats in 12_2_X, unless I'm missing something.

@perrotta
Copy link
Contributor

perrotta commented Mar 8, 2022

+1

@perrotta
Copy link
Contributor

perrotta commented Mar 9, 2022

@mmasciov after the merging of this PR in CMSSW_12_3_X_2022-03-08-2300 there are quite a lot of building errors in FWLite, see https://cmssdt.cern.ch/SDT/cgi-bin/showBuildLogs.py/fwlite/slc7_amd64_gcc10/www/tue/12.3-tue-23/CMSSW_12_3_X_2022-03-08-2300

/data/cmsbld/jenkins/workspace/build-fwlite-ib/cms/tmp/BUILDROOT/7d473ee20b53f0097cac9fcc6d90a6a3/opt/cmssw/slc7_amd64_gcc10/cms/fwlite/CMSSW_12_3_X_2022-03-08-2300_FWLITE/src/DataFormats/TrackReco/interface/HitPattern.h:127:10: fatal error: DataFormats/Scouting/interface/Run3ScoutingHitPatternPOD.h: No such file or directory
  127 | #include "DataFormats/Scouting/interface/Run3ScoutingHitPatternPOD.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

Could you please have a look and provide a fix at your earliest?

@Martin-Grunewald
Copy link
Contributor

Usually it isn't needed, but perhaps FWLite requires the DataFormats/Scouting BuildFile to include <use name="DataFormats/Scouting"/> ?

@missirol
Copy link
Contributor

missirol commented Mar 9, 2022

I wonder if DataFormats/Scouting should be added to
https://github.com/cms-sw/cmsdist/blob/IB/CMSSW_12_3_X/master/fwlite_build_set.file

Kindly asking feedback to @smuzaffar .

@smuzaffar
Copy link
Contributor

yes DataFormats/Scouting should be added to https://github.com/cms-sw/cmsdist/blob/IB/CMSSW_12_3_X/master/fwlite_build_set.file . This package only depend on DataFormats/Common ( which is already part of fwlite release) so there is no harm added DataFormats/Scouting to fwlite. I will update it for 11h00 Ib

@smuzaffar
Copy link
Contributor

done cms-sw/cmsdist@94774dd

@mmasciov
Copy link
Contributor Author

mmasciov commented Mar 9, 2022

Thanks! Just for completeness, this appears to be fixed in the 11h00 IB: https://cmssdt.cern.ch/SDT/cgi-bin/showBuildLogs.py/fwlite/slc7_amd64_gcc10/www/wed/12.3-wed-11/CMSSW_12_3_X_2022-03-09-1100

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

9 participants