Merge pull request #18289 from ianna/extended-2019-scenario-fix

Update 2019 Extended Scenario
cms-sw · Apr 12, 2017 · a0502f5 · a0502f5
2 parents 44bc494 + 7b51be1
commit a0502f5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/Geometry/CMSCommonData/data/cms/2019/v1/cms.xml b/Geometry/CMSCommonData/data/cms/2019/v1/cms.xml
@@ -18,13 +18,26 @@
  <Constant name="TrackBeamZ2"  value="2.935*m"/>
  <Constant name="TrackBeamSupZ1"  value="1.630*m-.6*cm"/>
  <Constant name="TrackBeamSupZ2"  value="1.630*m+.6*cm"/>
- <Constant name="TrackBeamR1"  value="2.50*cm"/> <!-- 3.10*cm -->
+ <Constant name="TrackBeamR1"  value="2.50*cm"/>
+ <Constant name="TrackBeamR11" value="3.10*cm"/>
+ <Constant name="TrackBeamR12" value="3.15*cm"/>
  <Constant name="TrackBeamR2"  value="7.40*cm"/>
+ <Constant name="TrackBeamR3" value="7.7633*cm"/>
  <Constant name="TrackLumiZ1"  value="1.722*m"/>
  <Constant name="TrackLumiZ2"  value="1.800*m"/>
  <Constant name="TrackLumiR1"  value="7.70*cm"/>
  <Constant name="TrackLumiR1Min" value="3.170*cm"/>
  <Constant name="TrackLumiR2Min" value="3.3*cm"/>
+ <Constant name="TrackFwdZ3"  value="1.948*m"/>
+ <Constant name="TrackFwdZOffset" value="106.91950*cm"/>
+ <Constant name="PIXSandwichLayer1Thick" value="0.2*mm"/>
+ <Constant name="PIXSandwichLayer2Thick" value="11.0*mm"/>
+ <Constant name="PIXSandwichLayer3Thick" value="0.5*mm"/>
+ <Constant name="PIXSandwichLayer4Thick" value="0.3*mm"/>
+ <Constant name="PIXSandwichLayerThick" value="[PIXSandwichLayer1Thick]+[PIXSandwichLayer2Thick]+[PIXSandwichLayer3Thick]+[PIXSandwichLayer4Thick]"/>
+ <Constant name="PIXNoseRin"  value="215*mm"/>
+ <Constant name="PIXNoseRout" value="[PIXNoseRin]+[PIXSandwichLayerThick]"/>
+ <Constant name="PIXNoseLength" value="619.5*mm"/>
  <Constant name="CalorBeamZ1"  value="3.180*m"/>
  <Constant name="CalorBeamZ2"  value="5.541*m"/>
  <Constant name="CalorBeamZ3"  value="5.245*m"/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py
@@ -7,10 +7,10 @@
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/cmsextent.xml',
         'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase.xml',
+        'Geometry/CMSCommonData/data/caloBase/2017/v1/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/CMSCommonData/data/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
@@ -46,7 +46,9 @@
         'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml', 
         'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml', 
         'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml', 
-        'Geometry/TrackerCommonData/data/PhaseI/pixbar.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbar.xml',
+        'Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml',
+        'Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml',
         'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml',
         'Geometry/TrackerCommonData/data/tibmaterial.xml',
         'Geometry/TrackerCommonData/data/tibmodpar.xml',
@@ -131,7 +133,7 @@
         'Geometry/TrackerCommonData/data/tobrod5l.xml',
         'Geometry/TrackerCommonData/data/tobrod5h.xml',
         'Geometry/TrackerCommonData/data/tobrod5.xml',
-        'Geometry/TrackerCommonData/data/tob.xml',
+        'Geometry/TrackerCommonData/data/v2/tob.xml',
         'Geometry/TrackerCommonData/data/tecmaterial.xml',
         'Geometry/TrackerCommonData/data/tecmodpar.xml',
         'Geometry/TrackerCommonData/data/tecmodule0.xml',
@@ -190,18 +192,18 @@
         'Geometry/TrackerCommonData/data/tecservices.xml',
         'Geometry/TrackerCommonData/data/tecbackplate.xml',
         'Geometry/TrackerCommonData/data/tec.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/tracker.xml',
+        'Geometry/TrackerCommonData/data/Run2/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/Run2/tracker.xml',
         'Geometry/TrackerCommonData/data/trackerpixbar.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml',
         'Geometry/TrackerCommonData/data/trackertibtidservices.xml',
         'Geometry/TrackerCommonData/data/trackertib.xml',
         'Geometry/TrackerCommonData/data/trackertid.xml',
         'Geometry/TrackerCommonData/data/trackertob.xml',
         'Geometry/TrackerCommonData/data/trackertec.xml',
-        'Geometry/TrackerCommonData/data/trackerbulkhead.xml',
+        'Geometry/TrackerCommonData/data/v2/trackerbulkhead.xml',
         'Geometry/TrackerCommonData/data/trackerother.xml',
-        'Geometry/EcalCommonData/data/eregalgo.xml',
+        'Geometry/EcalCommonData/data/Run2/eregalgo.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',

diff --git a/...uonNumbering/2019/v1/muonGemNumbering.xml → ...a/muonNumbering/2019/v1/muonNumbering.xml b/...uonNumbering/2019/v1/muonGemNumbering.xml → ...a/muonNumbering/2019/v1/muonNumbering.xml