Merge pull request #45696 from bsunanda/Phase2-hgx359M

Phase2-hgx359M Add the dd4hep version of the new algorithm needed for the V19 version of HGCal Geometry
cms-sw · Aug 14, 2024 · 1e818e7 · 1e818e7
2 parents 8793052 + f1fd834
commit 1e818e7
Show file tree

Hide file tree

Showing 4 changed files with 881 additions and 16 deletions.
diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc b/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc
@@ -153,16 +153,15 @@ void DDHGCalMixRotatedFineCassette::initialize(const DDNumericArguments& nArgs,
                                 << " PlaceOffset: " << placeOffset_ << "; number of cells along phi "
                                 << phiBinsFineScint_ << ":" << phiBinsScint_;
 #endif
-  firstFineLayer_ = (int)(nArgs["FirstFineLayer"]);
-  firstCoarseLayer_ = (int)(nArgs["FirstCoarseLayer"]);
-  absorbMode_ = (int)(nArgs["AbsorberMode"]);
-  sensitiveMode_ = (int)(nArgs["SensitiveMode"]);
-  passiveMode_ = (int)(nArgs["PassiveMode"]);
+  firstFineLayer_ = static_cast<int>(nArgs["FirstFineLayer"]);
+  firstCoarseLayer_ = static_cast<int>(nArgs["FirstCoarseLayer"]);
+  absorbMode_ = static_cast<int>(nArgs["AbsorberMode"]);
+  sensitiveMode_ = static_cast<int>(nArgs["SensitiveMode"]);
+  passiveMode_ = static_cast<int>(nArgs["PassiveMode"]);
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::First Layers " << firstFineLayer_ << ":"
-                                << firstCoarseLayer_ << " and "
-                                << "Absober:Sensitive mode " << absorbMode_ << ":" << sensitiveMode_ << ":"
-                                << passiveMode_;
+                                << firstCoarseLayer_ << " and Absober:Sensitive mode " << absorbMode_ << ":"
+                                << sensitiveMode_ << ":" << passiveMode_;
 #endif
   zMinBlock_ = nArgs["zMinBlock"];
   waferSize_ = nArgs["waferSize"];

diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedCassette.cc b/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedCassette.cc
@@ -32,7 +32,7 @@
 #include <unordered_set>
 #include <vector>
 
-#define EDM_ML_DEBUG
+//#define EDM_ML_DEBUG
 using namespace angle_units::operators;
 
 class DDHGCalSiliconRotatedCassette : public DDAlgorithm {
@@ -662,13 +662,13 @@ void DDHGCalSiliconRotatedCassette::positionPassive2(const DDLogicalPart& glog,
     double ypos = cshift.second;
     int i = layer * cassettes_ + k;
 #ifdef EDM_ML_DEBUG
-    edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette::Passive: layer " << layer + 1 << " cassette "
+    edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette::Passive2: layer " << layer + 1 << " cassette "
                                   << cassette << " Shift " << cshift.first << ":" << cshift.second << " PassiveIndex "
                                   << i << ":" << passiveFull_.size() << ":" << passivePart_.size();
 #endif
     std::string passive = (absType <= waferTypes_) ? passiveFull_[i] : passivePart_[i];
 #ifdef EDM_ML_DEBUG
-    edm::LogVerbatim("HGCalGeom") << " DDHGCalSiliconRotatedCassette: Passive " << passive << " number " << cassette
+    edm::LogVerbatim("HGCalGeom") << " DDHGCalSiliconRotatedCassette: Passive2 " << passive << " number " << cassette
                                   << " pos " << xpos << ":" << ypos;
     kount++;
 #endif