Merge pull request #31998 from bsunanda/Run3-gex32

Run3-gex32 Updates geometry building for EB/EE and solves the issue of failure
cms-sw · Nov 1, 2020 · 2383795 · 2383795
2 parents 8445e80 + 9acca18
commit 2383795
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/Geometry/CaloEventSetup/interface/CaloGeometryLoader.icc b/Geometry/CaloEventSetup/interface/CaloGeometryLoader.icc
@@ -20,11 +20,13 @@
 #include "DetectorDescription/Core/interface/DDScope.h"
 #include "DetectorDescription/Core/interface/DDFilter.h"
 
+#include "DD4hep/Filter.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <vector>
+//#define EDM_ML_DEBUG
 
 template <class T>
 typename CaloGeometryLoader<T>::PtrType CaloGeometryLoader<T>::load(const DDCompactView* cpv,
@@ -131,7 +133,10 @@ void CaloGeometryLoader<T>::makeGeometry(const cms::DDCompactView* cpv,
 
   unsigned int counter(0);
   while (fv.firstChild()) {
-    if (boost::starts_with(fv.name(), "EA")) {
+#ifdef EDM_ML_DEBUG
+    edm::LogVerbatim("EcalGeom") << "Do child " << fv.name();
+#endif
+    if (boost::starts_with(dd4hep::dd::noNamespace(fv.name()), "EA")) {
       continue;
     }
     ++counter;
@@ -202,8 +207,10 @@ unsigned int CaloGeometryLoader<T>::getDetIdForDD4HepNode(const cms::DDFilteredV
   EcalBaseNumber baseNumber;
   baseNumber.setSize(psize);
 
-  size_t n = path.find("/") + 1;
-  edm::LogVerbatim("CaloGeometryBuilder") << path << " n " << n;
+  size_t n = path.find('/') + 1;
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("EcalGeom") << path << " n " << n;
+#endif
   size_t start = n, startold = n;
   std::string det(""), num("");
   bool done(false);
@@ -222,7 +229,12 @@ unsigned int CaloGeometryLoader<T>::getDetIdForDD4HepNode(const cms::DDFilteredV
     }
   }
   baseNumber.reverse();
-
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("EcalGeom") << "Base number with " << baseNumber.getLevels() << " levels";
+  for (int k = 0; k < baseNumber.getLevels(); ++k)
+    edm::LogVerbatim("EcalGeom") << "[" << k << "] " << baseNumber.getLevelName(k) << ":"
+                                 << baseNumber.getCopyNumber(k);
+#endif
   return m_scheme.getUnitID(baseNumber);
 }
 

diff --git a/Geometry/EcalAlgo/plugins/EcalBarrelGeometryLoaderFromDDD.cc b/Geometry/EcalAlgo/plugins/EcalBarrelGeometryLoaderFromDDD.cc
@@ -29,12 +29,15 @@ void EcalBGL::fillGeom(EcalBarrelGeometry* geom,
                        const HepGeom::Transform3D& tr,
                        const DetId& id,
                        const double& scale) {
+  static constexpr uint32_t maxSize = 11;
   std::vector<CCGFloat> pv;
-  pv.reserve(vv.size());
-  for (unsigned int i(0); i != vv.size(); ++i) {
-    const CCGFloat factor(1 == i || 2 == i || 6 == i || 10 == i ? 1 : (CCGFloat)scale);
-
-    pv.emplace_back(factor * vv[i]);
+  unsigned int size = (vv.size() > maxSize) ? maxSize : vv.size();
+  unsigned int ioff = (vv.size() > maxSize) ? (vv.size() - maxSize) : 0;
+  pv.reserve(size);
+  for (unsigned int i(0); i != size; ++i) {
+    unsigned int ii = ioff + i;
+    const CCGFloat factor(1 == i || 2 == i || 6 == i || 10 == i ? 1 : static_cast<CCGFloat>(scale));
+    pv.emplace_back(factor * vv[ii]);
   }
 
   std::vector<GlobalPoint> corners(8);

diff --git a/Geometry/EcalAlgo/plugins/EcalEndcapGeometryLoaderFromDDD.cc b/Geometry/EcalAlgo/plugins/EcalEndcapGeometryLoaderFromDDD.cc
@@ -27,11 +27,15 @@ void EcalEGL::fillGeom(EcalEndcapGeometry* geom,
                        const HepGeom::Transform3D& tr,
                        const DetId& id,
                        const double& scale) {
+  static constexpr uint32_t maxSize = 11;
   std::vector<CCGFloat> pv;
-  pv.reserve(vv.size());
-  for (unsigned int i(0); i != vv.size(); ++i) {
+  unsigned int size = (vv.size() > maxSize) ? maxSize : vv.size();
+  unsigned int ioff = (vv.size() > maxSize) ? (vv.size() - maxSize) : 0;
+  pv.reserve(size);
+  for (unsigned int i(0); i != size; ++i) {
+    unsigned int ii = ioff + i;
     const CCGFloat factor(1 == i || 2 == i || 6 == i || 10 == i ? 1 : scale);
-    pv.emplace_back(factor * vv[i]);
+    pv.emplace_back(factor * vv[ii]);
   }
 
   std::vector<GlobalPoint> corners(8);

diff --git a/Geometry/EcalCommonData/src/EcalSimParametersFromDD.cc b/Geometry/EcalCommonData/src/EcalSimParametersFromDD.cc
@@ -159,7 +159,7 @@ bool EcalSimParametersFromDD::build(const cms::DDCompactView* cpv,
   mypar.filter(refs, attribute, name);
   fv.mergedSpecifics(refs);
   while (fv.firstChild()) {
-    const std::string name{fv.name().data(), fv.name().size()};
+    const std::string name{dd4hep::dd::noNamespace(fv.name()).data(), dd4hep::dd::noNamespace(fv.name()).size()};
     const std::string matName{dd4hep::dd::noNamespace(fv.materialName()).data(),
                               dd4hep::dd::noNamespace(fv.materialName()).size()};
     if (std::find(php.lvNames_.begin(), php.lvNames_.end(), name) == php.lvNames_.end()) {