Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run3-sim47 Remove reference to trackermaterial in materials.xml #28313

Merged
merged 6 commits into from
Apr 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 0 additions & 73 deletions Geometry/CMSCommonData/data/materials.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1154,79 +1154,6 @@
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
</CompositeMaterial>
<!-- Phase1 BPIX micro-twisted pairs signal cables material as defined by W. Bertl -->
<CompositeMaterial name="micro_twisted_signal_cable" density="4.09*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.476683">
<rMaterial name="materials:Aluminium"/>
</MaterialFraction>
<MaterialFraction fraction="0.274139">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.1494102">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.02006116">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.07960754">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
</CompositeMaterial>
<!-- Phase1 BPIX micro-twisted pairs power cables material as defined by W. Bertl -->
<CompositeMaterial name="micro_twisted_power_cable" density="3.42*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.751011">
<rMaterial name="materials:Aluminium"/>
</MaterialFraction>
<MaterialFraction fraction="0.138483">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.066287">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.0089008">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.0353182">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
</CompositeMaterial>

<!--OUTDATED Phase1 BPIX micro-twisted pairs boundle material as defined by W. Bertl, effective density defined to matcht the measured weigth (0.0071+0.0208 g/cm) in a single 1.5mm diam. boundle-->
<CompositeMaterial name="micro_twisted_boundle" density="1.585*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.7455">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
<MaterialFraction fraction="0.2545">
<rMaterial name="materials:micro_twisted_signal_cable"/>
</MaterialFraction>
</CompositeMaterial>

<!--Phase1 BPIX micro-twisted pairs boundle material as defined by L. Caminada-->
<CompositeMaterial name="micro_twisted_power_cable" density="3.639*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.36933">
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.63067">
<rMaterial name="trackermaterial:T_Aluminium"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="micro_twisted_boundle_1" density="2.93382*g/cm3" symbol=" " method="mixture by weight"> <!--for L1-->
<MaterialFraction fraction="0.04631">
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.95369">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="micro_twisted_boundle_2" density="2.91735*g/cm3" symbol=" " method="mixture by weight"> <!--for L2,3,4-->
<MaterialFraction fraction="0.04964">
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.95036">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
</CompositeMaterial>

<CompositeMaterial name="Carbon_fibre_str_Upgrade" density="0.293*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1.00000000">
<rMaterial name="materials:Carbon fibre str."/>
Expand Down
72 changes: 0 additions & 72 deletions Geometry/CMSCommonData/data/materials/2015/v1/materials.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1154,78 +1154,6 @@
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
</CompositeMaterial>
<!-- Phase1 BPIX micro-twisted pairs signal cables material as defined by W. Bertl -->
<CompositeMaterial name="micro_twisted_signal_cable" density="4.09*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.476683">
<rMaterial name="materials:Aluminium"/>
</MaterialFraction>
<MaterialFraction fraction="0.274139">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.1494102">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.02006116">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.07960754">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
</CompositeMaterial>
<!-- Phase1 BPIX micro-twisted pairs power cables material as defined by W. Bertl -->
<CompositeMaterial name="micro_twisted_power_cable" density="3.42*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.751011">
<rMaterial name="materials:Aluminium"/>
</MaterialFraction>
<MaterialFraction fraction="0.138483">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.066287">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.0089008">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.0353182">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
</CompositeMaterial>

<!--OUTDATED Phase1 BPIX micro-twisted pairs boundle material as defined by W. Bertl, effective density defined to matcht the measured weigth (0.0071+0.0208 g/cm) in a single 1.5mm diam. boundle-->
<CompositeMaterial name="micro_twisted_boundle" density="1.585*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.7455">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
<MaterialFraction fraction="0.2545">
<rMaterial name="materials:micro_twisted_signal_cable"/>
</MaterialFraction>
</CompositeMaterial>

<!--Phase1 BPIX micro-twisted pairs boundle material as defined by L. Caminada-->
<CompositeMaterial name="micro_twisted_power_cable" density="3.639*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.36933">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.63067">
<rMaterial name="materials:Aluminium"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="micro_twisted_boundle_1" density="2.93382*g/cm3" symbol=" " method="mixture by weight"> <!--for L1-->
<MaterialFraction fraction="0.04631">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.95369">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="micro_twisted_boundle_2" density="2.91735*g/cm3" symbol=" " method="mixture by weight"> <!--for L2,3,4-->
<MaterialFraction fraction="0.04964">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.95036">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
</CompositeMaterial>

<CompositeMaterial name="Carbon_fibre_str_Upgrade" density="0.293*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1.00000000">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1154,79 +1154,6 @@
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
</CompositeMaterial>
<!-- Phase1 BPIX micro-twisted pairs signal cables material as defined by W. Bertl -->
<CompositeMaterial name="micro_twisted_signal_cable" density="4.09*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.476683">
<rMaterial name="materials:Aluminium"/>
</MaterialFraction>
<MaterialFraction fraction="0.274139">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.1494102">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.02006116">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.07960754">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
</CompositeMaterial>
<!-- Phase1 BPIX micro-twisted pairs power cables material as defined by W. Bertl -->
<CompositeMaterial name="micro_twisted_power_cable" density="3.42*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.751011">
<rMaterial name="materials:Aluminium"/>
</MaterialFraction>
<MaterialFraction fraction="0.138483">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.066287">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.0089008">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.0353182">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
</CompositeMaterial>

<!--OUTDATED Phase1 BPIX micro-twisted pairs boundle material as defined by W. Bertl, effective density defined to matcht the measured weigth (0.0071+0.0208 g/cm) in a single 1.5mm diam. boundle-->
<CompositeMaterial name="micro_twisted_boundle" density="1.585*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.7455">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
<MaterialFraction fraction="0.2545">
<rMaterial name="materials:micro_twisted_signal_cable"/>
</MaterialFraction>
</CompositeMaterial>

<!--Phase1 BPIX micro-twisted pairs boundle material as defined by L. Caminada-->
<CompositeMaterial name="micro_twisted_power_cable" density="3.639*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.36933">
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.63067">
<rMaterial name="trackermaterial:T_Aluminium"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="micro_twisted_boundle_1" density="2.93382*g/cm3" symbol=" " method="mixture by weight"> <!--for L1-->
<MaterialFraction fraction="0.04631">
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.95369">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="micro_twisted_boundle_2" density="2.91735*g/cm3" symbol=" " method="mixture by weight"> <!--for L2,3,4-->
<MaterialFraction fraction="0.04964">
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.95036">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
</CompositeMaterial>

<CompositeMaterial name="Carbon_fibre_str_Upgrade" density="0.293*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1.00000000">
<rMaterial name="materials:Carbon fibre str."/>
Expand Down
72 changes: 0 additions & 72 deletions Geometry/CMSCommonData/data/materials/2021/v1/materials.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1162,78 +1162,6 @@
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
</CompositeMaterial>
<!-- Phase1 BPIX micro-twisted pairs signal cables material as defined by W. Bertl -->
<CompositeMaterial name="micro_twisted_signal_cable" density="4.09*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.476683">
<rMaterial name="materials:Aluminium"/>
</MaterialFraction>
<MaterialFraction fraction="0.274139">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.1494102">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.02006116">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.07960754">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
</CompositeMaterial>
<!-- Phase1 BPIX micro-twisted pairs power cables material as defined by W. Bertl -->
<CompositeMaterial name="micro_twisted_power_cable" density="3.42*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.751011">
<rMaterial name="materials:Aluminium"/>
</MaterialFraction>
<MaterialFraction fraction="0.138483">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.066287">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.0089008">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.0353182">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
</CompositeMaterial>

<!--OUTDATED Phase1 BPIX micro-twisted pairs boundle material as defined by W. Bertl, effective density defined to matcht the measured weigth (0.0071+0.0208 g/cm) in a single 1.5mm diam. boundle-->
<CompositeMaterial name="micro_twisted_boundle" density="1.585*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.7455">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
<MaterialFraction fraction="0.2545">
<rMaterial name="materials:micro_twisted_signal_cable"/>
</MaterialFraction>
</CompositeMaterial>

<!--Phase1 BPIX micro-twisted pairs boundle material as defined by L. Caminada-->
<CompositeMaterial name="micro_twisted_power_cable" density="3.639*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.36933">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.63067">
<rMaterial name="materials:Aluminium"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="micro_twisted_boundle_1" density="2.93382*g/cm3" symbol=" " method="mixture by weight"> <!--for L1-->
<MaterialFraction fraction="0.04631">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.95369">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="micro_twisted_boundle_2" density="2.91735*g/cm3" symbol=" " method="mixture by weight"> <!--for L2,3,4-->
<MaterialFraction fraction="0.04964">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.95036">
<rMaterial name="materials:micro_twisted_power_cable"/>
</MaterialFraction>
</CompositeMaterial>

<CompositeMaterial name="Carbon_fibre_str_Upgrade" density="0.293*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1.00000000">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -500,5 +500,78 @@
<rMaterial name="materials:C6F14" />
</MaterialFraction>
</CompositeMaterial>

<!-- Phase1 BPIX micro-twisted pairs signal cables material as defined by W. Bertl -->
<CompositeMaterial name="micro_twisted_signal_cable" density="0.95*4.09*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.476683">
<rMaterial name="trackermaterial:T_Aluminium"/>
</MaterialFraction>
<MaterialFraction fraction="0.274139">
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.1494102">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.02006116">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.07960754">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
</CompositeMaterial>
<!-- Phase1 BPIX micro-twisted pairs power cables material as defined by W. Bertl -->
<CompositeMaterial name="micro_twisted_power_cable" density="0.95*3.42*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.751011">
<rMaterial name="trackermaterial:T_Aluminium"/>
</MaterialFraction>
<MaterialFraction fraction="0.138483">
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.066287">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.0089008">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.0353182">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
</CompositeMaterial>

<!--OUTDATED Phase1 BPIX micro-twisted pairs boundle material as defined by W. Bertl, effective density defined to matcht the measured weigth (0.0071+0.0208 g/cm) in a single 1.5mm diam. boundle-->
<CompositeMaterial name="micro_twisted_boundle" density="0.95*1.585*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.7455">
<rMaterial name="trackermaterial:micro_twisted_power_cable"/>
</MaterialFraction>
<MaterialFraction fraction="0.2545">
<rMaterial name="trackermaterial:micro_twisted_signal_cable"/>
</MaterialFraction>
</CompositeMaterial>

<!--Phase1 BPIX micro-twisted pairs boundle material as defined by L. Caminada-->
<CompositeMaterial name="micro_twisted_power_cable2" density="0.95*3.639*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.36933">
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.63067">
<rMaterial name="trackermaterial:T_Aluminium"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="micro_twisted_boundle_1" density="0.95*2.93382*g/cm3" symbol=" " method="mixture by weight"> <!--for L1-->
<MaterialFraction fraction="0.04631">
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.95369">
<rMaterial name="trackermaterial:micro_twisted_power_cable2"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="micro_twisted_boundle_2" density="0.95*2.91735*g/cm3" symbol=" " method="mixture by weight"> <!--for L2,3,4-->
<MaterialFraction fraction="0.04964">
<rMaterial name="trackermaterial:T_Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.95036">
<rMaterial name="trackermaterial:micro_twisted_power_cable2"/>
</MaterialFraction>
</CompositeMaterial>
</MaterialSection>
</DDDefinition>
Loading