diff --git a/e2-estia.i b/e2-estia.i index 1b66a35..d4dde09 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -108,10 +108,10 @@ c read file=tallies/bunker_mesh_np.i echo c read file=tallies/full_mesh.i echo c read file=tallies/full_mesh_p.i echo read file=tallies/full_mesh_np.i echo -c read file=tallies/inbunker_f4.i echo -c read file=tallies/chopper_pit_doses.i echo -c read file=tallies/bunker_wall_f4.i echo -c read file=tallies/e1_e2_f4.i echo +read file=tallies/inbunker_f4.i echo +read file=tallies/chopper_pit_doses.i echo +read file=tallies/bunker_wall_f4.i echo +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 @@ -168,9 +168,9 @@ c read file=sources/geometry_test.i echo c * Source for simulation from proton beam (needs different WW and ESplit) c read file=sources/proton.i echo c * Source Term from Valentina for 2m adapted to size -read file=sources/e2_2m.i echo +c read file=sources/e2_2m.i echo c * McStas source terms for gamma doeses -c read file=sources/mcstas_source_vs.i echo +read file=sources/mcstas_source_vs.i echo c read file=sources/mcstas_source_sample.i echo c read file=sources/mcstas_gammas.i echo c read file=sources/mcstas_gammas_2.i echo diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index 2b7c535..0d74d25 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -893,50 +893,50 @@ c VS Carry Rods 25421 c/z 669.042 -892.275 3.000 25422 c/z 630.343 -896.070 3.000 25423 c/z 652.978 -927.687 3.000 -c c VS Blades (closed) -c 24501 p -0.860742 -0.509041 0.000000 -97.298 -c 24502 p -0.860742 -0.509041 0.000000 -99.298 -c 24503 p -0.860742 -0.509041 0.000000 -99.398 -c 24504 p 0.860742 0.509041 0.000000 101.798 -c 21501 pz 4.261 -c 21502 pz 0.261 -c 21503 pz -5.539 -c 21504 pz -1.539 -c 24505 p 0.509041 -0.860742 0.000000 1110.096 -c 24506 p 0.509041 -0.860742 0.000000 1110.496 -c c -c 24511 p -0.860742 -0.509041 0.000000 -96.807 -c 24512 p 0.860742 0.509041 0.000000 99.257 -c 24513 p -0.860742 -0.509041 0.000000 -101.307 -c 24514 p -0.860742 -0.509041 0.000000 -292.956 -c 21511 pz 6.061 -c 21512 pz 0.261 -c 21513 pz 2.561 -c 21514 pz -3.739 -c 24515 p -0.509041 0.860742 0.000000 -1110.595 -c 24516 p -0.509041 0.860742 0.000000 -1110.895 -c VS Blades (open) -24501 p -0.936060 -0.351842 0.000000 -288.420 -24502 p -0.936060 -0.351842 0.000000 -290.420 -24503 p -0.936060 -0.351842 0.000000 -290.520 -24504 p 0.936060 0.351842 0.000000 292.920 -21501 pz 5.061 -21502 pz 1.061 -21503 pz -4.739 -21504 pz -0.739 -24505 p 0.351842 -0.936060 0.000000 1073.540 -24506 p 0.351842 -0.936060 0.000000 1073.940 +c VS Blades (closed) +24501 p -0.860742 -0.509041 0.000000 -97.298 +24502 p -0.860742 -0.509041 0.000000 -99.298 +24503 p -0.860742 -0.509041 0.000000 -99.398 +24504 p 0.860742 0.509041 0.000000 101.798 +21501 pz 4.261 +21502 pz 0.261 +21503 pz -5.539 +21504 pz -1.539 +24505 p 0.509041 -0.860742 0.000000 1110.096 +24506 p 0.509041 -0.860742 0.000000 1110.496 c -24511 p -0.936060 -0.351842 0.000000 -288.356 -24512 p -0.936060 -0.351842 0.000000 -290.806 -24513 p -0.936060 -0.351842 0.000000 -292.856 -24514 p -0.936060 -0.351842 0.000000 -290.906 -21511 pz 5.261 -21512 pz 0.539 -21513 pz 1.761 -21514 pz -4.539 -24515 p -0.351842 0.936060 0.000000 -1078.921 -24516 p -0.351842 0.936060 0.000000 -1079.221 +24511 p -0.860742 -0.509041 0.000000 -96.807 +24512 p -0.860742 -0.509041 0.000000 -99.257 +24513 p -0.860742 -0.509041 0.000000 -101.307 +24514 p -0.860742 -0.509041 0.000000 -99.357 +21511 pz 6.061 +21512 pz 0.261 +21513 pz 2.561 +21514 pz -3.739 +24515 p -0.509041 0.860742 0.000000 -1110.595 +24516 p -0.509041 0.860742 0.000000 -1110.895 +c c VS Blades (open) +c 24501 p -0.936060 -0.351842 0.000000 -288.420 +c 24502 p -0.936060 -0.351842 0.000000 -290.420 +c 24503 p -0.936060 -0.351842 0.000000 -290.520 +c 24504 p 0.936060 0.351842 0.000000 292.920 +c 21501 pz 5.061 +c 21502 pz 1.061 +c 21503 pz -4.739 +c 21504 pz -0.739 +c 24505 p 0.351842 -0.936060 0.000000 1073.540 +c 24506 p 0.351842 -0.936060 0.000000 1073.940 +c c +c 24511 p -0.936060 -0.351842 0.000000 -288.356 +c 24512 p -0.936060 -0.351842 0.000000 -290.806 +c 24513 p -0.936060 -0.351842 0.000000 -292.856 +c 24514 p -0.936060 -0.351842 0.000000 -290.906 +c 21511 pz 5.261 +c 21512 pz 0.539 +c 21513 pz 1.761 +c 21514 pz -4.539 +c 24515 p -0.351842 0.936060 0.000000 -1078.921 +c 24516 p -0.351842 0.936060 0.000000 -1079.221 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 diff --git a/sources/mcstas_source_vs.i b/sources/mcstas_source_vs.i index 2be80c8..64ffaf9 100644 --- a/sources/mcstas_source_vs.i +++ b/sources/mcstas_source_vs.i @@ -1,7 +1,7 @@ c cold neutron source from McStas simulation for VS position c as this is primary for gamma shielding purposes, c no directional dependence has been considered -sdef dir=1 erg=d11 x=-26.25 y=d23 z=d24 vec=1 0 0 tr=5 +sdef dir=1 erg=d11 x=-26.25 y=d23 z=d24 vec=1 0 0 tr=4 par=n ara=8.0 wgt=3.1239791e+10 c scaling wgt is to flux from McStas nps si1 -1 0.99976203 1