Merged refs/pull/3136/head from repository cms-sw

cms-sw · Apr 1, 2014 · 0c73f26 · 0c73f26
2 parents 2bd9348 + abe1b86
commit 0c73f26
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Geometry/MuonCommonData/data/PhaseII/v3/mf.xml b/Geometry/MuonCommonData/data/PhaseII/v3/mf.xml
@@ -41,7 +41,7 @@
   </Polycone>
   <Tubs name="ME3Ring" rMin="1360*mm" rMax="7.02*m  " dz="32.75*cm " startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ME4Ring" rMin="1530*mm" rMax="7.02*m  " dz="33.675*cm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="RR2X" rMin="1.97*m  " rMax="6.99*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="RR2X" rMin="3.3015*m  " rMax="6.99*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
  </SolidSection>
 
  <LogicalPartSection label="mf.xml">

diff --git a/Geometry/MuonCommonData/data/v7/me0.xml b/Geometry/MuonCommonData/data/v7/me0.xml
@@ -15,8 +15,8 @@
    <Constant name="xTop"  value="(2.*[dZ]*tan(10*deg)+[xBot])"/> 
  </ConstantsSection>
  <SolidSection label="me0.xml">
-  <Tubs name="ME0" rMin="[rMin]" rMax="[rMax]" dz="15.*cm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Trd1 name="ME0Box" dz="[dZ]" dy1="15*cm" dy2="15*cm" dx1="[xBot]" dx2="[xTop]" />
+  <Tubs name="ME0" rMin="[rMin]" rMax="[rMax]" dz="14.75*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Trd1 name="ME0Box" dz="[dZ]" dy1="14.75*cm" dy2="14.75*cm" dx1="[xBot]" dx2="[xTop]" />
   <Trd1 name="ME0L" dz="[dZ]" dy1="0.3*cm" dy2="0.3*cm" dx1="[xBot]" dx2="[xTop]" />
  </SolidSection>
 
@@ -63,12 +63,12 @@
   <PosPart copyNumber="1">
     <rParent name="mf:ME0RingP"/>
     <rChild name="me0:ME0P"/>
-    <Translation x="0*fm" y="0*fm" z="5.391*m" />
+    <Translation x="0*fm" y="0*fm" z="5.3935*m" />
   </PosPart>
   <PosPart copyNumber="1">
     <rParent name="mf:ME0RingN"/>
     <rChild name="me0:ME0N"/>
-    <Translation x="0*fm" y="0*fm" z="5.391*m" />
+    <Translation x="0*fm" y="0*fm" z="5.3935*m" />
   </PosPart>
   <PosPart copyNumber="1">
     <rParent name="ME0Box"/>