diff --git a/compact/materials.xml b/compact/materials.xml
index 5ad6383c14f1787dbe073ccb2c6eb1370f11bbbc..6de9ac5ef7d12506389ecee65f88434bf7069cfd 100644
--- a/compact/materials.xml
+++ b/compact/materials.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<materials>
-
<!--
Air by weight from
@@ -12,77 +11,65 @@
<fraction n="0.234" ref="O"/>
<fraction n="0.012" ref="Ar"/>
</material>
- <material name="air">
- <D type="density" unit="g/cm3" value="0.0012"/>
- <fraction n="0.754" ref="N"/>
- <fraction n="0.234" ref="O"/>
- <fraction n="0.012" ref="Ar"/>
- </material>
-
- <!-- We model vakuum just as very thin air -->
- <material name="Vacuum">
- <D type="density" unit="g/cm3" value="0.0000000001" />
+ <!-- We model vacuum just as very thin air -->
+ <material name="Vacuum">
+ <D type="density" unit="g/cm3" value="0.0000000001"/>
<fraction n="0.754" ref="N"/>
<fraction n="0.234" ref="O"/>
<fraction n="0.012" ref="Ar"/>
</material>
-
<material name="Epoxy">
<D type="density" value="1.3" unit="g/cm3"/>
<composite n="44" ref="H"/>
<composite n="15" ref="C"/>
<composite n="7" ref="O"/>
</material>
-
<material name="Quartz">
<D type="density" value="2.2" unit="g/cm3"/>
<composite n="1" ref="Si"/>
<composite n="2" ref="O"/>
</material>
-
<material name="G10">
<D type="density" value="1.7" unit="g/cm3"/>
<fraction n="0.08" ref="Cl"/>
<fraction n="0.773" ref="Quartz"/>
<fraction n="0.147" ref="Epoxy"/>
</material>
-
<material name="Polystyrene">
<D value="1.032" unit="g/cm3"/>
<composite n="19" ref="C"/>
<composite n="21" ref="H"/>
</material>
-
<material name="Steel235">
<D value="7.85" unit="g/cm3"/>
<fraction n="0.998" ref="Fe"/>
<fraction n=".002" ref="C"/>
</material>
-
<material name="SiliconOxide">
<D type="density" value="2.65" unit="g/cm3"/>
<composite n="1" ref="Si"/>
<composite n="2" ref="O"/>
</material>
-
<material name="BoronOxide">
<D type="density" value="2.46" unit="g/cm3"/>
<composite n="2" ref="B"/>
<composite n="3" ref="O"/>
</material>
-
<material name="SodiumOxide">
<D type="density" value="2.65" unit="g/cm3"/>
<composite n="2" ref="Na"/>
<composite n="1" ref="O"/>
</material>
-
<material name="AluminumOxide">
<D type="density" value="3.89" unit="g/cm3"/>
<composite n="2" ref="Al"/>
<composite n="3" ref="O"/>
</material>
-
+ <material name="SiliconNitride">
+ <D type="density" value="3.17" unit="g/cm3"/>
+ <composite n="3" ref="Si"/>
+ <composite n="4" ref="N"/>
+ </material>
<material name="PyrexGlass">
<D type="density" value="2.23" unit="g/cm3"/>
<fraction n="0.806" ref="SiliconOxide"/>
@@ -90,19 +77,16 @@
<fraction n="0.040" ref="SodiumOxide"/>
<fraction n="0.023" ref="AluminumOxide"/>
</material>
-
<material name="CarbonFiber">
<D type="density" value="1.5" unit="g/cm3"/>
<fraction n="0.65" ref="C"/>
<fraction n="0.35" ref="Epoxy"/>
</material>
-
<material name="CarbonFiber_50D">
<D type="density" value="0.75" unit="g/cm3"/>
<fraction n="0.65" ref="C"/>
<fraction n="0.35" ref="Epoxy"/>
- </material>
-
+ </material>
<material name="Rohacell31">
<D type="density" value="0.032" unit="g/cm3"/>
<composite n="9" ref="C"/>
@@ -110,40 +94,136 @@
<composite n="2" ref="O"/>
<composite n="1" ref="N"/>
</material>
-
<material name="Rohacell31_50D">
<D type="density" value="0.016" unit="g/cm3"/>
<composite n="9" ref="C"/>
<composite n="13" ref="H"/>
<composite n="2" ref="O"/>
<composite n="1" ref="N"/>
- </material>
-
+ </material>
<material name="RPCGasDefault" state="gas">
<D type="density" value="0.0037" unit="g/cm3"/>
<composite n="209" ref="C"/>
<composite n="239" ref="H"/>
<composite n="381" ref="F"/>
</material>
-
<material name="PolystyreneFoam">
<D type="density" value="0.0056" unit="g/cm3"/>
<fraction n="1.0" ref="Polystyrene"/>
</material>
-
<material name="Kapton">
- <D value="1.43" unit="g/cm3" />
+ <D value="1.43" unit="g/cm3"/>
<composite n="22" ref="C"/>
- <composite n="10" ref="H" />
- <composite n="2" ref="N" />
- <composite n="5" ref="O" />
+ <composite n="10" ref="H"/>
+ <composite n="2" ref="N"/>
+ <composite n="5" ref="O"/>
</material>
-
<material name="PEEK">
- <D value="1.37" unit="g/cm3" />
+ <D value="1.37" unit="g/cm3"/>
<composite n="19" ref="C"/>
- <composite n="12" ref="H" />
- <composite n="3" ref="O" />
+ <composite n="12" ref="H"/>
+ <composite n="3" ref="O"/>
+ </material>
+ <material name="TungstenDens23">
+ <D value="17.7" unit="g / cm3"/>
+ <fraction n="0.925" ref="W"/>
+ <fraction n="0.066" ref="Ni"/>
+ <fraction n="0.009" ref="Fe"/>
+ </material>
+ <material name="TungstenDens24">
+ <D value="17.8" unit="g / cm3"/>
+ <fraction n="0.93" ref="W"/>
+ <fraction n="0.061" ref="Ni"/>
+ <fraction n="0.009" ref="Fe"/>
+ </material>
+ <material name="TungstenDens25">
+ <D value="18.2" unit="g / cm3"/>
+ <fraction n="0.950" ref="W"/>
+ <fraction n="0.044" ref="Ni"/>
+ <fraction n="0.006" ref="Fe"/>
+ </material>
+ <material name="CarbonFiber_25percent">
+ <D type="density" value="0.375" unit="g / cm3"/>
+ <fraction n="1.0" ref="CarbonFiber"/>
+ </material>
+ <material name="CarbonFiber_15percent">
+ <D type="density" value="0.225" unit="g / cm3"/>
+ <fraction n="1.0" ref="CarbonFiber"/>
+ </material>
+ <material name="Rohacell31_50percent">
+ <D type="density" value="0.016" unit="g / cm3"/>
+ <fraction n="1.0" ref="Rohacell31"/>
+ </material>
+ <material name="Rohacell31_15percent">
+ <D type="density" value="0.0048" unit="g / cm3"/>
+ <fraction n="1.0" ref="Rohacell31"/>
+ </material>
+ <material name="BoratedPolyethylene5">
+ <D value="0.93" unit="g / cm3"/>
+ <fraction n="0.612" ref="C"/>
+ <fraction n="0.222" ref="O"/>
+ <fraction n="0.116" ref="H"/>
+ <fraction n="0.050" ref="B"/>
+ </material>
+ <material name="SiliconCarbide">
+ <D value="3.1" unit="g / cm3"/>
+ <composite n="1" ref="Si"/>
+ <composite n="1" ref="C"/>
+ </material>
+ <material name="SiliconCarbide_6percent">
+ <D value="0.186" unit="g / cm3"/>
+ <fraction n="1.0" ref="SiliconCarbide"/>
+ </material>
+ <material name="PlasticScint">
+ <D type="density" unit="g/cm3" value="1.032"/>
+ <composite n="9" ref="C"/>
+ <composite n="10" ref="H"/>
+ </material>
+ <material name="PbWO4">
+ <D type="density" value="8.3" unit="g / cm3"/>
+ <composite n="1" ref="Pb"/>
+ <composite n="1" ref="W"/>
+ <composite n="4" ref="O"/>
+ </material>
+ <material name="Ar10CO2">
+ <D type="density" value="1.802" unit="mg / cm3"/>
+ <composite n="0.891" ref="Argon"/>
+ <!--<composite n="0.109" ref="CarbonDioxide"/>-->
+ <composite n="0.036" ref="C"/>
+ <composite n="0.073" ref="O"/>
+ </material>
+ <material name="Mylar">
+ <D type="density" value="1.39" unit="g/cm3" />
+ <fraction n="0.62502108" ref="C"/>
+ <fraction n="0.041960452" ref="H"/>
+ <fraction n="0.33301847" ref="O"/>
+ </material>
+ <material name="Nomex">
+ <D type="density" value="0.029" unit="g/cm3" />
+ <composite n="14" ref="C"/>
+ <composite n="10" ref="H"/>
+ <composite n="2" ref="N"/>
+ <composite n="2" ref="O"/>
+ </material>
+ <material name="Fr4_Epoxy">
+ <D type="density" value="1.2" unit="g/cm3"/>
+ <composite n="2" ref="H"/>
+ <composite n="2" ref="C"/>
+ </material>
+ <material name="Fr4">
+ <D type="density" value="1.86" unit="g/cm3"/>
+ <fraction n="0.528" ref="Quartz"/>
+ <fraction n="0.472" ref="Fr4_Epoxy"/>
+ </material>
+ <material name="Cfrp_intt">
+ <D type="density" value="1.69" unit="g/cm3"/>
+ <composite n="10" ref="C"/>
+ <composite n="6" ref="H"/>
+ <composite n="1" ref="O"/>
+ </material>
+ <material name="Graphite">
+ <D type="density" value="2.21" unit="g/cm3"/>
+ <composite n="1" ref="C"/>
</material>
</materials>