Skip to content

Commit

Permalink
Overlap fixes from Alessia.
Browse files Browse the repository at this point in the history
  • Loading branch information
ianna committed Mar 3, 2014
1 parent 9cb19b8 commit 9914b79
Show file tree
Hide file tree
Showing 27 changed files with 364 additions and 266 deletions.
14 changes: 7 additions & 7 deletions Geometry/TrackerCommonData/data/PhaseI/pixbar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -355,11 +355,11 @@
<Tubs name="PixelBarrelConnToST" rMin="[ConnToSTRin]" rMax="[ConnToSTRout]"
dz="[ConnToSTT]/2" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="PixelBarrelConn3" rMin="[Conn3Rin]" rMax="[Conn3Rout]"
dz="[Conn3T]/2" startPhi="285*deg" deltaPhi="150*deg"/>
dz="[Conn3T]/2" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="PixelBarrelConn4" rMin="[Conn4Rin]" rMax="[Conn3Rout]"
dz="[Conn4T]/2" startPhi="285*deg" deltaPhi="150*deg"/>
dz="[Conn4T]/2" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="PixelBarrelService" rMin="[ServiceRin]" rMax="[ServiceRout]"
dz="[ServT]/2" startPhi="293*deg" deltaPhi="134*deg"/>
dz="[ServT]/2" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="PixelBarrelSupTubCables" rMin="[RinSupTubCab]" rMax="[Conn3Rout]"
dz="[ServCablT]/2" startPhi="0*deg" deltaPhi="360*deg"/>
</SolidSection>
Expand Down Expand Up @@ -539,19 +539,19 @@
</LogicalPart>
<LogicalPart name="PixelBarrelConn3" category="unspecified">
<rSolid name="PixelBarrelConn3"/>
<rMaterial name="pixbarmaterial:SupplyTubeConn3"/>
<rMaterial name="pixbarmaterial:SupplyTubeConn3_3Disks"/>
</LogicalPart>
<LogicalPart name="PixelBarrelConn4" category="unspecified">
<rSolid name="PixelBarrelConn4"/>
<rMaterial name="pixbarmaterial:SectorC"/>
<rMaterial name="pixbarmaterial:SectorC_3Disks"/>
</LogicalPart>
<LogicalPart name="PixelBarrelService" category="unspecified">
<rSolid name="PixelBarrelService"/>
<rMaterial name="pixbarmaterial:SectorA"/>
<rMaterial name="pixbarmaterial:SectorA_3Disks"/>
</LogicalPart>
<LogicalPart name="PixelBarrelSupTubCables" category="unspecified">
<rSolid name="PixelBarrelSupTubCables"/>
<rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2"/>
<rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2_3Disks"/>
</LogicalPart>
</LogicalPartSection>

Expand Down
46 changes: 45 additions & 1 deletion Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<MaterialSection label="pixbarmaterial.xml">

<!-- New materials -->
<CompositeMaterial name="SupplyTubeConn3" density="0.3556*g/cm3" symbol=" " method="mixture by weight"> <!--Supply tube material in Conn3 volume-->
<CompositeMaterial name="SupplyTubeConn3" density="0.3556*g/cm3" symbol=" " method="mixture by weight"> <!--Supply tube material in Conn3 volume (no fpix contribution and 150/180 deg sectors)-->
<MaterialFraction fraction="0.027795">
<rMaterial name="materials:Bpix_Pipe_Steel"/>
</MaterialFraction>
Expand All @@ -30,6 +30,17 @@
<rMaterial name="materials:T_Kapton"/>
</MaterialFraction>
</CompositeMaterial>

<CompositeMaterial name="SupplyTubeConn3_3Disks" density="0.4646*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added -->
<MaterialFraction fraction="1.00000000">
<rMaterial name="SupplyTubeConn3"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="SupplyTubeConn3_10Disks" density="0.7908*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added -->
<MaterialFraction fraction="1.00000000">
<rMaterial name="SupplyTubeConn3"/>
</MaterialFraction>
</CompositeMaterial>

<CompositeMaterial name="SupplyTubeEpoxy" density="1.05*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.5999">
Expand Down Expand Up @@ -576,6 +587,17 @@
<rMaterial name="trackermaterial:T_Nomex"/>
</MaterialFraction>
</CompositeMaterial>

<CompositeMaterial name="SectorA_3Disks" density="0.55812*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added -->
<MaterialFraction fraction="1.0">
<rMaterial name="pixbarmaterial:SectorA"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="SectorA_10Disks" density="0.95001*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added -->
<MaterialFraction fraction="1.0">
<rMaterial name="pixbarmaterial:SectorA"/>
</MaterialFraction>
</CompositeMaterial>

<CompositeMaterial name="SectorB" density="0.74961*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.19011">
Expand Down Expand Up @@ -648,6 +670,17 @@
<rMaterial name="trackermaterial:T_Nomex"/>
</MaterialFraction>
</CompositeMaterial>

<CompositeMaterial name="SectorC_3Disks" density="1.22394*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added -->
<MaterialFraction fraction="1.000000">
<rMaterial name="pixbarmaterial:SectorC"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="SectorC_10Disks" density="2.18549*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added -->
<MaterialFraction fraction="1.000000">
<rMaterial name="pixbarmaterial:SectorC"/>
</MaterialFraction>
</CompositeMaterial>

<CompositeMaterial name="SectorC_Upgrade" density="0.19652*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1.00000000">
Expand Down Expand Up @@ -685,6 +718,17 @@
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
</CompositeMaterial>

<CompositeMaterial name="PixelBarrelSupTubCables2_3Disks" density="0.96016*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added -->
<MaterialFraction fraction="1.00000000">
<rMaterial name="PixelBarrelSupTubCables2"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="PixelBarrelSupTubCables2_10Disks" density="1.63436*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added -->
<MaterialFraction fraction="1.00000000">
<rMaterial name="PixelBarrelSupTubCables2"/>
</MaterialFraction>
</CompositeMaterial>


</MaterialSection>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!-- <Constant name="OuterRingHalfWidth" value="18.6*mm"/> -->
<Constant name="OuterRingHalfWidth" value="18.6*mm"/>
<Constant name="OuterRingZ" value="-[pixfwdDisks:DiskHalfWidth]+[OuterRingHalfWidth]"/>
<Constant name="InnerRingRMax" value="89.2"/>
<Constant name="InnerRingRMax" value="89.2*mm"/>
<Constant name="InnerRingRMin" value="[InnerRingRMax]-2.0*mm"/>
<Constant name="InnerRingCFRMax" value="[InnerRingRMin]"/>
<Constant name="InnerRingCFRMin" value="[InnerRingCFRMax]-0.5*mm"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-- <Constant name="OuterRingHalfWidth" value="18.6*mm"/> -->
<Constant name="OuterRingHalfWidth" value="18.6*mm"/>
<Constant name="OuterRingZ" value="-[pixfwdDisks:DiskHalfWidth]+[OuterRingHalfWidth]"/>
<Constant name="InnerRingRMax" value="89.2"/>
<Constant name="InnerRingRMax" value="89.2*mm"/>
<Constant name="InnerRingRMin" value="[InnerRingRMax]-2.0*mm"/>
<Constant name="InnerRingCFRMax" value="[InnerRingRMin]"/>
<Constant name="InnerRingCFRMin" value="[InnerRingCFRMax]-0.5*mm"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!-- <Constant name="OuterRingHalfWidth" value="18.6*mm"/> -->
<Constant name="OuterRingHalfWidth" value="18.6*mm"/>
<Constant name="OuterRingZ" value="-[pixfwdDisks:DiskHalfWidth]+[OuterRingHalfWidth]"/>
<Constant name="InnerRingRMax" value="89.2"/>
<Constant name="InnerRingRMax" value="89.2*mm"/>
<Constant name="InnerRingRMin" value="[InnerRingRMax]-2.0*mm"/>
<Constant name="InnerRingCFRMax" value="[InnerRingRMin]"/>
<Constant name="InnerRingCFRMin" value="[InnerRingCFRMax]-0.5*mm"/>
Expand Down
150 changes: 17 additions & 133 deletions Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
<Constant name="Rin1" value="2.50*cm"/>
<Constant name="Rin2" value="18.00*cm"/>
<Constant name="Rin3" value="18.6*cm"/>
<Constant name="RinSupTubCab" value="15.00*cm"/>
<Constant name="Rout1" value="21.35*cm"/>
<Constant name="Rout1" value="20.35*cm"/> <!-- 21.35*cm-->
<Constant name="Rout2" value="21.00*cm"/>
<Constant name="Zv1" value="28.70*cm"/>
<Constant name="Zv2" value="56.00*cm"/>
<Constant name="Zv3" value="110.5*cm"/>
<Constant name="Zv4" value="282.0*cm"/>
<Constant name="ZvSupTubCab" value="248.0*cm"/>
<Constant name="SupportL" value="221.0*cm"/>
<Constant name="SupportRin" value="21.2*cm"/>
<Constant name="SupportRin" value="20.2*cm"/> <!-- 21.2*cm-->
<Constant name="SupportL_cut" value="[FlangeT]"/>
<Constant name="SupportW_cut" value="7.00*cm"/>
<Constant name="SupportW" value="20.00*cm"/>
Expand Down Expand Up @@ -136,23 +135,9 @@
<Constant name="Conn2Rin" value="11.00*cm"/>
<Constant name="Conn1Z" value="[FlangeZ]-[FlangeT]/2-[Conn1T]/2"/>
<Constant name="Conn2Z" value="[FlangeZ]+[FlangeT]/2+[Conn1T]/2"/>
<Constant name="Conn3Rout" value="19.0*cm"/>
<Constant name="Conn3Rin" value="18.0*cm"/>
<Constant name="Conn4Rin" value="18.0*cm"/>
<Constant name="ConnToSTT" value="3.00*cm"/>
<Constant name="ConnToSTRin" value="18.0*cm"/>
<Constant name="ConnToSTRout" value="18.8*cm"/>
<Constant name="Conn3T" value="51.0*cm"/>
<Constant name="Conn4T" value="120.00*cm"/>
<Constant name="ConnToSTZ" value="30.50*cm"/>
<Constant name="Conn3Z" value="54.62*cm"/>
<Constant name="Conn4Z" value="[Conn3Z]+ ([Conn3T]+[Conn4T])/2"/>
<Constant name="ServiceRout" value="21.0*cm"/>
<Constant name="ServiceRin" value="18.0*cm"/>
<Constant name="ServT" value="48.5*cm"/>
<Constant name="ServZ" value="[Conn4Z]+ ([Conn4T]+[ServT])/2"/>
<Constant name="ServCablT" value="32.2*cm"/>
<Constant name="ServCablZ" value="[ServZ]+[ServT]/2+[ServCablT]/2"/>
<Constant name="RadialCoolZ" value="29.5*cm"/>
<Constant name="RadialCoolDZ" value="1.0*cm"/>
<Constant name="RadialCoolRin" value="4.0*cm"/>
Expand All @@ -162,24 +147,20 @@
</RotationSection>
<SolidSection label="pixbar.xml">
<Polycone name="PixelBarrel" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="-281.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/>
<ZSection z="-245.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/>
<ZSection z="-245.00*cm" rMin="[Rin2]" rMax="21.8*cm"/>
<ZSection z="-118.5*cm" rMin="[Rin2]" rMax="21.8*cm"/>
<ZSection z="-118.5*cm" rMin="[Rin2]" rMax="67.087*cm"/>
<ZSection z="-116.9*cm" rMin="[Rin2]" rMax="67.087*cm"/>
<ZSection z="-116.9*cm" rMin="[Rin2]" rMax="109.65*cm"/>
<ZSection z="-28.70*cm" rMin="[Rin2]" rMax="109.65*cm"/>
<ZSection z="-28.70*cm" rMin="[Rin1]" rMax="109.65*cm"/>
<ZSection z="28.70*cm" rMin="[Rin1]" rMax="109.65*cm"/>
<ZSection z="28.70*cm" rMin="[Rin2]" rMax="109.65*cm"/>
<ZSection z="116.9*cm" rMin="[Rin2]" rMax="109.65*cm"/>
<ZSection z="116.9*cm" rMin="[Rin2]" rMax="67.087*cm"/>
<ZSection z="118.5*cm" rMin="[Rin2]" rMax="67.087*cm"/>
<ZSection z="118.5*cm" rMin="[Rin2]" rMax="21.8*cm"/>
<ZSection z="245.00*cm" rMin="[Rin2]" rMax="21.8*cm"/>
<ZSection z="245.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/>
<ZSection z="281.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/>
<ZSection z="-291.0*cm" rMin="117.99*cm" rMax="120.0*cm"/>
<ZSection z="-119.0*cm" rMin="117.99*cm" rMax="120.0*cm"/>
<ZSection z="-119.0*cm" rMin="19.0*cm" rMax="120.0*cm"/>
<ZSection z="-29.12*cm" rMin="19.0*cm" rMax="120.0*cm"/>
<ZSection z="-29.12*cm" rMin="[Rin2]" rMax="120.0*cm"/>
<ZSection z="-28.70*cm" rMin="[Rin2]" rMax="120.0*cm"/>
<ZSection z="-28.70*cm" rMin="[Rin1]" rMax="120.0*cm"/>
<ZSection z="28.70*cm" rMin="[Rin1]" rMax="120.0*cm"/>
<ZSection z="28.70*cm" rMin="[Rin2]" rMax="120.0*cm"/>
<ZSection z="29.12*cm" rMin="[Rin2]" rMax="120.0*cm"/>
<ZSection z="29.12*cm" rMin="19.0*cm" rMax="120.0*cm"/>
<ZSection z="119.0*cm" rMin="19.0*cm" rMax="120.0*cm"/>
<ZSection z="119.0*cm" rMin="117.99*cm" rMax="120.0*cm"/>
<ZSection z="291.0*cm" rMin="117.99*cm" rMax="120.0*cm"/>
</Polycone>
<!--
<Polycone name="PixelBarrel" startPhi="0*deg" deltaPhi="360*deg">
Expand Down Expand Up @@ -209,7 +190,7 @@
</Polycone>
-->
<Tubs name="PixelBarrelSuppTub" rMin="[SupportRin]" rMax="[Rout1]" dz="[SupportL]/2" startPhi="0*deg" deltaPhi="360*deg"/>
<Box name="PixelBarrelSuppBox_full" dx="[SupportW]/2 - 3.2*cm" dy="[SupportT]/2" dz="[SupportL]/2"/>
<Box name="PixelBarrelSuppBox_full" dx="[SupportW]/2 - 3.7*cm" dy="[SupportT]/2" dz="[SupportL]/2"/>
<Box name="PixelBarrelSuppBox_cut" dx="[SupportW_cut]/2" dy="[SupportT]/2" dz="[SupportL_cut]/2"/>
<SubtractionSolid name="PixelBarrelSuppBox_1">
<rSolid name="PixelBarrelSuppBox_full"/>
Expand Down Expand Up @@ -291,10 +272,6 @@
<Tubs name="PixelBarrelConn1" rMin="[Conn1Rin]" rMax="[Shield3Rin]" dz="[Conn1T]/2" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="PixelBarrelConn2" rMin="[Conn2Rin]" rMax="[Shield3Rin]" dz="[Conn1T]/2" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="PixelBarrelConnToST" rMin="[ConnToSTRin]" rMax="[ConnToSTRout]" dz="[ConnToSTT]/2" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="PixelBarrelConn3" rMin="[Conn3Rin]" rMax="[Conn3Rout]" dz="[Conn3T]/2" startPhi="285*deg" deltaPhi="150*deg"/>
<Tubs name="PixelBarrelConn4" rMin="[Conn4Rin]" rMax="[Conn3Rout]" dz="[Conn4T]/2" startPhi="285*deg" deltaPhi="150*deg"/>
<Tubs name="PixelBarrelService" rMin="[ServiceRin]" rMax="[ServiceRout]" dz="[ServT]/2" startPhi="293*deg" deltaPhi="134*deg"/>
<Tubs name="PixelBarrelSupTubCables" rMin="[RinSupTubCab]" rMax="[Conn3Rout]" dz="[ServCablT]/2" startPhi="0*deg" deltaPhi="360*deg"/>
</SolidSection>
<LogicalPartSection label="pixbar.xml">
<LogicalPart name="PixelBarrel" category="unspecified">
Expand Down Expand Up @@ -461,22 +438,6 @@
<rSolid name="PixelBarrelConnToST"/>
<rMaterial name="pixbarmaterial:cable_endring_to_tube_Upgrade"/>
</LogicalPart>
<LogicalPart name="PixelBarrelConn3" category="unspecified">
<rSolid name="PixelBarrelConn3"/>
<rMaterial name="pixbarmaterial:SupplyTubeConn3"/>
</LogicalPart>
<LogicalPart name="PixelBarrelConn4" category="unspecified">
<rSolid name="PixelBarrelConn4"/>
<rMaterial name="pixbarmaterial:SectorC"/>
</LogicalPart>
<LogicalPart name="PixelBarrelService" category="unspecified">
<rSolid name="PixelBarrelService"/>
<rMaterial name="pixbarmaterial:SectorA"/>
</LogicalPart>
<LogicalPart name="PixelBarrelSupTubCables" category="unspecified">
<rSolid name="PixelBarrelSupTubCables"/>
<rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2"/>
</LogicalPart>
</LogicalPartSection>
<PosPartSection label="pixbar.xml">
<!-- -->
Expand Down Expand Up @@ -822,83 +783,6 @@
<rChild name="pixbar:PixelBarrelPipes_FlangeToSTXm"/>
<Translation x="[zero]" y="[zero]" z="-[PixelBarrelPipe_FlangeToST_Z]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelConn3"/>
<Translation x="[zero]" y="[zero]" z="[Conn3Z]"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelConn3"/>
<rRotation name="pixbar:180D"/>
<Translation x="[zero]" y="[zero]" z="[Conn3Z]"/>
</PosPart>
<PosPart copyNumber="3">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelConn3"/>
<Translation x="[zero]" y="[zero]" z="-[Conn3Z]"/>
</PosPart>
<PosPart copyNumber="4">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelConn3"/>
<rRotation name="pixbar:180D"/>
<Translation x="[zero]" y="[zero]" z="-[Conn3Z]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelConn4"/>
<Translation x="[zero]" y="[zero]" z="[Conn4Z]"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelConn4"/>
<rRotation name="pixbar:180D"/>
<Translation x="[zero]" y="[zero]" z="[Conn4Z]"/>
</PosPart>
<PosPart copyNumber="3">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelConn4"/>
<Translation x="[zero]" y="[zero]" z="-[Conn4Z]"/>
</PosPart>
<PosPart copyNumber="4">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelConn4"/>
<rRotation name="pixbar:180D"/>
<Translation x="[zero]" y="[zero]" z="-[Conn4Z]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelService"/>
<Translation x="[zero]" y="[zero]" z="[ServZ]"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelService"/>
<rRotation name="pixbar:180D"/>
<Translation x="[zero]" y="[zero]" z="[ServZ]"/>
</PosPart>
<PosPart copyNumber="3">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelService"/>
<Translation x="[zero]" y="[zero]" z="-[ServZ]"/>
</PosPart>
<PosPart copyNumber="4">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelService"/>
<rRotation name="pixbar:180D"/>
<Translation x="[zero]" y="[zero]" z="-[ServZ]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelSupTubCables"/>
<Translation x="[zero]" y="[zero]" z="[ServCablZ]"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbar:PixelBarrelSupTubCables"/>
<rRotation name="pixbar:180D"/>
<Translation x="[zero]" y="[zero]" z="-[ServCablZ]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="pixbar:PixelBarrel"/>
<rChild name="pixbarlayer0:PixelBarrelLayer0"/>
Expand Down
Loading

0 comments on commit 9914b79

Please sign in to comment.