Skip to content

Commit

Permalink
normalize veto names
Browse files Browse the repository at this point in the history
  • Loading branch information
@lobis
lobis committed Oct 6, 2024
1 parent 44b6253 commit 6d52bd5
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 43 deletions.
64 changes: 32 additions & 32 deletions gdml/IAXO-D1/NeutronShieldingVetoes.gdml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4275,15 +4275,15 @@
<position name="detectorPipeFilling.position" z="82.675" unit="mm"/>
</physvol>
</assembly>
<volume name="vetoOuterBoxLateralVolume">
<volume name="scintillatorVolumeOuterLateral">
<materialref ref="EJ254-5pct"/>
<solidref ref="vetoOuterBoxLateralSolid"/>
</volume>
<volume name="vetoOuterBoxBackVolume">
<volume name="scintillatorVolumeOuterBack">
<materialref ref="EJ254-5pct"/>
<solidref ref="vetoOuterBoxSolid"/>
</volume>
<volume name="vetoInnerBoxLateralVolume">
<volume name="scintillatorVolumeInnerLateral">
<materialref ref="EJ254-5pct"/>
<solidref ref="vetoInnerBoxLateralSolid"/>
</volume>
Expand All @@ -4305,44 +4305,44 @@
<position name="copperBox.position" z="144.5" unit="mm"/>
</physvol>
<physvol name="vetoOuterBack">
<volumeref ref="vetoOuterBoxBackVolume"/>
<volumeref ref="scintillatorVolumeOuterBack"/>
<position name="vetoOuterBack.position" z="-355.5" unit="mm"/>
</physvol>
<physvol name="vetoOuterLateralTop">
<volumeref ref="vetoOuterBoxLateralVolume"/>
<position name="vetoOuterLateralTop.position" x="50.0" y="400.0" z="-30.5" unit="mm"/>
<physvol name="scintillatorOuterTop">
<volumeref ref="scintillatorVolumeOuterLateral"/>
<position name="scintillatorOuterTop.position" x="50.0" y="400.0" z="-30.5" unit="mm"/>
</physvol>
<physvol name="vetoOuterLateralBottom">
<volumeref ref="vetoOuterBoxLateralVolume"/>
<position name="vetoOuterLateralBottom.position" x="-50.0" y="-400.0" z="-30.5" unit="mm"/>
<physvol name="scintillatorOuterBottom">
<volumeref ref="scintillatorVolumeOuterLateral"/>
<position name="scintillatorOuterBottom.position" x="-50.0" y="-400.0" z="-30.5" unit="mm"/>
</physvol>
<physvol name="vetoOuterLateralRight">
<volumeref ref="vetoOuterBoxLateralVolume"/>
<position name="vetoOuterLateralRight.position" x="-400.0" y="50.0" z="-30.5" unit="mm"/>
<rotation name="vetoOuterLateralRight.rotation" z="90.0" unit="deg"/>
<physvol name="scintillatorOuterRight">
<volumeref ref="scintillatorVolumeOuterLateral"/>
<position name="scintillatorOuterRight.position" x="-400.0" y="50.0" z="-30.5" unit="mm"/>
<rotation name="scintillatorOuterRight.rotation" z="90.0" unit="deg"/>
</physvol>
<physvol name="vetoOuterLateralLeft">
<volumeref ref="vetoOuterBoxLateralVolume"/>
<position name="vetoOuterLateralLeft.position" x="400.0" y="-50.0" z="-30.5" unit="mm"/>
<rotation name="vetoOuterLateralLeft.rotation" z="90.0" unit="deg"/>
<physvol name="scintillatorOuterLeft">
<volumeref ref="scintillatorVolumeOuterLateral"/>
<position name="scintillatorOuterLeft.position" x="400.0" y="-50.0" z="-30.5" unit="mm"/>
<rotation name="scintillatorOuterLeft.rotation" z="90.0" unit="deg"/>
</physvol>
<physvol name="vetoInnerLateralTop">
<volumeref ref="vetoInnerBoxLateralVolume"/>
<position name="vetoInnerLateralTop.position" x="25.0" y="175.0" z="119.5" unit="mm"/>
<physvol name="vetoInnerTop">
<volumeref ref="scintillatorVolumeInnerLateral"/>
<position name="vetoInnerTop.position" x="25.0" y="175.0" z="119.5" unit="mm"/>
</physvol>
<physvol name="vetoInnerLateralBottom">
<volumeref ref="vetoInnerBoxLateralVolume"/>
<position name="vetoInnerLateralBottom.position" x="-25.0" y="-175.0" z="119.5" unit="mm"/>
<physvol name="vetoInnerBottom">
<volumeref ref="scintillatorVolumeInnerLateral"/>
<position name="vetoInnerBottom.position" x="-25.0" y="-175.0" z="119.5" unit="mm"/>
</physvol>
<physvol name="vetoInnerLateralRight">
<volumeref ref="vetoInnerBoxLateralVolume"/>
<position name="vetoInnerLateralRight.position" x="-175.0" y="25.0" z="119.5" unit="mm"/>
<rotation name="vetoInnerLateralRight.rotation" z="90.0" unit="deg"/>
<physvol name="vetoInnerRight">
<volumeref ref="scintillatorVolumeInnerLateral"/>
<position name="vetoInnerRight.position" x="-175.0" y="25.0" z="119.5" unit="mm"/>
<rotation name="vetoInnerRight.rotation" z="90.0" unit="deg"/>
</physvol>
<physvol name="vetoInnerLateralLeft">
<volumeref ref="vetoInnerBoxLateralVolume"/>
<position name="vetoInnerLateralLeft.position" x="175.0" y="-25.0" z="119.5" unit="mm"/>
<rotation name="vetoInnerLateralLeft.rotation" z="90.0" unit="deg"/>
<physvol name="vetoInnerLeft">
<volumeref ref="scintillatorVolumeInnerLateral"/>
<position name="vetoInnerLeft.position" x="175.0" y="-25.0" z="119.5" unit="mm"/>
<rotation name="vetoInnerLeft.rotation" z="90.0" unit="deg"/>
</physvol>
</assembly>
<volume name="world">
Expand Down
30 changes: 19 additions & 11 deletions generator/src/main/kotlin/BabyIAXO/ShieldingNeutrons.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,21 @@ open class ShieldingNeutrons(
)

val vetoOuterBoxLateralVolume =
gdml.structure.volume(Materials.EJ254_5pct.ref, vetoOuterBoxLateralSolid, "vetoOuterBoxLateralVolume")
gdml.structure.volume(
Materials.EJ254_5pct.ref,
vetoOuterBoxLateralSolid,
"scintillatorVolumeOuterLateral"
)

val vetoOuterBoxBackVolume =
gdml.structure.volume(Materials.EJ254_5pct.ref, vetoOuterBackBoxSolid, "vetoOuterBoxBackVolume")
gdml.structure.volume(Materials.EJ254_5pct.ref, vetoOuterBackBoxSolid, "scintillatorVolumeOuterBack")

val vetoInnerBoxLateralVolume =
gdml.structure.volume(Materials.EJ254_5pct.ref, vetoInnerBoxLateralSolid, "vetoInnerBoxLateralVolume")
gdml.structure.volume(
Materials.EJ254_5pct.ref,
vetoInnerBoxLateralSolid,
"scintillatorVolumeInnerLateral"
)

val copperBoxOuterSolid =
gdml.solids.box(
Expand Down Expand Up @@ -166,7 +174,7 @@ open class ShieldingNeutrons(
physVolume(vetoOuterBoxBackVolume, name = "vetoOuterBack") {
position(z = -OffsetZ - SizeZ / 2 - vetoOuterThickness / 2) { unit = LUnit.MM }
}
physVolume(vetoOuterBoxLateralVolume, name = "vetoOuterLateralTop") {
physVolume(vetoOuterBoxLateralVolume, name = "scintillatorOuterTop") {
position(
y = SizeXY / 2 + vetoOuterThickness / 2,
x = vetoOuterThickness / 2,
Expand All @@ -175,7 +183,7 @@ open class ShieldingNeutrons(
unit = LUnit.MM
}
}
physVolume(vetoOuterBoxLateralVolume, name = "vetoOuterLateralBottom") {
physVolume(vetoOuterBoxLateralVolume, name = "scintillatorOuterBottom") {
position(
y = -SizeXY / 2 - vetoOuterThickness / 2,
x = -vetoOuterThickness / 2,
Expand All @@ -184,7 +192,7 @@ open class ShieldingNeutrons(
unit = LUnit.MM
}
}
physVolume(vetoOuterBoxLateralVolume, name = "vetoOuterLateralRight") {
physVolume(vetoOuterBoxLateralVolume, name = "scintillatorOuterRight") {
rotation(z = 90.0) { unit = AUnit.DEGREE }
position(
x = -SizeXY / 2 - vetoOuterThickness / 2,
Expand All @@ -194,7 +202,7 @@ open class ShieldingNeutrons(
unit = LUnit.MM
}
}
physVolume(vetoOuterBoxLateralVolume, name = "vetoOuterLateralLeft") {
physVolume(vetoOuterBoxLateralVolume, name = "scintillatorOuterLeft") {
rotation(z = 90.0) { unit = AUnit.DEGREE }
position(
x = SizeXY / 2 + vetoOuterThickness / 2,
Expand All @@ -206,7 +214,7 @@ open class ShieldingNeutrons(
}

// inner veto
physVolume(vetoInnerBoxLateralVolume, name = "vetoInnerLateralTop") {
physVolume(vetoInnerBoxLateralVolume, name = "vetoInnerTop") {
position(
y = vetoInnerThickness / 2 + chamberHoleXY / 2 + vetoInnerSpacing,
x = vetoInnerThickness / 2,
Expand All @@ -215,7 +223,7 @@ open class ShieldingNeutrons(
unit = LUnit.MM
}
}
physVolume(vetoInnerBoxLateralVolume, name = "vetoInnerLateralBottom") {
physVolume(vetoInnerBoxLateralVolume, name = "vetoInnerBottom") {
position(
y = -vetoInnerThickness / 2 - chamberHoleXY / 2 - vetoInnerSpacing,
x = -vetoInnerThickness / 2,
Expand All @@ -224,7 +232,7 @@ open class ShieldingNeutrons(
unit = LUnit.MM
}
}
physVolume(vetoInnerBoxLateralVolume, name = "vetoInnerLateralRight") {
physVolume(vetoInnerBoxLateralVolume, name = "vetoInnerRight") {
rotation(z = 90.0) { unit = AUnit.DEGREE }
position(
x = -vetoInnerThickness / 2 - chamberHoleXY / 2 - vetoInnerSpacing,
Expand All @@ -234,7 +242,7 @@ open class ShieldingNeutrons(
unit = LUnit.MM
}
}
physVolume(vetoInnerBoxLateralVolume, name = "vetoInnerLateralLeft") {
physVolume(vetoInnerBoxLateralVolume, name = "vetoInnerLeft") {
rotation(z = 90.0) { unit = AUnit.DEGREE }
position(
x = vetoInnerThickness / 2 + chamberHoleXY / 2 + vetoInnerSpacing,
Expand Down

0 comments on commit 6d52bd5

Please sign in to comment.