Remove stray includes from PFBlockAlgo.h and minor cleanups #26543
Conversation
|
The code-checks are being triggered in jenkins. |
|
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-26543/9438
|
|
A new Pull Request was created by @guitargeek (Jonas Rembser) for master. It involves the following packages: RecoParticleFlow/PFProducer @perrotta, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks. cms-bot commands are listed here |
|
@cmsbuild please test |
|
The tests are being triggered in jenkins. |
|
+1 The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic: |
|
Comparison job queued. |
|
Comparison is ready Comparison Summary:
|
| @@ -76,10 +69,6 @@ class PFBlockAlgo { | |||
| void packLinks(reco::PFBlock& block, | |||
| const std::unordered_map<std::pair<unsigned int,unsigned int>,double>& links) const; | |||
|
|
|||
| /// Avoid to check links when not useful | |||
| inline bool linkPrefilter(const reco::PFBlockElement* last, | |||
There was a problem hiding this comment.
This method is removed because it is never used. In fact, it is the BlockElementLinkerBase::linkPrefilter(...) that is called instead.
However, if I am not missing anything in the logic and the
std::vector<std::unique_ptr<BlockElementLinkerBase>> linkTests_;does not specialize into any of the clasess derived from BlockElementLinkerBase, that BlockElementLinkerBase::linkPrefilter(...) always identically returns true, see https://cmssdt.cern.ch/lxr/source/RecoParticleFlow/PFProducer/interface/BlockElementLinkerBase.h#0018
Could you please verify? If so, some further cleaning is possible (or some fix, if the original intention was different).
There was a problem hiding this comment.
Hi Andrea, it's not so simple I think on first glance. Some of the derived linkers implement this method in a non-trivial way, and thanks to the virtual table these are actually used.
There was a problem hiding this comment.
Hi Andrea, it's not so simple I think on first glance. Some of the derived linkers implement this method in a non-trivial way, and thanks to the virtual table these are actually used.
Thank you @guitargeek
Indeed I was expecting something similar, but it was not straightforward to me to find how those derived linkers enter in the game
|
+1
|
cmsbuild
added
fully-signed
reconstruction-approved
and removed
pending-signatures
reconstruction-pending
labels
|
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. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2) |
|
+1 |
PR description:
Sorry, quick follow up on #26519: there were still include files hiding at the bottom of
PFBlockAlgo.hwhich I forgot to remove. Also some minor cleaning of PFBlockAlgo and PFEgammaAlgo.PR validation:
CMSSW compiles and matrix tests pass.