Merge pull request #29963 from bsunanda/Run3-ft25

Run3-ft25 Fix overlap for run3 geometry - backport #29953
cms-sw · May 26, 2020 · 833d01b · 833d01b
2 parents 76c767f + fb725af
commit 833d01b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Geometry/CMSCommonData/data/beampipe/2021/v1/beampipe.xml b/Geometry/CMSCommonData/data/beampipe/2021/v1/beampipe.xml
@@ -31,7 +31,7 @@
   <Constant name="BeampipeRout2"  value="2.2700*cm"/>
   <Constant name="BeampipeRout3"  value="2.3200*cm"/>
   <Constant name="BeampipeRout4"  value="2.5275*cm"/>
-  <Constant name="BeampipeRout14" value="3.9000*cm"/>
+  <Constant name="BeampipeRout14" value="[cms:ForwdBeamR4]"/>
   <Constant name="BeampipeRout5"  value="3.7500*cm"/>
   <Constant name="BeampipeRout6"  value="4.1000*cm"/>
   <Constant name="BeampipeRout7"  value="7.5500*cm"/>

diff --git a/Geometry/CMSCommonData/data/cms/2021/v3/cms.xml b/Geometry/CMSCommonData/data/cms/2021/v3/cms.xml
@@ -87,7 +87,7 @@
  <Constant name="ForwdBeamR1"  value="12.495*cm"/>
  <Constant name="ForwdBeamR2"  value="12.50*cm"/>
  <Constant name="ForwdBeamR3"  value="25.0*cm"/>
- <Constant name="ForwdBeamR4"  value="2.85*cm+0.65*cm"/> <!-- Post LS2 beam-pipe -->
+ <Constant name="ForwdBeamR4"  value="3.90*cm"/> <!-- Post LS2 beam-pipe -->
  <Constant name="ForwdBeamR5"  value="7.50*cm"/>
  <Constant name="ForwdBeamR6"  value="20.5*cm"/>
  <Constant name="ForwdBeamR7"  value="4.00*cm"/>