From 90c1368d835a71b492e5596df1b7f08392dc8b28 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Tue, 6 Apr 2021 19:12:54 +0200 Subject: [PATCH] Update to more complex SKADI wall and latest shutter geometry --- e2-estia.i | 8 ++-- geometry/estia_guides.i | 80 ++++++++++++++++++++------------------- geometry/estia_shutter.i | 10 ++++- geometry/estia_surfaces.i | 47 +++++++++++++++++++---- 4 files changed, 92 insertions(+), 53 deletions(-) diff --git a/e2-estia.i b/e2-estia.i index 2cea5ab..7f01bfe 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 250r + 0 253r 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 170r + 0 173r 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 1e6 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 801r +imp:n,p,h,/,z 1 276r 0 0 1 804r 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_guides.i b/geometry/estia_guides.i index 3eb1aa6..e568d0a 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -97,43 +97,50 @@ c concrete floor 208001 49 0.074981 ((100068 -100072 208209 -100070 -100104 -100002) :(100072 -210118 208707 100112 208209 (-208304:(-208305 -100610 -100101)))) 100003 -100104 -c ceiling outside -208002 4 -1.2E-3 (100003 100072 -208101 208207 208203 208201 - (208202:-208302)) -c left outer wall (E01) -208003 4 -1.2E-3 (100072 -208100 208201 -208205 100059 -208207 100003) +c air above all shielding +208002 4 -1.2E-3 100112 -100101 100072 -208709 100003 208243 208203 +c right outer wall (E03) +208003 4 -1.2E-3 100112 -208241 208242 100072 -208709 100003 + 208251 -208243 100709 #(-208305 -100610) c Selene 1/2 separator -208004 49 0.074981 (208100 -208101 208201 -208302 100059 -208207 100003) - #(208100 -208101 -208221 -208222 -208223 -208224) +208004 49 0.074981 (208100 -208101 208201 -208248 100059 -208252 100003) + #(208100 -208101 -208221 208222 -208223 -208224) c Optical cave -208005 49 0.074981 (208101 -208709 100059 -208313 -208302 -208312 - 100003) -208006 4 -1.2E-3 (208101 -208709 100059 -208313 208311 208201 100003) -208007 4 -1.2E-3 (208101 -208709 208313 208702 208201 -208302 100003) +208005 49 0.074981 (208101 -208709 100059 -208243 -208242 -208312 + 100003) #(208248 208249) +208006 4 -1.2E-3 208100 -208709 -208201 -100101 208251 -208243 + #(-208305 -100610) +208007 4 -1.2E-3 208100 -208101 208252 -208243 -208246 208201 + #(208103 220002 -220003 220004 -220005) c air -208008 4 -1.2E-3 (208101 -208709 -208702 208203 208201 -208302 100003) -208009 4 -1.2E-3 (100072 -208100 208205 -208212 -208213 -208214 - 100003) #(208441 208442 208443 208444 208445 208446) #(-208446 - -208921) #(-208305 -100610) -208010 4 -1.2E-3 (208101 -208709 -208311 208312 -208313 -208314 100003) +c 208008 4 -1.2E-3 (208101 -208709 -208702 208203 208201 -208242 100003) +208009 4 -1.2E-3 -208245 -100101 100072 -208100 100003 + 208251 -208243 100708 208921 + #(208441 208442 208443 208444 208445 208446) + #(-208305 -100610) +c 208009 4 -1.2E-3 (100072 -208100 208205 -208245 -208243 -208214 +c 100003) #(208441 208442 208443 208444 208445 208446) #(-208446 +c -208921) #(-208305 -100610) +208010 4 -1.2E-3 (208101 -208709 208201 208312 -208243 -208314 100003) #(208121 -208122 208601 208602 208603 208604) #(-208121 -208933) #(208621 208622 208623 208624 208625 208626) #(-208934 208941 -208942) #100707 #100710 c Selene 1 shielding -c 208011 4 -1.2E-3 (208211 208205 -208213 -208214 100072 -208100 100003) -c #(-208305 -100610) -208012 4 -1.2E-3 (208205 (208202:-208302) 208213 -208218 100072 -208100 - 100003) -208013 49 0.074981 100072 (208202:-208302) 208212 208217 -208213 -208214 +208011 49 0.074981 208252 -208243 -208248 208246 -208253 -208100 +208012 54 0.0833854 100072 -208247 208248 (208241:-208242) + 208249 208251 -208243 + 100003 #(-208305 -100610) + #(-208257 -208253 -208100) +208013 49 0.074981 100072 (208247:-208248) 208245 + 208253 208251 -208243 100003 #(-208305 -100610) c -208020 49 0.074981 (-208217 -208100 208215 -208302 -208213 -208214 - 100003) -208021 4 -1.2E-3 (-208217 -208100 -208215 208212 -208213 -208214 - 100003) -208022 4 -1.2E-3 (208205 (208202:-208302) 208218 -208207 100072 -208100 - 100003) +208020 54 0.0833854 -208253 -208100 208257 -208252 -208248 -208256 +208021 4 -1.2E-3 (-208253 -208100 208256 208245 -208243 -208214 + 100003) + #(-208253 -208100 ((-208255 -208257):(208252 208246))) +208022 49 0.074981 -208253 -208100 -208242 -208255 208251 -208257 c c Selene 1 carrier 208301 18 -2.4 -208405 208406 (208401 208402 208403 208404) @@ -143,7 +150,7 @@ c Selene 1 carrier 0.99992537 0 -0.012217 0 1 0 0.012217 0 0.99992537) -208302 54 0.0833854 208414 208415 208416 -208404 -208417 208418 +208242 54 0.0833854 208414 208415 208416 -208404 -208417 208418 208303 0 -208405 208406 208402 ((-208407 208408 -208409):(208521 -208516 -208514)) #208310 #208311 #208411 #208412 #208413 @@ -194,10 +201,9 @@ c area around tank with structrual beams (front, back, top, bottom, left, right) #(208421 208422 208425 208426) c Area feeding through shutter wall air, steel, concrete 208401 4 -1.2E-3 (208100 -208103 208921 -208923) -208402 54 0.0833854 (208100 -208101 -208221 -208222 -220206 -208224 208923) - #(208103 220002 -220003 220004 -220005) -208403 49 0.074981 (208100 -208101 -208221 -208222 220206 -208223) - #(208103 220002 -220003 220004 -220005) +208402 54 0.0833854 (208100 -208101 -208221 208222 -208252 -208224 208923) + #(208103 220002 -220003 220006 -220005) +208403 49 0.074981 208100 -208101 208252 -208243 208246 -208248 c Copper in Selene 1 208411 14 -8.92 208111 -208112 100003 208402 ((208520 -208903) :(208511 -208901) @@ -232,12 +238,8 @@ c Selene 2 Vacuum tank (stainless steel) -208932) #(208626 208636 -208932) c #(8626 8636 -8932) c Air outside the guide shielding -208601 4 -1.2E-3 (100072 -208709 -100104 -208201 208203 208204) #(100101 - -100610 -100067) #(-208305 -100610) #(-208302 208702 ((208712 - 208711):(208809 -208311 -208313))) #100708 -208602 4 -1.2E-3 ((100112 -208202 208302) :(208202 208302 - 208101) ) - 100072 100003 208203 208204 -208709 #(-208305 -100610) #100709 +208601 4 -1.2E-3 100610 -208709 -100104 100101 208203 208251 +208602 49 0.074981 100003 100072 -100610 100101 -100104 100067 208203 c Tube after Selene 2 with sapphire window 208611 0 208636 208641 -208932 208612 5 0.0582256 -208626 208642 -208931 208932 @@ -245,4 +247,4 @@ c Tube after Selene 2 with sapphire window c Some air around it 208702 4 -1.2e-3 100104 208101 208721 208703 208203 -208709 c extension of Skadi-Estia wall -209001 49 0.074981 100059 -210102 -208302 -208312 208709 -210500 +209001 49 0.074981 100059 -210102 -208242 -208312 208709 -210500 diff --git a/geometry/estia_shutter.i b/geometry/estia_shutter.i index 6c32950..8f3cce0 100755 --- a/geometry/estia_shutter.i +++ b/geometry/estia_shutter.i @@ -1,8 +1,9 @@ c instrument shutter and surrounding elements -c outer boundary of shutter: X: 208103 -208101 Y: 220002 -220003 Z: 220004 -220005 +c outer boundary of shutter: X: 208103 -208101 Y: 220002 -220003 Z: 220006 -220005 c air around shutter -220001 4 -1.2E-3 208103 -208101 220002 -220003 220004 -220005 +220001 4 -1.2E-3 208103 -208101 220002 -220003 220006 -220005 #220011 #220013 #220041 #220042 #220043 + #220025 #220026 #220027 #(220000 -220001 220207 -220208 220204 -220205) c Aluminum vacuum housing 220011 5 0.0582256 220000 -220001 220002 -220003 220004 -220204 @@ -20,6 +21,11 @@ c Copper inserts with BorAl plate in front 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 Steel blocks around side rods +220025 54 0.0833854 220512 -220513 220514 -220207 220204 -220511 220501 +220026 54 0.0833854 220512 -220513 220208 -220515 220204 -220511 220502 +c Support plate below shutter +220027 54 0.0833854 220000 -220001 220002 -220003 220007 -220004 c Shutter block B4C and Lead in Al casing c closed shutter 220031 5 0.0582256 220400 -220401 220402 -220403 220404 -220405 diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index ae8f09b..1c09e0a 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -430,9 +430,9 @@ c Pre copper collor c ----------- Ouside Bunker -------------- c Wall radii 208100 px 2112.0 -208101 px 2164.0 +208101 px 2162.0 208102 px 2132.0 -208103 px 2135.0 +208103 px 2136.0 208111 px 1662.0 208112 px 1672.0 208113 px 1710.0 @@ -443,7 +443,7 @@ c Wall radii 208122 px 3275.0 c Shielding wall geometry c first section outside -208201 p 1.148348833801549e-07 -1.0000002116649709 0.0 -148.964 +208201 p -0.006981 -0.999976 0.0 -165.3 208202 p 0.03728383845122696 0.9993051509775893 0.0 -60.336 208203 p 0.0 0.0 -1.0 -666.4 208204 pz -200.000 @@ -460,10 +460,33 @@ c B4C concrete/steel interface 208217 p -0.9992962191730594 0.037515297352260946 0.0 -1958.974 208218 pz 105.900 c wall breakthrough -208221 p -1.148348833801549e-07 1.0000002116649709 0.0 32.866 -208222 p 1.148348833801549e-07 -1.0000002116649709 0.0 43.134 +208221 py 50.38 +208222 py -49.62 208223 pz 120.0 208224 p 0.0 0.0 -1.0 50.0 +c New Gemoetry +c SKADI wall +c Sides +208241 p 0.044988 0.998988 0.000000 -48.268 +208242 p -0.120137 -0.992757 0.000000 -80.725 +208243 pz 120.000 +208244 pz 90.000 +208245 p -0.037516 -0.999296 0.000000 0.000 +208246 p -0.120137 -0.992757 0.000000 -140.725 +208247 p 0.044988 0.998988 0.000000 -38.268 +208248 p -0.120137 -0.992757 0.000000 -90.725 +208249 p -0.992757 0.120137 0.000000 -2310.639 +208250 pz -150.000 +208251 pz -200.000 +c Selene Access Cutout +208252 pz 40.000 +208253 p -0.992757 0.120137 0.000000 -1952.246 +208254 p 0.059391 -0.998235 0.000000 286.398 +208255 p 0.120137 0.992757 0.000000 110.725 +208256 p 0.120137 0.992757 0.000000 101.225 +208257 pz -135.000 +208258 p -0.992757 0.120137 0.000000 -1910.746 +208259 p -0.992757 0.120137 0.000000 -2152.246 c Optical Cave Part c Outside 208302 p -0.1201368660871055 -0.9927569472110325 0.0 -80.725 @@ -625,7 +648,7 @@ c Selene 2 Inside Mirrors Ellipses Top-Bottom/Right c Vacuum vessels before S1/S1-S2 208921 21 cx 13.35 208922 21 cx 13.05 -208923 21 cx 16.00 +208923 21 cx 18.25 208931 3 c/x 0 -2 16.0 208932 3 c/x 0 -2 15.0 208933 3 c/x 0 -2 16.5 @@ -824,10 +847,12 @@ c Shutter geometry c outer boundary 220000 22 px -12.5 220001 22 px 12.5 -220002 22 py -31.0 -220003 22 py 31.0 +220002 22 py -34.0 +220003 22 py 34.0 220004 22 pz -17.75 220005 22 pz 123.0 +220006 22 pz -32.75 $ gap below shutter +220007 22 pz -22.75 $ holding plate c inner and outer vacuum flange cylinders 220100 22 cx 13.05 220101 22 cx 13.35 @@ -884,6 +909,12 @@ c shutter rod 220504 22 c/z 2 0 1.5 220505 22 pz 52.5 220506 22 pz 73.1 +c steel blocks around rods +220511 22 pz 25.25 +220512 22 px -8.015 +220513 22 px 8.015 +220514 22 py -32.5 +220515 22 py 32.5 c c UNIVERSES c Selene 1