diff --git a/e2-estia.i b/e2-estia.i index 21b0be1..cfa4b38 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -185,7 +185,7 @@ ext:n 0 276r $ in monolith 0 132r 0.25v3 13r $CPC1+2 0 28r 0.25v3 4r $ bunker wall 0 17r 0.25v3 7r $ BWC - 0 155r + 0 157r c exponential transform reference vectors: origin, selene 1, sample vect v1 0 0 0 v2 1000 -1394 -6.5 v3 2048 -2856 -30 c forced collisions in neutron guides @@ -194,8 +194,8 @@ fcl:n 0 276r $ in monolith 0 -0.05 -0.1 4r $ NBOA 0 23r -0.1 $ BBG 0 13r -0.25 6r $ NFGA - 0 173r -1 $ Glass in Selene 1 - 0 51r -1 -1 $ S1 back plate and mineral cast in universe + 0 174r -1 $ Glass in Selene 1 + 0 52r -1 -1 $ S1 back plate and mineral cast in universe 0 82r c c ----------------------------------------------------------- @@ -209,7 +209,7 @@ c 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 -imp:n,p,h,/,z 1 276r 0 0 1 672r +imp:n,p,h,/,z 1 276r 0 0 1 674r c imp:n,p,h,/,z 1 276r 0 0 1 487r 0 0 0 1 0 87r 1 9r cut:h,/,z 1e+08 1e-3 phys:n 3000 0 diff --git a/geometry/estia_guides.i b/geometry/estia_guides.i index 812e30c..2317aac 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -46,7 +46,7 @@ c Vacuum from shutter to Selene 2 c Vacuum inside Selene 2 206113 0 ((-208631 -208632 -208633 -208634 -208635 -208636 #(208121 -208122 208601 208602 208603 208604)) :(208121 -208122 - 208601 -208611 -208612 -208613 100003)) #208511 + 208601 -208611 -208612 -208613 100003)) #208510 #208511 c -----Bunker Wall Collimator (BWC)----- 207001 0 207205 -207206 -207301 207302 -207303 -207401 207002 0 207205 -207206 -207301 207302 -207402 207304 @@ -122,10 +122,12 @@ c Selene 1 carrier 208302 54 0.0833854 208414 208415 208416 -208404 -208417 208418 208303 0 -208405 208406 208402 ((-208407 208408 -208409):(208521 -208516 -208514)) - #208311 #208411 #208412 #208413 -c Selene 1 glass -208311 12 -2.51 -208405 208406 -208903 -208904 -208518 #(-208901 - -208902) #(-208522 -208523) 100003 + #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 +208311 12 -2.51 -208405 208406 -208903 -208904 -208518 #(-208907 + -208908) #(-208522 -208523) 100003 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 @@ -197,9 +199,11 @@ c Lead shielding for gammas at MF c Selene 2 carrier 208501 18 -2.4 (208121 -208122 208601 208602 208603 208604 100003) #(208121 -208122 208601 -208611 -208612 -208613 100003) -c Selene 2 glass (change material!!) -208511 12 -2.51 208121 -208122 -208913 -208914 208915 #(-208911 +c Selene 2 m=3.5 coating/glass (change material!!) +208510 87 -4.925 208121 -208122 -208917 -208918 208915 #(-208911 -208912) #(-208515 -208517) 100003 +208511 12 -2.51 208121 -208122 -208913 -208914 208915 #(-208917 + -208918) #(-208515 -208517) 100003 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_surfaces.i b/geometry/estia_surfaces.i index abea6e1..79115ee 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -245,11 +245,11 @@ c vertical surfaces 203446 pz -29.808 c Parametric Surfaces c Inside Mirrors Ellipses Top-Bottom/Right -203501 1 SQ 3.3058E-06 0 0.01359978 0 0 0 -1 550 0 0 -203502 1 SQ 3.3058E-06 0.01359978 0 0 0 0 -1 550 0 0 +203501 1 SQ 3.3049771E-06 0 0.013520822 0 0 0 -1 550 0 0 +203502 1 SQ 3.3049771E-06 0.013520822 0 0 0 0 -1 550 0 0 c Outside Mirrors Ellipses Top-Bottom/Right -203503 1 SQ 3.0237E-06 0 0.01137778 0 0 0 -1 550 0 0 -203504 1 SQ 3.0237E-06 0.01137778 0 0 0 0 -1 550 0 0 +203503 1 SQ 3.3048198E-06 0 0.011317338 0 0 0 -1 550 0 0 +203504 1 SQ 3.3048198E-06 0.011317338 0 0 0 0 -1 550 0 0 c Vacuum vessel 203521 2 cx 16.0 203522 2 cx 15.0 @@ -554,25 +554,33 @@ c Inside 208812 p -1.148348833801549e-07 1.0000002116649709 0.0 57.866 208815 p -1.0000002116649709 -1.148348833801549e-07 0.0 -3364.795 c Parametric Surfaces -c Selene 1 Inside Mirrors Ellipses Top-Bottom/Right -208901 1 SQ 2.77777777777778E-06 0 0.009070294784581 +c Selene 1 Mirrors Ellipses Top-Bottom/Right (inside, glass, coating) +208901 1 SQ 2.7769322E-6 0 9.122348E-3 0 0 0 -1 1700 0 0 -208902 1 SQ 2.77777777777778E-06 0.009070294784581 0 +208902 1 SQ 2.7769322E-6 9.122348E-3 0 0 0 0 -1 1700 0 0 208903 1 SQ 2.01149425287356E-06 0 0.004756242568371 0 0 0 -1 1700 0 0 208904 1 SQ 2.01149425287356E-06 0.004756242568371 0 0 0 0 -1 1700 0 0 +208907 1 SQ 2.7769321E-6 0 9.1216859E-3 + 0 0 0 -1 1700 0 0 +208908 1 SQ 2.7769321E-6 9.1216859E-3 0 + 0 0 0 -1 1700 0 0 c Selene 2 Inside Mirrors Ellipses Top-Bottom/Right -208911 1 SQ 2.77777777777778E-06 0 0.009070294784581 +208911 1 SQ 2.7769322E-6 0 9.122348E-3 0 0 0 -1 2900 0 0 -208912 1 SQ 2.77777777777778E-06 0.009070294784581 0 +208912 1 SQ 2.7769322E-6 9.122348E-3 0 0 0 0 -1 2900 0 0 208913 1 SQ 2.01149425287356E-06 0 0.004756242568371 0 0 0 -1 2900 0 0 208914 1 SQ 2.01149425287356E-06 0.004756242568371 0 0 0 0 -1 2900 0 0 208915 p 1.148348833801549e-07 -1.0000002116649709 0.0 5.0 +208917 1 SQ 2.7769321E-6 0 9.1216859E-3 + 0 0 0 -1 2900 0 0 +208918 1 SQ 2.7769321E-6 9.1216859E-3 0 + 0 0 0 -1 2900 0 0 c Vacuum vessels before S1/S1-S2 208921 21 cx 13.35 208922 21 cx 13.05 diff --git a/geometry/materials.i b/geometry/materials.i index 004c4c0..b3e0a7a 100644 --- a/geometry/materials.i +++ b/geometry/materials.i @@ -155,6 +155,29 @@ c Material : Copper rho=0.0844385 c (rho=8.91001 g/cc) m73 29063 0.0583892 29065 0.0260493 c +c +c Super-Mirror coating mixture Ni/Ti +c This is the ratio between Ni and Ti layers for m=2.0 +c 0.7/0.5 µm - -5.198 g/cm³ +m84 28000.50c 0.58333 22000.62c 0.41667 +mx84:h model 1r +c This is the ratio between Ni and Ti layers for m=2.5 +c 1.2/0.9 µm - -5.092 g/cm³ +m85 28000.50c 0.57143 22000.62c 0.42857 +mx85:h model 1r +c This is the ratio between Ni and Ti layers for m=3.0 +c 1.9/1.5 µm - -4.980 g/cm³ +m86 28000.50c 0.55882 22000.62c 0.44118 +mx86:h model 1r +c This is the ratio between Ni and Ti layers for m=3.5 +c 2.1/1.7 µm - -4.925 g/cm³ +m87 28000.50c 0.55263 22000.62c 0.44737 +mx87:h model 1r +c This is the ratio between Ni and Ti layers for m=4.0 +c 2.6/2.3 µm - -4.729 g/cm³ +m88 28000.50c 0.53061 22000.62c 0.46939 +mx88:h model 1r +c c Material : Be5H2O rho=0.122325 c m118 1001 0.00334228 4009 0.117311 8016 0.00167114 c