@@ -60,8 +60,8 @@ bool MTDParametersFromDD::build(const DDCompactView* cvp, PMTDParameters& ptp) {
6060 }
6161
6262 std::vector<std::string> etlLayout;
63- if (MTDTopologyMode::etlLayoutFromTopoMode (topoMode) == MTDTopologyMode::EtlLayout::v5 ||
64- MTDTopologyMode::etlLayoutFromTopoMode (topoMode) == MTDTopologyMode::EtlLayout::v8) {
63+ if (static_cast < int >( MTDTopologyMode::etlLayoutFromTopoMode (topoMode)) <=
64+ static_cast < int >( MTDTopologyMode::EtlLayout::v8) ) {
6565 etlLayout.emplace_back (" StartCopyNo_Front_Left" );
6666 etlLayout.emplace_back (" StartCopyNo_Front_Right" );
6767 etlLayout.emplace_back (" StartCopyNo_Back_Left" );
@@ -70,7 +70,8 @@ bool MTDParametersFromDD::build(const DDCompactView* cvp, PMTDParameters& ptp) {
7070 etlLayout.emplace_back (" Offset_Front_Right" );
7171 etlLayout.emplace_back (" Offset_Back_Left" );
7272 etlLayout.emplace_back (" Offset_Back_Right" );
73- } else if (MTDTopologyMode::etlLayoutFromTopoMode (topoMode) >= MTDTopologyMode::EtlLayout::v9) {
73+ } else if (static_cast <int >(MTDTopologyMode::etlLayoutFromTopoMode (topoMode)) >
74+ static_cast <int >(MTDTopologyMode::EtlLayout::v8)) {
7475 etlLayout.emplace_back (" StartCopyNo_Front_Disc_1" );
7576 etlLayout.emplace_back (" StartCopyNo_Back_Disc_1" );
7677 etlLayout.emplace_back (" StartCopyNo_Front_Disc_2" );
@@ -143,8 +144,8 @@ bool MTDParametersFromDD::build(const cms::DDCompactView* cvp, PMTDParameters& p
143144 }
144145
145146 std::vector<std::string> etlLayout;
146- if (MTDTopologyMode::etlLayoutFromTopoMode (topoMode) == MTDTopologyMode::EtlLayout::v5 ||
147- MTDTopologyMode::etlLayoutFromTopoMode (topoMode) == MTDTopologyMode::EtlLayout::v8) {
147+ if (static_cast < int >( MTDTopologyMode::etlLayoutFromTopoMode (topoMode)) <=
148+ static_cast < int >( MTDTopologyMode::EtlLayout::v8) ) {
148149 etlLayout.emplace_back (" StartCopyNo_Front_Left" );
149150 etlLayout.emplace_back (" StartCopyNo_Front_Right" );
150151 etlLayout.emplace_back (" StartCopyNo_Back_Left" );
@@ -153,7 +154,8 @@ bool MTDParametersFromDD::build(const cms::DDCompactView* cvp, PMTDParameters& p
153154 etlLayout.emplace_back (" Offset_Front_Right" );
154155 etlLayout.emplace_back (" Offset_Back_Left" );
155156 etlLayout.emplace_back (" Offset_Back_Right" );
156- } else if (MTDTopologyMode::etlLayoutFromTopoMode (topoMode) >= MTDTopologyMode::EtlLayout::v9) {
157+ } else if (static_cast <int >(MTDTopologyMode::etlLayoutFromTopoMode (topoMode)) >
158+ static_cast <int >(MTDTopologyMode::EtlLayout::v8)) {
157159 etlLayout.emplace_back (" StartCopyNo_Front_Disc_1" );
158160 etlLayout.emplace_back (" StartCopyNo_Back_Disc_1" );
159161 etlLayout.emplace_back (" StartCopyNo_Front_Disc_2" );
0 commit comments