Follow up to PR31722 (#614)

[ericcano]

PR description:

PR validation:

if this PR is a backport please specify the original PR and why you need to backport that PR:

Before submitting your pull requests, make sure you followed this checklist:

• verify that the PR is really intended for the chosen branch
• verify that changes follow CMS Naming, Coding, And Style Rules
• verify that the PR passes the basic test procedure suggested in the CMSSW PR instructions

[ericcano]

As requested by @VinInn, I close this PR to split it into a performance PR on one side and code cleanliness PR on the other.

[VinInn]

I am now working on the pixel producers. I copied the version in here. Please do not commit them anymore.