diff --git a/e2-estia.i b/e2-estia.i index e73a2b2..688a24d 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -197,7 +197,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 283r + 0 284r 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 @@ -208,7 +208,7 @@ fcl:n 0 276r $ in monolith 0 13r -1.0 6r $ NFGA 0 206r -1 $ Glass in Selene 1 0 53r -1 7r $ S1 back plate and mineral cast in universe - 0 203r + 0 204r c c ----------------------------------------------------------- c ------------------------------------------------------- @@ -225,7 +225,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 834r +imp:n,p,h,/,z 1 276r 0 0 1 835r 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_cave.i b/geometry/estia_cave.i index e84bf86..2708b04 100644 --- a/geometry/estia_cave.i +++ b/geometry/estia_cave.i @@ -2,9 +2,9 @@ c Experimental cave c c Sample Position c 209900 19 -8.65 -209002 209003 -209004 $ Cd -209900 2 -7.08 -209002 209003 -209004 $ GGG +c 209900 2 -7.08 -209002 209003 -209004 $ GGG c 209900 115 -1 -209001 $ water -c 209900 4 -1.2E-3 -209001 $ Air +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 diff --git a/geometry/estia_mf.i b/geometry/estia_mf.i index 3fd02ae..719451a 100644 --- a/geometry/estia_mf.i +++ b/geometry/estia_mf.i @@ -22,7 +22,7 @@ c Vacuum Vessel #(230114 -230801) 230111 0 230111 -230112 230113 -230114 -230752 230116 -230754 -230118 - #230200 #230201 #230202 #230203 + #230210 #230211 #230201 #230202 #230203 #230501 #230502 #230503 #230511 #230512 #(230562 -230563 230610 -230609 -230653 230656) @@ -35,12 +35,6 @@ c Vacuum Vessel #(230562 -230563 230626 -230627 230673 -230674) #230701 #230702 c Mask changer -c B4C-Al mask absorber at middle focus -c 230200 22 -2.7 230201 -230202 -230211 -c Cd absorber at middle focus -c 230200 19 -8.65 230201 -230202 -230211 -c Free flight path through wheel -230200 0 230201 -230202 -230211 c Changer wheel 230201 5 0.0582256 230201 -230202 -230203 230211 230212 230213 230214 @@ -49,6 +43,16 @@ c Changer wheel 230225 230226 230227 230228 230202 5 0.0582256 230202 -230231 -230238 230203 5 0.0582256 230231 -230232 230234 -230233 230236 -230235 230237 +c B4C-Al mask absorber at middle focus +c 230210 22 -2.7 230201 -230202 -230211 +c Cd absorber at middle focus +c 230210 19 -8.65 230201 -230202 -230211 +c Free flight path through wheel +c 230210 0 230201 -230202 -230211 +c 230211 0 230200 -230201 -230211 +c Incoherent scatterer 10cm length with B-Al shield around +230210 21 -6.11 230200 -230202 -230229 +230211 22 -2.7 230200 -230202 230229 -230211 c Polarizer c Guide Field plates and frame 230501 54 0.0833854 230503 -230504 230501 -230502 -230505 230506 @@ -72,32 +76,58 @@ c Magnets right/left (230547 -230548): (230549 -230550): (230551 -230552): (230553 -230554): (230555 -230556): (230557 -230558): (230559 -230560)) +c c Mirrors (silicon) +c 230601 90 -2.33 230562 -230563 ((230610 -230609 -230603 230606): +c (230609 -230608 -230602 230605): +c (230608 -230607 -230601 230604)) +c 230604 90 -2.33 230562 -230563 ((230620 -230619 -230613 230616): +c (230619 -230618 -230612 230615): +c (230618 -230617 -230611 230614)) +c 230611 90 -2.33 230562 -230563 230622 -230623 230621 -230624 -230656 +c 230612 90 -2.33 230562 -230563 230626 -230627 230625 -230628 -230666 +c c Mirror coatings +c 230651 89 -5.102 230562 -230563 ((230610 -230609 230603 -230653): +c (230609 -230608 230602 -230652): +c (230608 -230607 230601 -230651)) +c 230654 89 -5.102 230562 -230563 ((230610 -230609 230656 -230606): +c (230609 -230608 230655 -230605): +c (230608 -230607 230654 -230604)) +c 230661 89 -5.102 230562 -230563 ((230620 -230619 230613 -230663): +c (230619 -230618 230612 -230662): +c (230618 -230617 230611 -230661)) +c 230664 89 -5.102 230562 -230563 ((230620 -230619 230666 -230616): +c (230619 -230618 230665 -230615): +c (230618 -230617 230664 -230614)) +c 230671 89 -5.102 230562 -230563 230622 -230623 230671 -230621 -230656 +c 230672 89 -5.102 230562 -230563 230622 -230623 230624 -230672 -230656 +c 230673 89 -5.102 230562 -230563 230626 -230627 230673 -230625 -230666 +c 230674 89 -5.102 230562 -230563 230626 -230627 230628 -230674 -230666 c Mirrors (silicon) -230601 90 -2.33 230562 -230563 ((230610 -230609 -230603 230606): +230601 0 230562 -230563 ((230610 -230609 -230603 230606): (230609 -230608 -230602 230605): (230608 -230607 -230601 230604)) -230604 90 -2.33 230562 -230563 ((230620 -230619 -230613 230616): +230604 0 230562 -230563 ((230620 -230619 -230613 230616): (230619 -230618 -230612 230615): (230618 -230617 -230611 230614)) -230611 90 -2.33 230562 -230563 230622 -230623 230621 -230624 -230656 -230612 90 -2.33 230562 -230563 230626 -230627 230625 -230628 -230666 +230611 0 230562 -230563 230622 -230623 230621 -230624 -230656 +230612 0 230562 -230563 230626 -230627 230625 -230628 -230666 c Mirror coatings -230651 89 -5.102 230562 -230563 ((230610 -230609 230603 -230653): +230651 0 230562 -230563 ((230610 -230609 230603 -230653): (230609 -230608 230602 -230652): (230608 -230607 230601 -230651)) -230654 89 -5.102 230562 -230563 ((230610 -230609 230656 -230606): +230654 0 230562 -230563 ((230610 -230609 230656 -230606): (230609 -230608 230655 -230605): (230608 -230607 230654 -230604)) -230661 89 -5.102 230562 -230563 ((230620 -230619 230613 -230663): +230661 0 230562 -230563 ((230620 -230619 230613 -230663): (230619 -230618 230612 -230662): (230618 -230617 230611 -230661)) -230664 89 -5.102 230562 -230563 ((230620 -230619 230666 -230616): +230664 0 230562 -230563 ((230620 -230619 230666 -230616): (230619 -230618 230665 -230615): (230618 -230617 230664 -230614)) -230671 89 -5.102 230562 -230563 230622 -230623 230671 -230621 -230656 -230672 89 -5.102 230562 -230563 230622 -230623 230624 -230672 -230656 -230673 89 -5.102 230562 -230563 230626 -230627 230673 -230625 -230666 -230674 89 -5.102 230562 -230563 230626 -230627 230628 -230674 -230666 +230671 0 230562 -230563 230622 -230623 230671 -230621 -230656 +230672 0 230562 -230563 230622 -230623 230624 -230672 -230656 +230673 0 230562 -230563 230626 -230627 230673 -230625 -230666 +230674 0 230562 -230563 230626 -230627 230628 -230674 -230666 c Absorber plates 230701 22 -2.7 230701 -230702 230704 -230703 230705 -230706 #(230707 -230708 230710 -230709) diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index 199f450..9d259a8 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -1156,6 +1156,7 @@ c Vacuum Vessel Inside 230118 13 p 0.258819 -0.965926 0.000000 39.403 c Changer Wheel c Changer Wheel +230200 13 px -8.800 230201 13 px -0.800 230202 13 px 1.200 230203 13 c/x 0.000 -14.000 20.000 @@ -1175,6 +1176,7 @@ c Changer Wheel 230226 13 c/x -23.097 -23.567 7.500 230227 13 c/x -23.097 -4.433 7.500 230228 13 c/x -9.567 9.097 7.500 +230229 13 c/x 0.000 0.000 3.500 c Rotation Stage 230231 13 px 4.818 230232 13 px 11.283