diff --git a/dunecore/Geometry/gdml/generate_protodunevd_v4_refactored.pl b/dunecore/Geometry/gdml/generate_protodunevd_v4_refactored.pl index fb9e8034..8e2a08d7 100644 --- a/dunecore/Geometry/gdml/generate_protodunevd_v4_refactored.pl +++ b/dunecore/Geometry/gdml/generate_protodunevd_v4_refactored.pl @@ -59,6 +59,13 @@ # Pablo Barham Alzás ################################################################################## +# v4.1 tkosc (thomas.kosc@proton.me) 27th November 2023 +# - Rotated (-90° along z) the Steel Structure of cryostat (as indicated in todo list of v1) +# This concerns the following physical volumes : +# * volSteelSupport_Top, volSteelSupport_Bottom, volSteelSupport_TUS, volSteelSupport_DS +# * volSteelSupport_LS, volSteelSupport_RS + + # Each subroutine generates a fragment GDML file, and the last subroutine # creates an XML file that make_gdml.pl will use to appropriately arrange # the fragment GDML files to create the final desired DUNE GDML file, @@ -86,7 +93,7 @@ $ArapucaMesh_switch="on"; my $HD_CRT_switch="off"; -my $DP_CRT_switch="off"; # existing CRTs in NP02 (VD module 0), CRT used for the double phase DP +my $DP_CRT_switch="on"; # existing CRTs in NP02 (VD module 0), CRT used for the double phase DP # DP_CRT switch is OFF due to overlaps with the beam pipe. Once solved it should be turned ON. if ( defined $help ) @@ -112,7 +119,7 @@ # set wires on to be the default, unless given an input by the user -$wires_on = 0; # 1=on, 0=off +$wires_on = 1; # 1=on, 0=off if (defined $wires) { $wires_on = $wires; @@ -357,15 +364,23 @@ $posCryoInDetEnc_y = 0; $posCryoInDetEnc_z = 0; -$posTopSteelStruct = $Argon_y/2+$FoamPadding+$SteelSupport_y; #+ 61.8/2; ## JS Real, add boxCryoTop dz/2. -$posBotSteelStruct = -$Argon_y/2-$FoamPadding-$SteelSupport_y; # - 61.8/2; -$posZBackSteelStruct = $Argon_z/2+$FoamPadding+$SteelSupport_z;# + 61.8/2; ## JS Real, add boxCryoWallSm dz/2.; -$posZFrontSteelStruct = -$Argon_z/2-$FoamPadding-$SteelSupport_z;# - 61.8/2; -$posLeftSteelStruct = $Argon_x/2+$FoamPadding+$SteelSupport_x; # + 61.8/2; ## JS Real, add boxCryoWallLg dz/2.; -$posRightSteelStruct = -$Argon_x/2-$FoamPadding-$SteelSupport_x;# + 61.8/2; ## JS Real, add boxCryoWallLg dz/2.; +$boxCryoWidth = 61.8; +$posTopSteelStruct = $Argon_x/2+$FoamPadding+$SteelSupport_x + $boxCryoWidth/2. + 0.4/2.; #tkosc elaborate a little more these numbers +$posBotSteelStruct = -$Argon_x/2-$FoamPadding-$SteelSupport_x - $boxCryoWidth/2. - 0.4/2.; +$posZBackSteelStruct = $Argon_z/2+$FoamPadding+$SteelSupport_z + $boxCryoWidth/2. + 0.4/2.; +$posZFrontSteelStruct = -$Argon_z/2-$FoamPadding-$SteelSupport_z - $boxCryoWidth/2. - 0.4/2.; +$posLeftSteelStruct = $Argon_y/2+$FoamPadding+$SteelSupport_y + $boxCryoWidth/2. + 0.4/2.; +$posRightSteelStruct = -$Argon_y/2-$FoamPadding-$SteelSupport_y - $boxCryoWidth/2. - 0.4/2.; +#tkosc : the ±0.4/2 is added in order to compensate the reduction of $Argon_xyz dimensions by 0.4cm +# and keep the cryostat positions correct +#790.0 --> 789.6 in x +#854.8 --> 854.4 in y +#854.8 --> 854.4 in z + -$posTopSteelStruct -= 29.7 if $DP_CRT_switch eq "on"; # overlap volume otherwise -$posBotSteelStruct += 29.7 if $DP_CRT_switch eq "on"; + +#$posTopSteelStruct -= 29.7 if $DP_CRT_switch eq "on"; # overlap volume otherwise +#$posBotSteelStruct += 29.7 if $DP_CRT_switch eq "on"; # 2*AirThickness is added to the world volume in x, y and z $AirThickness = 3000; @@ -4911,44 +4926,44 @@ () - - + + - - + + - + - - + + - - + + - - + + - - + + EOF diff --git a/dunecore/Geometry/gdml/protodunevd_v4_refactored.gdml b/dunecore/Geometry/gdml/protodunevd_v4_refactored.gdml index f75f8bd0..b5503691 100644 --- a/dunecore/Geometry/gdml/protodunevd_v4_refactored.gdml +++ b/dunecore/Geometry/gdml/protodunevd_v4_refactored.gdml @@ -259,11 +259,6 @@ - - - - - @@ -12763,6 +12758,10 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43043,44 +43142,44 @@ - - + + - - + + - + - + - + - - + + - - + + @@ -43119,6 +43218,16 @@ + + + + + + + + + + diff --git a/dunecore/Geometry/gdml/protodunevd_v4_refactored_nowires.gdml b/dunecore/Geometry/gdml/protodunevd_v4_refactored_nowires.gdml index 9c619050..45fa47b0 100644 --- a/dunecore/Geometry/gdml/protodunevd_v4_refactored_nowires.gdml +++ b/dunecore/Geometry/gdml/protodunevd_v4_refactored_nowires.gdml @@ -259,11 +259,6 @@ - - - - - @@ -1283,6 +1278,10 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5079,44 +5178,44 @@ - - + + - - + + - + - + - + - - + + - - + + @@ -5155,6 +5254,16 @@ + + + + + + + + + +