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.

Sign up for GitHub

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

[CPP20][Visualisation] Fix deprecated enum bitwise operation in FWCandidateHGCalLegoProxyBuilder #45076

Merged
merged 5 commits into from
Jun 3, 2024
Merged

[CPP20][Visualisation] Fix deprecated enum bitwise operation in FWCandidateHGCalLegoProxyBuilder #45076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b97479
[CPP20][Visualisation] Fix deprecated enum bitwise operation in FWCan…
iarspider May 28, 2024
1fcda9d
[CPP20] Remove deprecated implicit capture of this in FWTEveViewer
iarspider May 28, 2024
349dedf
Changes from review
iarspider May 29, 2024
dd9a6af
Update FWCandidateHGCalLegoProxyBuilder.cc
iarspider May 29, 2024
cc91b8e
Update Fireworks/Core/interface/FWViewType.h
iarspider May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Fireworks/Candidates/plugins/FWCandidateHGCalLegoProxyBuilder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@ void FWCandidateHGCalLegoProxyBuilder::build(const reco::HGCalMultiCluster &iDat
REGISTER_FWPROXYBUILDER(FWCandidateHGCalLegoProxyBuilder,
reco::HGCalMultiCluster,
"HGCal Multiclusters Lego",
FWViewType::kLegoBit | FWViewType::kLegoHF);
FWViewType::kLegoBit | FWViewType::kLegoHFBit);
22 changes: 6 additions & 16 deletions Fireworks/Core/interface/FWViewType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,12 @@ class FWViewType {
kTypeSize
};

enum EBit {
k3DBit = 1 << k3D,
kRhoPhiBit = 1 << kRhoPhi,
kRhoZBit = 1 << kRhoZ,
kRhoPhiPFBit = 1 << kRhoPhiPF,
kISpyBit = 1 << kISpy,
kLegoBit = 1 << kLego,
kLegoHFBit = 1 << kLegoHF,
kLegoPFECALBit = 1 << kLegoPFECAL,
kGlimpseBit = 1 << kGlimpse,
kTableBit = 1 << kTable,
kTableHLTBit = 1 << kTableHLT,
kTableL1Bit = 1 << kTableL1,
kGeometryBit = 1 << kGeometryTable,
kOverlapBit = 1 << kOverlapTable
};
static constexpr unsigned int k3DBit = 1 << k3D, kRhoPhiBit = 1 << kRhoPhi, kRhoZBit = 1 << kRhoZ,
kRhoPhiPFBit = 1 << kRhoPhiPF, kISpyBit = 1 << kISpy, kLegoBit = 1 << kLego,
kLegoHFBit = 1 << kLegoHF, kLegoPFECALBit = 1 << kLegoPFECAL,
kGlimpseBit = 1 << kGlimpse, kTableBit = 1 << kTable, kTableHLTBit = 1 << kTableHLT,
kTableL1Bit = 1 << kTableL1, kGeometryBit = 1 << kGeometryTable,
kOverlapBit = 1 << kOverlapTable;

// shortcuts
static const int kAllRPZBits;
Expand Down