Merge pull request #28826 from bsunanda/Run3-hcx247

Run3-hcx247 Try to make Hcal reco geometry to be derived from dd4hep
cms-sw · Jan 31, 2020 · f2da23b · f2da23b
2 parents e1e3f94 + d105500
commit f2da23b
Show file tree

Hide file tree

Showing 7 changed files with 193 additions and 115 deletions.
diff --git a/Geometry/HcalAlgo/data/cms-test-Phase2GeometryFine-algorithm.xml b/Geometry/HcalAlgo/data/cms-test-Phase2GeometryFine-algorithm.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <debug>
+<!-- 
+    <debug_shapes/>
+    <debug_includes/>
+    <debug_rotations/>
+    <debug_includes/>
+    <debug_volumes/>
+    <debug_constants/>
+    <debug_namespaces/>
+    <debug_placements/>
+    <debug_algorithms/>
+    <debug_materials/>
+    <debug_visattr/>
+-->
+  </debug>
+
+  <open_geometry/>
+  <close_geometry/>
+
+  <IncludeSection>
+    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/TrackerCommonData/data/trackermaterial.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cms/2026/v1/cms.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsMuon.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/muonMB.xml"/>
+    <Include ref="Geometry/EcalCommonData/data/ectkcable.xml"/>
+    <Include ref="Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml"/>
+    <Include ref="Geometry/EcalCommonData/data/ebalgo.xml"/>
+    <Include ref="Geometry/EcalCommonData/data/ebcon.xml"/>
+    <Include ref="Geometry/EcalCommonData/data/ebrot.xml"/>
+    <Include ref="Geometry/EcalCommonData/data/eecon.xml"/>
+    <Include ref="Geometry/EcalCommonData/data/escon/2026/v1/escon.xml"/>
+    <Include ref="Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalrotations.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalbarrelalgo.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalouteralgo.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalforwardalgo.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalSimNumbering/2026/hcalSimNumbering.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalRecNumbering/2026/hcalRecNumbering.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml"/>
+    <Include ref="Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml"/>
+    <Include ref="Geometry/EcalSimData/data/PhaseII/ecalsens.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml"/>
+    <Include ref="Geometry/HcalSimData/data/hf.xml"/>
+    <Include ref="Geometry/HcalSimData/data/hfpmt.xml"/>
+    <Include ref="Geometry/HcalSimData/data/hffibrebundle.xml"/>
+    <Include ref="Geometry/HcalSimData/data/CaloUtil.xml"/>
+    <Include ref="Geometry/HGCalSimData/data/hgcsensv8.xml"/>
+    <Include ref="Geometry/HGCalSimData/data/hgccons.xml"/>
+    <Include ref="Geometry/HGCalSimData/data/hgcProdCuts.xml"/>
+    <Include ref="Geometry/HcalSimData/data/HcalProdCuts.xml"/>
+    <Include ref="Geometry/EcalSimData/data/EcalProdCuts.xml"/>
+    <Include ref="Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/FieldParameters.xml"/>
+  </IncludeSection>
+
+</DDDefinition>
diff --git a/Geometry/HcalAlgo/data/cms-test-ddhcalPhase2-algorithm.xml b/Geometry/HcalAlgo/data/cms-test-ddhcalPhase2-algorithm.xml
@@ -44,6 +44,7 @@
     <Include ref="Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml"/>
     <Include ref="Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml"/>
     <Include ref="Geometry/HcalCommonData/data/hcalSimNumbering.xml"/>
+    <Include ref="Geometry/HcalCommonData/data/hcalRecNumbering.xml"/>
     <Include ref="Geometry/HcalSimData/data/hf.xml"/>
     <Include ref="Geometry/HcalSimData/data/hfpmt.xml"/>
     <Include ref="Geometry/HcalSimData/data/hffibre.xml"/>

diff --git a/Geometry/HcalCommonData/interface/HcalGeomParameters.h b/Geometry/HcalCommonData/interface/HcalGeomParameters.h
@@ -25,8 +25,16 @@ class HcalParameters;
 
 class HcalGeomParameters {
 public:
-  HcalGeomParameters();
-  ~HcalGeomParameters();
+  static constexpr double k_ScaleFromDDD = 0.1;
+  static constexpr double k_ScaleToDDD = 10.0;
+  static constexpr double k_ScaleFromDDDToG4 = 1.0;
+  static constexpr double k_ScaleToDDDFromG4 = 1.0;
+  static constexpr double k_ScaleFromDD4Hep = 1.0;
+  static constexpr double k_ScaleToDD4Hep = 1.0;
+  static constexpr double k_ScaleFromDD4HepToG4 = 10.0;
+  static constexpr double k_ScaleToDD4HepFromG4 = 0.1;
+
+  HcalGeomParameters() = default;
 
   double getConstDzHF() const { return dzVcal_; }
   void getConstRHO(std::vector<double>&) const;

diff --git a/Geometry/HcalCommonData/interface/HcalParametersFromDD.h b/Geometry/HcalCommonData/interface/HcalParametersFromDD.h
@@ -14,7 +14,8 @@ class HcalParametersFromDD {
   bool build(const cms::DDCompactView*, HcalParameters&);
 
 private:
-  bool build(const HcalParameters&);
+  bool build(HcalParameters&);
+  void rescale(std::vector<double>&, const double s);
 };
 
 #endif