Merge pull request #19256 from bsunanda/Run2-hcx136

Run2-hx136 To enable access front layer position
cms-sw · Jun 23, 2017 · 5ad2ca3 · 5ad2ca3
2 parents 0ec3143 + 876f86c
commit 5ad2ca3
Show file tree

Hide file tree

Showing 11 changed files with 253 additions and 145 deletions.
diff --git a/Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml b/Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml
@@ -80,8 +80,9 @@
     22.0*cm, 165.0*cm, 30.0*cm, 0.0*cm, 1115.0*cm, 0.375*cm,
     1137.0*cm
   </Vector>
-  <Vector name="noff" type="numeric" nEntries="19">
-    15,103, 4, 10, 5, 2, 4, 18, 19, 11, 12, 13, 14,  3,  4, 53,  4,  0,  1
+  <Vector name="noff" type="numeric" nEntries="31">
+    15,103, 4, 10, 5, 2, 4, 18, 19, 11, 12, 13, 14,  3,  4, 53,  4,  0,  1,
+    0,   0, 0,  0, 0,10, 5,  0,  1,  7,  7,  7
   </Vector>
   <Vector name="Layer0Wt" type="numeric" nEntries="2">
     1.2, 1.2

diff --git a/Geometry/HcalCommonData/interface/HcalCellType.h b/Geometry/HcalCommonData/interface/HcalCellType.h
@@ -54,8 +54,10 @@ class HcalCellType {
   double phiBinWidth() const {return thePhiBinWidth;}
   double phiOffset() const {return thePhiOffset;}
   int    unitPhi() const {return theUnitPhi;}
-  void   setPhi(std::vector<std::pair<int,double>>& phis,
-		std::vector<int>& iphiMiss, double foff,double dphi, int unit);
+  void   setPhi(const std::vector<std::pair<int,double>>& phis,
+		const std::vector<int>& iphiMiss, double foff, double dphi,
+		int unit);
+  void   setPhi(const std::vector<std::pair<int,double>>& phis) {thePhis = phis;}
 
   /// which cell will actually do the readout for this cell
   /// 1 means move hits in this cell up, and -1 means down

diff --git a/Geometry/HcalCommonData/interface/HcalDDDRecConstants.h b/Geometry/HcalCommonData/interface/HcalDDDRecConstants.h
@@ -42,10 +42,11 @@ class HcalDDDRecConstants {
                                etaMin(et1), etaMax(et2) {}
   };
   struct HcalActiveLength {
-    int    ieta, depth;
+    int    ieta, depth, zside, stype;
     double eta, thick;
-    HcalActiveLength(int ie=0, int d=0, double et=0, 
-		     double t=0) : ieta(ie), depth(d), eta(et), thick(t) {}
+    HcalActiveLength(int ie=0, int d=0, int z=0, int s=0, double et=0, 
+		     double t=0) : ieta(ie), depth(d), zside(z), stype(s),
+                                   eta(et), thick(t) {}
   };
   struct HFCellParameters {
     int    ieta, depth, firstPhi, stepPhi, nPhi;
@@ -78,6 +79,7 @@ class HcalDDDRecConstants {
 				    int idepth) const;
   std::vector<HFCellParameters>    getHFCellParameters() const;
   void                      getLayerDepth(int ieta, std::map<int,int>& layers) const;
+  int                       getLayerFront(int det, int eta, int phi, int depth) const;
   double                    getLayer0Wt(int det, int phi, int zside) const {return hcons.getLayer0Wt(det,phi,zside);}
   int                       getMaxDepth(const int type) const {return maxDepth[type];}
   int                       getMaxDepth(const int itype, const int ieta,
@@ -95,6 +97,7 @@ class HcalDDDRecConstants {
   const std::vector<double> &      getPhiTableHF() const {return hpar->phitable;}
   int                       getPhiZOne(std::vector<std::pair<int,int> >& phiz) const;
   double                    getRZ(int subdet, int ieta, int depth) const;
+  double                    getRZ(int subdet, int ieta, int iphi, int depth) const;
   std::vector<HcalActiveLength>    getThickActive(const int type) const;
   int                       getTopoMode() const {return ((hpar->topologyMode)&0xFF);}
   int                       getTriggerMode() const {return (((hpar->topologyMode)>>8)&0xFF);}

diff --git a/Geometry/HcalCommonData/interface/HcalDDDSimConstants.h b/Geometry/HcalCommonData/interface/HcalDDDSimConstants.h
@@ -53,6 +53,7 @@ class HcalDDDSimConstants {
   const std::vector<HcalDetId> & getIdHF2QIE() const {return idHF2QIE;}
   double                    getLayer0Wt(const int det, const int phi, 
 					const int zside) const;
+  int                       getFrontLayer(const int det, const int eta) const;
   int                       getLayerFront(const int det, const int eta, 
 					  const int phi, const int zside,
 					  const int depth) const;
@@ -127,6 +128,8 @@ class HcalDDDSimConstants {
   double              dlShort;  // Diference of length between long and short
   int                 depthEta16[2]; // depth index of ieta=16 for HBmax, HEMin
   int                 depthEta29[2]; // maximum depth index for ieta=29
+  int                 layFHB[2]; // first layers in HB (normal, special 16)
+  int                 layFHE[3]; // first layers in HE (normal, special 16, 18)
   bool                isBH_;         // if HE is BH
   std::vector<HcalDetId> idHF2QIE;   // DetId's of HF modules with 2 QIE's
   std::pair<int,int>  depthMaxDf_, depthMaxSp_; // (subdet,maximum depth) default,special

diff --git a/Geometry/HcalCommonData/python/testPhase2GeometryFineXML_cfi.py b/Geometry/HcalCommonData/python/testPhase2GeometryFineXML_cfi.py
@@ -7,37 +7,39 @@
     geomXMLFiles = cms.vstring(
         'Geometry/CMSCommonData/data/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
-        'Geometry/CMSCommonData/data/extend/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
+        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
         'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2023/v1/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
         'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml',
         'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern.xml',
+        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
+        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixbar.xml',
         'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4026/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelProdCuts.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixelStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackersens.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4025/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/ectkcable.xml',
         'Geometry/EcalCommonData/data/PhaseII/eregalgo.xml',
@@ -71,11 +73,11 @@
         'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_BaseLine/gem21.xml',
+        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
         'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
         'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml',
         'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2015/v1/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials.xml',

diff --git a/Geometry/HcalCommonData/python/testPhase2GeometryXML_cfi.py b/Geometry/HcalCommonData/python/testPhase2GeometryXML_cfi.py
@@ -7,37 +7,39 @@
     geomXMLFiles = cms.vstring(
         'Geometry/CMSCommonData/data/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
-        'Geometry/CMSCommonData/data/extend/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
+        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
         'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2023/v1/muonBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
         'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml',
         'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern.xml',
+        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
+        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixbar.xml',
         'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4026/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelProdCuts.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixelStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackersens.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4025/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/ectkcable.xml',
         'Geometry/EcalCommonData/data/PhaseII/eregalgo.xml',
@@ -71,11 +73,11 @@
         'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_BaseLine/gem21.xml',
+        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
         'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
         'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml',
         'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2015/v1/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials.xml',

diff --git a/Geometry/HcalCommonData/src/HcalCellType.cc b/Geometry/HcalCommonData/src/HcalCellType.cc
@@ -84,12 +84,13 @@ void HcalCellType::setDepth(int bin, double dmin, double dmax) {
   theDepthMax     = dmax;
 }
 
-void HcalCellType::setPhi(std::vector<std::pair<int,double> >& phis,
-			  std::vector<int>& iphiMiss, double foff, double dphi,
-			  int unit) {
+void HcalCellType::setPhi(const std::vector<std::pair<int,double> >& phis,
+			  const std::vector<int>& iphiMiss, double foff, 
+			  double dphi, int unit) {
   thePhiBinWidth = dphi;
   thePhiOffset   = foff;
   theUnitPhi     = unit;
+  thePhis.clear();
   for (unsigned int k=0; k<phis.size(); ++k) {
     if (std::find(iphiMiss.begin(),iphiMiss.end(),phis[k].first) == iphiMiss.end()) {
       thePhis.push_back(phis[k]);