Merge pull request #8 from ghugo83/test

Base geometry scenarios D63, D64 and D65 on M4 instead of M6, to avoi…
cms-sw · Jul 31, 2020 · 3d36a2c · 3d36a2c
2 parents 5afca5e + c404f73
commit 3d36a2c
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 42 deletions.
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
@@ -56,8 +56,8 @@ Several detector combinations have been generated:
 * D60 = T15+C10+M4+I10+O4+F3
 * D61 = T17+C9+M5+I10+O4+F2
 * D62 = T17+C14+M7+I11+O7+F6
-* D63 = T21+C11+M6+I11+O5+F4
-* D64 = T22+C11+M6+I11+O5+F4
-* D65 = T23+C11+M6+I11+O5+F4
+* D63 = T21+C11+M4+I11+O5+F4
+* D64 = T22+C11+M4+I11+O5+F4
+* D65 = T23+C11+M4+I11+O5+F4
 
 D49 is the HLT TDR baseline.
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -1259,9 +1259,9 @@
     ("O4","T15","C10","M4","F3","I10") : "D60",
     ("O4","T17","C9","M5","F2","I10") : "D61",
     ("O7","T17","C14","M7","F6","I11") : "D62",
-    ("O5","T21","C11","M6","F4","I11") : "D63",
-    ("O5","T22","C11","M6","F4","I11") : "D64",
-    ("O5","T23","C11","M6","F4","I11") : "D65",
+    ("O5","T21","C11","M4","F4","I11") : "D63",
+    ("O5","T22","C11","M4","F4","I11") : "D64",
+    ("O5","T23","C11","M4","F4","I11") : "D65",
  }
 
 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", "D52", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D55" ])

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D63.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D63.xml
@@ -70,15 +70,15 @@
     <Include ref='Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v5/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v2/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/PostLS2/brm.xml'/>
@@ -94,7 +94,7 @@
     <Include ref='Geometry/MTDCommonData/data/etl/v3/etl.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdStructureTopology.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D64.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D64.xml
@@ -70,15 +70,15 @@
     <Include ref='Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v5/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v2/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/PostLS2/brm.xml'/>
@@ -94,7 +94,7 @@
     <Include ref='Geometry/MTDCommonData/data/etl/v3/etl.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdStructureTopology.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D65.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D65.xml
@@ -70,15 +70,15 @@
     <Include ref='Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v5/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v2/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/PostLS2/brm.xml'/>
@@ -94,7 +94,7 @@
     <Include ref='Geometry/MTDCommonData/data/etl/v3/etl.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdStructureTopology.xml'/>
     <Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hf.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D63XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D63XML_cfi.py
@@ -71,15 +71,15 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
-        'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v5/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
+        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
         'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml',
+        'Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml',
         'Geometry/ForwardCommonData/data/forwardshield/2026/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
@@ -97,7 +97,7 @@
         'Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D64XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D64XML_cfi.py
@@ -71,15 +71,15 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
-        'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v5/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
+        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
         'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml',
+        'Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml',
         'Geometry/ForwardCommonData/data/forwardshield/2026/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
@@ -97,7 +97,7 @@
         'Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D65XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D65XML_cfi.py
@@ -71,15 +71,15 @@
         'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
-        'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v5/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
+        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
         'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml',
+        'Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml',
         'Geometry/ForwardCommonData/data/forwardshield/2026/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
@@ -97,7 +97,7 @@
         'Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',