Fix deprecated enum arithmetics in CaloGeometry #45133

iarspider · 2024-06-04T13:22:31Z

PR description:

Fix the following compilation warning:

  src/Geometry/CaloGeometry/src/CaloGeometry.cc:19:16: warning: arithmetic between different enumeration types 'DetId::Detector' and 'CaloGeometry::<unnamed enum>' is deprecated [-Wdeprecated-enum-enum-conversion]
    19 |   return ((det - kMinDet) * kNSubDets + subdet);
      |            ~~~~^~~~~~~~~

PR validation:

Bot tests

cmsbuild · 2024-06-04T13:22:54Z

cms-bot internal usage

iarspider · 2024-06-04T13:23:30Z

please test for CMSSW_14_1_CPP20_X

cmsbuild · 2024-06-04T13:28:20Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-45133/40473

This PR adds an extra 16KB to repository

cmsbuild · 2024-06-04T13:28:39Z

A new Pull Request was created by @iarspider for master.

It involves the following packages:

Geometry/CaloGeometry (geometry)

@bsunanda, @makortel, @Dr15Jones, @mdhildreth, @civanch can you please review it and eventually sign? Thanks.
@fabiocos, @wang0jin, @bsunanda, @ReyerBand, @thomreis this is something you requested to watch as well.
@rappoccio, @sextonkennedy, @antoniovilela you are the release manager for this.

cms-bot commands are listed here

makortel · 2024-06-04T14:03:54Z

Geometry/CaloGeometry/src/CaloGeometry.cc

@@ -16,7 +16,7 @@ unsigned int CaloGeometry::makeIndex(DetId::Detector det, int subdet, bool& ok)
    edm::LogWarning("CaloGeometry") << "Det:Subdet " << idet << ":" << subdet << " min|max Det " << kMinDet << ":"
                                    << kMaxDet << " min|max subdet 0:" << kMaxSub;

-  return ((det - kMinDet) * kNSubDets + subdet);
+  return ((det - static_cast<int>(kMinDet)) * kNSubDets + subdet);


I think it would be better to define all these

cmssw/Geometry/CaloGeometry/interface/CaloGeometry.h

Lines 59 to 66 in a9682e8

enum {

kMaxDet = 10,

kMinDet = 3,

kNDets = kMaxDet - kMinDet + 1,

kMaxSub = 6,

kNSubDets = kMaxSub + 1,

kLength = kNDets * kNSubDets

};

as static constexpr constants.

iarspider · 2024-06-04T14:05:16Z

please abort

iarspider · 2024-06-04T14:11:38Z

please test for CMSSW_14_1_CPP20_X

cmsbuild · 2024-06-04T14:18:08Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-45133/40476

This PR adds an extra 20KB to repository

cmsbuild · 2024-06-04T14:18:28Z

Pull request #45133 was updated. @civanch, @makortel, @Dr15Jones, @mdhildreth, @bsunanda can you please check and sign again.

cmsbuild · 2024-06-04T21:17:13Z

-1

Failed Tests: UnitTests
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-7f5f34/39697/summary.html
COMMIT: f7a44d1
CMSSW: CMSSW_14_1_CPP20_X_2024-06-03-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/45133/39697/install.sh to create a dev area with all the needed externals and cmssw changes.

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-7f5f34/39697/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-7f5f34/39697/git-merge-result

Unit Tests

I found 1 errors in the following unit tests:

---> test RecoPPSLocalNewT2 had ERRORS

Comparison Summary

Summary:

You potentially added 2431 lines to the logs
Reco comparison results: 123 differences found in the comparisons
DQMHistoTests: Total files compared: 48
DQMHistoTests: Total histograms compared: 3338862
DQMHistoTests: Total failures: 966
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3337876
DQMHistoTests: Total skipped: 20
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 47 files compared)
Checked 202 log files, 165 edm output root files, 48 DQM output files
TriggerResults: no differences found

iarspider · 2024-06-04T21:50:04Z

please test

iarspider · 2024-06-04T21:50:56Z

test RecoPPSLocalNewT2 had ERRORS

#45101

cmsbuild · 2024-06-05T01:07:51Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-7f5f34/39702/summary.html
COMMIT: f7a44d1
CMSSW: CMSSW_14_1_X_2024-06-04-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/45133/39702/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

You potentially removed 2 lines from the logs
Reco comparison results: 0 differences found in the comparisons
DQMHistoTests: Total files compared: 48
DQMHistoTests: Total histograms compared: 3338862
DQMHistoTests: Total failures: 0
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3338842
DQMHistoTests: Total skipped: 20
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 47 files compared)
Checked 202 log files, 165 edm output root files, 48 DQM output files
TriggerResults: no differences found

civanch · 2024-06-06T08:29:22Z

+1

cmsbuild · 2024-06-06T08:29:43Z

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

rappoccio · 2024-06-06T13:30:25Z

+1

rappoccio · 2024-06-06T13:30:29Z

merge

Fix deprecated enum arithmetics in CaloGeometry

5b1e1c8

cmsbuild added this to the CMSSW_14_1_X milestone Jun 4, 2024

cmsbuild added geometry-pending pending-signatures tests-pending orp-pending code-checks-pending labels Jun 4, 2024

cmsbuild added tests-started and removed tests-pending labels Jun 4, 2024

cmsbuild added code-checks-approved and removed code-checks-pending labels Jun 4, 2024

makortel reviewed Jun 4, 2024

View reviewed changes

cmsbuild added tests-pending and removed tests-started labels Jun 4, 2024

Changes from review

f7a44d1

cmsbuild added tests-started code-checks-pending and removed tests-pending code-checks-approved labels Jun 4, 2024

cmsbuild added code-checks-approved and removed code-checks-pending labels Jun 4, 2024

cmsbuild added tests-rejected and removed tests-started labels Jun 4, 2024

cmsbuild added tests-started and removed tests-rejected labels Jun 4, 2024

cmsbuild added tests-approved and removed tests-started labels Jun 5, 2024

cmsbuild added geometry-approved fully-signed and removed geometry-pending pending-signatures labels Jun 6, 2024

cmsbuild added orp-approved and removed orp-pending labels Jun 6, 2024

cmsbuild merged commit dff78b8 into cms-sw:master Jun 6, 2024
16 of 17 checks passed

cmsbuild mentioned this pull request Jun 7, 2024

[llvm] Update to version 18.1.6 cms-sw/cmsdist#9200

Merged

perrotta mentioned this pull request Jun 7, 2024

Add new dEdx calibration and estimator #45016

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix deprecated enum arithmetics in CaloGeometry #45133

Fix deprecated enum arithmetics in CaloGeometry #45133

iarspider commented Jun 4, 2024

cmsbuild commented Jun 4, 2024 •

edited

Loading

iarspider commented Jun 4, 2024

cmsbuild commented Jun 4, 2024

cmsbuild commented Jun 4, 2024

makortel Jun 4, 2024

iarspider commented Jun 4, 2024

iarspider commented Jun 4, 2024

cmsbuild commented Jun 4, 2024

cmsbuild commented Jun 4, 2024

cmsbuild commented Jun 4, 2024

iarspider commented Jun 4, 2024

iarspider commented Jun 4, 2024

cmsbuild commented Jun 5, 2024

civanch commented Jun 6, 2024

cmsbuild commented Jun 6, 2024

rappoccio commented Jun 6, 2024

rappoccio commented Jun 6, 2024

	enum {
	kMaxDet = 10,
	kMinDet = 3,
	kNDets = kMaxDet - kMinDet + 1,
	kMaxSub = 6,
	kNSubDets = kMaxSub + 1,
	kLength = kNDets * kNSubDets
	};

Fix deprecated enum arithmetics in CaloGeometry #45133

Fix deprecated enum arithmetics in CaloGeometry #45133

Conversation

iarspider commented Jun 4, 2024

PR description:

PR validation:

cmsbuild commented Jun 4, 2024 • edited Loading

iarspider commented Jun 4, 2024

cmsbuild commented Jun 4, 2024

cmsbuild commented Jun 4, 2024

makortel Jun 4, 2024

Choose a reason for hiding this comment

iarspider commented Jun 4, 2024

iarspider commented Jun 4, 2024

cmsbuild commented Jun 4, 2024

cmsbuild commented Jun 4, 2024

cmsbuild commented Jun 4, 2024

Unit Tests

Comparison Summary

iarspider commented Jun 4, 2024

iarspider commented Jun 4, 2024

cmsbuild commented Jun 5, 2024

Comparison Summary

civanch commented Jun 6, 2024

cmsbuild commented Jun 6, 2024

rappoccio commented Jun 6, 2024

rappoccio commented Jun 6, 2024

cmsbuild commented Jun 4, 2024 •

edited

Loading