Merge pull request #34960 from osschar/from-CMSSW_12_1_X_2021-08-18-1500

[Fireworks/Geometry] Strip topolgy for sub-classes of StripTopology was not exported to RECO geometry.
cms-sw · Aug 20, 2021 · 86bd3d5 · 86bd3d5
2 parents 03b6c53 + c2b6d8a
commit 86bd3d5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc b/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc
@@ -67,8 +67,9 @@ using Phase2TrackerTopology = PixelTopology;
       fwRecoGeometry.idToName[rawid].topology[0] = 0;                                                          \
       fwRecoGeometry.idToName[rawid].topology[1] = topo->nstrips();                                            \
       fwRecoGeometry.idToName[rawid].topology[2] = topo->stripLength();                                        \
-    } else if (const RadialStripTopology* rtop =                                                               \
-                   dynamic_cast<const RadialStripTopology*>(&(det->specificType().specificTopology()))) {      \
+    }                                                                                                          \
+    if (const RadialStripTopology* rtop =                                                                      \
+            dynamic_cast<const RadialStripTopology*>(&(det->specificType().specificTopology()))) {             \
       fwRecoGeometry.idToName[rawid].topology[0] = 1;                                                          \
       fwRecoGeometry.idToName[rawid].topology[3] = rtop->yAxisOrientation();                                   \
       fwRecoGeometry.idToName[rawid].topology[4] = rtop->originToIntersection();                               \