Skip to content

Fix build failure in DBG_X #41169

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 3 commits into from
Mar 24, 2023
Merged

Fix build failure in DBG_X #41169

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9117e8
Fix build failure in DBG_X
iarspider Mar 24, 2023
52e08df
Update HGCalWaferMask.cc
iarspider Mar 24, 2023
a607b84
Code-format
iarspider Mar 24, 2023
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
36 changes: 18 additions & 18 deletions Geometry/HGCalCommonData/src/HGCalWaferMask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,8 +1242,8 @@ std::vector<std::pair<double, double> > HGCalWaferMask::waferXY(
xy.push_back(std::make_pair((xpos + dx[np[orient][k]] + offsetx[np[orient][k]]),
(ypos + dy[np[orient][k]] + offsety[np[orient][k]])));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]])<< ":"
<< dy[np[orient][k]] + offsety[np[orient][k]];
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]]
<< ":" << dy[np[orient][k]] + offsety[np[orient][k]];
#endif
}
} else if (part == HGCalTypes::WaferHalf) {
Expand All @@ -1253,8 +1253,8 @@ std::vector<std::pair<double, double> > HGCalWaferMask::waferXY(
xy.push_back(std::make_pair((xpos + dx[np[orient][k]] + offsetx[np[orient][k]]),
(ypos + dy[np[orient][k]] + offsety[np[orient][k]])));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]])<< ":"
<< dy[np[orient][k]] + offsety[np[orient][k]];
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]]
<< ":" << dy[np[orient][k]] + offsety[np[orient][k]];
#endif
}
} else if (part == HGCalTypes::WaferThree) {
Expand All @@ -1263,8 +1263,8 @@ std::vector<std::pair<double, double> > HGCalWaferMask::waferXY(
xy.push_back(std::make_pair((xpos + dx[np[orient][k]] + offsetx[np[orient][k]]),
(ypos + dy[np[orient][k]] + offsety[np[orient][k]])));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]])<< ":"
<< dy[np[orient][k]] + offsety[np[orient][k]];
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]]
<< ":" << dy[np[orient][k]] + offsety[np[orient][k]];
#endif
}
} else if (part == HGCalTypes::WaferChopTwo) {
Expand All @@ -1278,8 +1278,8 @@ std::vector<std::pair<double, double> > HGCalWaferMask::waferXY(
xy.push_back(std::make_pair((xpos + dx[np[orient][k]] + offsetx[np[orient][k]]),
(ypos + dy[np[orient][k]] + offsety[np[orient][k]])));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]])<< ":"
<< dy[np[orient][k]] + offsety[np[orient][k]];
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]]
<< ":" << dy[np[orient][k]] + offsety[np[orient][k]];
#endif
}
} else if (part == HGCalTypes::WaferSemi) {
Expand All @@ -1293,8 +1293,8 @@ std::vector<std::pair<double, double> > HGCalWaferMask::waferXY(
xy.push_back(std::make_pair((xpos + dx[np[orient][k]] + offsetx[np[orient][k]]),
(ypos + dy[np[orient][k]] + offsety[np[orient][k]])));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]])<< ":"
<< dy[np[orient][k]] + offsety[np[orient][k]];
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]]
<< ":" << dy[np[orient][k]] + offsety[np[orient][k]];
#endif
}
} else if (part == HGCalTypes::WaferChopTwoM) {
Expand All @@ -1308,8 +1308,8 @@ std::vector<std::pair<double, double> > HGCalWaferMask::waferXY(
xy.push_back(std::make_pair((xpos + dx[np[orient][k]] + offsetx[np[orient][k]]),
(ypos + dy[np[orient][k]] + offsety[np[orient][k]])));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]])<< ":"
<< dy[np[orient][k]] + offsety[np[orient][k]];
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]]
<< ":" << dy[np[orient][k]] + offsety[np[orient][k]];
#endif
}
} else if (part == HGCalTypes::WaferSemi2) {
Expand All @@ -1323,8 +1323,8 @@ std::vector<std::pair<double, double> > HGCalWaferMask::waferXY(
xy.push_back(std::make_pair((xpos + dx[np[orient][k]] + offsetx[np[orient][k]]),
(ypos + dy[np[orient][k]] + offsety[np[orient][k]])));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]])<< ":"
<< dy[np[orient][k]] + offsety[np[orient][k]];
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]]
<< ":" << dy[np[orient][k]] + offsety[np[orient][k]];
#endif
}
} else if (part == HGCalTypes::WaferFive2) {
Expand All @@ -1338,8 +1338,8 @@ std::vector<std::pair<double, double> > HGCalWaferMask::waferXY(
xy.push_back(std::make_pair((xpos + dx[np[orient][k]] + offsetx[np[orient][k]]),
(ypos + dy[np[orient][k]] + offsety[np[orient][k]])));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]])<< ":"
<< dy[np[orient][k]] + offsety[np[orient][k]];
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]]
<< ":" << dy[np[orient][k]] + offsety[np[orient][k]];
#endif
}
} else if (part == HGCalTypes::WaferHalf2) {
Expand All @@ -1353,8 +1353,8 @@ std::vector<std::pair<double, double> > HGCalWaferMask::waferXY(
xy.push_back(std::make_pair((xpos + dx[np[orient][k]] + offsetx[np[orient][k]]),
(ypos + dy[np[orient][k]] + offsety[np[orient][k]])));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]])<< ":"
<< dy[np[orient][k]] + offsety[np[orient][k]];
edm::LogVerbatim("HGCalGeom") << k << ":" << np[orient][k] << ":" << dx[np[orient][k]] + offsetx[np[orient][k]]
<< ":" << dy[np[orient][k]] + offsety[np[orient][k]];
#endif
}
}
Expand Down