Merge pull request #13996 from bsunanda/Phase2-gem14

bsunanda:Phase2-gem14 Update the forward muon definition in 2023 Geometry scenario
cms-sw · Apr 11, 2016 · 92c770d · 92c770d
2 parents 9df644c + 45708fa
commit 92c770d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py
@@ -233,7 +233,7 @@
         'Geometry/MuonCommonData/data/v7/gem21.xml',
         'Geometry/MuonCommonData/data/v2/csc.xml',
         'Geometry/MuonCommonData/data/PhaseII/mfshield.xml',
-        'Geometry/MuonCommonData/data/PhaseII/me0.xml',
+        'Geometry/MuonCommonData/data/v8/me0.xml',
         'Geometry/ForwardCommonData/data/forward.xml',
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023devXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023devXML_cfi.py
@@ -7,6 +7,7 @@
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/cmsextent.xml',
         'Geometry/CMSCommonData/data/PhaseI/cms.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',        
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
         'Geometry/CMSCommonData/data/caloBase.xml',
@@ -101,10 +102,14 @@
         'Geometry/MuonCommonData/data/v1/mb3.xml',
         'Geometry/MuonCommonData/data/v1/mb4.xml',
         'Geometry/MuonCommonData/data/design/muonYoke.xml',
-        'Geometry/MuonCommonData/data/v2/mf.xml',
-        'Geometry/MuonCommonData/data/v2/rpcf.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/v2/csc.xml',
-        'Geometry/MuonCommonData/data/v2/mfshield.xml',
+        'Geometry/MuonCommonData/data/PhaseII/mfshield.xml',
+        'Geometry/MuonCommonData/data/v8/me0.xml',
         'Geometry/ForwardCommonData/data/forward.xml',
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
@@ -128,14 +133,14 @@
         #'Geometry/ForwardCommonData/data/bcm1f.xml',
         #'Geometry/ForwardSimData/data/bcm1fsens.xml',
         #'Geometry/ForwardCommonData/data/plt.xml',
-        'Geometry/MuonCommonData/data/v2/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml',
         'Geometry/EcalSimData/data/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/MuonSimData/data/muonSens.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
@@ -146,7 +151,7 @@
         'Geometry/HcalSimData/data/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/EcalSimData/data/ESProdCuts.xml',
-        'Geometry/MuonSimData/data/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/CastorProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023simXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023simXML_cfi.py
@@ -7,6 +7,7 @@
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/cmsextent.xml',
         'Geometry/CMSCommonData/data/PhaseI/cms.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',        
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
         'Geometry/CMSCommonData/data/caloBase.xml',
@@ -101,10 +102,14 @@
         'Geometry/MuonCommonData/data/v1/mb3.xml',
         'Geometry/MuonCommonData/data/v1/mb4.xml',
         'Geometry/MuonCommonData/data/design/muonYoke.xml',
-        'Geometry/MuonCommonData/data/v2/mf.xml',
-        'Geometry/MuonCommonData/data/v2/rpcf.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/v2/csc.xml',
-        'Geometry/MuonCommonData/data/v2/mfshield.xml',
+        'Geometry/MuonCommonData/data/PhaseII/mfshield.xml',
+        'Geometry/MuonCommonData/data/v8/me0.xml',
         'Geometry/ForwardCommonData/data/forward.xml',
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
@@ -128,14 +133,14 @@
         #'Geometry/ForwardCommonData/data/bcm1f.xml',
         #'Geometry/ForwardSimData/data/bcm1fsens.xml',
         #'Geometry/ForwardCommonData/data/plt.xml',
-        'Geometry/MuonCommonData/data/v2/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml',
         'Geometry/EcalSimData/data/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/MuonSimData/data/muonSens.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
@@ -146,7 +151,7 @@
         'Geometry/HcalSimData/data/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/EcalSimData/data/ESProdCuts.xml',
-        'Geometry/MuonSimData/data/muonProdCuts.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/CastorProdCuts.xml',
         'Geometry/ForwardSimData/data/zdcProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',