diff --git a/e2-estia.i b/e2-estia.i index 6688940..99e5672 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 15r 0.25v3 7r $ BWC - 0 142r + 0 147r 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 @@ -202,7 +202,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 657r +imp:n,p,h,/,z 1 276r 0 0 1 662r 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 7842556..6922431 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -116,7 +116,7 @@ c c Selene 1 carrier 208301 18 -2.4 -208405 208406 (208401 208402 208403 208404) #208311 #208411 #208412 #208413 - fill=1 (776.64 -1110.40 -2.535 + fill=1 (775.2086 -1108.3372 -2.6402 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 29fcab8..b9eaa3a 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -429,12 +429,12 @@ c Wall radii 208101 p 0.582123 -0.813101 0.000000 2157.17 208102 cz 2149.17 208103 cz 2150.17 -208111 cz 1664.0 -208112 cz 1674.0 -208113 cz 1712.0 -208114 cz 1722.0 -208115 cz 1760.0 -208116 cz 1770.0 +208111 cz 1662.0 +208112 cz 1672.0 +208113 cz 1710.0 +208114 cz 1720.0 +208115 cz 1758.0 +208116 cz 1768.0 208121 cz 2555.54 208122 cz 3275.49 c Shielding wall geometry @@ -477,8 +477,8 @@ c Outside 208402 p -0.813101 -0.582123 0.000000 -7.034 208403 p -0.007112 0.009934 -0.999925 -58.883 208404 p 0.007112 -0.009934 0.999925 -36.117 -208405 p -0.582080 0.813040 0.012217 -1354.888 -208406 p -0.582080 0.813040 0.012217 -2074.888 +208405 p -0.582080 0.813040 0.012217 -1352.388 +208406 p -0.582080 0.813040 0.012217 -2077.388 c Inside 208411 p -0.813101 -0.582123 0.000000 14.866 208412 p -0.007112 0.009934 -0.999925 -38.883 @@ -868,8 +868,7 @@ c Selene guide carrier repeating components c axis system is centered to C-cutout with x-direction along guide 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 px 1.25 -300002 px 49.25 +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 @@ -882,51 +881,51 @@ c cyllinders for adjuster holes 300101 py 12.0 300102 py 23.0 c outer size -300111 c/y 5.5 22.25 2.0 -300112 c/y 5.5 12.35 2.0 -300113 c/y 5.5 1.75 2.0 -300114 c/y 5.5 -1.75 2.0 -300115 c/y 5.5 -12.35 2.0 -300116 c/y 5.5 -22.25 2.0 -300121 c/y 45.0 22.25 2.0 -300122 c/y 45.0 18.75 2.0 -300123 c/y 45.0 1.75 2.0 -300124 c/y 45.0 -1.75 2.0 -300125 c/y 45.0 -18.75 2.0 -300126 c/y 45.0 -22.25 2.0 +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 +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 +300124 c/y 46.25 -1.75 2.0 +300125 c/y 46.25 -18.75 2.0 +300126 c/y 46.25 -22.25 2.0 c inner size -300131 c/y 5.5 22.25 1.8 -300132 c/y 5.5 12.35 1.8 -300133 c/y 5.5 1.75 1.8 -300134 c/y 5.5 -1.75 1.8 -300135 c/y 5.5 -12.35 1.8 -300136 c/y 5.5 -22.25 1.8 -300141 c/y 45.0 22.25 1.8 -300142 c/y 45.0 18.75 1.8 -300143 c/y 45.0 1.75 1.8 -300144 c/y 45.0 -1.75 1.8 -300145 c/y 45.0 -18.75 1.8 -300146 c/y 45.0 -22.25 1.8 +300131 c/y 6.75 22.25 1.8 +300132 c/y 6.75 12.35 1.8 +300133 c/y 6.75 1.75 1.8 +300134 c/y 6.75 -1.75 1.8 +300135 c/y 6.75 -12.35 1.8 +300136 c/y 6.75 -22.25 1.8 +300141 c/y 46.25 22.25 1.8 +300142 c/y 46.25 18.75 1.8 +300143 c/y 46.25 1.75 1.8 +300144 c/y 46.25 -1.75 1.8 +300145 c/y 46.25 -18.75 1.8 +300146 c/y 46.25 -22.25 1.8 c screw size -300151 c/y 5.5 22.25 0.6 -300152 c/y 5.5 12.35 0.6 -300153 c/y 5.5 1.75 0.6 -300154 c/y 5.5 -1.75 0.6 -300155 c/y 5.5 -12.35 0.6 -300156 c/y 5.5 -22.25 0.6 -300161 c/y 45.0 22.25 0.6 -300162 c/y 45.0 18.75 0.6 -300163 c/y 45.0 1.75 0.6 -300164 c/y 45.0 -1.75 0.6 -300165 c/y 45.0 -18.75 0.6 -300166 c/y 45.0 -22.25 0.6 +300151 c/y 6.75 22.25 0.6 +300152 c/y 6.75 12.35 0.6 +300153 c/y 6.75 1.75 0.6 +300154 c/y 6.75 -1.75 0.6 +300155 c/y 6.75 -12.35 0.6 +300156 c/y 6.75 -22.25 0.6 +300161 c/y 46.25 22.25 0.6 +300162 c/y 46.25 18.75 0.6 +300163 c/y 46.25 1.75 0.6 +300164 c/y 46.25 -1.75 0.6 +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 1.25 -300202 px 9.25 +300201 px 2.5 +300202 px 10.75 300203 px 23.0 300204 px 30.0 -300205 px 41.25 -300206 px 49.25 +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 @@ -965,8 +964,7 @@ 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 px 0.0 -400002 px 50.0 +400001 rpp 0 50 -1000 1000 -1000 1000 400003 px 23.0 400004 px 23.8 400005 px 32.2 diff --git a/geometry/estia_universes.i b/geometry/estia_universes.i index 37e6b59..84663c1 100644 --- a/geometry/estia_universes.i +++ b/geometry/estia_universes.i @@ -1,20 +1,4 @@ c UNIVERSES for Selene geometry lattices -c Selene 1 holes for adjusters -c 218300 0 218301 -218302 U=1 fill=2 lat=1 -c 218301 18 -2.4 218311 218312 218313 218314 218315 218316 218321 218322 -c 218323 218324 218325 218326 U=2 -c 218311 0 -218311:-218314 U=2 -c 218312 0 -218312 U=2 -c 218313 0 -218313 U=2 -c c 18314 0 -18314 U=2 -c 218315 0 -218315 U=2 -c 218316 0 -218316 U=2 -c 218321 0 -218321:-218323 U=2 -c 218322 0 -218322 U=2 -c c 18323 0 -18323 U=2 -c 218324 0 -218324:-218326 U=2 -c 218325 0 -218325 U=2 -c 18326 0 -18326 U=2 c c just for plotting mesh geometry as transformation has bug in plot c 300121 0 -250121 @@ -22,7 +6,7 @@ c 300122 0 -250122 c 300123 0 -250123 c 300124 0 -250124 c Selene Guide carrier with repeating structure -300000 0 300001 -300002 U=1 fill=2 lat=1 +300000 0 -300001 U=1 fill=-1:15 0:0 0:0 3 2 14r 3 lat=1 300001 0 -300011 300013 -300015 -300202 #300201 #300203 #300211 #300212 #300213 #300214 #300215 #300216 U=2 @@ -31,6 +15,12 @@ c Selene Guide carrier with repeating structure #300221 #300222 #300223 #300224 #300225 #300226 U=2 300003 0 -300011 300013 -300015 300202 -300205 #300231 #300232 #300233 #300234 U=2 +300004 0 -300011 300013 -300015 U=3 +300005 18 -2.4 (300012:-300014:300016) 300017 U=3 +300006 3 0.0876276 (-300012 300014 -300016) + (300011:-300013:300015) U=3 +300007 3 0.0876276 -300017 300012 U=3 +300008 3 0.0876276 -300017 -300014 U=3 300011 18 -2.4 (300012:-300014:300016) 300017 (300111 300112 300113 300114 300115 300116 300121 300122 300123 300124 300125 300126) U=2 @@ -38,7 +28,7 @@ c Selene Guide carrier with repeating structure (300011:-300013:300015) (300111 300112 300113 300114 300115 300116 300121 300122 300123 300124 300125 300126) U=2 -300013 3 0.0876276 -300017 300012 U=2 +300013 3 0.0876276 -300017 300012 U=2 300014 3 0.0876276 -300017 -300014 U=2 c cyllinder holes and insets 300111 0 300015 -300101 300151 -300131 U=2 @@ -103,8 +93,8 @@ 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 -400002 U=11 fill=12 lat=1 -400001 4 -1.2E-3 -400003 U=12 +400000 0 -400001 U=11 fill=12 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 400004 3 0.0876276 400004 -400005 400007 U=12 diff --git a/tallies/shutter_wall_f4.i b/tallies/shutter_wall_f4.i index 6f46d30..0840174 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 170r $ up to end + 0.25 175r $ up to end