diff --git a/e2-estia.i b/e2-estia.i index 235a2a3..e7a0172 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -75,7 +75,7 @@ TR13 2314.8848 -2.1342 -14.3991 1 0 0 0 1 0 0 0 1 1 c Parallel to c-axis but horizontal and centered at VS TR14 1114.9743 -2.1342 0.261 1 0 0 0 1 0 0 0 1 1 c Parallel to c-axis but horizontal and centered at sample -TR15 3514.7959 -2.13570 -29.06 1 0 0 0 1 0 0 0 1 1 +TR15 3514.7952 -2.1342 -29.0595 1 0 0 0 1 0 0 0 1 1 c Flange axis for Selene 1 TR21 1334.9578 0.36581 -2.4264 0.99992537 0 -0.012217 0 1 0 @@ -189,7 +189,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 160r + 0 230r 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 @@ -200,7 +200,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 80r + 0 150r c c ----------------------------------------------------------- c ------------------------------------------------------- @@ -217,14 +217,14 @@ 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 711r +imp:n,p,h,/,z 1 276r 0 0 1 781r 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 348r $ zero for above +c imp:n,p,h,/,z 1 276r 0 0 1 323r 0 1 0 1 34r 0 1 414r $ zero for above c void 100268 201255 204001 204002 204003 204004 204005 c 204013 204055 204101 204102 204103 204201 $ void cells downstream of BBG c imp:n,p,h,/,z 1 276r 0 0 1 224r 0 1 97r 0 1 64r 0 4r -c 1 6r 0 1 11r 0 1 8r 0 2r 1 4r 0 1 277r $ zero for above +c 1 6r 0 1 11r 0 1 8r 0 2r 1 4r 0 1 343r $ zero for above c cut:h,/,z 1e+08 1e-3 phys:n 3000 0 @@ -259,7 +259,7 @@ 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_source_vs.i echo -c read file=sources/mcstas_source_sample.i echo +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 diff --git a/geometry/ess_outside_cells.i b/geometry/ess_outside_cells.i index fc7c3f4..8d124ff 100644 --- a/geometry/ess_outside_cells.i +++ b/geometry/ess_outside_cells.i @@ -6,9 +6,9 @@ c Main ESS plant geometry without the instrument (-100153 : 100154 : 100159) -100001 (-100062 : 100064 : 100063) (-100003 : -100103 : -100070 : -100064 : 100105 : 100104 : 100072) (-100121 : -100065 : -100063 : 100122 : 100101 : 100124) - #(208709 208720 100112 -100104 208703 208701) #(-100104 100112 - 100072 208710 208209 208203) #(100104 208708 208707 208710 208703 - 208701) #(100104 208101 208720 208721 208703 208203) #(100068 + #(208709 -210118 100112 -100104 208703 208701) #(-100104 100112 + 100072 -210118 208209 208203) #(100104 208708 208707 -210118 208703 + 208701) #(100104 208101 -210118 208721 208703 208203) #(100068 -100072 208209 -100070 -100104 -100002) 100042 54 0.0833854 100062 -100063 -100064 fill=5 ( 0 0 0 diff --git a/geometry/estia_cave.i b/geometry/estia_cave.i index 5f15b13..7f027a7 100644 --- a/geometry/estia_cave.i +++ b/geometry/estia_cave.i @@ -1,42 +1,166 @@ c Experimental cave -c First largest area: up-stream/down-stream/roof/floor/walls -c then cut corner and add extended roof -208701 4 -1.2E-3 ((-208809 -208810 -208801 -208803 -208806 -208807 - -208808 -208809 -208810 (-208806 : -208815)) :(-208809 -208810 - -208802 -208803 -208811 -208812) :(-208311 208312 208709 208809 - -208313 -208803) :(-208801 -208803 -208809 208815 208312 208806) - :(-208312 -208302 208809 208709 -208701 -208313)) 100003 #(208621 - 208622 208623 208624 208626) #206111 #208501 #208511 #209001 - #(-208626 208642 -208931) -208702 4 -1.2e-3 100104 208101 208721 208703 208203 -208708 -208703 4 -1.2e-3 -208707 208710 208721 208703 208203 208708 -208704 4 -1.2e-3 100104 -208710 208720 208721 208703 208203 -c floor -208711 50 0.074981 208703 208803 208707 208708 208709 (208706:(208805 - -208302)) 208710 -c walls -208712 50 0.074981 -208803 -208801 208709 -208705 -208312 -208302 -208713 50 0.074981 -208803 -208801 -208302 208806 208705 208805 -208714 50 0.074981 -208803 -208801 -208805 -208810 208806 208706 -208715 50 0.074981 -208803 -208801 208706 208707 208810 208710 -208716 50 0.074981 -208803 -208801 -208810 208707 208807 -208808 -208717 50 0.074981 -208803 -208801 208707 208808 208708 208709 -208718 50 0.074981 -208803 -208801 208311 208809 208709 -208808 -c ceiling -208719 50 0.074981 208801 208701 208710 208707 (208706:(208805 -208302)) - 208708 208709 #(208712 208710 208711) #(-208311 208809 208312) -208720 50 0.074981 208801 208702 208709 208712 208711 208710 #(-208810 - -208812 -208811 -208802) #(-208311 208809 208312) -208721 50 0.074981 208313 208702 208709 208809 208711 208712 -c sample position -c 209001 19 -8.65 -209002 209003 -209004 -209001 0 -209001 -c 209001 4 -1.2E-3 -209001 -c area around cave -209900 4 -1.2E-3 208709 208710 -100104 (-208708:-208707) 208703 208203 -209901 4 -1.2E-3 208709 208710 100112 (208302:-208805) 208703 208701 - -208706 -209902 4 -1.2E-3 208720 -208710 100112 -100104 208703 208701 +c +c Sample Position +c 209900 19 -8.65 -209002 209003 -209004 $ Cd +c 209900 2 -7.08 -209002 209003 -209004 $ GGG +209900 115 -1 -209001 $ water +c 209900 4 -1.2E-3 -209001 $ Air +c New experimental cave design concept, separate concrete elements +c wall stones, starting on Skadi side upstream +210000 50 0.074981 100059 -210102 210132 -210133 210113 -210114 +210001 50 0.074981 100059 -210102 -210131 -210132 + ((210113 -210361):-210301) +210002 50 0.074981 100059 -210102 -210131 -210132 + ((210361 210302 -210362):-210303) +210003 50 0.074981 100059 -210102 -210131 -210132 + ((210362 210304 -210363):-210305) +210004 50 0.074981 100059 -210102 -210131 -210132 + ((210363 210306 -210364):-210307) +210005 50 0.074981 100059 -210102 -210131 -210132 + ((210364 210308 -210365):-210309) +210006 50 0.074981 100059 -210102 -210131 -210132 + ((210365 210310 -210366):-210311) +210007 50 0.074981 100059 -210102 -210131 -210132 + (210366 210312 -210116) +c back side wall +210107 50 0.074981 100059 -210102 210115 -210116 + ((210132 -210367):(210367 -210313)) +210108 50 0.074981 100059 -210102 210115 -210116 + ((210367 210314 -210368):-210315) +210109 50 0.074981 100059 -210102 210115 -210116 + ((210368 210316 -210369):-210317) +210110 50 0.074981 100059 -210102 210115 -210116 + ((210369 210318 -210370):-210319) +210111 50 0.074981 100059 -210102 210115 -210116 + ((210370 210320 -210371):-210321) +210112 50 0.074981 100059 -210102 210117 -210118 + ((210137 210323 -210372):-210322) +210113 50 0.074981 100059 -210102 210117 -210118 + ((210372 210325 -210373):-210324) +210114 50 0.074981 100059 -210102 210117 -210118 + ((210373 210327 -210374):-210326) +210115 50 0.074981 100059 -210102 210117 -210118 + ((210374:-210328) -210134) +c E01 side wall +210215 50 0.074981 100059 -210102 210135 -210134 + -210117 210375 210329 +210216 50 0.074981 100059 -210102 210135 -210134 + ((-210375 210331 210376):-210330) +210217 50 0.074981 100059 -210102 210135 -210134 + ((-210376 210333 210377):-210332) +210218 50 0.074981 100059 -210102 210135 -210134 + ((-210377 210335 210378):-210334) +210219 50 0.074981 100059 -210102 210135 -210134 + ((-210378 210337 210379):-210336) +210220 50 0.074981 100059 -210102 210135 -210134 + ((-210379 210339 210380):-210338) +210221 50 0.074981 100059 -210102 210135 -210134 + ((-210380 210341 210381):-210340) +210222 50 0.074981 100059 -210102 210135 -210134 + ((-210381 210343 210382):-210342) +210223 50 0.074981 100059 -210102 210135 -210134 + ((-210382 -210121 210383):-210344) +c angled side +210323 50 0.074981 100059 -210102 -210122 -210121 + 210383 210345 -210135 +210324 50 0.074981 100059 -210102 -210122 -210121 + ((-210383 210347 210384):-210346) +210325 50 0.074981 100059 -210102 -210122 -210121 + ((-210384 210111):-210348) +c upstream wall piece +210425 50 0.074981 100059 -210102 210111 -210112 + 210349 210122 210385 +210426 50 0.074981 100059 -210102 210111 -210112 + ((-210385 210351 210386):-210350) +210427 50 0.074981 100059 -210102 210111 -210112 + ((-210386:-210352) 210138) +c gaps between wall elements +210501 4 -1.2e-3 100059 -210102 -210131 -210132 210301 -210302 210361 +210502 4 -1.2e-3 100059 -210102 -210131 -210132 210303 -210304 210362 +210503 4 -1.2e-3 100059 -210102 -210131 -210132 210305 -210306 210363 +210504 4 -1.2e-3 100059 -210102 -210131 -210132 210307 -210308 210364 +210505 4 -1.2e-3 100059 -210102 -210131 -210132 210309 -210310 210365 +210506 4 -1.2e-3 100059 -210102 -210131 -210132 210311 -210312 210366 +210507 4 -1.2e-3 100059 -210102 210115 -210116 210313 -210314 210367 +210508 4 -1.2e-3 100059 -210102 210115 -210116 210315 -210316 210368 +210509 4 -1.2e-3 100059 -210102 210115 -210116 210317 -210318 210369 +210510 4 -1.2e-3 100059 -210102 210115 -210116 210319 -210320 210370 +210511 4 -1.2e-3 100059 -210102 210117 -210118 -210323 210324 -210372 +210512 4 -1.2e-3 100059 -210102 210117 -210118 -210325 210326 -210373 +210513 4 -1.2e-3 100059 -210102 210117 -210118 -210327 210328 -210374 +210514 4 -1.2e-3 100059 -210102 210135 -210134 -210329 210330 210375 +210515 4 -1.2e-3 100059 -210102 210135 -210134 -210331 210332 210376 +210516 4 -1.2e-3 100059 -210102 210135 -210134 -210333 210334 210377 +210517 4 -1.2e-3 100059 -210102 210135 -210134 -210335 210336 210378 +210518 4 -1.2e-3 100059 -210102 210135 -210134 -210337 210338 210379 +210519 4 -1.2e-3 100059 -210102 210135 -210134 -210339 210340 210380 +210520 4 -1.2e-3 100059 -210102 210135 -210134 -210341 210342 210381 +210521 4 -1.2e-3 100059 -210102 210135 -210134 -210343 210344 210382 +210522 4 -1.2e-3 100059 -210102 -210122 -210121 -210345 210346 210383 +210523 4 -1.2e-3 100059 -210102 -210122 -210121 -210347 210348 210384 +210524 4 -1.2e-3 100059 -210102 210111 -210112 -210349 210350 210385 +210525 4 -1.2e-3 100059 -210102 210111 -210112 -210351 210352 210386 +c wall level air +210531 4 -1.2e-3 100059 -210103 208709 -210118 100112 208302 +210532 4 -1.2e-3 100059 -210103 210500 -210118 -208302 210131 +210533 4 -1.2e-3 100059 -210102 208709 -210500 208312 210131 +210534 4 -1.2e-3 100059 -210103 210116 -210118 -210131 -210137 210322 +210535 4 -1.2e-3 100059 -210103 208709 -210118 (210121:210134) 208721 +210536 4 -1.2e-3 100059 -210102 -208642 -210115 210132 -210135 + #209900 #210609 +210537 4 -1.2e-3 100059 -210102 210115 -210117 210137 -210135 + #(210115 -210116 -210371) 210321 +210538 4 -1.2e-3 100059 -210102 208709 208642 -210131 210122 -210135 + #(210138 -210112) #210000 #(210113 -210132) 208931 + #(208621 208622 208623 208624 208626) #210608 +c opening for hatch +210541 4 -1.2e-3 210102 -210103 210119 -210120 210140 -210141 +c air above cave +210550 4 -1.2e-3 210103 208203 208709 -210118 100112 208721 + #210611 #210612 #210613 #210621 +c gaps between ceiling elements +210561 4 -1.2e-3 210201 -210202 -210131 -210134 210205 -210204 +210562 4 -1.2e-3 210201 -210202 -210131 -210134 210208 -210207 +210563 4 -1.2e-3 210201 -210202 -210131 -210134 210212 -210211 +210564 4 -1.2e-3 210201 -210202 -210131 -210134 210216 -210215 +210565 4 -1.2e-3 210201 -210202 -210131 -210134 210219 -210220 210137 +c ceiling stones from upstream to downstream +210600 4 -1.2e-3 210102 -210103 -208302 210131 208709 -210500 +210601 50 0.074981 210102 -210103 -210131 -210134 -210121 + 210111 -210204 #( 210201 210203) +210602 50 0.074981 210102 -210103 -210131 -210134 + 210205 -210207 #(-210202 -210206) #(-210202 210208) + #(210119 -210120 210140 -210141) +210603 50 0.074981 210102 -210103 -210131 -210134 + 210210 -210211 #( 210201 -210209) #(-210202 210212) +210604 50 0.074981 210102 -210103 -210131 -210134 + 210214 -210215 #( 210201 -210213) #(-210202 210216) +210605 50 0.074981 210102 -210103 -210131 -210134 + 210218 -210116 #( 210201 -210217) + #(-210202 210219 210137) #(210220 210137) +210606 50 0.074981 210102 -210103 210137 -210134 + 210221 -210118 #( 210201 -210222) +210607 50 0.074981 210102 -210103 -210137 -210118 -210322 +210608 50 0.074981 210127 -210102 210132 -210135 + 210125 -210119 +210609 50 0.074981 210127 -210102 210132 -210135 + 210120 -210126 +c Access hatch items +210611 54 0.0833854 ((210103 -210104 210105 -210106 210139 -210140): + (210446 -210104 210447 -210448 210444 -210139)) + #(210443 -210140 210445 -210415 210441 -210442) + #(210443 -210139 210445 -210415) +210612 54 0.0833854 210103 -210104 210105 -210106 210140 -210414 + #(-210415 210411 -210412 -210413) +210613 54 0.0833854 210103 -210131 ((-210421 -210424 210411 -210412): + (-210422 -210425 210411 -210412): + (-210423 -210426)) + #(210105 -210106 210139 -210414) +210621 17 -1.36 210103 -210415 210411 -210412 210140 -210413 + #(210431 -210432 210433 -210434 -210435) + #(-210433 210445 -210415 210441 -210442) +c +c c visualize ESS 2m source term (comment for real runs) c 250000 0 -250000 c visualize Selene gamma sources (comment for real runs) diff --git a/geometry/estia_guides.i b/geometry/estia_guides.i index c047b19..f4f8f03 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -96,7 +96,7 @@ c ---- Outside of Bunker c -- Shielding Walls -- c concrete floor 208001 49 0.074981 ((100068 -100072 208209 -100070 -100104 -100002) - :(100072 208710 208707 100112 208209 (-208304:(-208305 -100610 + :(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 @@ -235,14 +235,17 @@ 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) - :(-208701 208203 208710 208709 208708 208707 -208302)) #(100101 +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 -208709 208302) :(208202 208302 - 208101 -208709) :(-208701 208203 208710 208709 208302 100112)) - 100072 100003 208203 208204 #(-208305 -100610) #100709 +208602 4 -1.2E-3 ((100112 -208202 208302) :(208202 208302 + 208101) ) + 100072 100003 208203 208204 -208709 #(-208305 -100610) #100709 c Tube after Selene 2 with sapphire window 208611 0 208636 208641 -208932 208612 5 0.0582256 -208626 208642 -208931 208932 208613 1 -3.98 -208641 208642 -208932 +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 diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index 797aed9..05f2988 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -563,8 +563,8 @@ c Inside 208635 p -0.9999255812308303 4.313335712491373e-07 0.012217 -2546.888 208636 p 0.9999255812308303 -4.313335712491373e-07 -0.012217 3295.888 c Tube after Selene 2 Vacuum Tank -208641 p -0.9999255812308303 4.313335712491373e-07 0.012217 -3497.388 -208642 p -0.9999255812308303 4.313335712491373e-07 0.012217 -3497.888 +208641 p -0.9999255812308303 4.313335712491373e-07 0.012217 -3472.388 +208642 p -0.9999255812308303 4.313335712491373e-07 0.012217 -3472.888 c Experimental Cave c Outside 208701 p 0.0 0.0 -1.0 -87.94 @@ -574,14 +574,14 @@ c Outside 208706 p 0.12186941877059759 0.9925460984526193 0.0 196.513 208707 p 1.148348833801549e-07 -1.0000002116649709 0.0 -677.866 208708 p 0.7277086534162994 -0.6858867977764525 0.0 1924.017 -208709 p 1.0000002116649709 1.148348833801549e-07 0.0 3019.795 +208709 px 3019.795 $ end of old cave structure 208710 p -1.0000002116649709 -1.148348833801549e-07 0.0 -4364.795 208711 p -1.148348833801549e-07 1.0000002116649709 0.0 -102.134 208712 p 1.148348833801549e-07 -1.0000002116649709 0.0 -77.866 208720 p -1.0000002116649709 -1.148348833801549e-07 0.0 -4464.795 208721 p 1.148348833801549e-07 -1.0000002116649709 0.0 -777.866 c Inside -208801 pz 57.941 +208801 pz 47.941 208802 pz 108.941 208803 p 0.0 0.0 -1.0 166.96 208804 p 1.148348833801549e-07 -1.0000002116649709 0.0 102.134 @@ -632,11 +632,193 @@ c Vacuum vessels before S1/S1-S2 208941 13 px -30.0 208942 13 px 50.0 c Sphere/disk at sample position to simulate gamma generation -209001 s 3912.9007920881677 -2.7186900870424324 -30.0 1.0 +209001 s 3514.7952 -2.1342 -29.0595 2.0 +209002 c/x -2.1342 -29.0595 5.0 +209003 px 3514.7452 +209004 px 3514.8452 c Sphere/disk at MF position to simulate gamma generation from mask 209012 13 cx 5.0 209013 13 px -0.05 209014 13 px 0.05 +c Experimental Cave +c Envelope +210101 pz -200.000 +210102 pz 110.001 +210103 pz 145.001 +210104 pz 275.001 +210105 px 3367.796 +210106 px 3679.796 +c +210111 px 3019.795 +210112 px 3069.795 +210113 px 3347.202 +210114 px 3402.434 +210115 px 4319.795 +210116 px 4369.795 +210117 px 4564.718 +210118 px 4614.718 +210119 px 3433.795 +210120 px 3613.795 +c +210121 p -0.707107 0.707107 0.000000 -1853.341 +210122 p 0.707107 -0.707107 0.000000 1903.341 +c bottom extension for roof stability +210125 px 3339.795 +210126 px 3713.795 +210127 pz 90.001 +c +210131 p -0.121869 -0.992546 0.000000 -192.935 +210132 p 0.121869 0.992546 0.000000 242.935 +210133 p 0.121869 0.992546 0.000000 272.934 +210134 py 678.381 +210135 py 628.381 +210136 py 398.222 +210137 py 192.381 +210138 py 77.840 +210139 py -116.619 +210140 py -101.619 +210141 py 98.381 +c +c Details Ceilinig Chicanes +210201 pz 127.001 +210202 pz 128.001 +210203 px 3383.795 +210204 px 3389.795 +210205 px 3383.795 +210206 px 3389.795 +210207 px 3663.795 +210208 px 3657.795 +210209 px 3663.795 +210210 px 3657.795 +210211 px 3898.795 +210212 px 3892.795 +210213 px 3898.795 +210214 px 3892.795 +210215 px 4133.795 +210216 px 4127.795 +210217 px 4133.795 +210218 px 4127.795 +210219 px 4338.795 +210220 px 4344.795 +210221 px 4338.795 +210222 px 4344.795 +c Details Wall Circles +210301 c/z 3468.409 -206.296 38.000 +210302 c/z 3468.409 -206.296 40.000 +210303 c/z 3619.276 -224.820 38.000 +210304 c/z 3619.276 -224.820 40.000 +210305 c/z 3770.143 -243.344 38.000 +210306 c/z 3770.143 -243.344 40.000 +210307 c/z 3921.010 -261.869 38.000 +210308 c/z 3921.010 -261.869 40.000 +210309 c/z 4071.877 -280.393 38.000 +210310 c/z 4071.877 -280.393 40.000 +210311 c/z 4222.744 -298.917 38.000 +210312 c/z 4222.744 -298.917 40.000 +210313 c/z 4344.795 -250.778 38.000 +210314 c/z 4344.795 -250.778 40.000 +210315 c/z 4344.795 -98.778 38.000 +210316 c/z 4344.795 -98.778 40.000 +210317 c/z 4344.795 53.222 38.000 +210318 c/z 4344.795 53.222 40.000 +210319 c/z 4344.795 205.222 38.000 +210320 c/z 4344.795 205.222 40.000 +210321 c/z 4324.795 353.222 45.000 +210322 c/z 4609.718 192.381 45.000 +210323 c/z 4589.718 340.381 40.000 +210324 c/z 4589.718 340.381 38.000 +210325 c/z 4589.718 492.381 40.000 +210326 c/z 4589.718 492.381 38.000 +210327 c/z 4589.718 644.381 40.000 +210328 c/z 4589.718 644.381 38.000 +210329 c/z 4455.493 653.381 40.000 +210330 c/z 4455.493 653.381 38.000 +210331 c/z 4303.493 653.381 40.000 +210332 c/z 4303.493 653.381 38.000 +210333 c/z 4151.493 653.381 40.000 +210334 c/z 4151.493 653.381 38.000 +210335 c/z 3999.493 653.381 40.000 +210336 c/z 3999.493 653.381 38.000 +210337 c/z 3847.493 653.381 40.000 +210338 c/z 3847.493 653.381 38.000 +210339 c/z 3695.493 653.381 40.000 +210340 c/z 3695.493 653.381 38.000 +210341 c/z 3543.493 653.381 40.000 +210342 c/z 3543.493 653.381 38.000 +210343 c/z 3391.493 653.381 40.000 +210344 c/z 3391.493 653.381 38.000 +210345 c/z 3209.643 553.268 40.000 +210346 c/z 3209.643 553.268 38.000 +210347 c/z 3102.592 446.217 40.000 +210348 c/z 3102.592 446.217 38.000 +210349 c/z 3044.795 246.840 40.000 +210350 c/z 3044.795 246.840 38.000 +210351 c/z 3044.795 94.840 40.000 +210352 c/z 3044.795 94.840 38.000 +c Cyllinder Limiting Planes +210361 px 3468.409 +210362 px 3619.276 +210363 px 3770.143 +210364 px 3921.010 +210365 px 4071.877 +210366 px 4222.744 +210367 py -250.778 +210368 py -98.778 +210369 py 53.222 +210370 py 205.222 +210371 py 353.222 +210372 py 340.381 +210373 py 492.381 +210374 py 644.381 +210375 px 4455.493 +210376 px 4303.493 +210377 px 4151.493 +210378 px 3999.493 +210379 px 3847.493 +210380 px 3695.493 +210381 px 3543.493 +210382 px 3391.493 +210383 px 3209.643 +210384 px 3102.592 +210385 py 246.840 +210386 py 94.840 +c +c Crane Cutout +210401 px 3973.295 +210402 px 4053.295 +210403 c/z 4013.295 -177.819 40.000 +c +c Hatch Steel Door +210411 px 3382.796 +210412 px 3664.796 +210413 py 108.381 +210414 py 123.381 +210415 pz 265.001 +c Central Plate - cylindrical form +210421 pz 157.001 +210422 pz 153.001 +210423 pz 149.001 +210424 c/z 3514.7952 -2.1342 165.0 +210425 c/z 3514.7952 -2.1342 230.0 +210426 c/z 3514.7952 -2.1342 360.0 +c Hatch MirroBor layer (2mm) +210431 px 3382.996 +210432 px 3664.596 +210433 py -101.419 +210434 py 108.181 +210435 pz 264.801 +c Hatch SEE Chicane +210441 px 3498.796 +210442 px 3548.796 +210443 py -141.619 +210444 py -151.619 +210445 pz 235.001 +210446 pz 225.001 +210447 px 3478.796 +210448 px 3568.796 +c +c Shared Wall +210500 px 3629.979 c UNIVERSES c Selene 1 c Chopper Pit final design geometry diff --git a/geometry/materials.i b/geometry/materials.i index 09bc32c..06f1cd4 100644 --- a/geometry/materials.i +++ b/geometry/materials.i @@ -121,6 +121,10 @@ c B4C sintered (2.3 g/cc) m20 5010 -0.1841 5011 -0.74345 8016 -0.07245 mx20:h j model j c +c Vanadium density=6.11 g/cm3 +m21 23050 -0.0025 23051 -0.9975 +mx21:h model model +c c self-extinquishing HDPE w/ 1% Boron -1.70 g/cm3 c element values from shieldwerx product SWX-207HD m31 1001 -0.0601 5010 -0.0016856 5011 -0.0069144 6000 -0.9313 @@ -151,6 +155,16 @@ m50 1001 0.00776555 1002 1.16501e-06 8016 0.0438499 mt50 lwtr.10t mx50:h 3j model 1r j j model 2r 3j model 2r c +c Material : Concrete rho=0.075731 added 1.0% Boron +m51 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 + 5010 1.49998e-4 5011 5.998478e-04 +mt51 lwtr.10t +mx51:h 3j model 1r j j model 2r 3j model 2r +c c Material : CastIron rho=0.0833854 m54 6000 0.00636 14028 0.0051404 25055 0.000386 26054 0.00419 26056 0.065789 26057 0.00152 diff --git a/pcave.com b/pcave.com index 40e3640..25e7712 100644 --- a/pcave.com +++ b/pcave.com @@ -1,4 +1,4 @@ -origin 3500 0 -29.06 & +origin 3700 0 -29.06 & basis 1 0 0 0 1 0 & label 0 0 & extent 1000 1000 & diff --git a/plot b/plot index 4f19a5a..b5aa85c 100755 --- a/plot +++ b/plot @@ -3,13 +3,13 @@ PLOT_NAME=`git describe --tags --long` # if the first argument is an runtpe file, use different plot command if [[ $1 == runs/* ]]; then - /home/ll_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6 p runtpe=$1 \ + /home/l_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6 p runtpe=$1 \ outp=tmp/plota.out comout=tmp/plota.com \ wwout=tmp/plota.wwg wwone=tmp/plota.wwo \ wwinp=weight_windows/current.wwg \ plotm=results/e2-estia_$PLOT_NAME ${@:2} else - /home/ll_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6 ip inp=e2-estia.i \ + /home/l_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6 ip inp=e2-estia.i \ outp=tmp/plota.out comout=tmp/plota.com \ wwout=tmp/plota.wwg wwone=tmp/plota.wwo \ mctal=tmp/plota.mct mdata=tmp/plota.mdt \ diff --git a/sbatch.tsh b/sbatch.tsh index 84e2fdc..2a3a97c 100644 --- a/sbatch.tsh +++ b/sbatch.tsh @@ -1,13 +1,13 @@ #!/usr/bin/env tcsh #SBATCH -J mcnpEstia -#SBATCH -N 2 +#SBATCH -N 7 #SBATCH --ntasks-per-node=24 #SBATCH --time=7-00:00:00 #SBATCH --mail-type=fail #SBATCH --mail-user=artur.glavic@psi.ch #SBATCH -o tmp/stdout.log #SBATCH -e tmp/stderr.log -#SBATCH --partition=ll_verylong +#SBATCH --partition=long setenv CURRENT_VERSION $1 #"`/usr/bin/git describe --tags --long`" @@ -19,7 +19,7 @@ echo "Running on $SLURM_NPROCS processors." echo "Current working directory is `pwd`" echo "Estia GIT revision is $CURRENT_VERSION" -mpirun -np $SLURM_NPROCS /home/ll_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6.mpi \ +mpirun -np $SLURM_NPROCS /home/l_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6.mpi \ inp=e2-estia.i outp=results/e2-estia_$CURRENT_VERSION.out \ runtpe=runs/e2-estia_$CURRENT_VERSION.run \ mctal=results/e2-estia_$CURRENT_VERSION.mct \ diff --git a/tallies/full_mesh.i b/tallies/full_mesh.i index eefeacc..1ed8538 100644 --- a/tallies/full_mesh.i +++ b/tallies/full_mesh.i @@ -1,7 +1,7 @@ c large and detailed mesh tally covering the beamline from monolith to full cave tmesh rmesh11:n dose 1 - cora11 1300 159i 4500 + cora11 1460 158i 4640 corb11 -400 59i 800 corc11 -200 39i 600 c Official ESS dose conversion factors from n/cm²/s to Sv/h diff --git a/tallies/full_mesh_np.i b/tallies/full_mesh_np.i index 7b6b937..07a5e79 100644 --- a/tallies/full_mesh_np.i +++ b/tallies/full_mesh_np.i @@ -5,7 +5,7 @@ tmesh corb1 -700 11i -100 9i 100 3i 300 corc1 -200 1i -100 9i 100 5i 400 rmesh11:n dose 1 - cora11 1460 151i 4500 + cora11 1460 158i 4640 corb11 -400 59i 800 corc11 -200 39i 600 c Official ESS dose conversion factors from n/cm²/s to Sv/h @@ -51,7 +51,7 @@ c corb21 -700 11i -100 9i 100 3i 300 corc21 -200 1i -100 9i 100 5i 400 rmesh31:p dose 2 - cora31 1460 151i 4500 + cora31 1460 158i 4640 corb31 -400 59i 800 corc31 -200 39i 600 c Official ESS dose conversion factors from gamma/cm²/s to Sv/h diff --git a/tallies/full_mesh_p.i b/tallies/full_mesh_p.i index 3d091c4..7cd97c6 100644 --- a/tallies/full_mesh_p.i +++ b/tallies/full_mesh_p.i @@ -1,7 +1,7 @@ c large and detailed mesh tally covering the beamline from monolith to full cave tmesh rmesh11:p dose 1 - cora11 1300 159i 4500 + cora11 1460 158i 4640 corb11 -400 59i 800 corc11 -200 39i 600 c Official ESS dose conversion factors from gamma/cm²/s to Sv/h