update materials with mass fraction fix

iaxo · Jul 27, 2024 · 1611f4e · 1611f4e
1 parent 1883e46
commit 1611f4e
Show file tree

Hide file tree

Showing 33 changed files with 25,083 additions and 9,179 deletions.
diff --git a/gdml/BabyIAXO/Chamber.gdml b/gdml/BabyIAXO/Chamber.gdml
diff --git a/gdml/BabyIAXO/ChamberAndPipe.gdml b/gdml/BabyIAXO/ChamberAndPipe.gdml
diff --git a/gdml/BabyIAXO/CompleteVeto1Layers.gdml b/gdml/BabyIAXO/CompleteVeto1Layers.gdml
diff --git a/gdml/BabyIAXO/CompleteVeto2Layers.gdml b/gdml/BabyIAXO/CompleteVeto2Layers.gdml
diff --git a/gdml/BabyIAXO/CompleteVeto3Layers.gdml b/gdml/BabyIAXO/CompleteVeto3Layers.gdml
diff --git a/gdml/BabyIAXO/CompleteVeto4Layers.gdml b/gdml/BabyIAXO/CompleteVeto4Layers.gdml
diff --git a/gdml/BabyIAXO/Default.gdml b/gdml/BabyIAXO/Default.gdml
diff --git a/gdml/BabyIAXO/DefaultXenon.gdml b/gdml/BabyIAXO/DefaultXenon.gdml
diff --git a/gdml/BabyIAXO/DetectorPipe.gdml b/gdml/BabyIAXO/DetectorPipe.gdml
diff --git a/gdml/BabyIAXO/NoVetos.gdml b/gdml/BabyIAXO/NoVetos.gdml
diff --git a/gdml/BabyIAXO/Shielding.gdml b/gdml/BabyIAXO/Shielding.gdml
diff --git a/gdml/BabyIAXO/ShieldingLayers.gdml b/gdml/BabyIAXO/ShieldingLayers.gdml
diff --git a/gdml/BabyIAXO/ShieldingLayersNoCopperBox.gdml b/gdml/BabyIAXO/ShieldingLayersNoCopperBox.gdml
diff --git a/gdml/BabyIAXO/Veto.gdml b/gdml/BabyIAXO/Veto.gdml
diff --git a/gdml/BabyIAXO/VetoSystem.gdml b/gdml/BabyIAXO/VetoSystem.gdml
diff --git a/gdml/BabyIAXO/WithTelescopePipe.gdml b/gdml/BabyIAXO/WithTelescopePipe.gdml
diff --git a/gdml/IAXO-D1/Chamber.gdml b/gdml/IAXO-D1/Chamber.gdml
diff --git a/gdml/IAXO-D1/ChamberAndPipe.gdml b/gdml/IAXO-D1/ChamberAndPipe.gdml
diff --git a/gdml/IAXO-D1/CompleteVeto1Layers.gdml b/gdml/IAXO-D1/CompleteVeto1Layers.gdml
diff --git a/gdml/IAXO-D1/CompleteVeto2Layers.gdml b/gdml/IAXO-D1/CompleteVeto2Layers.gdml
diff --git a/gdml/IAXO-D1/CompleteVeto3Layers.gdml b/gdml/IAXO-D1/CompleteVeto3Layers.gdml
diff --git a/gdml/IAXO-D1/CompleteVeto4Layers.gdml b/gdml/IAXO-D1/CompleteVeto4Layers.gdml
diff --git a/gdml/IAXO-D1/Default.gdml b/gdml/IAXO-D1/Default.gdml
diff --git a/gdml/IAXO-D1/DefaultXenon.gdml b/gdml/IAXO-D1/DefaultXenon.gdml
diff --git a/gdml/IAXO-D1/DetectorPipe.gdml b/gdml/IAXO-D1/DetectorPipe.gdml
diff --git a/gdml/IAXO-D1/NoVetos.gdml b/gdml/IAXO-D1/NoVetos.gdml
diff --git a/gdml/IAXO-D1/Shielding.gdml b/gdml/IAXO-D1/Shielding.gdml
diff --git a/gdml/IAXO-D1/ShieldingLayers.gdml b/gdml/IAXO-D1/ShieldingLayers.gdml
diff --git a/gdml/IAXO-D1/ShieldingLayersNoCopperBox.gdml b/gdml/IAXO-D1/ShieldingLayersNoCopperBox.gdml
diff --git a/gdml/IAXO-D1/Veto.gdml b/gdml/IAXO-D1/Veto.gdml
diff --git a/gdml/IAXO-D1/VetoSystem.gdml b/gdml/IAXO-D1/VetoSystem.gdml
diff --git a/gdml/IAXO-LiquidO/Default.gdml b/gdml/IAXO-LiquidO/Default.gdml
diff --git a/generator/src/main/kotlin/Materials.kt b/generator/src/main/kotlin/Materials.kt
@@ -1,6 +1,6 @@
 import space.kscience.gdml.*
 
-const val materialsUrl = "https://raw.githubusercontent.com/lobis/geant4-materials-xml/main/materials.xml"
+const val materialsUrl = "https://raw.githubusercontent.com/rest-for-physics/materials/main/output/materials.xml"
 
 private val materialsGdml = Gdml {
     loadMaterialsFromUrl(materialsUrl)
@@ -19,8 +19,8 @@ fun resolveMaterialByRef(material: Materials): GdmlMaterial {
 
 enum class Materials(val ref: GdmlRef<GdmlMaterial>) {
     Air(resolve("G4_AIR")),
-    GasArgon(resolve("GasMixture-Argon2%Isobutane1.4Bar")),
-    GasXenon(resolve("GasMixture-XenonNeon2.3%Isobutane1.05Bar")),
+    GasArgon(resolve("Argon1%Isobutane1.4bar")),
+    GasXenon(resolve("XenonNeon2.3%Isobutane1.05bar")),
     Vacuum(resolve("G4_Galactic")),
     Copper(resolve("G4_Cu")),
     Teflon(resolve("G4_TEFLON")),