diff --git a/e2-estia.i b/e2-estia.i index 015d979..702eb28 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -115,8 +115,8 @@ c read file=tallies/bunker_wall_f4.i echo c read file=tallies/e1_e2_f4.i echo c read file=tallies/e1_e2_f5.i echo c read file=tallies/shutter_f4.i echo -c read file=tallies/shutter_f5.i echo -read file=tallies/shutter_sample_f5.i echo +read file=tallies/shutter_f5.i echo +c read file=tallies/shutter_sample_f5.i echo c read file=tallies/selene1_walls_f4.i echo c read file=tallies/optical_cave_f5.i echo c read file=tallies/optical_cave_gammas.i echo @@ -138,7 +138,7 @@ ext:n 0 0 0.5V2 0 0.5V2 0 8r 0.5V2 7r 0 0.5V2 0 0.5V2 8r 0 0.5V2 0 0.5V2 0 0 0.5V2 0 0.5V2 0 0 0.5V2 0 0.5V2 0 0.5V2 0 0.5V2 0 22r 0.5V2 10r 0 4r 0.5V2 3r 0 0.5V2 13r 0 82r -0.5V1 49r 0 24r -0.1V1 4r 0 13r 0.1V3 9r $ chopper pit to bunker wall - 0 2r 0.1V3 1r 0 56r + 0 2r 0.1V3 1r 0 58r c exponential transform reference vectors: origin, selene 1, inst. shutter vect v1 0 0 0 v2 1000 -1394 -6.5 v3 1282 -1793 -13 c @@ -153,9 +153,9 @@ mode n p n h / d t s a c volume calculated for tally cells (spheres) c and set for chopper disk/spindle and stages x1/x2/z1/z2/rot vol 1 506r 11j 1 183r 3848.5 10104 1j 1 7r 479.5 479.5 913 913 1734 - 1 94r $ wall segments -imp:h,/,d,t,s,a 0 0 1 810r -imp:n,p 0 0 1 810r + 1 96r $ wall segments +imp:h,/,d,t,s,a 0 0 1 812r +imp:n,p 0 0 1 812r cut:h,/,d,t,s,a 1e+08 1e-3 phys:n 3000 0 phys:p 100 diff --git a/geometry/estia_guides.i b/geometry/estia_guides.i index 4a51544..2ee4ce5 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -34,7 +34,7 @@ c Vacuum before and inside Selene Guide 1 #8301 #8311 #8411 #8412 #8413 c Vacuum after Selene 1, until Selen 2 6111 0 ((8436 -8100 -8932 3) - :(8100 -8101 -8501 -8502 -8503 -8504 3) + :(8100 -8102 -8501 -8502 -8503 -8504 3) :(8101 8635 -8932 3)) #707 #8450 6112 5 0.0582256 (-8426 -8625 8932 -8931 3 #(8100 -8101)) @@ -116,6 +116,11 @@ c 8372 71 0.0843223 -8372 c Copper in wall 8401 14 -8.92 (8100 -8101 -8221 -8222 -8223 -8224 3) #(8100 -8101 -8501 -8502 -8503 -8504) +c Shutter B4C and Lead +8402 20 -2.3 8102 -8103 -8501 -8502 -8503 -8504 3 +8403 13 -11.34 8103 -8101 -8501 -8502 -8503 -8504 3 +c 8402 0 8102 -8103 -8501 -8502 -8503 -8504 3 +c 8403 0 8103 -8101 -8501 -8502 -8503 -8504 3 c Copper in Selene 1 8411 14 -8.92 (8111 -8112 8518 8402 8412 8413 3) :(8111 -8112 8511 8402 -8901 3) diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index 333e39f..5f1f2b1 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -520,8 +520,8 @@ c ----------- Ouside Bunker -------------- c Wall radii 8100 cz 2112.01 8101 cz 2157.17 -c 8102 cz 3023.41 -c 8103 cz 1355.64 +8102 cz 2149.17 +8103 cz 2150.17 c 8104 cz 2075.58 8111 cz 1655.0 8112 cz 1665.0 diff --git a/sources/e2_2m.i b/sources/e2_2m.i index 8339fe9..5c0fe30 100644 --- a/sources/e2_2m.i +++ b/sources/e2_2m.i @@ -1,6 +1,7 @@ c source definition based on tally_181.txt cut:n j 1e-11 -cut:p 1e+08 0.01 +c cut all photons that can't produce neutrons +cut:p 1e+08 1.667 c but adapted to model geometry and actual size of Estia beam extraction c make sure to supply the correct WWINP file WWP:n j j 5 j -1 j 1.79 diff --git a/tallies/shutter_f5.i b/tallies/shutter_f5.i index 7004042..807b221 100644 --- a/tallies/shutter_f5.i +++ b/tallies/shutter_f5.i @@ -17,4 +17,4 @@ e55 1e-10 1.58e-10 2.51e-10 3.98e-10 6.31e-10 1e+3 1.58e+3 2.51e+3 fq55 e f c reduce probability for contribution inside of bunker -pd55 0.0001 265r 1 0.0001 454r 0.1 1r 1 2r 0.1 10r 1 74r +pd55 0.0001 265r 1 0.0001 454r 0.1 1r 1 2r 0.1 10r 1 76r diff --git a/tallies/shutter_sample_f5.i b/tallies/shutter_sample_f5.i index 258fb4e..f2d4366 100644 --- a/tallies/shutter_sample_f5.i +++ b/tallies/shutter_sample_f5.i @@ -17,7 +17,7 @@ e55 1e-10 1.58e-10 2.51e-10 3.98e-10 6.31e-10 1e+3 1.58e+3 2.51e+3 fq55 e f c reduce probability for contribution inside of bunker -pd55 0.0001 265r 1 0.0001 454r 0.1 1r 1 2r 0.1 10r 1 74r +pd55 0.0001 265r 1 0.0001 454r 0.1 1r 1 2r 0.1 10r 1 76r fc255 neutron flux at detector position f255:n 2280 -3180 -30 0.0 e255 1e-10 1.58e-10 2.51e-10 3.98e-10 6.31e-10 @@ -36,4 +36,4 @@ e255 1e-10 1.58e-10 2.51e-10 3.98e-10 6.31e-10 1e+3 1.58e+3 2.51e+3 fq255 e f c reduce probability for contribution inside of bunker -pd255 0.0001 265r 1 0.0001 454r 0.1 1r 1 2r 0.1 10r 1 74r +pd255 0.0001 265r 1 0.0001 454r 0.1 1r 1 2r 0.1 10r 1 76r