Modify passive materials position according to latest drawings

cms-sw · Nov 8, 2018 · 5a3d286 · 5a3d286
1 parent d2e65d0
commit 5a3d286
Show file tree

Hide file tree

Showing 8 changed files with 5,831 additions and 230 deletions.
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
@@ -26,8 +26,8 @@ Fast Timing system:
 * I2: Fast Timing detector (LYSO barrel, silicon endcap), only sensitive layers
 * I3: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO tiles
 * I4: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars
-* I5: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along z
-* I6: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along z flat
+* I5: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along z flat
+* I6: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along z flat no hole between modules
 
 The script also handles the common and forward elements of the geometry:
 * O2: detailed cavern description

diff --git a/Configuration/Geometry/python/dict2023Geometry.py b/Configuration/Geometry/python/dict2023Geometry.py
@@ -861,13 +861,13 @@
         1 : [
             'Geometry/MTDCommonData/data/btl.xml',
             'Geometry/MTDCommonData/data/etl.xml',
-            'Geometry/MTDCommonData/data/CrystalBarZ/mtd.xml',
+            'Geometry/MTDCommonData/data/CrystalBarZflat/mtd.xml',
             ],
         3 : [
-            'Geometry/MTDSimData/data/CrystalBar/mtdsens.xml'
+            'Geometry/MTDSimData/data/CrystalBarZflat/mtdsens.xml'
             ],
         4 : [
-            'Geometry/MTDSimData/data/CrystalBar/mtdProdCuts.xml'
+            'Geometry/MTDSimData/data/CrystalBarZflat/mtdProdCuts.xml'
             ],
         "sim" : [
             'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *',
@@ -887,7 +887,7 @@
         1 : [
             'Geometry/MTDCommonData/data/btl.xml',
             'Geometry/MTDCommonData/data/etl.xml',
-            'Geometry/MTDCommonData/data/CrystalBarZflat/mtd.xml',
+            'Geometry/MTDCommonData/data/CrystalBarZflatNOhole/mtd.xml',
             ],
         3 : [
             'Geometry/MTDSimData/data/CrystalBarZflat/mtdsens.xml'

diff --git a/DataFormats/ForwardDetId/interface/BTLDetId.h b/DataFormats/ForwardDetId/interface/BTLDetId.h
@@ -56,7 +56,7 @@ class BTLDetId : public MTDDetId {
   static constexpr int MAX_HASH =  2*MAX_IPHI_TILE*MAX_IETA_TILE-1; // the total amount is invariant per tile or bar)
   static constexpr int kSizeForDenseIndexing = MAX_HASH + 1 ;
 
-  enum class CrysLayout { tile = 1 , bar = 2 , barz = 3 , barzflat = 4} ;
+  enum class CrysLayout { tile = 1 , bar = 2 , barzflat = 3} ;
 
   // ---------- Constructors, enumerated types ----------
 

diff --git a/DataFormats/ForwardDetId/src/BTLDetId.cc b/DataFormats/ForwardDetId/src/BTLDetId.cc
@@ -12,10 +12,6 @@ int BTLDetId::iphi( CrysLayout lay ) const {
       kCrystalsInPhi = kCrystalsInPhiBar ;
       break ;
     }
-    case CrysLayout::barz  : {
-      kCrystalsInPhi = kCrystalsInPhiBarZ ;
-      break ;
-    }
     case CrysLayout::barzflat  : {
       kCrystalsInPhi = kCrystalsInPhiBarZ ;
       break ;
@@ -45,12 +41,6 @@ int BTLDetId::ietaAbs( CrysLayout lay ) const {
       kTypeBoundaries = kTypeBoundariesReference;
       break ;
     }
-    case CrysLayout::barz  : {
-      kCrystalsInEta = kCrystalsInEtaBarZ ;
-      kCrystalsInPhi = kCrystalsInPhiBarZ ;
-      kTypeBoundaries = kTypeBoundariesReference;
-      break ;
-    }
     case CrysLayout::barzflat  : {
       kCrystalsInEta = kCrystalsInEtaBarZ ;
       kCrystalsInPhi = kCrystalsInPhiBarZ ;
@@ -79,11 +69,6 @@ int BTLDetId::hashedIndex( CrysLayout lay ) const {
       max_ieta = MAX_IETA_BAR;
       break ;
     }
-    case CrysLayout::barz : {
-      max_iphi = MAX_IPHI_BARZ;
-      max_ieta = MAX_IETA_BARZ;
-      break ;
-    }
     case CrysLayout::barzflat : {
       max_iphi = MAX_IPHI_BARZFLAT;
       max_ieta = MAX_IETA_BARZFLAT;
@@ -118,14 +103,6 @@ BTLDetId BTLDetId::getUnhashedIndex( int hi, CrysLayout lay ) const {
       kTypeBoundaries = kTypeBoundariesReference;
       break ;
     }
-    case CrysLayout::barz : {
-      max_iphi = MAX_IPHI_BARZ;
-      max_ieta = MAX_IETA_BARZ;
-      nphi = kCrystalsInPhiBarZ;
-      keta = kCrystalsInEtaBarZ;
-      kTypeBoundaries = kTypeBoundariesReference;
-      break ;
-    }
     case CrysLayout::barzflat : {
       max_iphi = MAX_IPHI_BARZFLAT;
       max_ieta = MAX_IETA_BARZFLAT;

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D33XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D33XML_cfi.py
@@ -90,7 +90,7 @@
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/btl.xml',
         'Geometry/MTDCommonData/data/etl.xml',
-        'Geometry/MTDCommonData/data/CrystalBarZ/mtd.xml',
+        'Geometry/MTDCommonData/data/CrystalBarZflat/mtd.xml',
     )+
     cms.vstring(
         'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
@@ -112,13 +112,13 @@
         'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/MTDSimData/data/CrystalBar/mtdsens.xml',
+        'Geometry/MTDSimData/data/CrystalBarZflat/mtdsens.xml',
         'Geometry/HcalSimData/data/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
-        'Geometry/MTDSimData/data/CrystalBar/mtdProdCuts.xml',
+        'Geometry/MTDSimData/data/CrystalBarZflat/mtdProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
     ),
     rootNodeName = cms.string('cms:OCMS')

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D34XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D34XML_cfi.py
@@ -90,7 +90,7 @@
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/MTDCommonData/data/btl.xml',
         'Geometry/MTDCommonData/data/etl.xml',
-        'Geometry/MTDCommonData/data/CrystalBarZflat/mtd.xml',
+        'Geometry/MTDCommonData/data/CrystalBarZflatNOhole/mtd.xml',
     )+
     cms.vstring(
         'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',