diff --git a/e2-estia.i b/e2-estia.i index f5a0a97..a0a2ea5 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -43,7 +43,7 @@ c 700 s 117.0 -155.00 13.5 3.0 c Estia geometry read file=geometry/estia_surfaces.i echo -read file=geometry/sm_reflectivity.i echo +c read file=geometry/sm_reflectivity.i echo read file=geometry/materials.i echo read file=geometry/materials_monolith.i echo c @@ -204,8 +204,8 @@ 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 -stop nps 392426460 CTME 4e5 $f31 0.01 -c stop nps 1e8 CTME 4e5 $f31 0.01 +c stop nps 392426460 CTME 4e5 $f31 0.01 +stop nps 1e8 CTME 4e5 $f31 0.01 rand gen=2 seed=29976355590901 $ default 19073486328125 c histp mode n p h / z $ neutron, photon, proton, pi+, pi0 @@ -237,11 +237,11 @@ 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 c read file=sources/e2_2m.i echo -c read file=sources/e2_2m_mod.i echo +read file=sources/e2_2m_mod.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 -read file=sources/mcstas_rssa.i echo +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 diff --git a/geometry/estia_guides.i b/geometry/estia_guides.i index 012ee21..d75fe7b 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -128,9 +128,9 @@ c Selene 1 carrier #208310 #208311 #208411 #208412 #208413 c Selene 1 m=3.5 coating/glass 208310 87 -4.925 -208405 208406 -208907 -208908 -208518 - #(-208901 -208902) #(-208522 -208523) 100003 + #(-208901 -208902) 208523 100003 $ #(-208522 -208523) 208311 12 -2.51 -208405 208406 -208903 -208904 -208518 #(-208907 - -208908) #(-208522 -208523) 100003 + -208908) 208523 100003 $ #(-208522 -208523) c Parts in front and back around the flange 208312 31 -1.70 208445 -208425 208421 208422 208423 208447 208321 208921 208313 4 -1.2E-3 208446 -208426 208421 208422 208423 208447 208321 208921 @@ -204,9 +204,9 @@ c Selene 2 carrier #(208121 -208122 208601 -208611 -208612 -208613 100003) c Selene 2 m=3.5 coating/glass (change material!!) 208510 87 -4.925 208121 -208122 -208917 -208918 208915 #(-208911 - -208912) #(-208515 -208517) 100003 + -208912) 208515 100003 $ #(-208515 -208517) 208511 12 -2.51 208121 -208122 -208913 -208914 208915 #(-208917 - -208918) #(-208515 -208517) 100003 + -208918) 208515 100003 $#(-208515 -208517) c Selene 2 Vacuum tank (stainless steel) 208521 3 0.0876276 (208621 208622 208623 208624 208625 208626) #(-208631 -208632 -208633 -208634 -208635 -208636) #(208625 208635 diff --git a/geometry/estia_inbunker.i b/geometry/estia_inbunker.i index b15b0c3..2dcf2f0 100644 --- a/geometry/estia_inbunker.i +++ b/geometry/estia_inbunker.i @@ -165,7 +165,7 @@ c MirroBor outside vessel 203142 17 -1.36 203110 -203111 203521 -203541 100003 #(-203431 -203326) #(-203432 -203326) #(-203433 -203326) c NFSA Guide support -203151 71 0.0843223 (203120 -203121 (203401 203402 203403 203404 100003) +203151 5 0.0582256 (203120 -203121 (203401 203402 203403 203404 100003) #(203411 203412 -203413 203414)) :(203446 -203404 -203437) :(203446 -201000 -203438) :(203446 -201000 -203439) c Chopper Virtual Source Collimation System (CVCS) @@ -298,7 +298,7 @@ c VS carry rods 204512 5 0.0582256 205601 -221105 -225422 204513 5 0.0582256 205601 -221105 -225423 c chopper disk (aluminum 5 0.0582256) -204521 0 -204621 204622 -204623 VOL=3848.5 +204521 5 0.0582256 -204621 204622 -204623 VOL=3848.5 c chopper spindle 204531 3 0.0876276 222106 204631 -204632 -204604 VOL=10104 c Steel support and lifting structure diff --git a/pexport.com b/pexport.com index ff8c723..e368cd2 100644 --- a/pexport.com +++ b/pexport.com @@ -19,14 +19,24 @@ shade 6117=magenta 6119=magenta 6120=coral 6121=coral 6122=coral 6123=coral & shade 6125=coral 6129=coral 6132=purple 6133=purple 6136=purple 6138=purple & shade 6140=purple 6141=purple 7410=DarkOliveGreen & shade 31=pink 32=LightPink & -origin 300 -8.3 10 basis 1 0 0 0 0 1 extent 300 & -file all term 0 viewport square +origin 275 -8.3 12.5 basis 1 0 0 0 1 0 extent 300 & +file all term 0 scales 1 +origin 300 -8.3 10 basis 1 0 0 0 0 1 extent 300 origin 375 -5.5 10 basis 1 0 0 0 0 1 extent 20 -origin 776 -10.2 8 basis 1 0 0 0 1 0 extent 300 +origin 750 -8.3 10 basis 1 0 0 0 0 1 extent 300 +origin 900 -10.2 2 basis 1 0 0 0 1 0 extent 400 origin 1100 -2.2 0.5 basis 1 0 0 0 1 0 extent 100 -origin 1182 -1.4 0 basis 1 0 0 0 0 1 extent 300 +origin 1185 -0.3 0 basis 1 0.022 0 0 0 1 extent 200 origin 1720 2.2 0 basis 1 0 0 0 1 0 extent 500 origin 1720 17.7 -6 basis 1 0 0 0 0 1 extent 400 -origin 1716 1.2 -6 basis 0 1 0 0 0 1 extent 100 -origin 2134 -9.3 -5 basis 1 0 0 0 1 0 extent 2400 +origin 1716 -2 -6 basis 0 1 0 0 0 1 extent 100 +origin 2316 -2 -14 basis 0 1 0 0 0 1 extent 100 +origin 2916 -2 -22 basis 0 1 0 0 0 1 extent 100 +origin 2135 0 -16 basis 1 0 -0.013 0 1 0 extent 2400 +mesh 0 color by den +viewport square & +origin 100 0 12 basis 1 0 -0.013 0 1 0 extent 700 +origin 1500 0 -5 basis 1 0 -0.013 0 1 0 extent 700 +origin 2900 0 -22 basis 1 0 -0.013 0 1 0 extent 700 +origin 4300 0 -39 basis 1 0 -0.013 0 1 0 extent 700 end