Merge pull request #48551 from bsunanda/Phase2-hgx364X

Phase2-hgx364X Equip RecHitTools with a few more utilities to find # of wafer types and the thicknesses in the current geometries

Author: cmsbuild

Geometry/HGCalCommonData/interface/HGCalDDDConstants.h

@@ -267,6 +267,10 @@ class HGCalDDDConstants {
   }
   int waferType(DetId const& id, bool fromFile) const;
   int waferType(int layer, int waferU, int waferV, bool fromFile) const;
+  inline int waferTypes() const {
+    return ((waferHexagon8()) ? (hgpar_->cellThickness_.size()) : ((waferHexagon6()) ? 3 : 0));
+    ;
+  }
   std::tuple<int, int, int> waferType(HGCSiliconDetId const& id, bool fromFile) const;
   std::pair<int, int> waferTypeRotation(int layer, int waferU, int waferV, bool fromFile, bool debug) const;
   inline int waferUVMax() const { return hgpar_->waferUVMax_; }

RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h

@@ -107,6 +107,8 @@ namespace hgcal {
     // Informaion of the wafer/tile
     siliconWaferInfo getWaferInfo(const DetId& id) const;
     scintillatorTileInfo getTileInfo(const DetId& id) const;
+    int getWaferTypes(DetId::Detector det, int subdet = ForwardSubdetector::ForwardEmpty) const;
+    std::vector<double> getSiThickness(DetId::Detector det, int subdet = ForwardSubdetector::ForwardEmpty) const;
 
   private:
     const CaloGeometry* geom_;

RecoLocalCalo/HGCalRecAlgos/src/RecHitTools.cc

@@ -71,6 +71,15 @@ namespace {
     return ddd;
   }
 
+  inline const HGCalDDDConstants* get_ddd(const CaloGeometry* geom,
+                                          DetId::Detector det,
+                                          int subdet = ForwardSubdetector::ForwardEmpty) {
+    const HGCalGeometry* hg = static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(det, subdet));
+    const HGCalDDDConstants* ddd = &(hg->topology().dddConstants());
+    check_ddd(ddd);
+    return ddd;
+  }
+
   enum CellType {
     CE_E_120 = 0,
     CE_E_200 = 1,
@@ -612,3 +621,13 @@ RecHitTools::scintillatorTileInfo RecHitTools::getTileInfo(const DetId& id) cons
   }
   return info;
 }
+
+int RecHitTools::getWaferTypes(DetId::Detector det, int subdet) const {
+  auto ddd = get_ddd(geom_, det, subdet);
+  return ddd->waferTypes();
+}
+
+std::vector<double> RecHitTools::getSiThickness(DetId::Detector det, int subdet) const {
+  auto ddd = get_ddd(geom_, det, subdet);
+  return ddd->cellThickness();
+}

RecoLocalCalo/HGCalRecAlgos/test/HGCalTestRecHitTools.cc

@@ -6,11 +6,13 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/ForwardDetId/interface/HGCScintillatorDetId.h"
 #include "DataFormats/ForwardDetId/interface/HGCSiliconDetId.h"
 #include "RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h"
 
 #include <vector>
+#include <sstream>
 
 class HGCalTestRecHitTools : public edm::one::EDAnalyzer<> {
 public:
@@ -46,7 +48,12 @@ void HGCalTestRecHitTools::analyze(const edm::Event& /*iEvent*/, const edm::Even
   for (const auto& det : dets) {
     auto layer = tool_.firstAndLastLayer(det, 0);
     edm::LogVerbatim("HGCalGeom") << "First & Last Layer for Det " << det << " are " << layer.first << ":"
-                                  << layer.second;
+                                  << layer.second << " # of wafer types: " << tool_.getWaferTypes(det);
+    std::vector<double> thick = tool_.getSiThickness(det);
+    std::ostringstream st1;
+    for (unsigned int k = 0; k < thick.size(); ++k)
+      st1 << " : " << thick[k];
+    edm::LogVerbatim("HGCalGeom") << "Thickness of the wafers" << st1.str();
   }
 
   edm::LogVerbatim("HGCalGeom") << "Maximum # of wafers per layer " << tool_.maxNumberOfWafersPerLayer();

RecoLocalCalo/HGCalRecAlgos/test/testHGCalRecHitTools_cfg.py

@@ -1,10 +1,47 @@
+###############################################################################
+# Way to use this:
+#   cmsRun testHGCalRecHitTools_cfg.py geometry=D110
+#
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
+#                        D105, D106, D107, D108, D109, D110, D111, D112, D113,
+#                        D114, D115, D116, D120
+#
+###############################################################################
 import FWCore.ParameterSet.Config as cms
+import os, sys, importlib, re
+import FWCore.ParameterSet.VarParsing as VarParsing
+
+###############################################################################
+### SETUP OPTIONS
+options = VarParsing.VarParsing('standard')
+options.register('geometry',
+                 "D110",
+                  VarParsing.VarParsing.multiplicity.singleton,
+                  VarParsing.VarParsing.varType.string,
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D120")
+
+### get and parse the command line arguments
+options.parseArguments()
+
+print(options)
+
+####################################################################
+# Use the options
+geomName = "Run4" + options.geometry
+geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
+import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
+GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
+
+print("Geometry Name:  ", geomName)
+print("Geom file Name: ", geomFile)
+print("Global Tag Name: ", GLOBAL_TAG)
+print("Era Name:        ", ERA)
 
 from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-process = cms.Process('PROD',Phase2C11)
+process = cms.Process('PROD',ERA)
 
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
-process.load('Configuration.Geometry.GeometryExtendedRun4D86Reco_cff')
+process.load(geomFile)
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load("RecoLocalCalo.HGCalRecAlgos.hgcalRecHitTools_cfi")