[GEOMETRY-UPGRADE] [CLANG] Fixes warnings reported by clang 14

[smuzaffar]

This PR fixes clang 14 warnings about the use of bitwise '&' with boolean operands

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40507/33703

• There are other open Pull requests which might conflict with changes you have proposed:
  • File Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h modified in PR(s): Remove Phase-2 IT bricked design #40443

[cmsbuild]

A new Pull Request was created by @smuzaffar (Malik Shahzad Muzaffar) for master.

It involves the following packages:

• Geometry/MTDGeometryBuilder (geometry, upgrade)

@civanch, @Dr15Jones, @bsunanda, @makortel, @ianna, @mdhildreth, @cmsbuild, @AdrianoDee, @srimanob can you please review it and eventually sign? Thanks.
@trtomei, @bsunanda, @beaucero, @fabiocos this is something you requested to watch as well.
@perrotta, @dpiparo, @rappoccio you are the release manager for this.

cms-bot commands are listed here

[smuzaffar]

please test

[ianna]

@smuzaffar - Thanks! Indeed this should be the only change in comparison with the
#40509 because the preshower detector is not present in the upgrade geometry configuration.

[cmsbuild]

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-6403b7/29974/summary.html
COMMIT: 8e8a6a6
CMSSW: CMSSW_13_0_X_2023-01-13-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/40507/29974/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

The relvals timed out after 4 hours.

Comparison Summary

Summary:

• No significant changes to the logs found
• Reco comparison results: 11 differences found in the comparisons
• DQMHistoTests: Total files compared: 49
• DQMHistoTests: Total histograms compared: 3555538
• DQMHistoTests: Total failures: 9
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 3555507
• DQMHistoTests: Total skipped: 22
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
• Checked 211 log files, 162 edm output root files, 49 DQM output files
• TriggerResults: no differences found

[civanch]

please test

[cmsbuild]

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-6403b7/29993/summary.html
COMMIT: 8e8a6a6
CMSSW: CMSSW_13_0_X_2023-01-13-2300/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/40507/29993/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

• No significant changes to the logs found
• Reco comparison results: 15 differences found in the comparisons
• DQMHistoTests: Total files compared: 49
• DQMHistoTests: Total histograms compared: 3555538
• DQMHistoTests: Total failures: 12
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 3555504
• DQMHistoTests: Total skipped: 22
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
• Checked 211 log files, 162 edm output root files, 49 DQM output files
• TriggerResults: no differences found

[civanch]

@smuzaffar , what about lines 134 and 136 - there is no warnings as in 138? By lines are basically the same.

[smuzaffar]

@civanch , you are right, there are few places where compiler is not complaining. I guess when compiler sees a simple arithematic in the logic then it does not complian but if it see bit complex logic e.g. calls to other funxtions ( even if they are inlined) then it complains. I would suggest to keep the line 134/136 as it is for now

[civanch]

+1

[ianna]

@civanch - I think, there is no need to modify the lines 134 and 136. See my comment.

[ianna]

It isn't obvious that || would be faster. The "short-circuit" evaluation means that the || operator must come with a branch, unlike |. However, looking at this particular method Clang generates exactly the same code (with optimisation enabled - at least -O1):

[srimanob]

+Upgrade

Technical PR.

Not sure if @smuzaffar has a comment to #40507 (comment)

[cmsbuild]

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, @rappoccio (and backports should be raised in the release meeting by the corresponding L2)

[rappoccio]

+1

Technical change.