diff --git a/e2-estia.i b/e2-estia.i index ae717d8..7c9bc13 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -178,7 +178,7 @@ ext:n 0 276r $ in monolith 0 132r 0.25v3 13r $CPC1+2 0 28r 0.25v3 4r $ bunker wall 0 17r 0.25v3 7r $ BWC - 0 151r + 0 154r c exponential transform reference vectors: origin, selene 1, sample vect v1 0 0 0 v2 1000 -1394 -6.5 v3 2048 -2856 -30 c forced collisions in neutron guides @@ -188,8 +188,8 @@ fcl:n 0 276r $ in monolith 0 23r -0.1 $ BBG 0 13r -0.25 6r $ NFGA 0 172r -1 $ Glass in Selene 1 - 0 49r -1 -1 $ S1 back plate and mineral cast in universe - 0 81r + 0 51r -1 -1 $ S1 back plate and mineral cast in universe + 0 82r c c ----------------------------------------------------------- c ------------------------------------------------------- @@ -201,7 +201,7 @@ stop nps 2e8 CTME 4e5 $f31 0.01 rand gen=2 seed=29976355590901 $ default 19073486328125 c histp mode n p h / z $ neutron, photon, proton, pi+, pi0 -imp:n,p,h,/,z 1 276r 0 0 1 668r +imp:n,p,h,/,z 1 276r 0 0 1 671r c imp:n,p,h,/,z 1 276r 0 0 1 487r 0 0 0 1 0 87r 1 9r cut:h,/,z 1e+08 1e-3 phys:n 3000 0 diff --git a/geometry/estia_guides.i b/geometry/estia_guides.i index 2ea4736..6c16b8f 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -124,18 +124,21 @@ c Selene 1 carrier c Selene 1 glass 208311 12 -2.51 -208405 208406 -208903 -208904 -208518 #(-208901 -208902) #(-208522 -208523) 100003 +c Parts in front and back around the flange +208312 31 -1.70 208445 -208425 208421 208422 208423 208447 208321 208921 +208313 4 -1.2E-3 208446 -208426 208421 208422 208423 208447 208321 208921 c Selene 1 Vacuum tank (stainless steel) 208321 3 0.0876276 (208421 208422 208423 208424 208425 208426) #(-208431 -208432 -208433 -208434 -208435 -208436) #(208425 208435 -208922) #(208426 208436 -208922) c area around tank with structrual beams (front, back, top, bottom, left, right) -208322 4 -1.2E-3 208445 -208425 208421 208422 208423 208424 208921 - #208328 fill=13 (734.25 -1126.67 0.0 +208322 4 -1.2E-3 208445 -208425 208421 208422 208423 208447 -208321 + fill=13 (734.23 -1126.64 0.0 0.813101 0.582123 0.000000 - -0.582080 0.813040 -0.012217 - 0.007112 -0.009934 0.999925) -208323 4 -1.2E-3 208446 -208426 208421 208422 208423 208424 208921 - #208328 fill=12 (1173.46 -1742.08 0.0 + -0.582080 0.813040 0.012217 + -0.007112 0.009934 -0.999925) +208323 4 -1.2E-3 208446 -208426 208421 208422 208423 208447 -208321 + fill=12 (1173.46 -1742.08 0.0 0.813101 0.582123 0.000000 0.582080 -0.813040 -0.012217 0.007112 -0.009934 0.999925) @@ -144,18 +147,18 @@ c area around tank with structrual beams (front, back, top, bottom, left, right) 0.582080 -0.813040 -0.012217 0.007112 -0.009934 0.999925 0.813101 0.582123 0.000000) -208325 4 -1.2E-3 208445 208446 208421 208422 -208424 208444 - fill=11 (762.66 -1105.26 -69.05 - 0.582080 -0.813040 -0.012217 +208325 4 -1.2E-3 208445 208446 208441 208442 -208424 208444 + fill=14 (1199.94 -1721.88 -78.21 + -0.582080 0.813040 0.012217 -0.007112 0.009934 -0.999925 0.813101 0.582123 0.000000) -208326 4 -1.2E-3 208445 208446 -208421 208441 208443 208444 - #208328 fill=11 (725.29 -1133.09 0.0 +208326 4 -1.2E-3 208445 208446 -208421 208441 208443 208447 + fill=11 (725.29 -1133.09 0.0 0.582080 -0.813040 -0.012217 -0.813101 -0.582123 0.000000 0.007112 -0.009934 0.999925) -208327 4 -1.2E-3 208445 208446 -208422 208442 208443 208444 - #208328 fill=11 (813.15 -1070.06 0.0 +208327 4 -1.2E-3 208445 208446 -208422 208442 208443 208447 + fill=11 (813.15 -1070.06 0.0 0.582080 -0.813040 -0.012217 0.813101 0.582123 0.000000 0.007112 -0.009934 0.999925) diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index b9eaa3a..5de8e86 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -471,6 +471,7 @@ c Inside 208312 p -0.737277 -0.675590 0.000000 140.725 208313 pz 102.500 208314 p 0.000000 0.000000 -1.000000 200.000 +208321 p 0.813101 0.582123 0.000000 -18.0002 c Selene 1 Carrier c Outside 208401 p 0.813101 0.582123 0.000000 -38.666 @@ -492,11 +493,11 @@ c Support Plate c Vacuum tank c Outside 208421 p 0.813101 0.582123 0.000000 -69.866 -208422 p -0.813101 -0.582123 0.000000 -38.134 -208423 p -0.007112 0.009934 -0.999925 -96.883 -208424 p 0.007112 -0.009934 0.999925 -52.617 -208425 p 0.582080 -0.813040 -0.012217 1343.388 -208426 p -0.582080 0.813040 0.012217 -2099.388 +208422 p -0.813101 -0.582123 0.000000 -38.134 +208423 p -0.007112 0.009934 -0.999925 -96.883 +208424 p 0.007112 -0.009934 0.999925 -52.617 +208425 p 0.582080 -0.813040 -0.012217 1343.388 +208426 p -0.582080 0.813040 0.012217 -2099.388 c Inside 208431 p -0.813101 -0.582123 0.000000 68.366 208432 p 0.813101 0.582123 0.000000 36.634 @@ -535,10 +536,10 @@ c Material 208523 p -0.007112 0.009934 -0.999925 -13.300 c Selene 2 Carrier c Outside -208601 p 0.813101 0.582123 0.000000 -2.7658 -208602 p -0.813101 -0.582123 0.000000 -42.9342 -208603 p -0.007112 0.009934 -0.999925 -58.883 -208604 p 0.007112 -0.009934 0.999925 -31.117 +208601 p 0.813101 0.582123 0.000000 -2.76581 +208602 p -0.813101 -0.582123 0.000000 -42.93421 +208603 p -0.007112 0.009934 -0.999925 -58.8831 +208604 p 0.007112 -0.009934 0.999925 -31.1171 c Inside 208611 p 0.813101 0.582123 0.000000 19.1342 208612 p 0.007112 -0.009934 0.999925 38.8829 @@ -870,23 +871,23 @@ c 0-position for z is c-axis and y the back surface c first define the lattice planes, set to be between two neighboring adjusters 300001 rpp 2.50 50.50 -1000 1000 -1000 1000 c surfaces for the steel plates, outside is mineral cast -300011 pz 25.0 -300012 pz 27.5 -300013 pz -25.0 -300014 pz -27.5 -300015 py 0 -300016 py 2.5 -300017 py -19.5 +300011 pz 25.00001 +300012 pz 27.50001 +300013 pz -25.00001 +300014 pz -27.50001 +300015 py 0.00001 +300016 py 2.50001 +300017 py -19.50001 c cyllinders for adjuster holes -300101 py 12.0 -300102 py 23.0 +300101 py 12.00001 +300102 py 23.00001 c outer size -300111 c/y 6.75 22.25 2.0 -300112 c/y 6.75 12.35 2.0 -300113 c/y 6.75 1.75 2.0 -300114 c/y 6.75 -1.75 2.0 -300115 c/y 6.75 -12.35 2.0 -300116 c/y 6.75 -22.25 2.0 +300111 c/y 6.75 22.25 2.00001 +300112 c/y 6.75 12.35 2.00001 +300113 c/y 6.75 1.75 2.00001 +300114 c/y 6.75 -1.75 2.00001 +300115 c/y 6.75 -12.35 2.00001 +300116 c/y 6.75 -22.25 2.00001 300121 c/y 46.25 22.25 2.0 300122 c/y 46.25 18.75 2.0 300123 c/y 46.25 1.75 2.0 @@ -920,12 +921,10 @@ c screw size 300165 c/y 46.25 -18.75 0.6 300166 c/y 46.25 -22.25 0.6 c planes of inserted components in beam direction -300201 px 2.5 300202 px 10.75 300203 px 23.0 300204 px 30.0 300205 px 42.25 -300206 px 50.50 c planes of inserted components parallel to top/bottom side c left side items 300211 pz 0.25 @@ -945,15 +944,15 @@ c left side items 300227 pz -20.75 300228 pz -23.75 c pusher/Cu holders -300231 pz 22.50 -300232 pz 14.70 -300233 pz -22.50 -300234 pz -14.70 +300231 pz 22.50001 +300232 pz 14.70001 +300233 pz -22.50001 +300234 pz -14.70001 c bottom/top items -300241 pz 17.25 -300242 pz 20.75 -300243 pz -17.25 -300244 pz -20.75 +300241 pz 17.25001 +300242 pz 20.75001 +300243 pz -17.25001 +300244 pz -20.75001 c planes of inserted components parallel to top/bottom side 300250 py -2.0 300251 py -5.2 @@ -964,16 +963,16 @@ c planes of inserted components parallel to top/bottom side 300256 py -17.5 300257 py -20.0 c Strengthening elements for Selene vacuum tanks -400001 rpp 0 50 -1000 1000 -1000 1000 -400003 px 23.0 -400004 px 23.8 -400005 px 32.2 -400006 px 33.0 -400007 py 5.2 +400001 rpp 0.00001 50.00001 -1000.00001 1000.00001 -1000.00001 1000.00001 +400003 px 23.00002 +400004 px 23.80002 +400005 px 32.20002 +400006 px 33.00002 +400007 py 5.20002 c Remote Handling Flange in local coordinate system 500000 so 50 c planes in beam direction -500001 px 0 $ beginning of thick plate +500001 px 0.00002 $ beginning of thick plate 500002 px 0.8 $ beginning of thick plate 500003 px 4.0 $ end of thick plate 500004 px 4.8 $ end of thick plate @@ -984,8 +983,8 @@ c cylinders 500012 cx 8.0 $ outer radius of tube 500013 cx 14.0 $ outer radius of clamping c outer rectangle -500021 pz -15 -500022 pz 15 -500023 py -20 -500024 py 20 +500021 pz -15.00001 +500022 pz 15.00001 +500023 py -20.00001 +500024 py 20.00001 c ++++++++++++++++++++++ END ++++++++++++++++++++++++++++ diff --git a/geometry/estia_universes.i b/geometry/estia_universes.i index 3b0dd6b..694bcfb 100644 --- a/geometry/estia_universes.i +++ b/geometry/estia_universes.i @@ -93,7 +93,7 @@ c pushers in center of horizontal mirrors 300233 5 0.0582256 300203 -300204 300013 -300233 300257 -300255 U=2 300234 5 0.0582256 300203 -300204 300233 -300234 300257 -300256 U=2 c Strengthening elements for Selene vacuum tanks -400000 0 -400001 U=11 fill=-1:16 0:0 0:0 13 3r 12 13r lat=1 +400000 0 -400001 U=11 fill=-1:15 0:0 0:0 13 3r 12 12r lat=1 400001 4 -1.2E-3 -400003 U=12 400002 3 0.0876276 400003 -400004 U=12 400003 4 -1.2E-3 400004 -400005 -400007 U=12 @@ -106,6 +106,7 @@ c Strengthening elements for Selene vacuum tanks 400014 3 0.0876276 400004 -400005 400007 U=13 400015 3 0.0876276 400005 -400006 U=13 400016 31 -1.70 400006 U=13 +400020 0 -400001 U=14 fill=-1:15 0:0 0:0 12 12r 13 3r lat=1 c Remote handling flange with local coordinate system, c has to be moved and rotated when filling universe and includes c surrounding air and internal vacuum tube. diff --git a/tallies/shutter_wall_f4.i b/tallies/shutter_wall_f4.i index fe1e21b..8230c52 100644 --- a/tallies/shutter_wall_f4.i +++ b/tallies/shutter_wall_f4.i @@ -23,4 +23,4 @@ dxc:n 0.001 276r $ in monolith 0.001 0.001 78r $ NBOA to NFGA 0.05 75r $ up to after CPC1 0.1 34r $ up to after CPC2 - 0.25 181r $ up to end + 0.25 184r $ up to end