diff --git a/e2-estia.i b/e2-estia.i index 99a2a16..d1eaca6 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -200,7 +200,7 @@ ext:n 0 276r $ in monolith 0 146r 0.75v2 8r 0.75v3 4r $CPC1+2 0 28r 0.75v3 4r $ bunker wall 0 37r 0.75v3 7r $ BWC - 0 274r + 0 276r c exponential transform reference vectors: origin, VS, shutter vect v1 0 0 0 v2 1114.8 -1.75 0.5 v3 2137 -1.25 -12.5 c forced collisions in neutron guides @@ -211,7 +211,7 @@ fcl:n 0 276r $ in monolith 0 13r -1.0 6r $ NFGA 0 206r -1 $ Glass in Selene 1 0 54r -1 7r $ S1 back plate and mineral cast in universe - 0 193r + 0 195r c c ----------------------------------------------------------- c ------------------------------------------------------- @@ -220,7 +220,7 @@ 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 nps 39242646 $ works with rssa file from McStas, original tracks 39242646 -stop nps 1e8 CTME 4e5 $f31 0.01 +stop nps 1e6 CTME 4e5 $f31 0.01 c nps 28e11 $ works with rssa file, value is scaled to 20x source particles c write particle tracks c ssw 206505 pty=n $ record all neutron tracks crossing outward @@ -228,7 +228,7 @@ c random number generator options rand gen=2 seed=29976355590901 $ default 19073486328125 c histp mode n p h / z $ neutron, photon, proton, pi+, pi0 -imp:n,p,h,/,z 1 276r 0 0 1 825r +imp:n,p,h,/,z 1 276r 0 0 1 827r c Reduce model size for WWG runs until earlier stages of the model: c void 201255 201257 203123 $ void cells downstream of BBG c imp:n,p,h,/,z 1 276r 0 0 1 323r 0 1 0 1 34r 0 1 414r $ zero for above @@ -270,10 +270,10 @@ c read file=sources/bunker_wall.i echo $ approximate, not for official results c * McStas source terms for gamma doeses c read file=sources/mcstas_rssa.i echo c read file=sources/mcstas_source_vs.i echo -read file=sources/mcstas_source_sample.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 -c read file=sources/mcstas_gammas_2.i echo +read file=sources/mcstas_gammas_2.i echo c read file=sources/mcstas_source_shutter.i echo prdmp -120 -30 1 2 5e5 print 30 32 40 diff --git a/geometry/estia_guides.i b/geometry/estia_guides.i index 4a9ba27..1e95ce1 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -233,7 +233,9 @@ c Air outside the guide shielding 208203 208251 208602 49 0.074981 100003 100072 -100610 100101 -100104 100067 208203 c Thin wall shielding the cabinet area -208603 49 0.074981 100610 -208709 208231 -208232 100059 -208223 +208603 48 -2.3 100610 -208709 208231 -208232 100059 -208233 308234 +208604 4 -1.2E-3 100610 -208709 208231 -208232 208233 -208223 308234 +208605 4 -1.2E-3 (100610:(-100101 208250)) -208709 208231 -208232 100059 -208223 -308234 c Tube after Selene 2 with sapphire window 208611 0 208636 208641 -208932 208612 5 0.0582256 -208626 208642 -208931 208932 diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index 493461d..c3686ab 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -465,8 +465,11 @@ c wall breakthrough 208223 pz 120.0 208224 p 0.0 0.0 -1.0 50.0 c Wall E01 side for cabinets -208231 py 308 -208232 py 310 +208231 py 289.4 +208232 py 309.4 +c diagonal limiting element from door +208233 pz 13.7 +308234 p 0.813101 0.582123 0 2169.0 c New Gemoetry c SKADI wall c Sides diff --git a/geometry/materials.i b/geometry/materials.i index 847785b..5e0f461 100644 --- a/geometry/materials.i +++ b/geometry/materials.i @@ -144,6 +144,15 @@ c m32 1001 -0.0299 5010 -0.0098 5011 -0.0402 6000 -0.9201 c mt32 poly.10t c mx32:h j j j model c +c Material : Concrete Bricks RaGuard density= -2.3 / -3.5 / -4.0 / -5.0 g/cm3 (=t/m3) +m48 1001 0.00776555 1002 1.16501e-06 8016 0.0438499 + 11023 0.00104778 12000.60c 0.000148662 13027 0.00238815 + 14028 0.0158026 16032 5.63433e-05 19000.60c 0.000693104 + 20000.60c 0.00291501 26054 1.84504e-05 26056 0.000286826 + 26057 6.5671e-06 26058 8.75613e-07 +mt48 lwtr.10t +mx48:h 3j model 1r j j model 2r 3j model +c c Material : Concrete rho=0.074981 m49 1001 0.00776555 1002 1.16501e-06 8016 0.0438499 11023 0.00104778 12000.60c 0.000148662 13027 0.00238815 diff --git a/pbunker.com b/pbunker.com index e8cd334..22770ff 100644 --- a/pbunker.com +++ b/pbunker.com @@ -3,7 +3,7 @@ basis 1 0 0 0 1 0 & label 0 0 & extent 500 500 & shade 4=LightYellow 9=LightGoldenrod 300=LightGoldenrod & -shade 5=green 10=DarkSeaGreen & +shade 5=green 10=DarkSeaGreen 48=DarkSlateGray & shade 49=SlateGray 16=DarkOliveGreen 200=DarkSlateGray & shade 71=RosyBrown 3=red 54=RosyBrown 121=brown & shade 14=orange & diff --git a/pcave.com b/pcave.com index 3b4a49f..220b1e6 100644 --- a/pcave.com +++ b/pcave.com @@ -3,7 +3,7 @@ basis 1 0 0 0 1 0 & label 0 0 & extent 1000 1000 & shade 4=LightYellow 9=LightGoldenrod 300=LightGoldenrod & -shade 5=green 10=DarkSeaGreen & +shade 5=green 10=DarkSeaGreen 48=DarkSlateGray & shade 49=SlateGray 16=DarkOliveGreen 200=DarkSlateGray & shade 71=RosyBrown 3=red 54=RosyBrown 121=brown & shade 14=orange & diff --git a/pcvs.com b/pcvs.com index 3b5f728..3337dfc 100644 --- a/pcvs.com +++ b/pcvs.com @@ -3,7 +3,7 @@ basis 1 0 0 0 0 1 & label 0 0 & extent 150 150 & shade 4=LightYellow 9=LightGoldenrod 300=LightGoldenrod & -shade 5=green 10=DarkSeaGreen & +shade 5=green 10=DarkSeaGreen 48=DarkSlateGray & shade 49=SlateGray 16=DarkOliveGreen 200=DarkSlateGray & shade 71=RosyBrown 3=red 54=RosyBrown 121=brown & shade 14=orange & diff --git a/pexport.com b/pexport.com index 1da99cc..05e6381 100644 --- a/pexport.com +++ b/pexport.com @@ -1,6 +1,6 @@ label 0 0 & shade 4=LightYellow 9=LightGoldenrod 300=LightGoldenrod & -shade 5=green 10=DarkSeaGreen & +shade 5=green 10=DarkSeaGreen 48=DarkSlateGray & shade 49=SlateGray 16=DarkOliveGreen 200=DarkSlateGray & shade 71=RosyBrown 3=red 54=RosyBrown 121=brown & shade 14=orange & diff --git a/pmf.com b/pmf.com index 2ec7491..793698d 100644 --- a/pmf.com +++ b/pmf.com @@ -3,7 +3,7 @@ basis 1 0 0 0 0 1 & extent 550 550 & label 0 0 & shade 4=LightYellow 9=LightGoldenrod 300=LightGoldenrod & -shade 5=green 10=DarkSeaGreen & +shade 5=green 10=DarkSeaGreen 48=DarkSlateGray & shade 49=SlateGray 16=DarkOliveGreen 200=DarkSlateGray & shade 71=RosyBrown 3=red 54=RosyBrown 121=brown & shade 14=orange & diff --git a/pshield.com b/pshield.com index ff95480..6a65865 100644 --- a/pshield.com +++ b/pshield.com @@ -3,7 +3,7 @@ basis 1 0 0 0 1 0 & extent 1000 1000 & label 0 0 & shade 4=LightYellow 9=LightGoldenrod 300=LightGoldenrod & -shade 5=green 10=DarkSeaGreen & +shade 5=green 10=DarkSeaGreen 48=DarkSlateGray & shade 49=SlateGray 16=DarkOliveGreen 200=DarkSlateGray & shade 71=RosyBrown 3=red 54=RosyBrown 121=brown & shade 14=orange & diff --git a/pshutter.com b/pshutter.com index da22f11..ceca102 100644 --- a/pshutter.com +++ b/pshutter.com @@ -3,7 +3,7 @@ basis 1 0 0 0 1 0 & extent 50 50 & label 0 0 & shade 4=LightYellow 9=LightGoldenrod 300=LightGoldenrod & -shade 5=green 10=DarkSeaGreen & +shade 5=green 10=DarkSeaGreen 48=DarkSlateGray & shade 49=SlateGray 16=DarkOliveGreen 200=DarkSlateGray & shade 71=RosyBrown 3=red 54=RosyBrown 121=brown & shade 14=orange & diff --git a/pxy.com b/pxy.com index 7253330..d7c6a9d 100644 --- a/pxy.com +++ b/pxy.com @@ -3,7 +3,7 @@ basis 1 0 0 0 1 0 & label 0 0 & extent 300 300 & shade 4=LightYellow 9=LightGoldenrod 300=LightGoldenrod & -shade 5=green 10=DarkSeaGreen & +shade 5=green 10=DarkSeaGreen 48=DarkSlateGray & shade 49=SlateGray 16=DarkOliveGreen 200=DarkSlateGray & shade 71=RosyBrown 3=red 54=RosyBrown 121=brown & shade 14=orange & diff --git a/pxz.com b/pxz.com index 7739361..00e729f 100644 --- a/pxz.com +++ b/pxz.com @@ -3,7 +3,7 @@ basis 1 0 0 0 0 1 & label 0 0 & extent 300 300 & shade 4=LightYellow 9=LightGoldenrod 300=LightGoldenrod & -shade 5=green 10=DarkSeaGreen & +shade 5=green 10=DarkSeaGreen 48=DarkSlateGray & shade 49=SlateGray 16=DarkOliveGreen 200=DarkSlateGray & shade 71=RosyBrown 3=red 54=RosyBrown 121=brown & shade 14=orange &