diff --git a/geometry/estia_mf.i b/geometry/estia_mf.i index 719451a..d6ec87d 100644 --- a/geometry/estia_mf.i +++ b/geometry/estia_mf.i @@ -48,11 +48,11 @@ 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 +230210 0 230201 -230202 -230211 +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 230210 21 -6.11 230200 -230202 -230229 +c 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 @@ -77,57 +77,57 @@ c Magnets right/left (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 0 230562 -230563 ((230610 -230609 -230603 230606): +230601 90 -2.33 230562 -230563 ((230610 -230609 -230603 230606): (230609 -230608 -230602 230605): (230608 -230607 -230601 230604)) -230604 0 230562 -230563 ((230620 -230619 -230613 230616): +230604 90 -2.33 230562 -230563 ((230620 -230619 -230613 230616): (230619 -230618 -230612 230615): (230618 -230617 -230611 230614)) -230611 0 230562 -230563 230622 -230623 230621 -230624 -230656 -230612 0 230562 -230563 230626 -230627 230625 -230628 -230666 -c Mirror coatings -230651 0 230562 -230563 ((230610 -230609 230603 -230653): +230611 90 -2.33 230562 -230563 230622 -230623 230621 -230624 -230656 +230612 90 -2.33 230562 -230563 230626 -230627 230625 -230628 -230666 +c c Mirror coatings +230651 89 -5.102 230562 -230563 ((230610 -230609 230603 -230653): (230609 -230608 230602 -230652): (230608 -230607 230601 -230651)) -230654 0 230562 -230563 ((230610 -230609 230656 -230606): +230654 89 -5.102 230562 -230563 ((230610 -230609 230656 -230606): (230609 -230608 230655 -230605): (230608 -230607 230654 -230604)) -230661 0 230562 -230563 ((230620 -230619 230613 -230663): +230661 89 -5.102 230562 -230563 ((230620 -230619 230613 -230663): (230619 -230618 230612 -230662): (230618 -230617 230611 -230661)) -230664 0 230562 -230563 ((230620 -230619 230666 -230616): +230664 89 -5.102 230562 -230563 ((230620 -230619 230666 -230616): (230619 -230618 230665 -230615): (230618 -230617 230664 -230614)) -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 +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 +c Mirrors (silicon) +c 230601 0 230562 -230563 ((230610 -230609 -230603 230606): +c (230609 -230608 -230602 230605): +c (230608 -230607 -230601 230604)) +c 230604 0 230562 -230563 ((230620 -230619 -230613 230616): +c (230619 -230618 -230612 230615): +c (230618 -230617 -230611 230614)) +c 230611 0 230562 -230563 230622 -230623 230621 -230624 -230656 +c 230612 0 230562 -230563 230626 -230627 230625 -230628 -230666 +c Mirror coatings +c 230651 0 230562 -230563 ((230610 -230609 230603 -230653): +c (230609 -230608 230602 -230652): +c (230608 -230607 230601 -230651)) +c 230654 0 230562 -230563 ((230610 -230609 230656 -230606): +c (230609 -230608 230655 -230605): +c (230608 -230607 230654 -230604)) +c 230661 0 230562 -230563 ((230620 -230619 230613 -230663): +c (230619 -230618 230612 -230662): +c (230618 -230617 230611 -230661)) +c 230664 0 230562 -230563 ((230620 -230619 230666 -230616): +c (230619 -230618 230665 -230615): +c (230618 -230617 230664 -230614)) +c 230671 0 230562 -230563 230622 -230623 230671 -230621 -230656 +c 230672 0 230562 -230563 230622 -230623 230624 -230672 -230656 +c 230673 0 230562 -230563 230626 -230627 230673 -230625 -230666 +c 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/pexport.com b/pexport.com index 05e6381..af9552f 100644 --- a/pexport.com +++ b/pexport.com @@ -61,4 +61,5 @@ origin 2300 0 0 basis 0 1 0 0 0 1 extent 600 origin 2900 0 0 basis 0 1 0 0 0 1 extent 600 origin 3500 0 0 basis 0 1 0 0 0 1 extent 800 origin 3050 0 0 basis 1 0 0 0 0 1 extent 1600 +origin 3050 330 0 basis 1 0 0 0 0 1 extent 1600 end diff --git a/results/baseline_v10_runs.txt b/results/baseline_v10_runs.txt deleted file mode 100755 index b296fd2..0000000 --- a/results/baseline_v10_runs.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Tallies : -1 - bunker neutron -11 - outside neutron -21 - bunker gamma -31 - outside gamma - -# run source comments -0-g386ffc6 rssa.i Fast neutrons from surface source in bunker wall (shutter closed) -1-g742ac83 mcstas_gammas.i Selene 1 gammas from McStas -2-g796a7a3 mcstas_source_shutter.i Neutron flux from McStas started before shutter -3-gf1fc7c3 mcstas_gammas_2.i Selene 1+2 gammas from McStas -4-g1f62be6 mcstas_source_sample.i Water at sample position -5-g74aaff4 mcstas_source_sample.i Cadmium at sample position -6-g1bd85d8 mcstas_source_sample.i GGG at sample position -7-gb9c60c4 rssa.i Fast neutrons from surface source in bunker wall (shutter open)