Skip to content

Commit

Permalink
bottom order
Browse files Browse the repository at this point in the history
  • Loading branch information
@lobis
lobis committed Oct 30, 2024
1 parent 4db665d commit e8217fc
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 73 deletions.
16 changes: 8 additions & 8 deletions gdml/BabyIAXO/CompleteVeto1Layers.gdml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4470,21 +4470,21 @@
</physvol>
</assembly>
<assembly name="assembly-9">
<physvol name="assembly-9.veto4">
<physvol name="assembly-9.veto1">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto4.position" x="-310.5" unit="mm"/>
<position name="assembly-9.veto1.position" x="-310.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto3">
<physvol name="assembly-9.veto2">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto3.position" x="-103.5" unit="mm"/>
<position name="assembly-9.veto2.position" x="-103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto2">
<physvol name="assembly-9.veto3">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto2.position" x="103.5" unit="mm"/>
<position name="assembly-9.veto3.position" x="103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto1">
<physvol name="assembly-9.veto4">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto1.position" x="310.5" unit="mm"/>
<position name="assembly-9.veto4.position" x="310.5" unit="mm"/>
</physvol>
</assembly>
<assembly name="assembly-10">
Expand Down
16 changes: 8 additions & 8 deletions gdml/BabyIAXO/CompleteVeto2Layers.gdml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4475,21 +4475,21 @@
</physvol>
</assembly>
<assembly name="assembly-9">
<physvol name="assembly-9.veto4">
<physvol name="assembly-9.veto1">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto4.position" x="-310.5" unit="mm"/>
<position name="assembly-9.veto1.position" x="-310.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto3">
<physvol name="assembly-9.veto2">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto3.position" x="-103.5" unit="mm"/>
<position name="assembly-9.veto2.position" x="-103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto2">
<physvol name="assembly-9.veto3">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto2.position" x="103.5" unit="mm"/>
<position name="assembly-9.veto3.position" x="103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto1">
<physvol name="assembly-9.veto4">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto1.position" x="310.5" unit="mm"/>
<position name="assembly-9.veto4.position" x="310.5" unit="mm"/>
</physvol>
</assembly>
<assembly name="assembly-10">
Expand Down
16 changes: 8 additions & 8 deletions gdml/BabyIAXO/CompleteVeto3Layers.gdml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4480,21 +4480,21 @@
</physvol>
</assembly>
<assembly name="assembly-9">
<physvol name="assembly-9.veto4">
<physvol name="assembly-9.veto1">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto4.position" x="-310.5" unit="mm"/>
<position name="assembly-9.veto1.position" x="-310.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto3">
<physvol name="assembly-9.veto2">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto3.position" x="-103.5" unit="mm"/>
<position name="assembly-9.veto2.position" x="-103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto2">
<physvol name="assembly-9.veto3">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto2.position" x="103.5" unit="mm"/>
<position name="assembly-9.veto3.position" x="103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto1">
<physvol name="assembly-9.veto4">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto1.position" x="310.5" unit="mm"/>
<position name="assembly-9.veto4.position" x="310.5" unit="mm"/>
</physvol>
</assembly>
<assembly name="assembly-10">
Expand Down
16 changes: 8 additions & 8 deletions gdml/BabyIAXO/CompleteVeto4Layers.gdml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4485,21 +4485,21 @@
</physvol>
</assembly>
<assembly name="assembly-9">
<physvol name="assembly-9.veto4">
<physvol name="assembly-9.veto1">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto4.position" x="-310.5" unit="mm"/>
<position name="assembly-9.veto1.position" x="-310.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto3">
<physvol name="assembly-9.veto2">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto3.position" x="-103.5" unit="mm"/>
<position name="assembly-9.veto2.position" x="-103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto2">
<physvol name="assembly-9.veto3">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto2.position" x="103.5" unit="mm"/>
<position name="assembly-9.veto3.position" x="103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto1">
<physvol name="assembly-9.veto4">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto1.position" x="310.5" unit="mm"/>
<position name="assembly-9.veto4.position" x="310.5" unit="mm"/>
</physvol>
</assembly>
<assembly name="assembly-10">
Expand Down
16 changes: 8 additions & 8 deletions gdml/BabyIAXO/Default.gdml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4480,21 +4480,21 @@
</physvol>
</assembly>
<assembly name="assembly-9">
<physvol name="assembly-9.veto4">
<physvol name="assembly-9.veto1">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto4.position" x="-310.5" unit="mm"/>
<position name="assembly-9.veto1.position" x="-310.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto3">
<physvol name="assembly-9.veto2">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto3.position" x="-103.5" unit="mm"/>
<position name="assembly-9.veto2.position" x="-103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto2">
<physvol name="assembly-9.veto3">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto2.position" x="103.5" unit="mm"/>
<position name="assembly-9.veto3.position" x="103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto1">
<physvol name="assembly-9.veto4">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto1.position" x="310.5" unit="mm"/>
<position name="assembly-9.veto4.position" x="310.5" unit="mm"/>
</physvol>
</assembly>
<assembly name="assembly-10">
Expand Down
16 changes: 8 additions & 8 deletions gdml/BabyIAXO/DefaultXenon.gdml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4480,21 +4480,21 @@
</physvol>
</assembly>
<assembly name="assembly-9">
<physvol name="assembly-9.veto4">
<physvol name="assembly-9.veto1">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto4.position" x="-310.5" unit="mm"/>
<position name="assembly-9.veto1.position" x="-310.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto3">
<physvol name="assembly-9.veto2">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto3.position" x="-103.5" unit="mm"/>
<position name="assembly-9.veto2.position" x="-103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto2">
<physvol name="assembly-9.veto3">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto2.position" x="103.5" unit="mm"/>
<position name="assembly-9.veto3.position" x="103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto1">
<physvol name="assembly-9.veto4">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto1.position" x="310.5" unit="mm"/>
<position name="assembly-9.veto4.position" x="310.5" unit="mm"/>
</physvol>
</assembly>
<assembly name="assembly-10">
Expand Down
16 changes: 8 additions & 8 deletions gdml/BabyIAXO/VetoSystem.gdml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4123,21 +4123,21 @@
</physvol>
</assembly>
<assembly name="assembly-5">
<physvol name="assembly-5.veto4">
<physvol name="assembly-5.veto1">
<volumeref ref="assembly-4"/>
<position name="assembly-5.veto4.position" x="-310.5" unit="mm"/>
<position name="assembly-5.veto1.position" x="-310.5" unit="mm"/>
</physvol>
<physvol name="assembly-5.veto3">
<physvol name="assembly-5.veto2">
<volumeref ref="assembly-4"/>
<position name="assembly-5.veto3.position" x="-103.5" unit="mm"/>
<position name="assembly-5.veto2.position" x="-103.5" unit="mm"/>
</physvol>
<physvol name="assembly-5.veto2">
<physvol name="assembly-5.veto3">
<volumeref ref="assembly-4"/>
<position name="assembly-5.veto2.position" x="103.5" unit="mm"/>
<position name="assembly-5.veto3.position" x="103.5" unit="mm"/>
</physvol>
<physvol name="assembly-5.veto1">
<physvol name="assembly-5.veto4">
<volumeref ref="assembly-4"/>
<position name="assembly-5.veto1.position" x="310.5" unit="mm"/>
<position name="assembly-5.veto4.position" x="310.5" unit="mm"/>
</physvol>
</assembly>
<assembly name="assembly-6">
Expand Down
16 changes: 8 additions & 8 deletions gdml/BabyIAXO/WithTelescopePipe.gdml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4488,21 +4488,21 @@
</physvol>
</assembly>
<assembly name="assembly-9">
<physvol name="assembly-9.veto4">
<physvol name="assembly-9.veto1">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto4.position" x="-310.5" unit="mm"/>
<position name="assembly-9.veto1.position" x="-310.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto3">
<physvol name="assembly-9.veto2">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto3.position" x="-103.5" unit="mm"/>
<position name="assembly-9.veto2.position" x="-103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto2">
<physvol name="assembly-9.veto3">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto2.position" x="103.5" unit="mm"/>
<position name="assembly-9.veto3.position" x="103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto1">
<physvol name="assembly-9.veto4">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto1.position" x="310.5" unit="mm"/>
<position name="assembly-9.veto4.position" x="310.5" unit="mm"/>
</physvol>
</assembly>
<assembly name="assembly-10">
Expand Down
16 changes: 8 additions & 8 deletions gdml/IAXO-D1/DefaultXenon.gdml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4480,21 +4480,21 @@
</physvol>
</assembly>
<assembly name="assembly-9">
<physvol name="assembly-9.veto4">
<physvol name="assembly-9.veto1">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto4.position" x="-310.5" unit="mm"/>
<position name="assembly-9.veto1.position" x="-310.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto3">
<physvol name="assembly-9.veto2">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto3.position" x="-103.5" unit="mm"/>
<position name="assembly-9.veto2.position" x="-103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto2">
<physvol name="assembly-9.veto3">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto2.position" x="103.5" unit="mm"/>
<position name="assembly-9.veto3.position" x="103.5" unit="mm"/>
</physvol>
<physvol name="assembly-9.veto1">
<physvol name="assembly-9.veto4">
<volumeref ref="assembly-8"/>
<position name="assembly-9.veto1.position" x="310.5" unit="mm"/>
<position name="assembly-9.veto4.position" x="310.5" unit="mm"/>
</physvol>
</assembly>
<assembly name="assembly-10">
Expand Down
2 changes: 1 addition & 1 deletion generator/src/main/kotlin/BabyIAXO/VetoSystem.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ class VetoLayerTop(private val numberOfLayers: Int = 3) : Geometry() {
class VetoLayerBottom(private val numberOfLayers: Int = 3) : Geometry() {
override fun generate(gdml: Gdml): GdmlRef<GdmlAssembly> {

val vetoLayer = VetoLayer(4).generate(gdml)
val vetoLayer = VetoLayer(4, reverseIndex = true).generate(gdml)

val vetoLayerVolume: GdmlRef<GdmlAssembly> by lazy {
return@lazy gdml.structure.assembly {
Expand Down

0 comments on commit e8217fc

Please sign in to comment.