Skip to content

[CPP20][GEOMETRY] Remove deprecated enum arithmetic #44488

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

Closed
iarspider wants to merge 1 commit into from
Closed

[CPP20][GEOMETRY] Remove deprecated enum arithmetic #44488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Geometry/CaloEventSetup/interface/CaloGeometryDBEP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class CaloGeometryDBEP : public edm::ESProducer {

const unsigned int nTrParm(tvec.size() / T::k_NumberOfCellsForCorners);

assert(dvec.size() == T::k_NumberOfShapes * T::k_NumberOfParametersPerShape);
assert(dvec.size() == static_cast<int>(T::k_NumberOfShapes) * static_cast<int>(T::k_NumberOfParametersPerShape));

PtrType ptr = std::make_unique<T>();

Expand Down
6 changes: 4 additions & 2 deletions Geometry/CaloEventSetup/interface/CaloGeometryLoader.icc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ void CaloGeometryLoader<T>::makeGeometry(const DDCompactView* cpv,
fillNamedParams(fv0, geom);

geom->allocateCorners(T::k_NumberOfCellsForCorners);
geom->allocatePar(T::k_NumberOfParametersPerShape * T::k_NumberOfShapes, T::k_NumberOfParametersPerShape);
geom->allocatePar(static_cast<int>(T::k_NumberOfParametersPerShape) * static_cast<int>(T::k_NumberOfShapes),
T::k_NumberOfParametersPerShape);

DDFilteredView fv(*cpv, filter);

Expand Down Expand Up @@ -123,7 +124,8 @@ void CaloGeometryLoader<T>::makeGeometry(const cms::DDCompactView* cpv,
fillNamedParams(fv, geom);

geom->allocateCorners(T::k_NumberOfCellsForCorners);
geom->allocatePar(T::k_NumberOfParametersPerShape * T::k_NumberOfShapes, T::k_NumberOfParametersPerShape);
geom->allocatePar(static_cast<int>(T::k_NumberOfParametersPerShape) * static_cast<int>(T::k_NumberOfShapes),
T::k_NumberOfParametersPerShape);

std::string attribute = "ReadOutName";
cms::DDSpecParRefs ref;
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CaloTopology/src/HcalTopology.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,7 @@ unsigned int HcalTopology::detId2denseIdHT(const DetId& id) const {
} else {
index = kHTSizePreLS1;
if (zside == -1)
index += ((kHTSizePhase1 - kHTSizePreLS1) / 2);
index += ((static_cast<double>(kHTSizePhase1) - static_cast<double>(kHTSizePreLS1)) / 2);
index += (36 * (ietaAbs - 30) + ((iphi - 1) / 2));
}

Expand Down
3 changes: 2 additions & 1 deletion Geometry/EcalTestBeam/test/ee/CaloGeometryLoaderTest.icc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ void CaloGeometryLoaderTest<T>::makeGeometry(const DDCompactView* cpv,
const Alignments* alignments,
const Alignments* globals) {
geom->allocateCorners(T::k_NumberOfCellsForCorners);
geom->allocatePar(T::k_NumberOfParametersPerShape * T::k_NumberOfShapes, T::k_NumberOfParametersPerShape);
geom->allocatePar(static_cast<int>(T::k_NumberOfParametersPerShape) * static_cast<int>(T::k_NumberOfShapes),
T::k_NumberOfParametersPerShape);

DDFilteredView fv(*cpv, m_filter);

Expand Down
5 changes: 3 additions & 2 deletions Geometry/ForwardGeometry/src/CastorHardcodeGeometryLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ void CastorHardcodeGeometryLoader::fill(HcalCastorDetId::Section section, CaloSu
if (geom->cornersMgr() == nullptr)
geom->allocateCorners(HcalCastorDetId::kSizeForDenseIndexing);
if (geom->parMgr() == nullptr)
geom->allocatePar(CastorGeometry::k_NumberOfShapes * CastorGeometry::k_NumberOfParametersPerShape,
geom->allocatePar(static_cast<int>(CastorGeometry::k_NumberOfShapes) *
static_cast<int>(CastorGeometry::k_NumberOfParametersPerShape),
CastorGeometry::k_NumberOfParametersPerShape);

// start by making the new HcalDetIds
Expand Down Expand Up @@ -118,7 +119,7 @@ void CastorHardcodeGeometryLoader::makeCell(const HcalCastorDetId& detId, CaloSu
const double leg(dR + dy);
const double len(sqrt(leg * leg + dx * dx));

static const double dphi(2. * M_PI / (1.0 * HcalCastorDetId::kNumberSectorsPerEnd));
static const double dphi(2. * M_PI / (1.0 * static_cast<double>(HcalCastorDetId::kNumberSectorsPerEnd)));

const double fphi(atan(dx / (dR + dy)));

Expand Down
5 changes: 3 additions & 2 deletions Geometry/ForwardGeometry/src/ZdcHardcodeGeometryLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ void ZdcHardcodeGeometryLoader::fill(HcalZDCDetId::Section section, ReturnType g
if (geom->cornersMgr() == nullptr)
geom->allocateCorners(HcalZDCDetId::kSizeForDenseIndexing);
if (geom->parMgr() == nullptr)
geom->allocatePar(ZdcGeometry::k_NumberOfParametersPerShape * ZdcGeometry::k_NumberOfShapes,
ZdcGeometry::k_NumberOfParametersPerShape);
geom->allocatePar(
static_cast<int>(ZdcGeometry::k_NumberOfParametersPerShape) * static_cast<int>(ZdcGeometry::k_NumberOfShapes),
ZdcGeometry::k_NumberOfParametersPerShape);

edm::LogVerbatim("ZdcGeometry") << "Number of ZDC DetIds made: " << section << " " << zdcIds.size();

Expand Down