Merge branch 'master' of github.com:iaxo/iaxo-geometry

* 'master' of github.com:iaxo/iaxo-geometry: add xenon material, fix typo
iaxo · Aug 19, 2023 · 142128a · 142128a
2 parents 121e81b + 7a1472e
commit 142128a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/generator/src/main/kotlin/BabyIAXO/Chamber.kt b/generator/src/main/kotlin/BabyIAXO/Chamber.kt
@@ -1,10 +1,13 @@
 package BabyIAXO
 
 import Geometry
+import Materials
 
 import space.kscience.gdml.*
 
-open class Chamber : Geometry() {
+open class Chamber(
+    val useXenon: Boolean = false,
+) : Geometry() {
     companion object Parameters {
         // Body
         const val Height: Double = 30.0
@@ -184,7 +187,9 @@ open class Chamber : Geometry() {
                 gdml.solids.subtraction(gasSolidAux, cathodeWindowSolid, "gasSolid") {
                     position(z = Height / 2 - CathodeWindowThickness / 2) { unit = LUnit.MM }
                 }
-            val gasVolume = gdml.structure.volume(Materials.Gas.ref, gasSolid, "gasVolume")
+            val gasMaterialRef = if (useXenon) Materials.GasXenon.ref else Materials.GasArgon.ref
+
+            val gasVolume = gdml.structure.volume(gasMaterialRef, gasSolid, "gasVolume")
 
             return@lazy gdml.structure.assembly {
                 name = "Chamber"

diff --git a/generator/src/main/kotlin/BabyIAXO/Main.kt b/generator/src/main/kotlin/BabyIAXO/Main.kt
@@ -10,11 +10,12 @@ private const val worldSizeZ = 1450.0
 
 fun completeGeometry(
     vetoSystem: VetoSystem = VetoSystem(),
+    useXenon: Boolean = false,
 ): Gdml {
     return Gdml {
         loadMaterialsFromUrl(materialsUrl) /* This adds all materials form the URL (we do not need them all) */
 
-        val chamberVolume = Chamber().generate(this)
+        val chamberVolume = Chamber(useXenon = useXenon).generate(this)
         val detectorPipeVolume = DetectorPipe().generate(this)
         val shieldingVolume = Shielding().generate(this)
         val vetoSystemVolume = vetoSystem.generate(this)
@@ -38,6 +39,7 @@ fun completeGeometry(
 
 val geometries = mapOf(
     "Default" to completeGeometry(),
+    "DefaultXenon" to completeGeometry(useXenon = true),
     "CompleteVeto1Layers" to completeGeometry(vetoSystem = VetoSystem(numberOfLayers = 1)),
     "CompleteVeto2Layers" to completeGeometry(vetoSystem = VetoSystem(numberOfLayers = 2)),
     "CompleteVeto3Layers" to completeGeometry(vetoSystem = VetoSystem(numberOfLayers = 3)),

diff --git a/generator/src/main/kotlin/IAXO-D1/Main.kt b/generator/src/main/kotlin/IAXO-D1/Main.kt
@@ -46,6 +46,7 @@ fun completeGeometry(
 
 val geometries = mapOf(
     "Default" to completeGeometry(),
+    "DefaultXenon" to BabyIAXO.completeGeometry(useXenon = true),
     "CompleteVeto1Layers" to completeGeometry(vetoSystem = VetoSystem(numberOfLayers = 1)),
     "CompleteVeto2Layers" to completeGeometry(vetoSystem = VetoSystem(numberOfLayers = 2)),
     "CompleteVeto3Layers" to completeGeometry(vetoSystem = VetoSystem(numberOfLayers = 3)),

diff --git a/generator/src/main/kotlin/IAXO-D1/VetoSystem.kt b/generator/src/main/kotlin/IAXO-D1/VetoSystem.kt
@@ -153,7 +153,7 @@ class VetoLayerFront(private val numberOfLayers: Int = 3) : Geometry() {
         val vetoLayerVolume: GdmlRef<GdmlAssembly> by lazy {
             return@lazy gdml.structure.assembly {
                 for (i in 1..numberOfLayers) {
-                    physVolume(vetoLayer, name = "vetoLayerBack$i") {
+                    physVolume(vetoLayer, name = "vetoLayerFront$i") {
                         position(
                             z = (Veto.FullThickness + 20) * (i - 1)
                         ) { unit = LUnit.MM }

diff --git a/generator/src/main/kotlin/Main.kt b/generator/src/main/kotlin/Main.kt
@@ -27,7 +27,7 @@ fun main() {
 
         for ((name, gdml) in geometries) {
             File("$outputDirectoryName/$geometryName/$name.gdml")
-                .writeText(gdml.removeUnusedMaterials().encodeToString())
+                .writeText(gdml.encodeToString()) // do not use removeUnusedMaterials() here
         }
     }
 }
diff --git a/generator/src/main/kotlin/Materials.kt b/generator/src/main/kotlin/Materials.kt
@@ -19,7 +19,8 @@ fun resolveMaterialByRef(material: Materials): GdmlMaterial {
 
 enum class Materials(val ref: GdmlRef<GdmlMaterial>) {
     Air(resolve("G4_AIR")),
-    Gas(resolve("GasMixture-Argon2%Isobutane1.4Bar")),
+    GasArgon(resolve("GasMixture-Argon2%Isobutane1.4Bar")),
+    GasXenon(resolve("GasMixture-XenonNeon2.3%Isobutane1.05Bar")),
     Vacuum(resolve("G4_Galactic")),
     Copper(resolve("G4_Cu")),
     Teflon(resolve("G4_TEFLON")),