Optimised geometry

diff --git a/Euclid/ITSgeometry_5asymm.euc b/Euclid/ITSgeometry_5asymm.euc
index 6db16219349248b6e55a8f451f1a34d36514033c..5f222403fffd70e39e1ed77cf272b222340eea23 100644 (file)
--- a/Euclid/ITSgeometry_5asymm.euc
+++ b/Euclid/ITSgeometry_5asymm.euc
@@ -443,7 +443,7 @@ ROTM 935 90.0 300.0 90.0 30.0 180.0 0.0
 VOLU 'ITSV' 'PCON' 5 39
                    0. 360. 12. -289.1 44.9 85. -284. 44.9 85. -284.
                    44.9 56.1 -100.7 44.9 56.1 -77.2 44.9 56.1 -40. 
-                                                3.29 56.1 40. 3.29 56.1 77.2 44.9 56.1 100.7
+                                                3.295 56.1 40. 3.295 56.1 77.2 44.9 56.1 100.7
                    44.9 56.1 284. 61.5 65.5 284. 61.5 85. 288.1 62.4 85.
 VOLU 'ITSD' 'PCON' 5 15
                    0. 360. 4. -77.2 45. 56. -40. 3.3 56. 40.
@@ -888,22 +888,30 @@ VOLU 'ICCC' 'TUBE' 4 3
       46. 47.5 9.5
 VOLU 'IPAN' 'TUBE' 11 3
       45. 56. 2.25
-VOLU 'ICU1' 'PCON' 14 9
-      0. 360. 2. 100.7 45.2 46.2 284. 61.8 62.8
-VOLU 'ICC1' 'PCON' 4 9
-      0. 360. 2. 100.7 46.2 47.5 284. 62.8 64.3                
-VOLU 'ICU2' 'PCON' 14 9
-      0. 360. 2. 285.5 62.5 74.5 286.5 62.5 74.5
-VOLU 'ICC2' 'PCON' 4 9
-      0. 360. 2. 284. 62.5 74.5 285.5 62.5 74.5                
-VOLU 'ICU3' 'TUBE' 14 3
+VOLU 'ICU1' 'CONS' 14 7
+      91.65 45.2 46.2 61.8 62.8 12. 168.  
+VOLU 'ICU2' 'CONS' 14 7
+      91.65 45.2 46.2 61.8 62.8 192. 348.
+VOLU 'ICU3' 'TUBS' 14 5
+      62.5 74.5 0.5 12. 168.
+VOLU 'ICU4' 'TUBS' 14 5
+      62.5 74.5 0.5 192. 348.
+VOLU 'ICU5' 'TUBE' 14 3
       45. 46. 92.4
-VOLU 'ICC3' 'TUBE' 4 3
-      46. 47.5 91.65           
-VOLU 'ICU4' 'PCON' 14 9
-      0. 360. 2. -286.5 45. 74.5 -285.5 45. 74.5               
-VOLU 'ICC4' 'PCON' 4 9
-      0. 360. 2. -285.5 46. 74.5 -284. 46. 74.5
+VOLU 'ICU6' 'TUBE' 14 3
+      45. 74.5 0.5   
+VOLU 'ICC1' 'CONS' 4 7
+      91.65 46.2 47.7 62.8 64.3 12. 168.
+VOLU 'ICC2' 'CONS' 4 7
+      91.65 46.2 47.7 62.8 64.3 192. 348.
+VOLU 'ICC3' 'TUBS' 4 5
+      62.5 74.5 0.75 12. 168.
+VOLU 'ICC4' 'TUBS' 4 5
+      62.5 74.5 0.75 192. 348.
+VOLU 'ICC5' 'TUBE' 4 3
+      46. 47.5 91.65
+VOLU 'ICC6' 'TUBE' 4 3
+      46. 74.5 0.75       
 VOLU 'IHOK' 'TUBE' 65 3
       74.5 79.5 2.5
 !
@@ -911,6 +919,8 @@ VOLU 'IHOK' 'TUBE' 65 3
 !
 VOLU 'IRAI' 'BOX ' 64 3
       0.85 10. 190.
+!VOLU 'ICYL' 'TUBE' 64 4
+!      58. 59. 0.2  
 !
 !      DIVISIONS
 !
@@ -2025,20 +2035,26 @@ POSI 'ICCC' 1 'ITSV' 0. 0. 86.7 0 'ONLY'
 POSI 'ICCC' 2 'ITSV' 0. 0. -86.7 212 'ONLY'
 POSI 'IPAN' 1 'ITSV' 0. 0. 98.45 0 'ONLY'
 POSI 'IPAN' 2 'ITSV' 0. 0. -98.45 212 'ONLY'
-POSI 'ICU1' 1 'ITSV' 0. 0. 0. 0 'ONLY'
-POSI 'ICC1' 1 'ITSV' 0. 0. 0. 0 'ONLY'
-POSI 'ICU2' 1 'ITSV' 0. 0. 0. 0 'ONLY'
-POSI 'ICC2' 1 'ITSV' 0. 0. 0. 0 'ONLY'
-POSI 'ICU3' 1 'ITSV' 0. 0. -193.1 0 'ONLY'
-POSI 'ICC3' 1 'ITSV' 0. 0. -192.35 0 'ONLY'
-POSI 'ICU4' 1 'ITSV' 0. 0. 0. 0 'ONLY'
-POSI 'ICC4' 1 'ITSV' 0. 0. 0. 0 'ONLY'
+POSI 'ICU1' 1 'ITSV' 0. 0. 192.35 0 'ONLY'
+POSI 'ICU2' 1 'ITSV' 0. 0. 192.35 0 'ONLY'
+POSI 'ICU3' 1 'ITSV' 0. 0. 286. 0 'ONLY'
+POSI 'ICU4' 1 'ITSV' 0. 0. 286. 0 'ONLY'
+POSI 'ICU5' 1 'ITSV' 0. 0. -193.1 0 'ONLY'
+POSI 'ICU6' 1 'ITSV' 0. 0. -286. 0 'ONLY'
+POSI 'ICC1' 1 'ITSV' 0. 0. 192.35 0 'ONLY'
+POSI 'ICC2' 1 'ITSV' 0. 0. 192.35 0 'ONLY'
+POSI 'ICC3' 1 'ITSV' 0. 0. 284.75 0 'ONLY'
+POSI 'ICC4' 1 'ITSV' 0. 0. 284.75 0 'ONLY'
+POSI 'ICC5' 1 'ITSV' 0. 0. -192.35 0 'ONLY'
+POSI 'ICC6' 1 'ITSV' 0. 0. -286.75 0 'ONLY'
 POSI 'IHOK' 1 'ITSV' 0. 0. -286.5 0 'ONLY'
 !
 !      POSITIONNEMENTS RAILS
 !
 POSI 'IRAI' 1 'ITSV' 53. 0. -69.5 0 'ONLY'
 POSI 'IRAI' 2 'ITSV' -53. 0. -69.5 0 'ONLY'
+!POSI 'ICYL' 1 'ITSV' 0. 0. 74. 0 'ONLY
+!POSI 'ICYL' 1 'ITSV' 0. 0. -74. 212 'ONLY
 !
 !      Positionnements Finals
 !

diff --git a/Euclid/ITSgeometry_5symm.euc b/Euclid/ITSgeometry_5symm.euc
index 1fce93788c98d0fc7bb2ba521b66e0a98ea61274..bc0f1955e19c96b209bbc4a339fcb5322197f98d 100644 (file)
--- a/Euclid/ITSgeometry_5symm.euc
+++ b/Euclid/ITSgeometry_5symm.euc
@@ -443,7 +443,7 @@ ROTM 935 90.0 300.0 90.0 30.0 180.0 0.0
 VOLU 'ITSV' 'PCON' 5 39
                    0. 360. 12. -289.1 62.4 85. -284. 61.5 85. -284.
                    61.5 65.5 -100.7 44.9 56.1 -77.2 44.9 56.1 -40. 
-                                                3.29 56.1 40. 3.29 56.1 77.2 44.9 56.1 100.7
+                                                3.295 56.1 40. 3.295 56.1 77.2 44.9 56.1 100.7
                    44.9 56.1 284. 61.5 65.5 284. 61.5 85. 288.1 62.4 85.
 VOLU 'ITSD' 'PCON' 5 15
                    0. 360. 4. -77.2 45. 56. -40. 3.3 56. 40.
@@ -888,23 +888,33 @@ VOLU 'ICCC' 'TUBE' 4 3
       46. 47.5 9.5
 VOLU 'IPAN' 'TUBE' 11 3
       45. 56. 2.25
-VOLU 'ICU1' 'PCON' 14 9
-      0. 360. 2. 100.7 45.2 46.2 284. 61.8 62.8
-VOLU 'ICC1' 'PCON' 4 9
-      0. 360. 2. 100.7 46.2 47.7 284. 62.8 64.3
-VOLU 'ICU2' 'PCON' 14 9
-      0. 360. 2. 285.5 62.5 74.5 286.5 62.5 74.5
-VOLU 'ICC2' 'PCON' 4 9
-      0. 360. 2. 284. 62.5 74.5 285.5 62.5 74.5
-VOLU 'IHOK' 'TUBE' 65 3
-      74.5 79.5 2.5
+VOLU 'ICU1' 'CONS' 14 7
+      91.65 45.2 46.2 61.8 62.8 12. 168.
+VOLU 'ICU2' 'CONS' 14 7
+      91.65 45.2 46.2 61.8 62.8 192. 348.      
+VOLU 'ICU3' 'TUBS' 14 5
+      62.5 74.5 0.5 12. 168.
+VOLU 'ICU4' 'TUBS' 14 5
+      62.5 74.5 0.5 192. 348.
+VOLU 'ICC1' 'CONS' 4 7
+      91.65 46.2 47.7 62.8 64.3 12. 168.
+VOLU 'ICC2' 'CONS' 4 7      
+      91.65 46.2 47.7 62.8 64.3 192. 348.
+VOLU 'ICC3' 'TUBS' 4 5
+      62.5 74.5 0.75 12. 168.
+VOLU 'ICC4' 'TUBS' 4 5
+      62.5 74.5 0.75 192. 348.
+VOLU 'IHK1' 'TUBS' 65 5
+      74.5 79.5 2.5 12. 168.
+VOLU 'IHK2' 'TUBS' 65 5
+      74.5 79.5 2.5 192. 348.      
 !
 !      VOLUMES RAILS
 !
 VOLU 'IRAI' 'BOX ' 64 3
-      0.85 10. 132.75
-! In the symmetric case the rails cannot be longer than 145 cm on the opposite
-! side w.r.t. the absorber
+      0.85 10. 190.
+!VOLU 'ICYL' 'TUBE' 64 4
+!      58. 59. 0.2      
 !
 !      DIVISIONS
 !
@@ -2019,22 +2029,31 @@ POSI 'ICCC' 1 'ITSV' 0. 0. 86.7 0 'ONLY'
 POSI 'ICCC' 2 'ITSV' 0. 0. -86.7 212 'ONLY'
 POSI 'IPAN' 1 'ITSV' 0. 0. 98.45 0 'ONLY'
 POSI 'IPAN' 2 'ITSV' 0. 0. -98.45 212 'ONLY'
-POSI 'ICU1' 1 'ITSV' 0. 0. 0. 0 'ONLY'
-POSI 'ICU1' 2 'ITSV' 0. 0. 0. 212 'ONLY'
-POSI 'ICC1' 1 'ITSV' 0. 0. 0. 0 'ONLY'
-POSI 'ICC1' 2 'ITSV' 0. 0. 0. 212 'ONLY'
-POSI 'ICU2' 1 'ITSV' 0. 0. 0. 0 'ONLY'
-POSI 'ICU2' 2 'ITSV' 0. 0. 0. 212 'ONLY'
-POSI 'ICC2' 1 'ITSV' 0. 0. 0. 0 'ONLY'
-POSI 'ICC2' 2 'ITSV' 0. 0. 0. 212 'ONLY'
-POSI 'IHOK' 1 'ITSV' 0. 0. -286.5 0 'ONLY'
+POSI 'ICU1' 1 'ITSV' 0. 0. 192.35 0 'ONLY'
+POSI 'ICU1' 2 'ITSV' 0. 0. -192.35 212 'ONLY'
+POSI 'ICU2' 1 'ITSV' 0. 0. 192.35 0 'ONLY'
+POSI 'ICU2' 2 'ITSV' 0. 0. -192.35 212 'ONLY'
+POSI 'ICU3' 1 'ITSV' 0. 0. 286. 0 'ONLY'
+POSI 'ICU3' 2 'ITSV' 0. 0. -286. 212 'ONLY'
+POSI 'ICU4' 1 'ITSV' 0. 0. 286. 0 'ONLY'
+POSI 'ICU4' 2 'ITSV' 0. 0. -286. 212 'ONLY'
+POSI 'ICC1' 1 'ITSV' 0. 0. 192.35 0 'ONLY'
+POSI 'ICC1' 2 'ITSV' 0. 0. -192.35 212 'ONLY'
+POSI 'ICC2' 1 'ITSV' 0. 0. 192.35 0 'ONLY'
+POSI 'ICC2' 2 'ITSV' 0. 0. -192.35 212 'ONLY'
+POSI 'ICC3' 1 'ITSV' 0. 0. 284.75 0 'ONLY'
+POSI 'ICC3' 2 'ITSV' 0. 0. -284.75 212 'ONLY'
+POSI 'ICC4' 1 'ITSV' 0. 0. 284.75 0 'ONLY'
+POSI 'ICC4' 2 'ITSV' 0. 0. -284.75 212 'ONLY'
+POSI 'IHK1' 1 'ITSV' 0. 0. -286.5 0 'ONLY'
+POSI 'IHK2' 1 'ITSV' 0. 0. -286.5 0 'ONLY'
 !
 !      POSITIONNEMENTS RAILS
 !
-POSI 'IRAI' 1 'ITSV' 53. 0. -12.25 0 'ONLY'
-POSI 'IRAI' 2 'ITSV' -53. 0. -12.25 0 'ONLY'
-! In the symmetric case the rails cannot be longer than 145 cm on the opposite
-! side w.r.t. the absorber
+POSI 'IRAI' 1 'ITSV' 53. 0. -69.5 0 'ONLY'
+POSI 'IRAI' 2 'ITSV' -53. 0. -69.5 0 'ONLY'
+!POSI 'ICYL' 1 'ITSV' 0. 0. 74. 0 'ONLY
+!POSI 'ICYL' 1 'ITSV' 0. 0. -74. 212 'ONLY
 !
 !      Positionnements Finals
 !