diff --git a/geometry/estia_guides.i b/geometry/estia_guides.i index 2658b3f..3367ebe 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -7,10 +7,10 @@ c #(-5102 5501 5502 -5505 5504) c #(5102 -7100 -5531) 6002 4 -1.2E-3 ((6101 -6102 -6401 -6402 -6403 -6404) :(6102 -6103 -6501 -6502 -6503 -6504)) 3 -c #(5102 -7100 -5531) -c #((7100 -7102 7201 7202 7203 7204) -c :(7102 -7103 7205 7206 7207 7208)) -c #(7103 -6103 -8921) +c #(5102 -7100 -5531) + #((7100 -7102 7201 7202 7203 7204) + :(7102 -7103 7205 7206 7207 7208)) + #(7103 -6103 -8921) 6003 4 -1.2E-3 (6103 -72 -6601 -6602 -6603 -6604 -6605) 3 #(7103 8405 -8921) #(7102 -7103 7205 7206 7207 7208) diff --git a/geometry/estia_inbunker.i b/geometry/estia_inbunker.i index 0e0ab97..92ea361 100644 --- a/geometry/estia_inbunker.i +++ b/geometry/estia_inbunker.i @@ -57,7 +57,7 @@ c split of wedge of monolith components for increased importance -61 58 ( -43 : -45 : 46 : 44 ) c partitioned air in bunker 1255 4 -1.2E-3 3 -68 -2 -101 66 -67 64 112 - ( 329 : 4615 : -342 : 353 : 4100 ) + ( 329 : 4615 : -342 : 353 : 4805 ) ( -66 : 4615 : -342 : 353 : -22001 ) #(-1605 -1623) #(-1622 1623 -1624) #(-1639 1624 -1637) #(-1658 1637 -1660) @@ -66,7 +66,7 @@ c partitioned air in bunker #( 2100 -2101 2201 2202 2203 2204 ) 1257 4 -1.2E-3 (( -329 -4615 342 -353 ) 3110 -4805 #((3110 -22001 -3541) - :(22001 -4100 -3531))) + :(22001 -4805 -3531))) #(-3440 -3404 3446) #(-3441 -3326 3446) #(-3442 -3326 3446) @@ -300,9 +300,11 @@ c 5751 20 -2.3 ((-5751 -5754 5755) c :(-5752 -5755 5703)) -5753 5756 -5757 c 5761 20 -2.3 ((-5762 -5764 5765) c :(-5763 -5765 5703)) -5761 -5766 5767 -4000 4 -1.2E-3 ( 66 -4615 22001 -68 ) #703 #704 +4000 4 -1.2E-3 ( 66 -4615 22001 -68 342 -353) #703 #704 #4001 #4002 #4003 #4004 #4005 #4006 #4007 #4008 - #4101 #4102 #4103 #4104 #4105 #4106 #4107 #4108 + #4101 #4102 #4103 #4104 #4105 #4106 + #4107 #4108 #4109 #4110 #4111 #4112 #4113 #4114 + #4115 #4116 #4117 #4118 #4119 #4120 c Concrete base (5% B4C) 4001 16 -2.4 21001 -21002 22001 -22002 -23001 23002 24001 24002 -24003 4002 16 -2.4 21002 -21003 22001 -22002 -23001 23002 24001 24002 -24003 @@ -314,11 +316,23 @@ c Concrete base (5% B4C) 4007 16 -2.4 21003 -21005 22001 -22004 -23006 23002 4008 16 -2.4 21003 -21005 22004 -22005 -23007 23002 c Vaccum Tank (aluminum) -4101 5 0.0582256 22001 -22101 25101 -25102 -4102 5 0.0582256 22101 -22102 25103 -25102 -4103 5 0.0582256 22102 -22103 25103 -25104 -4104 5 0.0582256 22104 -22105 25105 -25106 -4105 5 0.0582256 22105 -22106 25105 -25108 -4106 5 0.0582256 22106 -6100 25107 -25108 +4101 5 0.0582256 22001 -22101 26101 -26102 +4102 5 0.0582256 22101 -22102 26103 -26102 +4103 5 0.0582256 22102 -22104 26103 -26104 +4104 5 0.0582256 25105 22106 -22107 26105 -26106 +4105 5 0.0582256 22107 -22108 26105 -26108 +4106 5 0.0582256 22108 -22109 26107 -26108 4107 5 0.0582256 21002 -21101 -25001 -4108 5 0.0582256 21101 -21003 25111 -25001 +4108 5 0.0582256 21101 -21003 25101 -25001 +4109 5 0.0582256 21003 -21102 22005 -22105 -23003 23106 25101 +4110 5 0.0582256 21003 -21102 22105 -25106 -23003 23106 25101 +4111 5 0.0582256 21102 -21005 22005 -22104 -23003 23106 26104 +4112 5 0.0582256 21102 -21005 22104 -22105 -23003 23102 +4113 5 0.0582256 21102 -21005 22104 -22105 -23105 23106 +4114 5 0.0582256 21102 -21005 22105 25105 -25106 26106 +4115 5 0.0582256 21005 -21105 22103 -22104 -23101 23107 26104 +4116 5 0.0582256 21005 -21105 22104 -22105 -23101 23102 +4117 5 0.0582256 21005 -21105 22104 -22105 -23105 23107 +4118 5 0.0582256 21005 -21105 22105 25105 -25107 26106 +4119 5 0.0582256 21105 -21106 22103 -22105 -23101 23107 +4120 5 0.0582256 21105 -21106 22105 22105 -25107 diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index fdbc457..3865e46 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -736,23 +736,46 @@ c Concrete Block c 25001 c/z 650.788 -905.344 25.000 c Vacuum Chamber -21101 pz -55 -21102 pz -25 -22101 p 0.582123 -0.813101 0.000000 1050 -22102 p 0.582123 -0.813101 0.000000 1052 -22103 p 0.582123 -0.813101 0.000000 1070 -22104 p 0.582123 -0.813101 0.000000 1140 -22105 p 0.582123 -0.813101 0.000000 1160 -22106 p 0.582123 -0.813101 0.000000 1162 -25101 14 c/x -2 -0.5 10.0 -25102 14 c/x -2 -0.5 11.0 -25103 14 c/x -2 -0.5 5.0 -25104 14 c/x -2 -0.5 6.0 -25105 14 c/x 2 0 5.0 -25106 14 c/x 2 0 6.0 -25107 14 c/x 2 0 10.0 -25108 14 c/x 2 0 11.0 -25111 c/z 650.788 -905.344 24.000 +21101 pz -53.139 +21102 pz -23.039 +21103 pz -16.239 +21104 pz -14.939 +21105 pz 11.761 +21106 pz 16.461 +21107 pz 72.761 +22101 p 0.582123 -0.813101 0.000000 1060.174 +22102 p 0.582123 -0.813101 0.000000 1061.374 +22103 p 0.582123 -0.813101 0.000000 1065.024 +22104 p 0.582123 -0.813101 0.000000 1069.274 +22105 p 0.582123 -0.813101 0.000000 1108.174 +22106 p 0.582123 -0.813101 0.000000 1111.174 +22107 p 0.582123 -0.813101 0.000000 1164.624 +22108 p 0.582123 -0.813101 0.000000 1165.624 +22109 p 0.582123 -0.813101 0.000000 1176.824 +23101 p 0.813101 0.582123 0.000000 46.384 +23102 p 0.813101 0.582123 0.000000 42.134 +23103 p 0.813101 0.582123 0.000000 18.934 +23104 p 0.813101 0.582123 0.000000 -12.266 +23105 p 0.813101 0.582123 0.000000 -37.866 +23106 p 0.813101 0.582123 0.000000 -39.866 +23107 p 0.813101 0.582123 0.000000 -42.116 +c +25101 c/z 650.788 -905.344 23.000 +25102 c/z 632.688 -878.947 8.250 +25103 c/z 632.688 -878.947 2.600 +25104 c/z 632.688 -878.947 2.000 +25105 c/z 643.307 -894.896 40.000 +25106 c/z 643.307 -894.896 42.000 +25107 c/z 643.307 -894.896 44.250 +c +26101 14 c/x -1.200 -1.125 7.000 +26102 14 c/x -1.200 -1.125 8.750 +26103 14 c/x -1.200 -0.916 5.500 +26104 14 c/x -1.200 -0.916 6.500 +26105 14 c/x 1.300 -0.128 5.050 +26106 14 c/x 1.300 -0.128 5.900 +26107 14 c/x 1.300 0.072 7.200 +26108 14 c/x 1.300 0.072 8.500 c visualize Selene gamma sources 50001 1 rpp 1339.25 2060.75 2 8 2 8 50002 1 rpp 2539.25 3260.75 -8 -2 -8 -2