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.

Sign up for GitHub

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

Jump to bottom

Revise densities & atomic weights for chemical elements to match Geant4 #29856

Merged
merged 1 commit into from
May 20, 2020
Merged

Revise densities & atomic weights for chemical elements to match Geant4 #29856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<close_geometry/>

<IncludeSection>
<Include ref="Geometry/CMSCommonData/data/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
<Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
<Include ref="Geometry/CMSCommonData/data/cms/2021/v2/cms.xml"/>
Expand Down
125 changes: 62 additions & 63 deletions Geometry/CMSCommonData/data/materials/2021/v1/materials.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,76 @@
<?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">
<MaterialSection label="materials.xml">
<ElementaryMaterial name="Aluminium" density="2.7*g/cm3" symbol=" " atomicWeight="26.98*g/mole" atomicNumber="13"/>
<ElementaryMaterial name="TD_Aluminium" density="8.1*g/cm3" symbol=" " atomicWeight="26.98*g/mole" atomicNumber="13"/>
<ElementaryMaterial name="Antimony" density="6.679*g/cm3" symbol=" " atomicWeight="121.75*g/mole" atomicNumber="51"/>
<ElementaryMaterial name="Argon" density="1.639*mg/cm3" symbol=" " atomicWeight="39.948*g/mole" atomicNumber="18"/>
<ElementaryMaterial name="Arsenic" density="5.72*g/cm3" symbol=" " atomicWeight="74.922*g/mole" atomicNumber="33"/>
<ElementaryMaterial name="Aluminium" density="2.699*g/cm3" symbol=" " atomicWeight="26.982*g/mole" atomicNumber="13"/>
<ElementaryMaterial name="Antimony" density="6.691*g/cm3" symbol=" " atomicWeight="121.76*g/mole" atomicNumber="51"/>
<ElementaryMaterial name="Argon" density="1.662*mg/cm3" symbol=" " atomicWeight="39.948*g/mole" atomicNumber="18"/>
<ElementaryMaterial name="Arsenic" density="5.73*g/cm3" symbol=" " atomicWeight="74.922*g/mole" atomicNumber="33"/>
<ElementaryMaterial name="Barium" density="3.5*g/cm3" symbol=" " atomicWeight="137.33*g/mole" atomicNumber="56"/>
<ElementaryMaterial name="Beryllium" density="1.848*g/cm3" symbol=" " atomicWeight="9.0122*g/mole" atomicNumber="4"/>
<ElementaryMaterial name="Bismuth" density="9.37*g/cm3" symbol=" " atomicWeight="208.98*g/mole" atomicNumber="83"/>
<ElementaryMaterial name="Bor 10" density="2.34*g/cm3" symbol=" " atomicWeight="10*g/mole" atomicNumber="5"/>
<ElementaryMaterial name="Bor 11" density="2.34*g/cm3" symbol=" " atomicWeight="11*g/mole" atomicNumber="5"/>
<ElementaryMaterial name="Bromine" density="3.11*g/cm3" symbol=" " atomicWeight="79.904*g/mole" atomicNumber="35"/>
<ElementaryMaterial name="Cadmium" density="8.63*g/cm3" symbol=" " atomicWeight="112.41*g/mole" atomicNumber="48"/>
<ElementaryMaterial name="Bismuth" density="9.747*g/cm3" symbol=" " atomicWeight="208.98*g/mole" atomicNumber="83"/>
<ElementaryMaterial name="Bor 10" density="2.37*g/cm3" symbol=" " atomicWeight="10*g/mole" atomicNumber="5"/>
<ElementaryMaterial name="Bor 11" density="2.37*g/cm3" symbol=" " atomicWeight="11*g/mole" atomicNumber="5"/>
<ElementaryMaterial name="Bromine" density="7.702*mg/cm3" symbol=" " atomicWeight="79.904*g/mole" atomicNumber="35"/>
<ElementaryMaterial name="Cadmium" density="8.65*g/cm3" symbol=" " atomicWeight="112.41*g/mole" atomicNumber="48"/>
<ElementaryMaterial name="Calcium" density="1.55*g/cm3" symbol=" " atomicWeight="40.078*g/mole" atomicNumber="20"/>
<ElementaryMaterial name="Carbon" density="2.265*g/cm3" symbol=" " atomicWeight="12.011*g/mole" atomicNumber="6"/>
<ElementaryMaterial name="Cerium" density="6.637*g/cm3" symbol=" " atomicWeight="140.12*g/mole" atomicNumber="58"/>
<ElementaryMaterial name="Cesium" density="1.87*g/cm3" symbol=" " atomicWeight="132.9054*g/mole" atomicNumber="55"/>
<ElementaryMaterial name="Chlorine" density="1.56*g/cm3" symbol=" " atomicWeight="35.45*g/mole" atomicNumber="17"/>
<ElementaryMaterial name="Carbon" density="2*g/cm3" symbol=" " atomicWeight="12.011*g/mole" atomicNumber="6"/>
<ElementaryMaterial name="Cerium" density="6.657*g/cm3" symbol=" " atomicWeight="140.12*g/mole" atomicNumber="58"/>
<ElementaryMaterial name="Cesium" density="1.873*g/cm3" symbol=" " atomicWeight="132.91*g/mole" atomicNumber="55"/>
<ElementaryMaterial name="Chlorine" density="2.995*mg/cm3" symbol=" " atomicWeight="35.45*g/mole" atomicNumber="17"/>
<ElementaryMaterial name="Chromium" density="7.18*g/cm3" symbol=" " atomicWeight="51.996*g/mole" atomicNumber="24"/>
<ElementaryMaterial name="Cobalt" density="8.9*g/cm3" symbol=" " atomicWeight="58.933*g/mole" atomicNumber="27"/>
<ElementaryMaterial name="Copper" density="8.96*g/cm3" symbol=" " atomicWeight="63.546*g/mole" atomicNumber="29"/>
<ElementaryMaterial name="Deuterium" density="162*mg/cm3" symbol=" " atomicWeight="2.01*g/mole" atomicNumber="1"/>
<ElementaryMaterial name="Fluorine" density="1.108*g/cm3" symbol=" " atomicWeight="18.998*g/mole" atomicNumber="9"/>
<ElementaryMaterial name="Gallium" density="5.877*g/cm3" symbol=" " atomicWeight="69.723*g/mole" atomicNumber="31"/>
<ElementaryMaterial name="Germanium" density="5.323*g/cm3" symbol=" " atomicWeight="72.61*g/mole" atomicNumber="32"/>
<ElementaryMaterial name="Gold" density="18.85*g/cm3" symbol=" " atomicWeight="196.97*g/mole" atomicNumber="79"/>
<ElementaryMaterial name="Helium" density="125*mg/cm3" symbol=" " atomicWeight="4.0026*g/mole" atomicNumber="2"/>
<ElementaryMaterial name="Hydrogen" density="70.8*mg/cm3" symbol=" " atomicWeight="1.00794*g/mole" atomicNumber="1"/>
<ElementaryMaterial name="Indium" density="7.3*g/cm3" symbol=" " atomicWeight="114.82*g/mole" atomicNumber="49"/>
<ElementaryMaterial name="Iodine" density="7.3*g/cm3" symbol=" " atomicWeight="114.82*g/mole" atomicNumber="53"/>
<ElementaryMaterial name="Iron" density="7.87*g/cm3" symbol=" " atomicWeight="55.85*g/mole" atomicNumber="26"/>
<ElementaryMaterial name="Krypton" density="2.6*g/cm3" symbol=" " atomicWeight="83.8*g/mole" atomicNumber="36"/>
<ElementaryMaterial name="Lanthanum" density="6.127*g/cm3" symbol=" " atomicWeight="138.9055*g/mole" atomicNumber="57"/>
<ElementaryMaterial name="Lead" density="11.35*g/cm3" symbol=" " atomicWeight="207.19*g/mole" atomicNumber="82"/>
<ElementaryMaterial name="Lithium" density="534*mg/cm3" symbol=" " atomicWeight="6.941*g/mole" atomicNumber="3"/>
<ElementaryMaterial name="Lutecium" density="9.841*g/cm3" symbol=" " atomicWeight="174.96*g/mole" atomicNumber="71"/>
<ElementaryMaterial name="Magnesium" density="1.735*g/cm3" symbol=" " atomicWeight="24.305*g/mole" atomicNumber="12"/>
<ElementaryMaterial name="Manganese" density="7.43*g/cm3" symbol=" " atomicWeight="54.938*g/mole" atomicNumber="25"/>
<ElementaryMaterial name="Molybdenum" density="10.2*g/cm3" symbol=" " atomicWeight="95.94*g/mole" atomicNumber="42"/>
<ElementaryMaterial name="Neodymium" density="1e-22*mg/cm3" symbol=" " atomicWeight="144.24*g/mole" atomicNumber="60"/>
<ElementaryMaterial name="Neon" density="1.207*g/cm3" symbol=" " atomicWeight="20.18*g/mole" atomicNumber="10"/>
<ElementaryMaterial name="Nickel" density="8.876*g/cm3" symbol=" " atomicWeight="58.693*g/mole" atomicNumber="28"/>
<ElementaryMaterial name="Niobium" density="8.55*g/cm3" symbol=" " atomicWeight="92.906*g/mole" atomicNumber="41"/>
<ElementaryMaterial name="Nitrogen" density="808*mg/cm3" symbol=" " atomicWeight="14.007*g/mole" atomicNumber="7"/>
<ElementaryMaterial name="Oxygen" density="1.43*mg/cm3" symbol=" " atomicWeight="15.999*g/mole" atomicNumber="8"/>
<ElementaryMaterial name="Palladium" density="12*g/cm3" symbol=" " atomicWeight="106.42*g/mole" atomicNumber="46"/>
<ElementaryMaterial name="Phosphor" density="1.82*g/cm3" symbol=" " atomicWeight="30.974*g/mole" atomicNumber="15"/>
<ElementaryMaterial name="Potassium" density="860*mg/cm3" symbol=" " atomicWeight="39.098*g/mole" atomicNumber="19"/>
<ElementaryMaterial name="Praseodymium" density="1e-22*mg/cm3" symbol=" " atomicWeight="140.9077*g/mole" atomicNumber="59"/>
<ElementaryMaterial name="Rhodium" density="12.39*g/cm3" symbol=" " atomicWeight="102.9055*g/mole" atomicNumber="45"/>
<ElementaryMaterial name="Rubidium" density="1.529*g/cm3" symbol=" " atomicWeight="85.4678*g/mole" atomicNumber="37"/>
<ElementaryMaterial name="Ruthenium" density="12.39*g/cm3" symbol=" " atomicWeight="101.07*g/mole" atomicNumber="44"/>
<ElementaryMaterial name="Scandium" density="2.98*g/cm3" symbol=" " atomicWeight="44.956*g/mole" atomicNumber="21"/>
<ElementaryMaterial name="Selenium" density="4.78*g/cm3" symbol=" " atomicWeight="78.96*g/mole" atomicNumber="34"/>
<ElementaryMaterial name="Silicon" density="2.33*g/cm3" symbol=" " atomicWeight="28.09*g/mole" atomicNumber="14"/>
<ElementaryMaterial name="Silver" density="10.48*g/cm3" symbol=" " atomicWeight="107.87*g/mole" atomicNumber="47"/>
<ElementaryMaterial name="Sodium" density="969*mg/cm3" symbol=" " atomicWeight="22.99*g/mole" atomicNumber="11"/>
<ElementaryMaterial name="Deuterium" density="0.17*mg/cm3" symbol=" " atomicWeight="2.01*g/mole" atomicNumber="1"/>
<ElementaryMaterial name="Fluorine" density="1.58*mg/cm3" symbol=" " atomicWeight="18.998*g/mole" atomicNumber="9"/>
<ElementaryMaterial name="Gallium" density="5.904*g/cm3" symbol=" " atomicWeight="69.723*g/mole" atomicNumber="31"/>
<ElementaryMaterial name="Germanium" density="5.323*g/cm3" symbol=" " atomicWeight="72.63*g/mole" atomicNumber="32"/>
<ElementaryMaterial name="Gold" density="19.32*g/cm3" symbol=" " atomicWeight="196.97*g/mole" atomicNumber="79"/>
<ElementaryMaterial name="Helium" density="0.166*mg/cm3" symbol=" " atomicWeight="4.0026*g/mole" atomicNumber="2"/>
<ElementaryMaterial name="Hydrogen" density="0.0837*mg/cm3" symbol=" " atomicWeight="1.00794*g/mole" atomicNumber="1"/>
<ElementaryMaterial name="Indium" density="7.31*g/cm3" symbol=" " atomicWeight="114.82*g/mole" atomicNumber="49"/>
<ElementaryMaterial name="Iodine" density="4.93*g/cm3" symbol=" " atomicWeight="126.9*g/mole" atomicNumber="53"/>
<ElementaryMaterial name="Iron" density="7.87*g/cm3" symbol=" " atomicWeight="55.845*g/mole" atomicNumber="26"/>
<ElementaryMaterial name="Krypton" density="3.48*mg/cm3" symbol=" " atomicWeight="83.798*g/mole" atomicNumber="36"/>
<ElementaryMaterial name="Lanthanum" density="6.154*g/cm3" symbol=" " atomicWeight="138.91*g/mole" atomicNumber="57"/>
<ElementaryMaterial name="Lead" density="11.35*g/cm3" symbol=" " atomicWeight="207.2*g/mole" atomicNumber="82"/>
<ElementaryMaterial name="Lithium" density="534*mg/cm3" symbol=" " atomicWeight="6.94*g/mole" atomicNumber="3"/>
<ElementaryMaterial name="Lutetium" density="9.84*g/cm3" symbol=" " atomicWeight="174.97*g/mole" atomicNumber="71"/>
<ElementaryMaterial name="Magnesium" density="1.74*g/cm3" symbol=" " atomicWeight="24.305*g/mole" atomicNumber="12"/>
<ElementaryMaterial name="Manganese" density="7.44*g/cm3" symbol=" " atomicWeight="54.938*g/mole" atomicNumber="25"/>
<ElementaryMaterial name="Molybdenum" density="10.22*g/cm3" symbol=" " atomicWeight="95.95*g/mole" atomicNumber="42"/>
<ElementaryMaterial name="Neodymium" density="6.9*g/cm3" symbol=" " atomicWeight="144.24*g/mole" atomicNumber="60"/>
<ElementaryMaterial name="Neon" density="0.8385*mg/cm3" symbol=" " atomicWeight="20.18*g/mole" atomicNumber="10"/>
<ElementaryMaterial name="Nickel" density="8.902*g/cm3" symbol=" " atomicWeight="58.693*g/mole" atomicNumber="28"/>
<ElementaryMaterial name="Niobium" density="8.57*g/cm3" symbol=" " atomicWeight="92.906*g/mole" atomicNumber="41"/>
<ElementaryMaterial name="Nitrogen" density="1.165*mg/cm3" symbol=" " atomicWeight="14.007*g/mole" atomicNumber="7"/>
<ElementaryMaterial name="Oxygen" density="1.3315*mg/cm3" symbol=" " atomicWeight="15.999*g/mole" atomicNumber="8"/>
<ElementaryMaterial name="Palladium" density="12.02*g/cm3" symbol=" " atomicWeight="106.42*g/mole" atomicNumber="46"/>
<ElementaryMaterial name="Phosphor" density="2.2*g/cm3" symbol=" " atomicWeight="30.974*g/mole" atomicNumber="15"/>
<ElementaryMaterial name="Potassium" density="862*mg/cm3" symbol=" " atomicWeight="39.098*g/mole" atomicNumber="19"/>
<ElementaryMaterial name="Praseodymium" density="6.71*g/cm3" symbol=" " atomicWeight="140.91*g/mole" atomicNumber="59"/>
<ElementaryMaterial name="Rhodium" density="12.41*g/cm3" symbol=" " atomicWeight="102.91*g/mole" atomicNumber="45"/>
<ElementaryMaterial name="Rubidium" density="1.532*g/cm3" symbol=" " atomicWeight="85.468*g/mole" atomicNumber="37"/>
<ElementaryMaterial name="Ruthenium" density="12.41*g/cm3" symbol=" " atomicWeight="101.07*g/mole" atomicNumber="44"/>
<ElementaryMaterial name="Scandium" density="2.989*g/cm3" symbol=" " atomicWeight="44.956*g/mole" atomicNumber="21"/>
<ElementaryMaterial name="Selenium" density="4.5*g/cm3" symbol=" " atomicWeight="78.971*g/mole" atomicNumber="34"/>
<ElementaryMaterial name="Silicon" density="2.33*g/cm3" symbol=" " atomicWeight="28.085*g/mole" atomicNumber="14"/>
<ElementaryMaterial name="Silver" density="10.5*g/cm3" symbol=" " atomicWeight="107.87*g/mole" atomicNumber="47"/>
<ElementaryMaterial name="Sodium" density="971*mg/cm3" symbol=" " atomicWeight="22.99*g/mole" atomicNumber="11"/>
<ElementaryMaterial name="Strontium" density="2.54*g/cm3" symbol=" " atomicWeight="87.62*g/mole" atomicNumber="38"/>
<ElementaryMaterial name="Sulfur" density="2.07*g/cm3" symbol=" " atomicWeight="32.066*g/mole" atomicNumber="16"/>
<ElementaryMaterial name="Tantalum" density="16.65*g/cm3" symbol=" " atomicWeight="180.9479*g/mole" atomicNumber="73"/>
<ElementaryMaterial name="Technetium" density="11.48*g/cm3" symbol=" " atomicWeight="98*g/mole" atomicNumber="43"/>
<ElementaryMaterial name="Tellurium" density="6.23*g/cm3" symbol=" " atomicWeight="127.6*g/mole" atomicNumber="52"/>
<ElementaryMaterial name="Tin" density="7.31*g/cm3" symbol=" " atomicWeight="118.69*g/mole" atomicNumber="50"/>
<ElementaryMaterial name="Titanium" density="4.53*g/cm3" symbol=" " atomicWeight="47.88*g/mole" atomicNumber="22"/>
<ElementaryMaterial name="Tungsten" density="19.3*g/cm3" symbol=" " atomicWeight="183.85*g/mole" atomicNumber="74"/>
<ElementaryMaterial name="Sulfur" density="2*g/cm3" symbol=" " atomicWeight="32.06*g/mole" atomicNumber="16"/>
<ElementaryMaterial name="Tantalum" density="16.65*g/cm3" symbol=" " atomicWeight="180.95*g/mole" atomicNumber="73"/>
<ElementaryMaterial name="Technetium" density="11.5*g/cm3" symbol=" " atomicWeight="97*g/mole" atomicNumber="43"/>
<ElementaryMaterial name="Tellurium" density="6.24*g/cm3" symbol=" " atomicWeight="127.6*g/mole" atomicNumber="52"/>
<ElementaryMaterial name="Tin" density="7.31*g/cm3" symbol=" " atomicWeight="118.71*g/mole" atomicNumber="50"/>
<ElementaryMaterial name="Titanium" density="4.54*g/cm3" symbol=" " atomicWeight="47.867*g/mole" atomicNumber="22"/>
<ElementaryMaterial name="Tungsten" density="19.3*g/cm3" symbol=" " atomicWeight="183.84*g/mole" atomicNumber="74"/>
<ElementaryMaterial name="Uranium" density="18.95*g/cm3" symbol=" " atomicWeight="238.03*g/mole" atomicNumber="92"/>
<ElementaryMaterial name="Vacuum" density="1e-13*mg/cm3" symbol=" " atomicWeight="1*g/mole" atomicNumber="1"/>
<ElementaryMaterial name="Vanadium" density="6.1*g/cm3" symbol=" " atomicWeight="50.941*g/mole" atomicNumber="23"/>
<ElementaryMaterial name="Xenon" density="3.057*g/cm3" symbol=" " atomicWeight="131.29*g/mole" atomicNumber="54"/>
<ElementaryMaterial name="Yttrium" density="4.456*g/cm3" symbol=" " atomicWeight="88.9059*g/mole" atomicNumber="39"/>
<ElementaryMaterial name="Zinc" density="7.112*g/cm3" symbol=" " atomicWeight="65.39*g/mole" atomicNumber="30"/>
<ElementaryMaterial name="Zirconium" density="6.494*g/cm3" symbol=" " atomicWeight="91.22*g/mole" atomicNumber="40"/>
<ElementaryMaterial name="Vanadium" density="6.11*g/cm3" symbol=" " atomicWeight="50.942*g/mole" atomicNumber="23"/>
<ElementaryMaterial name="Xenon" density="5.485*mg/cm3" symbol=" " atomicWeight="131.29*g/mole" atomicNumber="54"/>
<ElementaryMaterial name="Yttrium" density="4.469*g/cm3" symbol=" " atomicWeight="88.906*g/mole" atomicNumber="39"/>
<ElementaryMaterial name="Zinc" density="7.133*g/cm3" symbol=" " atomicWeight="65.38*g/mole" atomicNumber="30"/>
<ElementaryMaterial name="Zirconium" density="6.506*g/cm3" symbol=" " atomicWeight="91.224*g/mole" atomicNumber="40"/>
<CompositeMaterial name="FPix_Thermflow" density="0.7625*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.3787448">
<rMaterial name="materials:Silicon"/>
Expand Down Expand Up @@ -4606,7 +4605,7 @@
</CompositeMaterial>
<CompositeMaterial name="LYSO" density="7.11*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.7145">
<rMaterial name="materials:Lutecium"/>
<rMaterial name="materials:Lutetium"/>
</MaterialFraction>
<MaterialFraction fraction="0.0403">
<rMaterial name="materials:Yttrium"/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring(
'Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
'Geometry/CMSCommonData/data/cms/2021/v2/cms.xml',
Expand Down