Merge pull request cms-sw#31787 from ghugo83/step_2_dd4hep

DD4hep workflow: Fix issue at step 2

Author: cmsbuild

Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc

@@ -43,8 +43,14 @@ namespace {
 TrackerGeometry* TrackerGeomBuilderFromGeometricDet::build(const GeometricDet* gd,
                                                            const PTrackerParameters& ptp,
                                                            const TrackerTopology* tTopo) {
-  int BIG_PIX_PER_ROC_X = ptp.vpars[2];
-  int BIG_PIX_PER_ROC_Y = ptp.vpars[3];
+  if (ptp.vpars.size() != 6) {
+    throw cms::Exception("TrackerGeomBuilderFromGeometricDet")
+        << "Tracker parameters block from XMLs called vPars is expected to have 6 entries, but has " << ptp.vpars.size()
+        << " entrie(s).";
+  }
+
+  const int BIG_PIX_PER_ROC_X = ptp.vpars[2];
+  const int BIG_PIX_PER_ROC_Y = ptp.vpars[3];
 
   thePixelDetTypeMap.clear();
   theStripDetTypeMap.clear();

Geometry/TrackerGeometryBuilder/src/TrackerParametersFromDD.cc

@@ -39,12 +39,18 @@ bool TrackerParametersFromDD::build(const cms::DDCompactView* cvp, PTrackerParam
     }
   }
 
-  auto it = vmap.find("vPars");
-  if (it != end(vmap)) {
-    std::vector<int> tmpVec;
-    for (const auto& i : it->second)
-      tmpVec.emplace_back(std::round(i));
-    ptp.vpars = tmpVec;
+  // get "vPars" parameter block from XMLs.
+  const std::string& vPars = "trackerParameters:vPars";
+  for (auto const& parameterXMLBlock : vmap) {
+    const std::string& parameterName = parameterXMLBlock.first;
+    // Look for vPars parameter XML block.
+    if (dd4hep::dd::compareEqual(vPars, parameterName)) {
+      const std::vector<double>& parameterValues = parameterXMLBlock.second;
+      for (const auto& value : parameterValues) {
+        ptp.vpars.emplace_back(std::round(value));
+      }
+      break;  // Same logic as old DD: it should be found only once.
+    }
   }
 
   return true;