Merge branch 'cvcs_tg'

e2-estia.i

@@ -33,10 +33,10 @@ c 700 s 117.0 -155.00 13.5 3.0
 704 1 s 1082 -0.25 0 5.0
 705 1 s 1165 0.7 0 5.0
 706 s 778 -1085 -3 12.0
-707 1 s 2190 3.5 -2 12.0
+707 s 1267 -1769 -13 12.0
 708 s 746 -1370 0 30.0
 709 s 1030 -1155 0 30.0
-710 s 1328 -1756 -13 12.0
+710 s 1341 -1717 -13 12.0
 c Estia geometry
 read file=geometry/estia_surfaces.i echo
 
@@ -89,15 +89,18 @@ c -------------------------------------------------------
 c --------------- WEIGHT CARDS --------------------------
 c -------------------------------------------------------
 c weight window generator, can be run with previous weight window files
-c WWGE:n,p 1e-3 1e-1 1e1 3e3
-c WWG:n,p  5 0 0
+c WWGE:n   1e-3 1e-1 1 10 100 3e3
+c mesh based weight windows, can be reused after change of cell structure
+c WWG      55 0 0
 c MESH     GEOM=CYL ORIGIN=0 0 -500 REF=133.7 -176.7 13.5 AXS=0 0 1 
-c          IMESH=200 550 1150 1500 5000
-c          IINTS=  2   5    1   10    5
-c          JMESH=100 300 460 500 540 700 900 1000
-c          JINTS=  2   4   4   8   8   4   4    2
-c          KMESH=298 315 360
-c          KINTS= 14   3   2
+c          IMESH=200 550 1150 1500 2112.01  2157.17 4600 
+c          IINTS=  2   5    1   10    1        1       4
+c          JMESH=100 300 460 500 540 700 900 1200
+c          JINTS=  2   4   4   8   8   4   4    6
+c          KMESH=298 303 309 315 360
+c          KINTS= 14   1  20   1   2
+c generate cell based weight windows, needs to be updated on geometry change
+c WWG      55 1042 0
 c ++++++++++++++++++++++ END ++++++++++++++++++++++++++++
 c -----------------------------------------------------------
 c ------------------- TALLY CARDS ---------------------------
@@ -109,13 +112,14 @@ c read file=tallies/bunker_mesh_act.i echo
 c read file=tallies/full_mesh.i echo
 c read file=tallies/full_mesh_p.i echo
 c read file=tallies/full_mesh_np.i echo
-c read file=tallies/inbunker_f4.i echo
+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/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
-read file=tallies/shutter_f5.i echo
+c read file=tallies/shutter_f5.i echo
+read file=tallies/shutter_wall_f4.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
@@ -135,10 +139,13 @@ c 538 539 540-543 544-554 555-585 //
 c 586 587-591 592 593 594-601 602 603-end//
 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.5V2 2r 0 222r  0.02V3 1r 0 219r 0.25V2 5r
-      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 0.5V2 0 0.5V2 0 0 0.5V2 0 0.5V2 0 0.5V2 0 0.5V2 0 28r
+      0.5V2 4r 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 58r
+c forced collisions in neutron guides
+fcl:n 0 528r -0.05 -0.1 4r 0 39r -0.1 0 13r -0.25 5r 0 171r 
+                  -1 0 10r -1 -1 0 22r -1 0 8r $218r
 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 
@@ -147,7 +154,7 @@ c -------------------------------------------------------
 c --------------- PHYSICS CARDS --------------------------
 c -------------------------------------------------------
 c dbcn 375642321 j j j j j j j j j j j 15291711
-nps 1e10
+nps 2e10
 c histp
 mode n p n h / d t s a
 c volume calculated for tally cells (spheres)
@@ -177,7 +184,7 @@ c read file=sources/mcstas_source_mf.i echo
 c 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 1e8 -60 1 2 1e7
+prdmp 5e8 -60 1 2 5e7
 print 30 32 40 $ 120 128 150 160 161 162  
 c ++++++++++++++++++++++ END ++++++++++++++++++++++++++++
 

geometry/estia_guides.i

@@ -117,9 +117,9 @@ 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
+c 8402   20 -2.3    8102 -8103 -8501 -8502 -8503 -8504 3
 c 8403   13 -11.34  8103 -8101 -8501 -8502 -8503 -8504 3
-c 8402   0          8102 -8103 -8501 -8502 -8503 -8504 3
+8402   0          8102 -8103 -8501 -8502 -8503 -8504 3
 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)