Skip to content

Phase2-hgx365C Try to avoid the complation issue as reported by Akrit Behera for HGCalTypes in UBSCAN platform #49811

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

Merged
cmsbuild merged 4 commits into from
Jan 15, 2026
Merged

Phase2-hgx365C Try to avoid the complation issue as reported by Akrit Behera for HGCalTypes in UBSCAN platform #49811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5443ca6
Try to avoid the complation issue as reported by Akrit Behera for HGC…
Jan 14, 2026
6cfcd42
Code check
Jan 14, 2026
b1af5b2
Change constexpr to const for std::string
Jan 15, 2026
32651a9
Code check
Jan 15, 2026
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
14 changes: 0 additions & 14 deletions Geometry/HGCalCommonData/interface/HGCalTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,20 +156,6 @@ class HGCalTypes {
static constexpr int32_t faccell_ = 100;
static constexpr int32_t faccelltype_ = 10000;
static constexpr int32_t faccell6_ = 1000;
static constexpr int32_t layerType_[7] = {HGCalTypes::WaferCenter,
HGCalTypes::WaferCenterB,
HGCalTypes::WaferCenterR,
HGCalTypes::CornerCenterYp,
HGCalTypes::CornerCenterYm,
HGCalTypes::CornerCenterXp,
HGCalTypes::CornerCenterXm};
static constexpr std::string layerTypes_[7] = {
"Center", "CenterB", "CenterYp", "CenterYm", "CenterR", "CenterXp", "CenterXm"};
static constexpr std::string waferType_[4] = {"HD120", "LD200", "LD300", "HD200"};
static constexpr std::string waferTypeX_[27] = {
"Full", "Five", "ChopTwo", "ChopTwoM", "Half", "Semi", "Semi2", "Three", "Half2",
"Five2", "Unknown10", "LDTop", "LDBottom", "LDLeft", "LDRight", "LDFive", "LDThree", "Unknown17",
"Unknown18", "Unknown19", "Unknown20", "HDTop", "HDBottom", "HDLeft", "HDRight", "HDFive", "Out"};
};

#endif
24 changes: 20 additions & 4 deletions Geometry/HGCalCommonData/src/HGCalTypes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,31 @@ int32_t HGCalTypes::getUnpackedCellType6(int id) { return (id / faccell6_); }
int32_t HGCalTypes::getUnpackedCell6(int id) { return (id % faccell6_); }

int32_t HGCalTypes::layerType(int type) {
return ((type >= 0) && (type < 7)) ? HGCalTypes::layerType_[type] : HGCalTypes::WaferCenter;
static const int32_t layerTypeX[7] = {HGCalTypes::WaferCenter,
HGCalTypes::WaferCenterB,
HGCalTypes::WaferCenterR,
HGCalTypes::CornerCenterYp,
HGCalTypes::CornerCenterYm,
HGCalTypes::CornerCenterXp,
HGCalTypes::CornerCenterXm};
return ((type >= 0) && (type < 7)) ? layerTypeX[type] : HGCalTypes::WaferCenter;
}

std::string HGCalTypes::layerTypeX(int32_t type) { return layerTypes_[HGCalTypes::layerType(type)]; }
std::string HGCalTypes::layerTypeX(int32_t type) {
static const std::string layerTypes[7] = {
"Center", "CenterB", "CenterYp", "CenterYm", "CenterR", "CenterXp", "CenterXm"};
return layerTypes[layerType(type)];
}

std::string HGCalTypes::waferType(int32_t type) {
return (((type >= 0) && (type < 4)) ? HGCalTypes::waferType_[type] : "Undefined");
static const std::string waferType[4] = {"HD120", "LD200", "LD300", "HD200"};
return (((type >= 0) && (type < 4)) ? waferType[type] : "Undefined");
}

std::string HGCalTypes::waferTypeX(int32_t type) {
return (((type >= 0) && (type < 27)) ? HGCalTypes::waferTypeX_[type] : "UnknownXX");
static const std::string waferTypeX[27] = {
"Full", "Five", "ChopTwo", "ChopTwoM", "Half", "Semi", "Semi2", "Three", "Half2",
"Five2", "Unknown10", "LDTop", "LDBottom", "LDLeft", "LDRight", "LDFive", "LDThree", "Unknown17",
"Unknown18", "Unknown19", "Unknown20", "HDTop", "HDBottom", "HDLeft", "HDRight", "HDFive", "Out"};
return (((type >= 0) && (type < 27)) ? waferTypeX[type] : "UnknownXX");
}