diff --git a/e2-estia.i b/e2-estia.i index 669e572..209b74c 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -195,7 +195,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 246r + 0 250r 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 @@ -206,7 +206,7 @@ fcl:n 0 276r $ in monolith 0 13r -1.0 6r $ NFGA 0 208r -1 $ Glass in Selene 1 0 51r -1 7r $ S1 back plate and mineral cast in universe - 0 166r + 0 170r c c ----------------------------------------------------------- c ------------------------------------------------------- @@ -215,7 +215,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 1e7 CTME 4e5 $f31 0.01 c nps 14e10 $ works with rssa file, value is scaled to source particles c write particle tracks c ssw 206505 pty=n $ record all neutron tracks crossing outward @@ -223,7 +223,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 797r +imp:n,p,h,/,z 1 276r 0 0 1 801r 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 diff --git a/geometry/estia_shutter.i b/geometry/estia_shutter.i index c83266e..9a31f64 100755 --- a/geometry/estia_shutter.i +++ b/geometry/estia_shutter.i @@ -2,7 +2,7 @@ c instrument shutter and surrounding elements c outer boundary of shutter: X: 208103 -208101 Y: 220002 -220003 Z: 220004 -220005 c air around shutter 220001 4 -1.2E-3 208103 -208101 220002 -220003 220004 -220005 - #220011 #220013 + #220011 #220013 #220041 #220042 #220043 #(220000 -220001 220207 -220208 220204 -220205) c Aluminum vacuum housing 220011 5 0.0582256 220000 -220001 220002 -220003 220004 -220204 @@ -10,30 +10,42 @@ c Aluminum vacuum housing #(220200 -220201 220202 -220203) #(-220100) 220013 5 0.0582256 220000 -220001 220002 -220003 220205 -220206 -c Copper inserts -220021 14 -8.92 220200 -220304 220202 -220203 220204 -220205 + #220041 #220042 #220043 +c Copper inserts with BorAl plate in front +220020 22 -2.7 220200 -220306 220202 -220203 220204 -220205 #(220300 -220301 220302 -220303) -220022 14 -8.92 220304 -220305 220202 -220306 220204 -220205 -220023 14 -8.92 220304 -220305 220307 -220203 220204 -220205 +220021 14 -8.92 220306 -220304 220202 -220203 220204 -220205 + #(220300 -220301 220302 -220303) +220022 14 -8.92 220304 -220305 220202 -220307 220204 -220205 +220023 14 -8.92 220304 -220305 220308 -220203 220204 -220205 220024 14 -8.92 220305 -220201 220202 -220203 220204 -220205 #(220300 -220301 220302 -220303) c Shutter block B4C and Lead in Al casing c closed shutter 220031 5 0.0582256 220400 -220401 220402 -220403 220404 -220405 #(220406 -220408 220410 -220411 220412 -220413) + #(220300 -220301 220302 -220303 -220406) 220032 20 -2.3 220406 -220407 220410 -220411 220412 -220413 220033 13 -11.34 220407 -220408 220410 -220411 220412 -220413 c open shutter c 220031 5 0.0582256 220400 -220401 220402 -220403 220420 -220423 c #(220406 -220408 220410 -220411 220421 -220422) +c #(220300 -220301 220424 -220425 -220406) c 220032 20 -2.3 220406 -220407 220410 -220411 220421 -220422 c 220033 13 -11.34 220407 -220408 220410 -220411 220421 -220422 +c attached items +220041 5 0.0582256 220204 -220503 -220501 +220042 5 0.0582256 220204 -220503 -220502 +220043 5 0.0582256 220405 -220505 -220504 $ closed +c 220043 5 0.0582256 220423 -220506 -220504 $ open c Vacuum elements 220051 0 220000 -220200 -220100 220052 0 220200 -220304 220300 -220301 220302 -220303 -220053 0 220304 -220305 220306 -220307 220204 -220205 +220053 0 ((220304 -220305 220307 -220308 220204 -220205 #220043 #(220400 -220401 220402 -220403 220404 -220405) $ closed + ):(220300 -220301 220302 -220303 220400 -220406)) c #(220400 -220401 220402 -220403 220420 -220423) $ opened +c ):(220300 -220301 220424 -220425 220400 -220406)) 220054 0 220305 -220201 220300 -220301 220302 -220303 220055 0 220201 -220001 -220100 c McStas shutter source location diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index 195780c..d4bdcd2 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -834,28 +834,29 @@ c inner and outer vacuum flange cylinders c Vacuum vessel inside (Al 2 cm thickness) and top 220200 22 px -10.5 220201 22 px 10.5 -220202 22 py -26.0 -220203 22 py 26.0 +220202 22 py -23.0 +220203 22 py 23.0 220204 22 pz -15.0 220205 22 pz 42.0 220206 22 pz 44.0 -220207 22 py -28.0 -220208 22 py 28.0 +220207 22 py -25.0 +220208 22 py 25.0 c Copper inserts c window 220300 22 py -3.75 220301 22 py 3.75 220302 22 pz -8.0 220303 22 pz 8.0 -c up-stream/center/downstream +c up-stream/center/downstream/BorAl 220304 22 px -2.5 -220305 22 px 5.5 +220305 22 px 5.8 +220306 22 px -10.0 c opening for shutter -220306 22 py -11.25 -220307 22 py 11.25 +220307 22 py -11.25 +220308 22 py 11.25 c Shutter block outside 220400 22 px -1.46 -220401 22 px 5.3 +220401 22 px 5.7 220402 22 py -11.0 220403 22 py 11.0 220404 22 pz -14.9 @@ -873,6 +874,16 @@ c vertical location when opened 220421 22 pz 13.0 220422 22 pz 37.0 220423 22 pz 41.9 +220424 22 pz 17.0 +220425 22 pz 33.0 +c vertical guide elements +220501 22 c/z 0 -29 1.8 +220502 22 c/z 0 29 1.8 +220503 22 pz 100.0 +c shutter rod +220504 22 c/z 3 0 1.5 +220505 22 pz 55.0 +220506 22 pz 80.0 c c UNIVERSES c Selene 1