From e35e7bfc70af58fa5887574b1fab34fef665e74c Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Tue, 16 Apr 2019 11:58:38 +0200 Subject: [PATCH] Put SKADI wall for Selene 1 with light concrete and join with cave --- geometry/estia_cave.i | 22 ++++++++++++---------- geometry/estia_guides.i | 34 ++++++++++++++++++---------------- geometry/estia_surfaces.i | 5 +++-- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/geometry/estia_cave.i b/geometry/estia_cave.i index d32f953..feb359f 100644 --- a/geometry/estia_cave.i +++ b/geometry/estia_cave.i @@ -1,18 +1,20 @@ c Experimental cave c First largest area: up-stream/down-stream/roof/floor/walls c then cut corner and add extended roof -8701 4 -1.2E-3 ((8709 8710 8701 8703 8706 8707 8708 8709 8710 (8704 : 8705)) - :(8709 8710 8702 8703 8711 8712)) - #((-8809 -8810 -8801 -8803 -8806 -8807 -8808 -8809 -8810 - (-8804 : -8805)) - :(-8809 -8810 -8802 -8803 -8811 -8812) - :(-8311 -8312 8709 8809 -8313 -8803)) +8701 49 0.074981 ((8709 8710 8701 8703 8706 8707 8708 8709 8710 (-8302 : 8705)) + :(8709 8710 8702 8703 8711 8712) + :(8709 8701 8703 -8302 8805 8806)) + #((-8809 -8810 -8801 -8803 -8806 -8807 -8808 -8809 -8810) + :(-8809 -8810 -8802 -8803 -8811 -8812) + :(-8311 8312 8709 8809 -8313 -8803) + :(-8801 -8803 -8809 8815 8312 8806)) #(( 72 -8101 8201 8202 8203 8204 3) - :(8101 -8709 8301 8302 8303 8304 3)) + :(8101 -8709 8301 -8302 8303 8304 3)) 8702 4 -1.2E-3 ((-8809 -8810 -8801 -8803 -8806 -8807 -8808 -8809 -8810 - (-8804 : -8805)) + (-8806 : -8815)) :(-8809 -8810 -8802 -8803 -8811 -8812) - :(-8311 -8312 8709 8809 -8313 -8803)) 3 + :(-8311 8312 8709 8809 -8313 -8803) + :(-8801 -8803 -8809 8815 8312 8806)) 3 #(8621 8622 8623 8624 8626) #6111 #8501 #8511 #9001 c sample position @@ -20,7 +22,7 @@ c sample position c 9001 4 -1.2E-3 -9001 c area around cave 9900 4 -1.2E-3 8709 8710 -104 (-8708:-8707) 8703 8701 -9901 4 -1.2E-3 8709 8710 112 ((-8704 -8705):-8706) 8703 8701 +9901 4 -1.2E-3 8709 8710 112 (8302:-8805) 8703 8701 -8706 9902 4 -1.2E-3 8720 -8710 112 -104 8703 8701 c visualize Selene gamma sources (comment for real runs) c 50001 0 -50001 diff --git a/geometry/estia_guides.i b/geometry/estia_guides.i index f8317b5..cbe270e 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -59,28 +59,28 @@ c ceiling outside c left outer wall (E01) 8003 4 -1.2E-3 ( 72 -8100 8201 -8205 59 -8207 3) #(-8305 -610) c Selene 1/2 separator -8004 200 -3.9 (8100 -8101 8201 8202 59 -8207 3) - #(8100 -8101 -8221 -8222 -8223 -8224) +8004 49 0.074981 (8100 -8101 8201 -8302 59 -8207 3) + #(8100 -8101 -8221 -8222 -8223 -8224) c Optical cave -8005 4 -1.2E-3 (8101 -8709 59 8201 8302 8203 3) - #(8101 -8709 -8311 -8312 -8313 -8314) +8005 49 0.074981 (8101 -8709 59 8201 -8302 8203 3) + #(8101 -8709 -8311 8312 -8313 -8314) c air 8008 4 -1.2E-3 (72 -8100 -8211 -8212 -8213 -8214 3) #(8421 8422 8423 8424 8425 8426) #(-8426 -8931) #(-8305 -610) -8009 4 -1.2E-3 (8101 -8709 -8311 -8312 -8313 -8314 3) +8009 4 -1.2E-3 (8101 -8709 -8311 8312 -8313 -8314 3) #(8121 -8122 8601 8602 8603 8604) #(-8121 -8931) #(8621 8622 8623 8624 8625 8626) #707 #710 c Selene 1 shielding -8011 4 -1.2E-3 (8211 8205 -8213 -8214 72 -8100 3) #(-8305 -610) -8012 16 -2.400 (8205 8202 8213 -8218 72 -8100 3) -8013 4 -1.2E-3 72 8202 8212 8217 -8213 -8214 3 #(-8305 -610) +8011 4 -1.2E-3 (8211 8205 -8213 -8214 72 -8100 3) #(-8305 -610) +8012 4 -1.2E-3 (8205 8202 8213 -8218 72 -8100 3) +8013 49 0.074981 72 (8202:-8302) 8212 8217 -8213 -8214 3 #(-8305 -610) c -8020 71 0.0843223 (-8217 -8100 8215 8202 -8213 -8214 3) -8021 71 0.0843223 (-8217 -8100 -8215 8212 -8213 -8214 3) -8022 71 0.0843223 (8205 8202 8218 -8207 72 -8100 3) +8020 49 0.074981 (-8217 -8100 8215 -8302 -8213 -8214 3) +8021 4 -1.2E-3 (-8217 -8100 -8215 8212 -8213 -8214 3) +8022 4 -1.2E-3 (8205 8202 8218 -8207 72 -8100 3) c c Selene 1 carrier 8301 18 -2.4 -8405 8406 ((8401 8402 8403 8404) @@ -126,12 +126,14 @@ c Selene 2 Vacuum tank (stainless steel) c #(8626 8636 -8932) c Air outside the guide shielding 8601 4 -1.2E-3 ((72 -8709 -104 -8201 8203 8204) - :(-8701 8203 8710 8709 -104 8302)) + :(-8701 8203 8710 8709 -104 -8302)) #(101 -610 -67) #(-8305 -610) - #(8302 8702 (8712:(8809 -8311 -8313))) + #(-8302 8702 ((8712 8711):(8809 -8311 -8313))) #708 -8602 4 -1.2E-3 ((112 -8202 -8709) - :(8202 -8302 8101 -8709) - :(-8701 8203 8710 8709 -8302 112)) +8602 4 -1.2E-3 ( + (112 -8202 -8709 8302) + :(8202 8302 8101 -8709) + :(-8701 8203 8710 8709 8302 112) + ) 72 8203 8204 #(-8305 -610) #709 diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index bdb70c0..85390ad 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -550,14 +550,14 @@ c wall breakthrough c Optical Cave Part c Outside 8301 p 0.813101 0.582123 0.000000 -147.866 -8302 p -0.813101 -0.582123 0.000000 -102.134 +8302 p 0.737277 0.675590 0.000000 -80.725 8303 p 0.000000 0.000000 -1.000000 -666 c -132.500 8304 pz -200.000 8305 pz -150.000 c Inside 8311 p -0.813101 -0.582123 0.000000 117.866 -8312 p 0.813101 0.582123 0.000000 72.134 +8312 p -0.737277 -0.675590 0.000000 140.725 8313 pz 102.500 8314 p 0.000000 0.000000 -1.000000 200.000 c Dose determination spheres for Selene 1 Metrology+Robot @@ -675,6 +675,7 @@ c Inside 8810 p 0.582123 -0.813101 0.000000 4314.795 8811 p 0.813101 0.582123 0.000000 82.134 8812 p -0.813101 -0.582123 0.000000 57.866 +8815 p -0.582123 0.813101 0.000000 -3364.795 c Parametric Surfaces c Selene 1 Inside Mirrors Ellipses Top-Bottom/Right 8901 1 SQ 2.77777777777778E-06 0 0.009070294784581 0 0 0 -1 1700 0 0