From 9f29fa164a95c38d44d538d6f9caa2c58d774974 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Wed, 31 Jul 2019 17:33:37 +0200 Subject: [PATCH] Implement proposed change in NBOA geometry from SNAG --- e2-estia.i | 8 ++++---- geometry/estia_inbunker.i | 34 +++++++++++++++++++--------------- geometry/estia_surfaces.i | 14 +++++++++++++- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/e2-estia.i b/e2-estia.i index bc2eff1..2822c19 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -130,14 +130,14 @@ 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_wall_f4.i echo -read file=tallies/detector_f5.i echo +c read file=tallies/shutter_wall_f4.i echo +c read file=tallies/detector_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 c read file=tallies/experimental_cave_f5.i echo c read file=tallies/cave_mesh.i echo -read file=tallies/selene1_f5.i echo +c read file=tallies/selene1_f5.i echo c read file=tallies/selene1_f6.i echo c c =============================== @@ -169,7 +169,7 @@ c --------------- PHYSICS CARDS -------------------------- c ------------------------------------------------------- c dbcn 375642321 j j j j j j j j j j j 15291711 c stop calculation either at 2e8 histories, 6.5 days or tally 15 error <0.001 -stop nps 1e9 CTME 4.5e6 $f255 0.05 +stop nps 1e9 CTME 8e4 $f255 0.05 rand gen=2 seed=29976355590901 $ default 19073486328125 c histp mode n p h / z $ neutron, photon, proton, pi+, pi0 diff --git a/geometry/estia_inbunker.i b/geometry/estia_inbunker.i index dafc050..9922683 100644 --- a/geometry/estia_inbunker.i +++ b/geometry/estia_inbunker.i @@ -11,16 +11,16 @@ c NBOA beam -201502 U=-10 201003 9 2.45e-05 201102 -201103 (-201331:-201332) -201311 -201501 -201502 U=-10 -201004 9 2.45e-05 201103 -201104 (-201341:-201342) -201311 -201501 - -201502 U=-10 -201005 9 2.45e-05 201104 -201105 (-201351:-201352) -201311 -201501 - -201502 U=-10 -201006 9 2.45e-05 201105 -201106 (-201361:-201362) -201311 -201502 - -201501 U=-10 -201007 9 2.45e-05 201106 -201107 (-201371:-201372) -201311 -201502 - -201501 U=-10 -201008 9 2.45e-05 201107 -201108 (-201381:-201382) -201311 -201502 - -201501 U=-10 +201004 9 2.45e-05 201103 -201104 (-201341:-201342:(201343 201344)) + -201311 -201501 -201502 U=-10 +201005 9 2.45e-05 201104 -201105 (-201351:-201352:(201353 201354)) + -201311 -201501 -201502 U=-10 +201006 9 2.45e-05 201105 -201106 (-201361:-201362:(201363 201364)) + -201311 -201502 -201501 U=-10 +201007 9 2.45e-05 201106 -201107 (-201371:-201372:(201373 201374)) + -201311 -201502 -201501 U=-10 +201008 9 2.45e-05 201107 -201108 (-201381:-201382:(201383 201384)) + -201311 -201502 -201501 U=-10 201011 9 2.45e-05 201100 -201101 #(201201 201202 201203 201204) 201305 201306 201307 201308 U=-10 201012 9 2.45e-05 ((201101 -201115 201213 -201507 -201508) :(201115 @@ -45,11 +45,15 @@ c NBOA outside c NBOA wedges 201032 14 -8.92 ((201101 -201102 201321 201322) :(201102 -201103 201331 201332)) -201502 -201311 U=-10 -201033 14 -8.92 201103 -201104 201341 201342 -201502 -201311 U=-10 -201034 14 -8.92 201104 -201105 201351 201352 -201502 -201311 U=-10 -201035 14 -8.92 ((201105 -201106 201361 201362) :(201106 -201107 201371 - 201372)) -201502 -201311 U=-10 -201036 14 -8.92 201107 -201108 201381 201382 -201502 -201311 U=-10 +201033 14 -8.92 201103 -201104 201341 201342 -201502 -201311 + #(201343 201344) U=-10 +201034 14 -8.92 201104 -201105 201351 201352 -201502 -201311 + #(201353 201354) U=-10 +201035 14 -8.92 ((201105 -201106 201361 201362 #(201363 201364)) + :(201106 -201107 201371 201372 #(201373 201374))) + -201502 -201311 U=-10 +201036 14 -8.92 201107 -201108 201381 201382 -201502 -201311 + #(201383 201384) U=-10 c Al window and He in front of NBOA 201041 5 0.0582256 -201110 201305 201306 201307 201308 U=10 VOL=59.8 201042 9 2.45e-05 201110 -201100 201305 201306 201307 201308 U=-10 diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index 6de3985..5c9d659 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -48,21 +48,33 @@ c NBEX 201308 p 0.023455 -0.032762 0.999188 11.796 c Mirrors left 201311 p -0.808067 -0.589090 -0.000105 -0.506 -c Inserts Top/Botom +c Inserts Top/Botom (no gap) 201321 p -0.007112 0.009934 -0.999925 -14.274 201322 p 0.007112 -0.009934 0.999925 13.492 201331 p -0.007112 0.009934 -0.999925 -14.407 201332 p 0.007112 -0.009934 0.999925 13.359 +c gap with 8mm plates 201341 p -0.007112 0.009934 -0.999925 -14.838 201342 p 0.007112 -0.009934 0.999925 12.928 +201343 p -0.007112 0.009934 -0.999925 -14.038 +201344 p 0.007112 -0.009934 0.999925 13.728 201351 p -0.007112 0.009934 -0.999925 -15.267 201352 p 0.007112 -0.009934 0.999925 12.499 +201353 p -0.007112 0.009934 -0.999925 -14.467 +201354 p 0.007112 -0.009934 0.999925 13.299 +c gap with 15mm plates 201361 p -0.007112 0.009934 -0.999925 -15.697 201362 p 0.007112 -0.009934 0.999925 12.069 +201363 p -0.007112 0.009934 -0.999925 -14.197 +201364 p 0.007112 -0.009934 0.999925 13.569 201371 p -0.007112 0.009934 -0.999925 -16.127 201372 p 0.007112 -0.009934 0.999925 11.639 +201373 p -0.007112 0.009934 -0.999925 -14.527 +201374 p 0.007112 -0.009934 0.999925 13.139 201381 p -0.007112 0.009934 -0.999925 -16.556 201382 p 0.007112 -0.009934 0.999925 11.210 +201383 p -0.007112 0.009934 -0.999925 -15.056 +201384 p 0.007112 -0.009934 0.999925 12.710 c c Parametric Surfaces c Inside Mirrors Ellipses Top-Bottom/Right