diff --git a/e2-estia.i b/e2-estia.i index 6abb7d6..45188f8 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -148,8 +148,8 @@ c read file=tallies/bunker_mesh.i echo c read file=tallies/bunker_mesh_p.i echo c read file=tallies/bunker_mesh_np.i echo c read file=tallies/bunker_mesh_act.i echo -read file=tallies/full_mesh.i echo -c read file=tallies/full_mesh_p.i echo +c read file=tallies/full_mesh.i echo +read file=tallies/full_mesh_p.i echo c read file=tallies/full_mesh_np.i echo c read file=tallies/vs_fine_mesh.i echo c read file=tallies/boundary_meshes.i echo @@ -208,9 +208,9 @@ c --------------- PHYSICS CARDS -------------------------- c ------------------------------------------------------- c dbcn 375642321 j j j j j j j j j j j 15291711 c stop calculation either at XeY histories, 6.5 days or tally 15 error <0.001 -c stop nps 39242646 CTME 4e5 $f31 0.01 -c stop nps 1e9 CTME 4e5 $f31 0.01 -nps 14e10 $ works with rssa file, value is scaled to source particles +c nps 39242646 $ works with rssa file from McStas, original tracks 39242646 +stop nps 1e7 CTME 4e5 $f31 0.01 +c nps 14e10 $ works with rssa file, value is scaled to source particles c write particle tracks c ssw 206505 pty=n $ record all neutron tracks crossing outward c random number generator options @@ -253,7 +253,7 @@ c read file=sources/proton.i echo c * Source Term from Valentina for 2m adapted to size c read file=sources/e2_2m.i echo c read file=sources/e2_2m_mod.i echo -read file=sources/rssa.i echo +c read file=sources/rssa.i echo c * Estimated source within bunker wall to optimize collimator efficiency c read file=sources/bunker_wall.i echo $ approximate, not for official results c * McStas source terms for gamma doeses @@ -261,10 +261,10 @@ c read file=sources/mcstas_rssa.i echo c read file=sources/mcstas_source_vs.i echo c read file=sources/mcstas_source_sample.i echo c read file=sources/mcstas_source_mf.i echo -c read file=sources/mcstas_gammas.i echo +read file=sources/mcstas_gammas.i echo c read file=sources/mcstas_gammas_2.i echo c read file=sources/mcstas_source_shutter.i echo -prdmp -120 -30 1 2 -1 +prdmp -120 -30 1 2 5e5 print 30 32 40 c 120 $O importance function quality c 128 $O universe map diff --git a/rssa b/rssa index 835dd5c..b9983fd 120000 --- a/rssa +++ b/rssa @@ -1 +1 @@ -results/e2-estia_baseline_v09-0-gfab54af.ssa \ No newline at end of file +../old_results/VS.ssa \ No newline at end of file diff --git a/sources/mcstas_rssa.i b/sources/mcstas_rssa.i index 1af3c95..83025bf 100644 --- a/sources/mcstas_rssa.i +++ b/sources/mcstas_rssa.i @@ -1,5 +1,6 @@ c source definition based on surface source generated from McStas -cut:n j 0 0 0 $ use analog capture for source from McStas +cut:n j j -0.2 -0.1 $ put weight cut-off for 0-WW to 10% of source weight +c cut:n j 0 0 0 $ use analog capture for source from McStas c cut all photons that can't produce neutrons cut:p 1e+08 0.05 c adjust weight windows to be essentially ignored diff --git a/tallies/full_mesh_p.i b/tallies/full_mesh_p.i index 6b1ab25..3d091c4 100644 --- a/tallies/full_mesh_p.i +++ b/tallies/full_mesh_p.i @@ -1,11 +1,7 @@ c large and detailed mesh tally covering the beamline from monolith to full cave tmesh - rmesh1:p dose 1 - cora1 500 9i 1000 22i 1460 - corb1 -700 11i -100 9i 100 3i 300 - corc1 -200 1i -100 9i 100 5i 400 rmesh11:p dose 1 - cora11 1460 151i 4500 + cora11 1300 159i 4500 corb11 -400 59i 800 corc11 -200 39i 600 c Official ESS dose conversion factors from gamma/cm²/s to Sv/h