Merge pull request #15055 from bsunanda/Phase2-hgx60

bsunanda:Phase2-hgx60 Correct BH geometry...
cms-sw · Jul 5, 2016 · 58301da · 58301da
2 parents 63cde7f + 6728103
commit 58301da
Show file tree

Hide file tree

Showing 15 changed files with 321 additions and 266 deletions.
diff --git a/DetectorDescription/Core/src/Polycone.cc b/DetectorDescription/Core/src/Polycone.cc
@@ -126,3 +126,12 @@ double Polycone::volume() const
    }
    return result;
 }
+
+void DDI::Polycone::stream(std::ostream & os) const
+{
+  os << " startPhi[deg]=" << p_[0]/deg
+     << " dPhi[deg]=" << p_[1]/deg 
+     << " Sizes[cm]=";
+  for (unsigned k=2; k<p_.size(); ++k)
+    os << p_[k]/cm << " ";
+}
diff --git a/DetectorDescription/Core/src/Polycone.h b/DetectorDescription/Core/src/Polycone.h
@@ -1,6 +1,7 @@
 #ifndef DDI_Polycone_h
 #define DDI_Polycone_h
 
+#include <iosfwd>
 #include <vector>
 
 #include "Solid.h"
@@ -20,7 +21,7 @@ namespace DDI {
 	       const std::vector<double> & r);
 
     double volume() const;
-
+    void stream(std::ostream &) const;  	       
   };		  
 }
 #endif // DDI_Polycone_h
diff --git a/DetectorDescription/Core/src/Polyhedra.cc b/DetectorDescription/Core/src/Polyhedra.cc
@@ -156,3 +156,13 @@ double Polyhedra::volume() const
 
    return volume;
 }
+
+void DDI::Polyhedra::stream(std::ostream & os) const
+{
+  os << " sides=" << p_[0]
+     << " startPhi[deg]=" << p_[1]/deg
+     << " dPhi[deg]=" << p_[2]/deg 
+     << " Sizes[cm]=";
+  for (unsigned k=3; k<p_.size(); ++k)
+    os << p_[k]/cm << " ";
+}
diff --git a/DetectorDescription/Core/src/Polyhedra.h b/DetectorDescription/Core/src/Polyhedra.h
@@ -1,6 +1,7 @@
 #ifndef DDI_Polyhedra_h
 #define DDI_Polyhedra_h
 
+#include <iosfwd>
 #include <vector>
 
 #include "Solid.h"
@@ -20,6 +21,7 @@ namespace DDI {
 	       const std::vector<double> & r);
 
     double volume() const;
+    void stream(std::ostream &) const;
 
   };		  
 }

diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc
@@ -115,7 +115,7 @@ void DDHGCalHEAlgo::constructLayers(DDLogicalPart module, DDCompactView& cpv) {
 
     double routB   = rMax(zo);
     std::string name = "HGCal"+names[ii]+dbl_to_string(copy);
-    edm::LogInfo("HGCalGeom") << "DDHGCalEEAlgo test: Layer " << i << ":" 
+    edm::LogInfo("HGCalGeom") << "DDHGCalHEAlgo test: Layer " << i << ":" 
 			      << ii << ":" << ityp << " Front " << zi << ", " 
 			      << rinF << ", " << routF << " Back " << zo 
 			      << ", " << rinB << ", " << routB;

diff --git a/Geometry/HGCalCommonData/python/testHGCV5XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV5XML_cfi.py
@@ -0,0 +1,20 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/cmsextent.xml',
+        'Geometry/CMSCommonData/data/PhaseI/cms.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/HGCalCommonData/data/v5/hgcal.xml',
+        'Geometry/HGCalCommonData/data/v5/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/v5/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/v5/hgcalHEsci.xml',
+        'Geometry/HGCalCommonData/data/v5/hgcalCons.xml'),
+    rootNodeName = cms.string('cms:OCMS')
+)
+
+
diff --git a/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py
@@ -0,0 +1,27 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/cmsextent.xml',
+        'Geometry/CMSCommonData/data/PhaseI/cms.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuild.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalsenspmf.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcal.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalCons.xml'),
+    rootNodeName = cms.string('cms:OCMS')
+)
+
+
diff --git a/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py
@@ -231,12 +231,12 @@
         'Geometry/MuonCommonData/data/design/muonYoke.xml',
         'Geometry/MuonCommonData/data/PhaseII/mf.xml',
         'Geometry/MuonCommonData/data/PhaseII/rpcf.xml',
-        'Geometry/MuonCommonData/data/v2/gemf.xml',
-        'Geometry/MuonCommonData/data/v7/gem11.xml',
-        'Geometry/MuonCommonData/data/v7/gem21.xml',
+        'Geometry/MuonCommonData/data/PhaseII/gemf.xml',
+        'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/gem21.xml',
         'Geometry/MuonCommonData/data/v2/csc.xml',
         'Geometry/MuonCommonData/data/PhaseII/mfshield.xml',
-        'Geometry/MuonCommonData/data/PhaseII/me0.xml',
+        'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/me0.xml',
         'Geometry/ForwardCommonData/data/forward.xml',
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',

diff --git a/Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml b/Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml
@@ -150,7 +150,7 @@
     <Numeric name="ModuleThick"   value="9.0*mm"/>
     <Numeric name="LayerThick"    value="7.0*mm"/>
     <Numeric name="ScintThick"    value="3.7*mm"/>
-    <Numeric name="RMaxFront"     value="[rMaxHECal1]"/>
+    <Numeric name="RMaxFront"     value="[rMaxHECalP3]"/>
     <Numeric name="RMaxBack"      value="[rMaxHECalP3]"/>
     <Numeric name="TrimLeft"      value="0.5*mm"/>
     <Numeric name="TrimRight"     value="0.5*mm"/>

diff --git a/Geometry/HcalCommonData/data/PhaseII/Rebuild/hcalendcapalgo.xml b/Geometry/HcalCommonData/data/PhaseII/Rebuild/hcalendcapalgo.xml
@@ -189,7 +189,7 @@
     <Numeric name="ModuleThick"   value="43.5*mm"/>
     <Numeric name="LayerThick"    value="12.0*mm"/>
     <Numeric name="ScintThick"    value="9.0*mm"/>
-    <Numeric name="RMaxFront"     value="[rMaxHECal0]"/>
+    <Numeric name="RMaxFront"     value="[rMaxHECalP1]"/>
     <Numeric name="RMaxBack"      value="[rMaxHECalP1]"/>
     <Numeric name="TrimLeft"      value="0.5*mm"/>
     <Numeric name="TrimRight"     value="1.5*mm"/>
@@ -223,7 +223,7 @@
     <Numeric name="ModuleThick"   value="43.5*mm"/>
     <Numeric name="LayerThick"    value="12.0*mm"/>
     <Numeric name="ScintThick"    value="9.0*mm"/>
-    <Numeric name="RMaxFront"     value="[rMaxHECalP1]"/>
+    <Numeric name="RMaxFront"     value="[rMaxHECalP2]"/>
     <Numeric name="RMaxBack"      value="[rMaxHECalP2]"/>
     <Numeric name="TrimLeft"      value="0.5*mm"/>
     <Numeric name="TrimRight"     value="1.5*mm"/>
@@ -257,7 +257,7 @@
     <Numeric name="ModuleThick"   value="9.0*mm"/>
     <Numeric name="LayerThick"    value="7.0*mm"/>
     <Numeric name="ScintThick"    value="3.7*mm"/>
-    <Numeric name="RMaxFront"     value="[rMaxHECalP2]"/>
+    <Numeric name="RMaxFront"     value="[rMaxHECalP3]"/>
     <Numeric name="RMaxBack"      value="[rMaxHECalP3]"/>
     <Numeric name="TrimLeft"      value="0.5*mm"/>
     <Numeric name="TrimRight"     value="0.5*mm"/>

diff --git a/Geometry/HcalCommonData/data/PhaseII/hcalendcapalgo.xml b/Geometry/HcalCommonData/data/PhaseII/hcalendcapalgo.xml
@@ -165,7 +165,7 @@
     <Numeric name="ModuleThick"   value="43.5*mm"/>
     <Numeric name="LayerThick"    value="12.0*mm"/>
     <Numeric name="ScintThick"    value="9.0*mm"/>
-    <Numeric name="RMaxFront"     value="[rMaxHECal1]"/>
+    <Numeric name="RMaxFront"     value="[rMaxHECalP1]"/>
     <Numeric name="RMaxBack"      value="[rMaxHECalP1]"/>
     <Numeric name="TrimLeft"      value="0.5*mm"/>
     <Numeric name="TrimRight"     value="1.5*mm"/>