Skip to content

Commit

Permalink
rename "East", "West" to "Right", "Left"
Browse files Browse the repository at this point in the history
  • Loading branch information
@lobis
lobis committed Aug 23, 2023
1 parent 142128a commit 66037bd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions generator/src/main/kotlin/BabyIAXO/VetoSystem.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,15 +259,15 @@ class VetoLayerBottom(private val numberOfLayers: Int = 3) : Geometry() {
}
}

class VetoLayerEast(private val numberOfLayers: Int = 3) : Geometry() {
class VetoLayerRight(private val numberOfLayers: Int = 3) : Geometry() {
override fun generate(gdml: Gdml): GdmlRef<GdmlAssembly> {

val vetoLayer = VetoLayer(4).generate(gdml)

val vetoLayerVolume: GdmlRef<GdmlAssembly> by lazy {
return@lazy gdml.structure.assembly {
for (i in 1..numberOfLayers) {
physVolume(vetoLayer, name = "vetoLayerEast$i") {
physVolume(vetoLayer, name = "vetoLayerRight$i") {
position(
x = -(Veto.FullThickness + 20) * (i - 1)
) { unit = LUnit.MM }
Expand All @@ -281,15 +281,15 @@ class VetoLayerEast(private val numberOfLayers: Int = 3) : Geometry() {
}
}

class VetoLayerWest(private val numberOfLayers: Int = 3) : Geometry() {
class VetoLayerLeft(private val numberOfLayers: Int = 3) : Geometry() {
override fun generate(gdml: Gdml): GdmlRef<GdmlAssembly> {

val vetoLayer = VetoLayer(4).generate(gdml)

val vetoLayerVolume: GdmlRef<GdmlAssembly> by lazy {
return@lazy gdml.structure.assembly {
for (i in 1..numberOfLayers) {
physVolume(vetoLayer, name = "vetoLayerWest$i") {
physVolume(vetoLayer, name = "vetoLayerLeft$i") {
position(
x = (Veto.FullThickness + 20) * (i - 1)
) { unit = LUnit.MM }
Expand Down Expand Up @@ -365,13 +365,13 @@ class VetoSystem(private val numberOfLayers: Int = 3) : Geometry() {
z = -Shielding.OffsetZ
) { unit = LUnit.MM }
}
physVolume(VetoLayerEast(numberOfLayers).generate(gdml), name = "vetoSystemEast") {
physVolume(VetoLayerRight(numberOfLayers).generate(gdml), name = "vetoSystemRight") {
position(
x = -xyShieldingDistance - 130,
z = -Shielding.OffsetZ - 30
) { unit = LUnit.MM }
}
physVolume(VetoLayerWest(numberOfLayers).generate(gdml), name = "vetoSystemWest") {
physVolume(VetoLayerLeft(numberOfLayers).generate(gdml), name = "vetoSystemLeft") {
position(
x = xyShieldingDistance + 130,
z = -Shielding.OffsetZ
Expand Down
12 changes: 6 additions & 6 deletions generator/src/main/kotlin/IAXO-D1/VetoSystem.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ class VetoLayerBottom(private val numberOfLayers: Int = 3) : Geometry() {
}
}

class VetoLayerEast(private val numberOfLayers: Int = 3) : Geometry() {
class VetoLayerRight(private val numberOfLayers: Int = 3) : Geometry() {
override fun generate(gdml: Gdml): GdmlRef<GdmlAssembly> {

val vetoLayer = VetoLayer(3, vetoSize = VetoSize.LARGE, separation = 10.0).generate(gdml)

val vetoLayerVolume: GdmlRef<GdmlAssembly> by lazy {
return@lazy gdml.structure.assembly {
for (i in 1..numberOfLayers) {
physVolume(vetoLayer, name = "vetoLayerEast$i") {
physVolume(vetoLayer, name = "vetoLayerRight$i") {
position(
x = -(Veto.FullThickness + 20) * (i - 1)
) { unit = LUnit.MM }
Expand All @@ -99,15 +99,15 @@ class VetoLayerEast(private val numberOfLayers: Int = 3) : Geometry() {
}
}

class VetoLayerWest(private val numberOfLayers: Int = 3) : Geometry() {
class VetoLayerLeft(private val numberOfLayers: Int = 3) : Geometry() {
override fun generate(gdml: Gdml): GdmlRef<GdmlAssembly> {

val vetoLayer = VetoLayer(3, vetoSize = VetoSize.LARGE, separation = 10.0).generate(gdml)

val vetoLayerVolume: GdmlRef<GdmlAssembly> by lazy {
return@lazy gdml.structure.assembly {
for (i in 1..numberOfLayers) {
physVolume(vetoLayer, name = "vetoLayerWest$i") {
physVolume(vetoLayer, name = "vetoLayerLeft$i") {
position(
x = (Veto.FullThickness + 20) * (i - 1)
) { unit = LUnit.MM }
Expand Down Expand Up @@ -184,13 +184,13 @@ class VetoSystem(private val numberOfLayers: Int = 3) : Geometry() {
z = -Shielding.OffsetZ
) { unit = LUnit.MM }
}
physVolume(VetoLayerEast(numberOfLayers).generate(gdml), name = "vetoSystemEast") {
physVolume(VetoLayerRight(numberOfLayers).generate(gdml), name = "vetoSystemRight") {
position(
x = -xyShieldingDistance - 130 + 80,
z = -Shielding.OffsetZ + 100
) { unit = LUnit.MM }
}
physVolume(VetoLayerWest(numberOfLayers).generate(gdml), name = "vetoSystemWest") {
physVolume(VetoLayerLeft(numberOfLayers).generate(gdml), name = "vetoSystemLeft") {
position(
x = xyShieldingDistance + 130 - 80,
z = -Shielding.OffsetZ - 100
Expand Down

0 comments on commit 66037bd

Please sign in to comment.