Skip to content

Commit

Permalink
Merge pull request #2794 from GiacomoSguazzoni/from-CMSSW_7_1_0_pre3
Browse files Browse the repository at this point in the history
Geometry -- Adding the TEC mod from Adrian Perieanu to the test2014 folder
  • Loading branch information
ktf committed Mar 12, 2014
2 parents e828357 + 657d1ad commit 84658f9
Showing 3 changed files with 332 additions and 2 deletions.
25 changes: 24 additions & 1 deletion Geometry/TrackerCommonData/data/test2014/tecmaterial.xml
Original file line number Diff line number Diff line change
@@ -894,7 +894,7 @@
<rMaterial name="trackermaterial:T_CarbonFibreStr" />
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="TEC_PatchpanelBox" density="2.669*g/cm3" method="mixture by weight" symbol=" ">
<CompositeMaterial density="2.669*0.79*g/cm3" method="mixture by weight" name="TEC_PatchpanelBox" symbol=" ">
<MaterialFraction fraction="0.01151">
<rMaterial name="trackermaterial:CAB_Al48" />
</MaterialFraction>
@@ -917,6 +917,29 @@
<rMaterial name="trackermaterial:T_CarbonFibreStr" />
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial density="2.669*1.21*g/cm3" method="mixture by weight" name="TEC_Connectors" symbol=" ">
<MaterialFraction fraction="0.01151">
<rMaterial name="trackermaterial:CAB_Al48"/>
</MaterialFraction>
<MaterialFraction fraction="0.19806">
<rMaterial name="trackermaterial:T_Aluminium"/>
</MaterialFraction>
<MaterialFraction fraction="0.01207">
<rMaterial name="trackermaterial:CAB_Al36"/>
</MaterialFraction>
<MaterialFraction fraction="0.7577">
<rMaterial name="trackermaterial:MS_Cu60"/>
</MaterialFraction>
<MaterialFraction fraction="0.00372">
<rMaterial name="materials:Steel-008"/>
</MaterialFraction>
<MaterialFraction fraction="0.01044">
<rMaterial name="trackermaterial:CAB_Al60"/>
</MaterialFraction>
<MaterialFraction fraction="0.0065">
<rMaterial name="trackermaterial:T_CarbonFibreStr"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="TEC_PatchCtrlBox" density="1.382*g/cm3" method="mixture by weight" symbol=" ">
<MaterialFraction fraction="0.00445">
<rMaterial name="trackermaterial:MS_cntrl_cable" />
293 changes: 293 additions & 0 deletions Geometry/TrackerCommonData/data/test2014/trackerbulkhead.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,293 @@
<?xml version="1.0"?>
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
<ConstantsSection label="trackerbulkhead.xml" eval="true">
<Constant name="zero" value="0.0*fm"/>
<Constant name="Rin" value="190*mm"/>
<Constant name="Rout" value="1.233*m"/>
<Constant name="Thick" value="[BulkheadThick]+[BHDiskThick]+[BHCoversThick]"/>
<Constant name="BulkheadZ" value="[tob:Zv3]+0.5*[Thick]"/>
<!--should be 4mm behind TEC is at the end of tob to prevent overlaps-->
<Constant name="BulkheadThick" value="89*mm"/>
<Constant name="BulkheadRout" value="1053*mm"/>
<Constant name="BulkheadRin" value="[tecpetal3:PetalContRmin]"/>
<Constant name="PatchpanelR4" value="1105*mm"/>
<!-- inside of the outer cable region. NOTE: there is a (historical?) gap between R3 and R4 -->
<Constant name="PatchpanelR3" value="[BulkheadRout]"/>
<!-- outside of bulkhead region-->
<Constant name="PatchpanelR2" value="645*mm"/>
<!-- outside of the inner pixel region-->
<Constant name="PatchpanelR1" value="[AlignRingRout]"/>
<!-- inside of the inner pixel region-->
<Constant name="PatchpanelThick" value="[BulkheadThick]"/>
<Constant name="TECPatchpanelWidth" value="35*deg"/>
<!-- <Constant name="PIXPatchpanelWidth1" value="20*deg"/> -->
<Constant name="PIXPatchpanelWidth1" value="10*deg"/>
<Constant name="PIXPatchpanelWidth2" value="160*deg"/>
<Constant name="PIXPatchpanelPhi" value="-100*deg"/>
<Constant name="TECPatchpanelPhi" value="10*deg"/>
<Constant name="PpBoxWidth" value="175*mm"/>
<!-- <Constant name="PpBoxLengthL" value="298.19*mm"/> -->
<Constant name="PpConnectorsLength" value="50.*mm"/>
<Constant name="PpConnectorsThick" value="15.*mm"/>
<!-- <Constant name="PpBoxLengthL" value="154.96*mm"/> -->
<!-- <Constant name="PpBoxLengthL" value="129.96*mm"/> -->
<Constant name="PpBoxLengthL" value="104.96*mm"/>
<!-- <Constant name="PpBoxLengthS" value="143.23*mm"/> -->
<!-- <Constant name="PpBoxLengthS" value="118.23*mm"/> -->
<Constant name="PpBoxLengthS" value="93.23*mm"/>
<Constant name="PpBoxThick" value="0.5*43.43*mm"/>
<Constant name="PpBoxSideX" value="20.2*mm"/>
<Constant name="PpBoxSideY" value="12.5*mm"/>
<Constant name="PpBoxDistX" value="35*mm"/>
<Constant name="PpBoxDistY" value="14*mm"/>
<Constant name="CtrlBoxWidth" value="75*mm"/>
<Constant name="CtrlBoxLength" value="195*mm"/>
<Constant name="CtrlBoxThick" value="25*mm"/>
<Constant name="CtrlBoxDistX" value="73.35*mm"/>
<Constant name="CtrlBoxDistY" value="12.85*mm"/>
<Constant name="AlignRingRin" value="235*mm"/>
<Constant name="AlignRingRout" value="365*mm"/>
<Constant name="AlignRingThick" value="48.5*mm"/>
<Constant name="PixelCablesRin" value="[Rin]"/>
<!-- cables going to pixel patchpanel -->
<Constant name="PixelCablesRout" value="[AlignRingRout]"/>
<Constant name="PixelCablesThick" value="12.2*mm"/>
<Constant name="BHDiskRin" value="[BulkheadRin]"/>
<Constant name="BHDiskRout" value="[BulkheadRout]"/>
<Constant name="BHDiskThick" value="5*mm"/>
<Constant name="BHCoversRin" value="[BulkheadRin]"/>
<Constant name="BHCoversRout" value="[BulkheadRout]"/>
<Constant name="BHCoversThick" value="1.1*mm"/>
</ConstantsSection>
<SolidSection label="trackerbulkhead.xml">
<Tubs name="TrackerBulkhead" rMin="[Rin]" rMax="[Rout]" dz="0.5*[Thick]" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="BHDisk" rMin="[BHDiskRin]" rMax="[BHDiskRout]" dz="0.5*[BHDiskThick]" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="BHCovers" rMin="[BHCoversRin]" rMax="[BHCoversRout]" dz="0.5*[BHCoversThick]" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="OuterCables" rMin="[PatchpanelR4]" rMax="[Rout]" dz="0.5*[Thick]" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="TECPatchpanel" rMin="[PatchpanelR2]" rMax="[PatchpanelR3]" dz="0.5*[PatchpanelThick]" startPhi="-[TECPatchpanelWidth]" deltaPhi="[TECPatchpanelWidth]"/>
<Tubs name="PIXPatchpanel1" rMin="[PatchpanelR1]" rMax="[PatchpanelR3]" dz="0.5*[PatchpanelThick]" startPhi="-2*[PIXPatchpanelWidth1]" deltaPhi="[PIXPatchpanelWidth1]"/>
<Tubs name="PIXPatchpanel1b" rMin="[PatchpanelR1]" rMax="[PatchpanelR3]" dz="0.5*[PatchpanelThick]" startPhi="-2*[PIXPatchpanelWidth1]" deltaPhi="[PIXPatchpanelWidth1]"/>
<Tubs name="PIXPatchpanel2" rMin="[PatchpanelR1]" rMax="[PatchpanelR2]" dz="0.5*[PatchpanelThick]" startPhi="-[PIXPatchpanelWidth2]" deltaPhi="[PIXPatchpanelWidth2]"/>
<Tubs name="TECAlignRing" rMin="[AlignRingRin]" rMax="[AlignRingRout]" dz="0.5*[AlignRingThick]" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="PixelCables" rMin="[PixelCablesRin]" rMax="[PixelCablesRout]" dz="0.5*[PixelCablesThick]" startPhi="0*deg" deltaPhi="360*deg"/>
<Box name="TECPpConnectors" dx="0.5*[PpConnectorsLength]" dy="0.5*[PpBoxWidth]" dz="0.5*[PpConnectorsThick]"/>
<Box name="TECPpBoxC" dx="0.5*[PpConnectorsLength]" dy="0.5*[PpBoxWidth]" dz="0.5*[PpBoxThick]"/>
<Box name="TECPpBoxL" dx="0.5*[PpBoxLengthL]" dy="0.5*[PpBoxWidth]" dz="0.5*[PpBoxThick]"/>
<Box name="TECPpBoxS" dx="0.5*[PpBoxLengthS]" dy="0.5*[PpBoxWidth]" dz="[PpBoxThick]"/>
<Box name="TECCtrlBox" dx="0.5*[CtrlBoxLength]" dy="0.5*[CtrlBoxWidth]" dz="0.5*[CtrlBoxThick]"/>
</SolidSection>
<LogicalPartSection label="trackerbulkhead.xml">
<LogicalPart name="TrackerBulkhead" category="unspecified">
<rSolid name="trackerbulkhead:TrackerBulkhead"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="BHDisk" category="unspecified">
<rSolid name="BHDisk"/>
<rMaterial name="tecmaterial:TEC_BHDisk"/>
</LogicalPart>
<LogicalPart name="BHCovers" category="unspecified">
<rSolid name="BHCovers"/>
<rMaterial name="tecmaterial:TEC_BHCovers"/>
</LogicalPart>
<LogicalPart name="OuterCables" category="unspecified">
<rSolid name="trackerbulkhead:OuterCables"/>
<rMaterial name="trackermaterial:Tk_panels_up"/>
</LogicalPart>
<LogicalPart name="TECPatchpanel" category="unspecified">
<rSolid name="trackerbulkhead:TECPatchpanel"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="PIXPatchpanel1" category="unspecified">
<rSolid name="trackerbulkhead:PIXPatchpanel1"/>
<rMaterial name="trackermaterial:Tk_panels_mid1"/>
</LogicalPart>
<LogicalPart name="PIXPatchpanel1b" category="unspecified">
<rSolid name="trackerbulkhead:PIXPatchpanel1b"/>
<rMaterial name="trackermaterial:Tk_panels_mid1b"/>
</LogicalPart>
<LogicalPart name="PIXPatchpanel2" category="unspecified">
<rSolid name="trackerbulkhead:PIXPatchpanel2"/>
<rMaterial name="trackermaterial:Tk_panels_mid2"/>
</LogicalPart>
<LogicalPart name="TECAlignRing" category="unspecified">
<rSolid name="trackerbulkhead:TECAlignRing"/>
<rMaterial name="tecmaterial:TEC_AlignRing"/>
</LogicalPart>
<LogicalPart name="PixelCables" category="unspecified">
<rSolid name="trackerbulkhead:PixelCables"/>
<rMaterial name="pixbarmaterial:PixelBarrelSupTubCables"/>
</LogicalPart>
<LogicalPart name="TECPpConnectors" category="unspecified">
<rSolid name="trackerbulkhead:TECPpConnectors"/>
<rMaterial name="tecmaterial:TEC_Connectors"/>
</LogicalPart>
<LogicalPart name="TECPpBoxC" category="unspecified">
<rSolid name="trackerbulkhead:TECPpBoxC"/>
<rMaterial name="tecmaterial:TEC_PatchpanelBox"/>
</LogicalPart>
<LogicalPart name="TECPpBoxL" category="unspecified">
<rSolid name="trackerbulkhead:TECPpBoxL"/>
<rMaterial name="tecmaterial:TEC_PatchpanelBox"/>
</LogicalPart>
<LogicalPart name="TECPpBoxS" category="unspecified">
<rSolid name="trackerbulkhead:TECPpBoxS"/>
<rMaterial name="tecmaterial:TEC_PatchpanelBox"/>
</LogicalPart>
<LogicalPart name="TECCtrlBox" category="unspecified">
<rSolid name="trackerbulkhead:TECCtrlBox"/>
<rMaterial name="tecmaterial:TEC_PatchCtrlBox"/>
</LogicalPart>
</LogicalPartSection>
<PosPartSection label="trackerbulkhead.xml">
<PosPart copyNumber="1">
<rParent name="tracker:Tracker"/>
<rChild name="trackerbulkhead:TrackerBulkhead"/>
<Translation x="[zero]" y="[zero]" z="[BulkheadZ]"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="tracker:Tracker"/>
<rChild name="trackerbulkhead:TrackerBulkhead"/>
<Translation x="[zero]" y="[zero]" z="-[BulkheadZ]"/>
<rRotation name="tracker:180D"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="trackerbulkhead:TrackerBulkhead"/>
<rChild name="trackerbulkhead:BHDisk"/>
<Translation x="[zero]" y="[zero]" z="-0.5*[Thick]+0.5*[BHDiskThick]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="trackerbulkhead:TrackerBulkhead"/>
<rChild name="trackerbulkhead:BHCovers"/>
<Translation x="[zero]" y="[zero]" z="0.5*[Thick]-0.5*[BHCoversThick]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="trackerbulkhead:TrackerBulkhead"/>
<rChild name="trackerbulkhead:OuterCables"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="trackerbulkhead:TrackerBulkhead"/>
<rChild name="trackerbulkhead:TECAlignRing"/>
<Translation x="[zero]" y="[zero]" z="-0.5*[Thick]+0.5*[AlignRingThick]+[BHDiskThick]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="trackerbulkhead:TrackerBulkhead"/>
<rChild name="trackerbulkhead:PixelCables"/>
<Translation x="[zero]" y="[zero]" z="-0.5*[Thick]+0.5*[PixelCablesThick]+[AlignRingThick]+[BHDiskThick]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="trackerbulkhead:TECPatchpanel"/>
<rChild name="trackerbulkhead:TECPpConnectors"/>
<Translation x="[PatchpanelR2]+0.5*[PpConnectorsLength]+[PpBoxSideX]" y="-0.5*[PpBoxWidth]-[PpBoxSideY]" z="-0.5*[PatchpanelThick]+0.5*[PpBoxThick]"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="trackerbulkhead:TECPatchpanel"/>
<rChild name="trackerbulkhead:TECPpConnectors"/>
<Translation x="[PatchpanelR2]+[PpConnectorsLength]+[PpBoxLengthL]+0.5*[PpConnectorsLength]+[PpBoxSideX]" y="-0.5*[PpBoxWidth]-[PpBoxSideY]" z="-0.5*[PatchpanelThick]+0.5*[PpBoxThick]"/>
</PosPart>
<PosPart copyNumber="3">
<rParent name="trackerbulkhead:TECPatchpanel"/>
<rChild name="trackerbulkhead:TECPpConnectors"/>
<Translation x="[PatchpanelR2]+0.5*[PpConnectorsLength]+[PpBoxSideX]-[PpBoxDistX]" y="-1.5*[PpBoxWidth]-[PpBoxSideY]-[PpBoxDistY]" z="-0.5*[PatchpanelThick]+0.5*[PpBoxThick]"/>
</PosPart>
<PosPart copyNumber="4">
<rParent name="trackerbulkhead:TECPatchpanel"/>
<rChild name="trackerbulkhead:TECPpConnectors"/>
<Translation x="[PatchpanelR2]+[PpConnectorsLength]+[PpBoxLengthL]+0.5*[PpConnectorsLength]+[PpBoxSideX]-[PpBoxDistX]" y="-1.5*[PpBoxWidth]-[PpBoxSideY]-[PpBoxDistY]" z="-0.5*[PatchpanelThick]+0.5*[PpBoxThick]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="trackerbulkhead:TECPatchpanel"/>
<rChild name="trackerbulkhead:TECPpBoxC"/>
<Translation x="[PatchpanelR2]+[PpConnectorsLength]+[PpBoxLengthL]+0.5*[PpConnectorsLength]+[PpBoxSideX]" y="-0.5*[PpBoxWidth]-[PpBoxSideY]" z="-0.5*[PatchpanelThick]+[PpConnectorsThick]+0.5*[PpBoxThick]"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="trackerbulkhead:TECPatchpanel"/>
<rChild name="trackerbulkhead:TECPpBoxC"/>
<Translation x="[PatchpanelR2]+[PpConnectorsLength]+[PpBoxLengthL]+0.5*[PpConnectorsLength]+[PpBoxSideX]-[PpBoxDistX]" y="-1.5*[PpBoxWidth]-[PpBoxSideY]-[PpBoxDistY]" z="-0.5*[PatchpanelThick]+[PpConnectorsThick]+0.5*[PpBoxThick]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="trackerbulkhead:TECPatchpanel"/>
<rChild name="trackerbulkhead:TECPpBoxL"/>
<Translation x="[PatchpanelR2]+[PpConnectorsLength]+0.5*[PpBoxLengthL]+[PpBoxSideX]" y="-0.5*[PpBoxWidth]-[PpBoxSideY]" z="-0.5*[PatchpanelThick]+0.5*[PpBoxThick]"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="trackerbulkhead:TECPatchpanel"/>
<rChild name="trackerbulkhead:TECPpBoxL"/>
<Translation x="[PatchpanelR2]+[PpConnectorsLength]+0.5*[PpBoxLengthL]+[PpBoxSideX]-[PpBoxDistX]" y="-1.5*[PpBoxWidth]-[PpBoxSideY]-[PpBoxDistY]" z="-0.5*[PatchpanelThick]+0.5*[PpBoxThick]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="trackerbulkhead:TECPatchpanel"/>
<rChild name="trackerbulkhead:TECPpBoxS"/>
<Translation x="[PatchpanelR2]+[PpConnectorsLength]+[PpBoxLengthL]+[PpConnectorsLength]+0.5*[PpBoxLengthS]+[PpBoxSideX]" y="-0.5*[PpBoxWidth]-[PpBoxSideY]" z="-0.5*[PatchpanelThick]+0.5*[PpBoxThick]"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="trackerbulkhead:TECPatchpanel"/>
<rChild name="trackerbulkhead:TECPpBoxS"/>
<Translation x="[PatchpanelR2]+[PpConnectorsLength]+[PpBoxLengthL]+[PpConnectorsLength]+0.5*[PpBoxLengthS]+[PpBoxSideX]-[PpBoxDistX]" y="-1.5*[PpBoxWidth]-[PpBoxSideY]-[PpBoxDistY]" z="-0.5*[PatchpanelThick]+0.5*[PpBoxThick]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="trackerbulkhead:TECPatchpanel"/>
<rChild name="trackerbulkhead:TECCtrlBox"/>
<Translation x="[PatchpanelR2]+0.5*[CtrlBoxLength]+[PpBoxSideX]+[CtrlBoxDistX]" y="-[PpBoxSideY]-2*[PpBoxWidth]-[PpBoxDistY]-[CtrlBoxDistY]-0.5*[CtrlBoxWidth]" z="-0.5*[PatchpanelThick]+0.5*[CtrlBoxThick]"/>
</PosPart>
</PosPartSection>
<Algorithm name="track:DDTrackerAngular">
<rParent name="trackerbulkhead:TrackerBulkhead"/>
<String name="ChildName" value="trackerbulkhead:TECPatchpanel"/>
<Numeric name="N" value="4"/>
<Numeric name="StartCopyNo" value="1"/>
<Numeric name="IncrCopyNo" value="1"/>
<Numeric name="RangeAngle" value="360*deg"/>
<Numeric name="StartAngle" value="-[TECPatchpanelPhi]"/>
<Numeric name="Radius" value="[zero]"/>
<Vector name="Center" type="numeric" nEntries="3">
0, 0, 0.5*([BHDiskThick] - [BHCoversThick]) </Vector>
</Algorithm>
<Algorithm name="track:DDTrackerAngular">
<rParent name="trackerbulkhead:TrackerBulkhead"/>
<String name="ChildName" value="trackerbulkhead:TECPatchpanel"/>
<Numeric name="N" value="4"/>
<Numeric name="StartCopyNo" value="5"/>
<Numeric name="IncrCopyNo" value="1"/>
<Numeric name="RangeAngle" value="360*deg"/>
<Numeric name="StartAngle" value="-[TECPatchpanelPhi]-[TECPatchpanelWidth]"/>
<Numeric name="Radius" value="[zero]"/>
<Vector name="Center" type="numeric" nEntries="3">
0, 0, 0.5*([BHDiskThick] - [BHCoversThick]) </Vector>
</Algorithm>
<Algorithm name="track:DDTrackerAngular">
<rParent name="trackerbulkhead:TrackerBulkhead"/>
<String name="ChildName" value="trackerbulkhead:PIXPatchpanel1"/>
<Numeric name="N" value="2"/>
<Numeric name="StartCopyNo" value="1"/>
<Numeric name="IncrCopyNo" value="1"/>
<Numeric name="RangeAngle" value="360*deg"/>
<Numeric name="StartAngle" value="-[PIXPatchpanelPhi]"/>
<Numeric name="Radius" value="[zero]"/>
<Vector name="Center" type="numeric" nEntries="3">
0, 0,0.5*([BHDiskThick] - [BHCoversThick]) </Vector>
</Algorithm>
<Algorithm name="track:DDTrackerAngular">
<rParent name="trackerbulkhead:TrackerBulkhead"/>
<String name="ChildName" value="trackerbulkhead:PIXPatchpanel1b"/>
<Numeric name="N" value="2"/>
<Numeric name="StartCopyNo" value="1"/>
<Numeric name="IncrCopyNo" value="1"/>
<Numeric name="RangeAngle" value="360*deg"/>
<Numeric name="StartAngle" value="-[PIXPatchpanelPhi]+10*deg"/>
<Numeric name="Radius" value="[zero]"/>
<Vector name="Center" type="numeric" nEntries="3">
0, 0,0.5*([BHDiskThick] - [BHCoversThick]) </Vector>
</Algorithm>
<Algorithm name="track:DDTrackerAngular">
<rParent name="trackerbulkhead:TrackerBulkhead"/>
<String name="ChildName" value="trackerbulkhead:PIXPatchpanel2"/>
<Numeric name="N" value="2"/>
<Numeric name="StartCopyNo" value="1"/>
<Numeric name="IncrCopyNo" value="1"/>
<Numeric name="RangeAngle" value="360*deg"/>
<Numeric name="StartAngle" value="-[TECPatchpanelPhi]-2*[TECPatchpanelWidth]-2*[PIXPatchpanelWidth1]"/>
<Numeric name="Radius" value="[zero]"/>
<Vector name="Center" type="numeric" nEntries="3">
0, 0, 0.5*([BHDiskThick] - [BHCoversThick]) </Vector>
</Algorithm>
</DDDefinition>
16 changes: 15 additions & 1 deletion Geometry/TrackerCommonData/data/test2014/trackermaterial.xml
Original file line number Diff line number Diff line change
@@ -432,7 +432,7 @@
<rMaterial name="trackermaterial:TS_SignalCable" />
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="Tk_panels_mid1" density="1.17876*g/cm3" method="mixture by weight" symbol=" ">
    <CompositeMaterial name="Tk_panels_mid1" density="1.17876*0.67*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1e-05">
<rMaterial name="materials:Quartz" />
</MaterialFraction>
@@ -446,6 +446,20 @@
<rMaterial name="materials:C6F14" />
</MaterialFraction>
</CompositeMaterial>
        <CompositeMaterial name="Tk_panels_mid1b" density="1.17876*g/cm3" symbol=" " method="mixture by weight">
            <MaterialFraction fraction="1e-05">
                <rMaterial name="materials:Quartz"/>
            </MaterialFraction>
            <MaterialFraction fraction="0.08405">
                <rMaterial name="materials:Polyethylene"/>
            </MaterialFraction>
            <MaterialFraction fraction="0.84501">
                <rMaterial name="trackermaterial:T_Copper"/>
            </MaterialFraction>
            <MaterialFraction fraction="0.07094">
                <rMaterial name="materials:C6F14"/>
            </MaterialFraction>
        </CompositeMaterial>
<CompositeMaterial name="Tk_panels_mid2" density="0.35866*g/cm3" method="mixture by weight" symbol=" ">
<MaterialFraction fraction="1e-05">
<rMaterial name="materials:Quartz" />

0 comments on commit 84658f9

Please sign in to comment.