Update Wall E01 (length and orientation) from CATIA

2019-02-21 20:30:53 +01:00
parent 86c4aab729
commit 02aae50af8
3 changed files with 10 additions and 4 deletions
--- a/geometry/ess_cells.i
+++ b/geometry/ess_cells.i
@@ -496,7 +496,7 @@ c Main ESS plant geometry without the instrument
        -112
 257 200 -3.9  ( -3 : -69 : -2 : -70 : -64 : 71 : 68 ) 3 -102 2 103
        66 -67 64  
-258 49 0.074981  64 -67 66 -104 101 -72 3  
+258 49 0.074981  -104 101 -67 ((64 66 -72 3):(72 -610 59))
 259  49 0.074981  ( -3 : -69 : -2 : -70 : -64 : 71 : 72 ) 3 -72 103
        -104 -66 70 64  
 260 200 -3.9  -67 66 -107 -2 -72 68 3  
--- a/geometry/ess_surfaces.i
+++ b/geometry/ess_surfaces.i
@@ -100,10 +100,13 @@ c 70 pz -334.4
 98 pz 341.389474
 99 pz 351.126316
 100 pz 360.863158
-101 p -0.906307787 -0.422618262 0.0 -5.52451529e-14
+c Building Wall E01
+c 101 p -0.906307787 -0.422618262 0.0 -5.52451529e-14
+101 p -0.866025 -0.5 0.0 80.345
 102 cz 2450
 103 p 0.0 -1 0.0 -80
-104 p -0.906307787 -0.422618262 0.0 80
+c 104 p -0.906307787 -0.422618262 0.0 80
+104 p -0.866025 -0.5 0.0 180.345
 105 pz 375.6
 106 cz 2770
 107 p -0.125718017 -0.992066016 0.0 0.0
@@ -379,3 +382,6 @@ c 463 pz 13.5
 572 p 0.809016994 0.587785252 0.0 17.5262
 575 pz 7.4
 600 s 1603.5 2265.0 13.0 3.0
+c additional surfaces from CATIA
+c D01/D02 boundary
+610 px 1090
--- a/geometry/estia_guides.i
+++ b/geometry/estia_guides.i
@@ -118,7 +118,7 @@ c Selene 2 glass (change material!!)
 8511 12 -2.51  8121 -8122 -8913 -8914 8915 
      #(-8911 -8912) #(-8515 -8517) 3
 c Air outside the guide shielding
-8601  4 -1.2E-3 72 -8709 -104 -8201 8203 8204 
+8601  4 -1.2E-3 72 -8709 -104 -8201 8203 8204 #(101 -610 -67)
                 #708
 8602  4 -1.2E-3 ((112 -8202)
                :(8202 -8302 8101)) 72 -8709  8203 8204