Skip to content

Commit

Permalink
Merge pull request #31246 from bsunanda/Run3-ft31
Browse files Browse the repository at this point in the history
Run3-ft31 Move tracker specific materials from materials.xml
  • Loading branch information
cmsbuild committed Aug 28, 2020
2 parents 1bff68d + 093c253 commit 1f72323
Show file tree
Hide file tree
Showing 51 changed files with 31,398 additions and 1 deletion.
4,467 changes: 4,467 additions & 0 deletions Geometry/CMSCommonData/data/materials/2017/v1/materials.xml

Large diffs are not rendered by default.

4,456 changes: 4,456 additions & 0 deletions Geometry/CMSCommonData/data/materials/2021/v2/materials.xml

Large diffs are not rendered by default.

1,336 changes: 1,336 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseI/v2/pixbar.xml

Large diffs are not rendered by default.

71 changes: 71 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladder.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version="1.0"?>
<DDDefinition>

<ConstantsSection label="pixbarladder.xml" eval="true">
<Constant name="Length" value="53.6*cm"/>
<Constant name="ExternalLength" value="54.00*cm"/>
<Constant name="Modules" value="8"/>
<Constant name="ModulesPerSide" value="[Modules]/2"/>
<Constant name="BaseThick" value="0.20*mm"/>
<Constant name="ROChipThick0" value="0.075*mm"/>
<Constant name="ROChipThick123" value="0.175*mm"/>
<Constant name="SensorThick" value="0.285*mm"/>
<Constant name="SensorDz" value="6.66*cm"/>
<Constant name="SensorEdge" value="1.20*mm"/>
<Constant name="ActiveDz" value="6.48*cm"/>
<Constant name="HybridThick" value="0.050*mm"/>
<Constant name="HybridDz" value="6.50*cm"/>
<Constant name="ModuleCapThick" value="0.070*mm"/>
<Constant name="CableThick" value="1.5*mm"/>
<Constant name="Cable1Length" value="21.02*cm"/>
<Constant name="Cable2Length" value="14.32*cm"/>
<Constant name="Cable3Length" value="7.62*cm"/>
<Constant name="Cable4Length" value="0.92*cm"/>
<Constant name="CableDzOverModule" value="1.93*cm"/>
<Constant name="Cable1Dz" value="[Cable1Length]+[CableDzOverModule]"/>
<Constant name="Cable2Dz" value="[Cable2Length]+[CableDzOverModule]"/>
<Constant name="Cable3Dz" value="[Cable3Length]+[CableDzOverModule]"/>
<Constant name="Cable4Dz" value="[Cable4Length]+[CableDzOverModule]"/>
<Constant name="CableBoundleDiameter" value="1.3*mm"/>
<Constant name="CableBoxThick" value="[CableBoundleDiameter]"/>
<Constant name="CapacitorZ" value="2.80*cm"/>
<Constant name="CapacitorThick" value="1.50*mm"/>
<Constant name="CapacitorDx" value="3.20*mm"/>
<Constant name="CapacitorDz" value="2.50*mm"/>
<Constant name="CapacitorStripThick" value="0.50*mm"/>
<Constant name="CapacitorStripDx" value="0.50*mm"/>
<Constant name="CapacitorStripDz" value="([HybridDz]-2.0*mm)"/>
<Constant name="TBMchipThick" value="0.30*mm"/>
<Constant name="TBMchipDx" value="3.20*mm"/>
<Constant name="TBMchipDz" value="4.80*mm"/>

<!-- Module thick uses CapacitorThick since it is the highest object on the Hybrid surface -->
<Constant name="Module0Thick" value="([ROChipThick0]+
[SensorThick]+[HybridThick]+[CapacitorStripThick]+[pixbarladder:ModuleCapThick])"/>
<Constant name="Module1Thick" value="([BaseThick]+[ROChipThick123]+
[SensorThick]+[HybridThick]+[CapacitorStripThick]+[pixbarladder:ModuleCapThick])"/>
<Constant name="Module23Thick" value="([BaseThick]+[ROChipThick123]+
[SensorThick]+[HybridThick]+[CapacitorStripThick]+[pixbarladder:ModuleCapThick])"/>

<Constant name="ModuleDz" value="[Length]/[Modules]"/>
<Constant name="ModuleZ" value="-([Length]-[ModuleDz])/2"/>
<Constant name="Cable1BoundleX" value="-([pixbarladder:CableBoundleDiameter]+[pixbarladder:CableBoundleDiameter]/2)"/>
<Constant name="Cable2BoundleX" value="-([pixbarladder:CableBoundleDiameter]/2)"/>
<Constant name="Cable3BoundleX" value="([pixbarladder:CableBoundleDiameter]/2)"/>
<Constant name="Cable4BoundleX" value="([pixbarladder:CableBoundleDiameter]+[pixbarladder:CableBoundleDiameter]/2)"/>

<Constant name="Cable1Z" value="([ExternalLength]-[Cable1Dz])/2"/>
<Constant name="Cable2Z" value="([ExternalLength]-[Cable2Dz])/2"/>
<Constant name="Cable3Z" value="([ExternalLength]-[Cable3Dz])/2"/>
<Constant name="Cable4Z" value="([ExternalLength]-[Cable4Dz])/2"/>
-->
</ConstantsSection>

<RotationSection label="pixbarladder.xml">
<Rotation name="Z2XY" thetaX="90*deg" phiX="0*deg" thetaY="180*deg"
phiY="0*deg" thetaZ="90*deg" phiZ="90*deg" />
<Rotation name="Y180D" thetaX="90*deg" phiX="180*deg" thetaY="90*deg"
phiY="90*deg" thetaZ="180*deg" phiZ="0*deg" />
</RotationSection>

</DDDefinition>
399 changes: 399 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull0.xml

Large diffs are not rendered by default.

420 changes: 420 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull1.xml

Large diffs are not rendered by default.

383 changes: 383 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull2.xml

Large diffs are not rendered by default.

383 changes: 383 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull3.xml

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0"?>
<DDDefinition>

<ConstantsSection label="pixbarlayer.xml" eval="true">
<Constant name="LayerDz" value="54.00*cm"/> <!--55.40 -->
<Constant name="CoolDz" value="54.00*cm"/> <!--55.40 -->
<Constant name="CoolSide" value="0.40*cm"/>
<Constant name="CoolThick" value="0.005*cm"/>
</ConstantsSection>

</DDDefinition>
43 changes: 43 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer0.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0"?>
<DDDefinition>

<ConstantsSection label="pixbarlayer0.xml" eval="true">
<Constant name="Ladders" value="12"/>
<Constant name="CoolDist" value="3.03*cm"/>
<Constant name="CoolRadius" value="0.0900*cm"/>
<Constant name="LadderOffset" value="0.220*cm"/>
<Constant name="Cool1Offset" value="0.83*cm"/>
<Constant name="Cool2Offset" value="-0.16*cm"/>
<Constant name="OuterFirst" value="1"/>
<Constant name="PitchFineTune" value="-0.917*deg"/>
<Constant name="OuterOffsetFineTune" value="-0.0467*cm+[pixbarladder:SensorThick]/2"/>
<Constant name="InnerOffsetFineTune" value="-0.0120*cm-[pixbarladder:SensorThick]/2"/>
</ConstantsSection>

<Algorithm name="track:DDPixBarLayerUpgradeAlgo">
<rParent name="pixbarlayer0:PixelBarrelLayer0"/>
<String name="GeneralMaterial" value="materials:Air"/>
<Numeric name="Ladders" value="[pixbarlayer0:Ladders]"/>
<Numeric name="LayerDz" value="[pixbarlayer:LayerDz]"/>
<Numeric name="CoolDz" value="[pixbarlayer:CoolDz]"/>
<Numeric name="CoolThick" value="[pixbarlayer:CoolThick]"/>
<Numeric name="CoolRadius" value="[pixbarlayer0:CoolRadius]"/>
<Numeric name="CoolDist" value="[pixbarlayer0:CoolDist]"/>
<Numeric name="Cool1Offset" value="[pixbarlayer0:Cool1Offset]"/>
<Numeric name="Cool2Offset" value="[pixbarlayer0:Cool2Offset]"/>
<String name="CoolMaterial" value="pixbarmaterial:Bpix_CO2_-20C"/>
<String name="CoolTubeMaterial" value="pixbarmaterial:Bpix_Pipe_Steel"/>
<String name="CoolMaterialHalf" value="pixbarmaterial:Bpix_CO2_-20C_Half"/>
<String name="CoolTubeMaterialHalf" value="pixbarmaterial:Bpix_Pipe_Steel_Half"/>
<String name="LadderName" value="pixbarladderfull0:PixelBarrelLadderFull0"/>
<Numeric name="LadderWidth" value="[pixbarladderfull0:LadderWidth]"/>
<Numeric name="LadderThick" value="[pixbarladderfull0:LadderThick]"/>
<Numeric name="LadderOffset" value="[pixbarlayer0:LadderOffset]"/>
<Numeric name="ActiveWidth" value="[pixbarladderfull0:ActiveWidth]"/>
<Numeric name="OuterFirst" value="[pixbarlayer0:OuterFirst]"/>
<Numeric name="PitchFineTune" value="[pixbarlayer0:PitchFineTune]"/>
<Numeric name="OuterOffsetFineTune" value="[pixbarlayer0:OuterOffsetFineTune]"/>
<Numeric name="InnerOffsetFineTune" value="[pixbarlayer0:InnerOffsetFineTune]"/>
</Algorithm>

</DDDefinition>
42 changes: 42 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer1.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0"?>
<DDDefinition>

<ConstantsSection label="pixbarlayer1.xml" eval="true">
<Constant name="Ladders" value="28"/>
<Constant name="CoolDist" value="6.8*cm"/>
<Constant name="CoolRadius" value="0.0900*cm"/>
<Constant name="LadderOffset" value="0.270*cm"/>
<Constant name="Cool1Offset" value="0.9*cm"/>
<Constant name="Cool2Offset" value="-0.1*cm"/>
<Constant name="OuterFirst" value="1"/>
<Constant name="PitchFineTune" value="-0.9435*deg"/>
<Constant name="OuterOffsetFineTune" value="-0.0281*cm+[pixbarladder:SensorThick]/2"/>
<Constant name="InnerOffsetFineTune" value="0.0263*cm-[pixbarladder:SensorThick]/2"/>
</ConstantsSection>

<Algorithm name="track:DDPixBarLayerUpgradeAlgo">
<rParent name="pixbarlayer1:PixelBarrelLayer1"/>
<String name="GeneralMaterial" value="materials:Air"/>
<Numeric name="Ladders" value="[pixbarlayer1:Ladders]"/>
<Numeric name="LayerDz" value="[pixbarlayer:LayerDz]"/>
<Numeric name="CoolDz" value="[pixbarlayer:CoolDz]"/>
<Numeric name="CoolThick" value="[pixbarlayer:CoolThick]"/>
<Numeric name="CoolRadius" value="[pixbarlayer1:CoolRadius]"/>
<Numeric name="CoolDist" value="[pixbarlayer1:CoolDist]"/>
<Numeric name="Cool1Offset" value="[pixbarlayer1:Cool1Offset]"/>
<Numeric name="Cool2Offset" value="[pixbarlayer1:Cool2Offset]"/>
<String name="CoolMaterial" value="pixbarmaterial:Bpix_CO2_-20C"/>
<String name="CoolTubeMaterial" value="pixbarmaterial:Bpix_Pipe_Steel"/>
<String name="CoolMaterialHalf" value="pixbarmaterial:Bpix_CO2_-20C_Half"/>
<String name="CoolTubeMaterialHalf" value="pixbarmaterial:Bpix_Pipe_Steel_Half"/>
<String name="LadderName" value="pixbarladderfull1:PixelBarrelLadderFull1"/>
<Numeric name="LadderWidth" value="[pixbarladderfull1:LadderWidth]"/>
<Numeric name="LadderThick" value="[pixbarladderfull1:LadderThick]"/>
<Numeric name="LadderOffset" value="[pixbarlayer1:LadderOffset]"/>
<Numeric name="OuterFirst" value="[pixbarlayer1:OuterFirst]"/>
<Numeric name="PitchFineTune" value="[pixbarlayer1:PitchFineTune]"/>
<Numeric name="OuterOffsetFineTune" value="[pixbarlayer1:OuterOffsetFineTune]"/>
<Numeric name="InnerOffsetFineTune" value="[pixbarlayer1:InnerOffsetFineTune]"/>
</Algorithm>

</DDDefinition>
42 changes: 42 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0"?>
<DDDefinition>

<ConstantsSection label="pixbarlayer2.xml" eval="true">
<Constant name="Ladders" value="44"/>
<Constant name="CoolDist" value="10.9*cm"/>
<Constant name="CoolRadius" value="0.0900*cm"/>
<Constant name="LadderOffset" value="0.270*cm"/>
<Constant name="Cool1Offset" value="0.9*cm"/>
<Constant name="Cool2Offset" value="-0.1*cm"/>
<Constant name="OuterFirst" value="1"/>
<Constant name="PitchFineTune" value="0.118*deg"/>
<Constant name="OuterOffsetFineTune" value="-0.0413*cm+[pixbarladder:SensorThick]/2"/>
<Constant name="InnerOffsetFineTune" value="0.0413*cm-[pixbarladder:SensorThick]/2"/>
</ConstantsSection>

<Algorithm name="track:DDPixBarLayerUpgradeAlgo">
<rParent name="pixbarlayer2:PixelBarrelLayer2"/>
<String name="GeneralMaterial" value="materials:Air"/>
<Numeric name="Ladders" value="[pixbarlayer2:Ladders]"/>
<Numeric name="LayerDz" value="[pixbarlayer:LayerDz]"/>
<Numeric name="CoolDz" value="[pixbarlayer:CoolDz]"/>
<Numeric name="CoolThick" value="[pixbarlayer:CoolThick]"/>
<Numeric name="CoolRadius" value="[pixbarlayer2:CoolRadius]"/>
<Numeric name="CoolDist" value="[pixbarlayer2:CoolDist]"/>
<Numeric name="Cool1Offset" value="[pixbarlayer2:Cool1Offset]"/>
<Numeric name="Cool2Offset" value="[pixbarlayer2:Cool2Offset]"/>
<String name="CoolMaterial" value="pixbarmaterial:Bpix_CO2_-20C"/>
<String name="CoolTubeMaterial" value="pixbarmaterial:Bpix_Pipe_Steel"/>
<String name="CoolMaterialHalf" value="pixbarmaterial:Bpix_CO2_-20C_Half"/>
<String name="CoolTubeMaterialHalf" value="pixbarmaterial:Bpix_Pipe_Steel_Half"/>
<String name="LadderName" value="pixbarladderfull2:PixelBarrelLadderFull2"/>
<Numeric name="LadderWidth" value="[pixbarladderfull2:LadderWidth]"/>
<Numeric name="LadderThick" value="[pixbarladderfull2:LadderThick]"/>
<Numeric name="LadderOffset" value="[pixbarlayer2:LadderOffset]"/>
<Numeric name="OuterFirst" value="[pixbarlayer2:OuterFirst]"/>
<Numeric name="PitchFineTune" value="[pixbarlayer2:PitchFineTune]"/>
<Numeric name="OuterOffsetFineTune" value="[pixbarlayer2:OuterOffsetFineTune]"/>
<Numeric name="InnerOffsetFineTune" value="[pixbarlayer2:InnerOffsetFineTune]"/>
</Algorithm>

</DDDefinition>
42 changes: 42 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer3.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0"?>
<DDDefinition>

<ConstantsSection label="pixbarlayer3.xml" eval="true">
<Constant name="Ladders" value="64"/>
<Constant name="CoolDist" value="16.0*cm"/>
<Constant name="CoolRadius" value="0.0900*cm"/>
<Constant name="LadderOffset" value="0.270*cm"/>
<Constant name="Cool1Offset" value="0.9*cm"/>
<Constant name="Cool2Offset" value="-0.1*cm"/>
<Constant name="OuterFirst" value="1"/>
<Constant name="PitchFineTune" value="0.0535*deg"/>
<Constant name="OuterOffsetFineTune" value="-0.0405*cm+[pixbarladder:SensorThick]/2"/>
<Constant name="InnerOffsetFineTune" value="0.0405*cm-[pixbarladder:SensorThick]/2"/>
</ConstantsSection>

<Algorithm name="track:DDPixBarLayerUpgradeAlgo">
<rParent name="pixbarlayer3:PixelBarrelLayer3"/>
<String name="GeneralMaterial" value="materials:Air"/>
<Numeric name="Ladders" value="[pixbarlayer3:Ladders]"/>
<Numeric name="LayerDz" value="[pixbarlayer:LayerDz]"/>
<Numeric name="CoolDz" value="[pixbarlayer:CoolDz]"/>
<Numeric name="CoolThick" value="[pixbarlayer:CoolThick]"/>
<Numeric name="CoolRadius" value="[pixbarlayer3:CoolRadius]"/>
<Numeric name="CoolDist" value="[pixbarlayer3:CoolDist]"/>
<Numeric name="Cool1Offset" value="[pixbarlayer3:Cool1Offset]"/>
<Numeric name="Cool2Offset" value="[pixbarlayer3:Cool2Offset]"/>
<String name="CoolMaterial" value="pixbarmaterial:Bpix_CO2_-20C"/>
<String name="CoolTubeMaterial" value="pixbarmaterial:Bpix_Pipe_Steel"/>
<String name="CoolMaterialHalf" value="pixbarmaterial:Bpix_CO2_-20C_Half"/>
<String name="CoolTubeMaterialHalf" value="pixbarmaterial:Bpix_Pipe_Steel_Half"/>
<String name="LadderName" value="pixbarladderfull3:PixelBarrelLadderFull3"/>
<Numeric name="LadderWidth" value="[pixbarladderfull3:LadderWidth]"/>
<Numeric name="LadderThick" value="[pixbarladderfull3:LadderThick]"/>
<Numeric name="LadderOffset" value="[pixbarlayer3:LadderOffset]"/>
<Numeric name="OuterFirst" value="[pixbarlayer3:OuterFirst]"/>
<Numeric name="PitchFineTune" value="[pixbarlayer3:PitchFineTune]"/>
<Numeric name="OuterOffsetFineTune" value="[pixbarlayer3:OuterOffsetFineTune]"/>
<Numeric name="InnerOffsetFineTune" value="[pixbarlayer3:InnerOffsetFineTune]"/>
</Algorithm>

</DDDefinition>
Loading

0 comments on commit 1f72323

Please sign in to comment.