Skip to content

MTD geometry: fix the topology parameters reading for ETL v10 #47660

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 1 commit into from
Mar 25, 2025
Merged

MTD geometry: fix the topology parameters reading for ETL v10 #47660

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
14 changes: 8 additions & 6 deletions Geometry/MTDGeometryBuilder/src/MTDParametersFromDD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ bool MTDParametersFromDD::build(const DDCompactView* cvp, PMTDParameters& ptp) {
}

std::vector<std::string> etlLayout;
if (MTDTopologyMode::etlLayoutFromTopoMode(topoMode) == MTDTopologyMode::EtlLayout::v5 ||
MTDTopologyMode::etlLayoutFromTopoMode(topoMode) == MTDTopologyMode::EtlLayout::v8) {
if (static_cast<int>(MTDTopologyMode::etlLayoutFromTopoMode(topoMode)) <=
static_cast<int>(MTDTopologyMode::EtlLayout::v8)) {
etlLayout.emplace_back("StartCopyNo_Front_Left");
etlLayout.emplace_back("StartCopyNo_Front_Right");
etlLayout.emplace_back("StartCopyNo_Back_Left");
Expand All @@ -70,7 +70,8 @@ bool MTDParametersFromDD::build(const DDCompactView* cvp, PMTDParameters& ptp) {
etlLayout.emplace_back("Offset_Front_Right");
etlLayout.emplace_back("Offset_Back_Left");
etlLayout.emplace_back("Offset_Back_Right");
} else if (MTDTopologyMode::etlLayoutFromTopoMode(topoMode) >= MTDTopologyMode::EtlLayout::v9) {
} else if (static_cast<int>(MTDTopologyMode::etlLayoutFromTopoMode(topoMode)) >
static_cast<int>(MTDTopologyMode::EtlLayout::v8)) {
etlLayout.emplace_back("StartCopyNo_Front_Disc_1");
etlLayout.emplace_back("StartCopyNo_Back_Disc_1");
etlLayout.emplace_back("StartCopyNo_Front_Disc_2");
Expand Down Expand Up @@ -143,8 +144,8 @@ bool MTDParametersFromDD::build(const cms::DDCompactView* cvp, PMTDParameters& p
}

std::vector<std::string> etlLayout;
if (MTDTopologyMode::etlLayoutFromTopoMode(topoMode) == MTDTopologyMode::EtlLayout::v5 ||
MTDTopologyMode::etlLayoutFromTopoMode(topoMode) == MTDTopologyMode::EtlLayout::v8) {
if (static_cast<int>(MTDTopologyMode::etlLayoutFromTopoMode(topoMode)) <=
static_cast<int>(MTDTopologyMode::EtlLayout::v8)) {
etlLayout.emplace_back("StartCopyNo_Front_Left");
etlLayout.emplace_back("StartCopyNo_Front_Right");
etlLayout.emplace_back("StartCopyNo_Back_Left");
Expand All @@ -153,7 +154,8 @@ bool MTDParametersFromDD::build(const cms::DDCompactView* cvp, PMTDParameters& p
etlLayout.emplace_back("Offset_Front_Right");
etlLayout.emplace_back("Offset_Back_Left");
etlLayout.emplace_back("Offset_Back_Right");
} else if (MTDTopologyMode::etlLayoutFromTopoMode(topoMode) >= MTDTopologyMode::EtlLayout::v9) {
} else if (static_cast<int>(MTDTopologyMode::etlLayoutFromTopoMode(topoMode)) >
static_cast<int>(MTDTopologyMode::EtlLayout::v8)) {
etlLayout.emplace_back("StartCopyNo_Front_Disc_1");
etlLayout.emplace_back("StartCopyNo_Back_Disc_1");
etlLayout.emplace_back("StartCopyNo_Front_Disc_2");
Expand Down