Geometry scenario: Update D48. It is better to have D48 based on all …

…the latest CMS geometries. Hence, D48 is now same as D47, but with Tracker T16 instead of T15.
ghugo83 · Aug 22, 2019 · ce63120 · ce63120
1 parent b245d6b
commit ce63120
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
@@ -40,6 +40,6 @@ Several detector combinations have been generated:
 * D45 = T15+C8+M3+I10+O3+F2
 * D46 = T15+C9+M3+I10+O3+F2
 * D47 = T15+C10+M3+I10+O3+F3
-* D48 = T16+C9+M3+I10+O3+F2
+* D48 = T16+C10+M3+I10+O3+F3
 
 D35 is the baseline for the MTD TDR, and D41 is the baseline for the L1T TDR.
diff --git a/Configuration/Geometry/python/GeometryExtended2026D48Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D48Reco_cff.py
@@ -16,6 +16,8 @@
 # calo
 from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
 from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.HFNoseTopology_cfi import *
+from Geometry.ForwardGeometry.HFNoseGeometryESProducer_cfi import *
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
 CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
@@ -25,7 +27,8 @@
                                 "TOWER",
                                 "HGCalEESensitive",
                                 "HGCalHESiliconSensitive",
-                                "HGCalHEScintillatorSensitive"
+                                "HGCalHEScintillatorSensitive",
+                                "HGCalHFNoseSensitive",
     )
 )
 from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *

diff --git a/Configuration/Geometry/python/GeometryExtended2026D48_cff.py b/Configuration/Geometry/python/GeometryExtended2026D48_cff.py
@@ -10,4 +10,7 @@
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
 from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
 from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.ForwardCommonData.hfnoseParametersInitialization_cfi import *
+from Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi  import *
+
 from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -914,7 +914,7 @@
     ("O3","T15","C8","M3","F2","I10") : "D45",
     ("O3","T15","C9","M3","F2","I10") : "D46",
     ("O3","T15","C10","M3","F3","I10") : "D47",
-    ("O3","T16","C9","M3","F2","I10") : "D48",
+    ("O3","T16","C10","M3","F3","I10") : "D48",
 }
 
 deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42" ])

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D48XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D48XML_cfi.py
@@ -65,6 +65,10 @@
         'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
+        'Geometry/ForwardCommonData/data/hfnose/v1/hfnose.xml',
+        'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
+        'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml',
+        'Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
@@ -79,9 +83,9 @@
         'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
         'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
         'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2026/v1/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
+        'Geometry/ForwardCommonData/data/brm/2026/v2/brm.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
@@ -104,6 +108,7 @@
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv9.xml',
+        'Geometry/ForwardSimData/data/hfnosesens.xml',
         'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
@@ -117,6 +122,7 @@
         'Geometry/HcalSimData/data/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
+        'Geometry/ForwardSimData/data/hfnoseProdCuts.xml',
         'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',