From 481e9979542e5d04a2e2fd39f098849359e5aa37 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Wed, 24 Apr 2019 19:26:02 +0200 Subject: [PATCH] Update in-bunker collimator --- geometry/estia_guides.i | 49 ++++++++++++++++++------------------- geometry/estia_inbunker.i | 4 +-- geometry/estia_surfaces.i | 51 +++++++++++++++++++++++---------------- 3 files changed, 55 insertions(+), 49 deletions(-) diff --git a/geometry/estia_guides.i b/geometry/estia_guides.i index b407236..7b3afab 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -16,20 +16,20 @@ c -----Wall Cut-Out--- #4204 #4311 #4312 #4313 #4314 c #(-5102 5501 5502 -5505 5504) c #(5102 -7100 -5531) -6002 4 -1.2E-3 ((6305 -6405 -6401 -6402 -6403 -6404) - :(6405 -6505 -6501 -6502 -6503 -6504)) 3 26108 -c #(5102 -7100 -5531) - #((7100 -7102 7201 7202 7203 7204) - :(7102 -7103 7205 7206 7207 7208)) - #(7103 -6505 -8921) -6003 4 -1.2E-3 (6505 -72 -6601 -6602 -6603 -6604 -72) 3 +6002 4 -1.2E-3 6305 -7205 -6401 -6402 -6403 -6404 26108 + #7031 #7032 #7033 +6003 4 -1.2E-3 7205 -7208 -6401 -6402 -6403 -6404 + #(7201 -7202 -7203 7204) +6004 4 -1.2E-3 7208 -6405 -6401 -6402 -6403 -6404 8921 +6005 4 -1.2E-3 6405 -6505 -6501 -6502 -6503 -6504 8921 +6006 4 -1.2E-3 (6505 -72 -6601 -6602 -6603 -6604 -72) -114 #(7103 8405 -8921) #(7102 -7103 7205 7206 7207 7208) #(8421 8422 8423 8424 8425 8426) c #(-8405 8401 8402 8403 8404) c Vacuum before and inside Selene Guide 1 -6101 0 (7103 8435 -8922 3) #706 -6102 5 0.0582256 (7103 -8425 8922 -8921 3) +6101 0 (7208 8435 -8922 3) #706 +6102 5 0.0582256 (7208 -8425 8922 -8921 3) 6103 0 (-8431 -8432 -8433 -8434 -8435 -8436 (-8441:-8442) (-8443:-8444)) #8301 #8311 #8411 #8412 #8413 c Vacuum after Selene 1, until Selen 2 @@ -43,23 +43,20 @@ c Vacuum inside Selene 2 #(8121 -8122 8601 8602 8603 8604)) :(8121 -8122 8601 -8611 -8612 -8613 3)) #8511 c -----Bunker Wall Collimator (BWC)----- -7001 0 (7100 -7103 -7301 -7302 -7303 -7304 3) - #(7101 -7401 7402) -7021 14 -8.92 7100 -7101 7201 7202 7203 7204 3 - #(7100 -7101 -7301 -7302 -7303 -7304) -7022 14 -8.92 7101 -7111 7201 7202 7203 7204 3 - #(7101 -7111 -7301 -7302 -7303 7401) - #(7101 -7111 -7301 -7302 -7402 -7304) -7023 14 -8.92 7111 -7112 7201 7202 7203 7204 3 7110 -7024 14 -8.92 7111 -7112 -7110 3 - #(7111 -7112 -7301 -7302 -7303 7401) - #(7111 -7112 -7301 -7302 -7402 -7304) -7025 14 -8.92 7112 -7102 7201 7202 7203 7204 3 - #(7112 -7103 -7301 -7302 -7303 7401) - #(7112 -7103 -7301 -7302 -7402 -7304) -7026 14 -8.92 7102 -7103 7205 7206 7207 7208 3 - #(7102 -7103 -7301 -7302 -7303 7401) - #(7102 -7103 -7301 -7302 -7402 -7304) +7001 0 7205 -7208 -7301 7302 -7303 -7401 +7002 0 7205 -7208 -7301 7302 -7402 7304 +7011 5 0.0582256 7205 -7206 7411 -7413 +7012 5 0.0582256 7206 -7207 7411 -7414 +7013 5 0.0582256 7207 -7208 7412 -7414 +7021 14 -8.92 7205 -7207 -7411 + #(-7301 7302 ((-7303 -7401):(-7402 7304))) +7022 14 -8.92 7207 -7208 -7412 + #(-7301 7302 ((-7303 -7401):(-7402 7304))) +7023 14 -8.92 7205 -7206 7413 7201 -7202 -7203 7204 +7024 14 -8.92 7206 -7208 7414 7201 -7202 -7203 7204 +7031 14 -8.92 7504 -7205 -6404 -6203 -6401 -7501 +7032 14 -8.92 7504 -7205 -6404 -6203 -6402 7502 +7033 14 -8.92 7504 -7205 7503 -6403 7501 -7502 c ---- Outside of Bunker c -- Shielding Walls -- c concrete floor diff --git a/geometry/estia_inbunker.i b/geometry/estia_inbunker.i index 3b86356..4176028 100644 --- a/geometry/estia_inbunker.i +++ b/geometry/estia_inbunker.i @@ -274,7 +274,7 @@ c Chopper Virtual Source Collimation System (CVCS) 4059 0 22105 25106 -22212 -26105 4060 0 21301 -25201 -21204 #(24201 24202 24203 24204) #(21110 -25104) -4061 0 22215 -7100 -26107 #705 +4061 0 22215 -7205 -26107 #705 4062 0 21105 -21106 25104 -25103 4063 0 22110 -22111 -23108 23109 21105 -21106 #4521 4064 0 21106 -21111 24102 -22112 -23112 23113 #4521 @@ -294,7 +294,7 @@ c Vaccum Tank (aluminum) 4203 5 0.0582256 22102 -22104 26103 -26104 4204 5 0.0582256 25106 22106 -22107 26105 -26106 4205 5 0.0582256 22107 -22108 26105 -26108 -4206 5 0.0582256 22108 -7100 26107 -26108 +4206 5 0.0582256 22108 -7205 26107 -26108 4207 5 0.0582256 21002 -21101 -25001 4208 5 0.0582256 21101 -21003 25101 -25001 4209 5 0.0582256 21003 -21102 22005 -22105 -23003 23106 25101 diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index c204e51..690f7f5 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -488,25 +488,34 @@ c test surface for poly layer 7110 3 c/x -9.5 -2.5 10.0 7111 cz 1256.0 7112 cz 1265.0 -c Outside -7201 p 0.805412 0.592715 0.000160 -43.5 -7202 p -0.805412 -0.592715 -0.000160 -8.452 -7203 p 0.000000 0.000000 -1.000000 -28.000 -7204 pz -24.500 -7205 p 0.805412 0.592715 0.000160 -43.5 -7206 p -0.805412 -0.592715 -0.000160 -8.452 -7207 p 0.000000 0.000000 -1.000000 -28.000 -7208 pz -24.500 -c Inside -7301 p -0.833884 -0.551939 0.000448 -42.986 -7302 p 0.817145 0.576433 -0.000085 9.918 -7303 p -0.012583 0.018884 0.999743 -24.424 -7304 p -0.026798 0.038739 -0.998890 -53.2 -c Wedge -7401 p 733.315 -1028.754 -0.756 769.257 & - -1084.030 -0.985 773.866 -1080.495 -0.786 -7402 p 732.679 -1027.688 -2.322 774.001 & - -1080.498 -3.724 769.345 -1083.823 -3.525 +c BWC +c Outside +7201 p 0.813101 0.582123 0.000000 -23.866 +7202 p 0.813101 0.582123 0.000000 23.134 +7203 pz 24.622 +7204 pz -23.946 +7205 p 0.582080 -0.813040 0.012217 1249.888 +7206 p 0.582080 -0.813040 0.012217 1265.888 +7207 p 0.582080 -0.813040 0.012217 1267.388 +7208 p 0.582080 -0.813040 0.012217 1284.888 +c Inside +7301 p -0.832328 -0.554283 0.000413 -39.401 +7302 p -0.818297 -0.574796 0.000110 -12.599 +7303 p -0.011979 0.016733 0.999788 -21.534 +7304 p 0.026195 -0.036589 0.998987 49.285 +c Wedge +7401 p -0.001731 0.002418 -0.999996 -2.427 +7402 p 0.012492 -0.017449 0.999770 25.338 +c Vacuum Vessel +7411 4 c/x 2.500 0.000 7.600 +7412 4 c/x 2.500 0.000 13.000 +7413 4 c/x 2.500 0.000 7.950 +7414 4 c/x 2.500 0.000 13.350 +c Pre copper collor +7501 p 0.813101 0.582123 0.000000 -21.866 +7502 p 0.813101 0.582123 0.000000 21.134 +7503 pz 22.622 +7504 p 0.582080 -0.813040 0.012217 1239.888 c ----------- Ouside Bunker -------------- c Wall radii 8100 cz 2112.01 @@ -692,8 +701,8 @@ c Selene 2 Inside Mirrors Ellipses Top-Bottom/Right 8914 1 SQ 2.01149425287356E-06 0.004756242568371 0 0 0 0 -1 2900 0 0 8915 p 0.813101 0.582123 0.000000 5 c Vacuum vessels before S1/S1-S2 -8921 3 c/x -8 -2.5 16.0 -8922 3 c/x -8 -2.5 15.0 +8921 4 c/x 2.500 0.000 16.0 +8922 4 c/x 2.500 0.000 15.0 8931 3 c/x 0 -2 16.0 8932 3 c/x 0 -2 15.0 c Sphere at sample position to simulate gamma generation