New version of space frame

diff --git a/Euclid/frame0399.euc b/Euclid/frame0799.euc
similarity index 63%
rename from Euclid/frame0399.euc
rename to Euclid/frame0799.euc
index 904ed35f807c30db88e4f08b7de230d687800e6e..c26289bfc4f48bb1b16936fb4e0cf3626d4e6a09 100644 (file)
--- a/Euclid/frame0399.euc
+++ b/Euclid/frame0799.euc
@@ -99,18 +99,24 @@ ROTM 89 10.0 180.0 80.0 0.0 90.0 90.0
 ROTM 90 170.0 180.0 90.0 90.0 80.0 180.0
 ROTM 91 170.0 0.0 90.0 90.0 80.0 0.0
 ROTM 92 0.0 0.0 90.0 90.0 90.0 180.0
-ROTM 93 90.0 90.0 90.0 360.0 0.0 0.0
 ROTM 94 150.73 180.0 90.0 90.0 60.73 180.0
-ROTM 95 150.73 360.0 90.0 90.0 60.73 0.0
+ROTM 95 150.73 0.0 90.0 90.0 60.73 0.0
+ROTM 1 90.0 90.0 90.0 360.0 0.0 0.0
+ROTM 96 80.0 360.0 90.0 90.0 10.0 180.0
+ROTM 97 150.73 0.0 90.0 90.0 60.73 360.0
 !
 !      Volumes
 !
-VOLU 'B010' 'PGON' 5 10
-      0 360 18 2 -350 284.6 420 350 284.6 420
+VOLU 'B032' 'PGON' 5 10
+      0 360 18 2 -376 284.6 420 376 284.6 420
 VOLU 'B001' 'PGON' 5 10
       0 360 18 2 -350 399 420 350 399 420
-VOLU 'B011' 'TRD1' 5 4
-      50.1827 70.3545 350 57.2
+VOLU 'B030' 'TRD1' 5 4
+      50.18 70.35 375.5 57.2
+VOLU 'B029' 'TRD1' 5 4
+      50.18 70.35 375.5 57.2
+VOLU 'B028' 'TRD1' 5 4
+      50.18 70.35 375.5 57.2
 VOLU 'B002' 'BOX ' 65 3
       5 10 350
 VOLU 'B004' 'BOX ' 65 3
@@ -124,20 +130,24 @@ VOLU 'B009' 'TRAP' 25 11
 VOLU 'B014' 'BOX ' 25 3
       1 2 53.85
 VOLU 'B016' 'TRAP' 25 0
-VOLU 'B018' 'TRAP' 25 11
-      2 10 0 350 0.5 0.5 0 350 0.5 0.5 0
+VOLU 'B027' 'TRAP' 25 11
+      2 10 0 350 1 1 0 350 1 1 0
 VOLU 'B012' 'TRAP' 25 11
       2.5 10 0 350 3.75 3.75 0 350 3.75 3.75 0
-VOLU 'B019' 'TRD1' 5 4
-      63.915 68.32 350 12.5
-VOLU 'B020' 'TRD1' 5 4
-      49.63 63.735 350 40
+VOLU 'BTO3' 'TRD1' 5 4
+      65.237 70.35 375.5 14.5
+VOLU 'BTR3' 'TRD1' 5 4
+      51.8373 64.8844 375.5 37
 VOLU 'B024' 'BOX ' 5 3
       50 0.5 350
-VOLU 'B025' 'TRD1' 5 4
-      63.9 68.3 350 12.5
-VOLU 'B026' 'TRD1' 5 4
-      49.6 63.7 350 40
+VOLU 'BTO2' 'TRD1' 5 4
+      65.237 70.35 375.5 14.5
+VOLU 'BTR2' 'TRD1' 5 4
+      51.8373 64.8844 375.5 37
+VOLU 'BTO1' 'TRD1' 5 4
+      65.237 70.35 375.5 14.5
+VOLU 'BTR1' 'TRD1' 5 4
+      51.8373 64.8844 375.5 37
 VOLU 'B003' 'BOX ' 5 3
       4.5 9.5 350
 VOLU 'B005' 'BOX ' 5 3
@@ -162,26 +172,26 @@ VOLU 'B023' 'BOX ' 4 3
 !
 !      Positionnements
 !
-POSI 'B001' 1 'B010' 0.0 0.0 0.0 0 'ONLY'
-POSI 'B011' 18 'B010' 116.902 321.187 0.0 64 'ONLY'
-POSI 'B011' 17 'B010' 219.705 261.834 0.0 65 'ONLY'
-POSI 'B011' 16 'B010' 296.007 170.9 0.0 66 'ONLY'
-POSI 'B011' 15 'B010' 336.607 59.353 0.0 68 'ONLY'
-POSI 'B011' 14 'B010' 336.607 -59.3529 0.0 69 'ONLY'
-POSI 'B011' 13 'B010' 296.008 -170.9 0.0 70 'ONLY'
-POSI 'B011' 12 'B010' 219.705 -261.834 0.0 71 'ONLY'
-POSI 'B011' 11 'B010' 116.903 -321.187 0.0 72 'ONLY'
-POSI 'B011' 10 'B010' 0.0001 -341.8 0.0 73 'ONLY'
-POSI 'B011' 9 'B010' -116.902 -321.187 0.0 74 'ONLY'
-POSI 'B011' 8 'B010' -219.705 -261.834 0.0 75 'ONLY'
-POSI 'B011' 7 'B010' -296.007 -170.9 0.0 76 'ONLY'
-POSI 'B011' 6 'B010' -336.607 -59.353 0.0 77 'ONLY'
-POSI 'B011' 5 'B010' -336.607 59.3529 0.0 79 'ONLY'
-POSI 'B011' 4 'B010' -296.008 170.9 0.0 80 'ONLY'
-POSI 'B011' 3 'B010' -219.705 261.834 0.0 81 'ONLY'
-POSI 'B011' 2 'B010' -116.902 321.187 0.0 82 'ONLY'
-POSI 'B011' 1 'B010' 0.0 341.8 0.0 83 'ONLY'
-POSI 'B002' 9 'B001' 415.28 0.0 0.0 93 'ONLY'
+POSI 'B001' 3 'B032' 0.0 0.0 0.0 0 'ONLY'
+POSI 'B030' 3 'B032' -116.902 321.187 0.0 82 'ONLY'
+POSI 'B030' 2 'B032' 116.902 321.187 0.0 64 'ONLY'
+POSI 'B030' 1 'B032' 0.0 341.8 0.0 83 'ONLY'
+POSI 'B029' 1 'B032' -219.705 -261.834 0.0 75 'ONLY'
+POSI 'B028' 1 'B032' -219.705 261.834 0.0 81 'ONLY'
+POSI 'B028' 2 'B032' 219.705 261.834 0.0 65 'ONLY'
+POSI 'B028' 3 'B032' 296.008 170.9 0.0 66 'ONLY'
+POSI 'B028' 4 'B032' 336.607 59.353 0.0 68 'ONLY'
+POSI 'B028' 5 'B032' 336.607 -59.3529 0.0 69 'ONLY'
+POSI 'B028' 6 'B032' 296.008 -170.9 0.0 70 'ONLY'
+POSI 'B029' 2 'B032' -116.902 -321.187 0.0 74 'ONLY'
+POSI 'B029' 3 'B032' 0.0 -341.8 0.0 73 'ONLY'
+POSI 'B029' 4 'B032' 116.902 -321.187 0.0 72 'ONLY'
+POSI 'B029' 5 'B032' 219.705 -261.834 0.0 71 'ONLY'
+POSI 'B028' 7 'B032' -296.008 170.9 0.0 80 'ONLY'
+POSI 'B028' 8 'B032' -336.607 59.3529 0.0 79 'ONLY'
+POSI 'B028' 9 'B032' -336.607 -59.353 0.0 77 'ONLY'
+POSI 'B028' 10 'B032' -296.008 -170.9 0.0 76 'ONLY'
+POSI 'B002' 9 'B001' 415.28 0.0 0.0 1 'ONLY'
 POSI 'B002' 10 'B001' 390.236 142.034 0.0 2 'ONLY'
 POSI 'B002' 11 'B001' 318.123 266.937 0.0 3 'ONLY'
 POSI 'B002' 12 'B001' 207.64 359.643 0.0 4 'ONLY'
@@ -272,41 +282,105 @@ POSI 'B009' 4 'B001' -204.665 349.49 0.0 31 'ONLY'
 POSI 'B009' 3 'B001' -200.335 351.99 0.0 62 'ONLY'
 POSI 'B009' 2 'B001' -67.8654 399.281 0.0 63 'ONLY'
 POSI 'B009' 1 'B001' -72.7894 398.413 0.0 32 'ONLY'
-POSI 'B014' 10 'B011' 59.9575 -348.0 3.9944 84 'ONLY'
-POSI 'B014' 9 'B011' 59.9575 -174.0 3.9944 84 'ONLY'
-POSI 'B014' 8 'B011' 59.9575 0.0 3.9944 84 'ONLY'
-POSI 'B014' 7 'B011' 59.9575 174.0 3.9944 84 'ONLY'
-POSI 'B014' 6 'B011' 59.9575 348.0 3.9945 84 'ONLY'
-POSI 'B014' 5 'B011' -59.9575 348.0 3.9944 85 'ONLY'
-POSI 'B014' 4 'B011' -59.9575 174.0 3.9944 85 'ONLY'
-POSI 'B014' 1 'B011' -59.9575 0.0 3.9944 85 'ONLY'
-POSI 'B014' 2 'B011' -59.9575 -174.0 3.9943 85 'ONLY'
-POSI 'B014' 3 'B011' -59.9575 -348.0 3.9943 85 'ONLY'
-POSP 'B016' 5 'B011' 60.0924 -261.0 4.7594 86 'ONLY' 11
+POSI 'B014' 40 'B030' 59.9575 -348.0 3.9944 84 'ONLY'
+POSP 'B016' 32 'B030' 60.0924 -261.0 4.7594 86 'ONLY' 11
       85 31 0 1 2 2 0 1 2 2 0
-POSP 'B016' 8 'B011' 60.0924 -87.0 4.7595 87 'ONLY' 11
+POSI 'B014' 39 'B030' 59.9575 -174.0 3.9944 84 'ONLY'
+POSP 'B016' 31 'B030' 60.0924 -87.0 4.7595 87 'ONLY' 11
       85 31 360 1 2 2 0 1 2 2 0
-POSP 'B016' 6 'B011' 60.0924 87.0 4.7595 86 'ONLY' 11
+POSI 'B014' 38 'B030' 59.9575 0.0 3.9944 84 'ONLY'
+POSP 'B016' 30 'B030' 60.0924 87.0 4.7595 86 'ONLY' 11
       85 31 360 1 2 2 0 1 2 2 0
-POSP 'B016' 7 'B011' 60.0924 261.0 4.7595 87 'ONLY' 11
+POSI 'B014' 37 'B030' 59.9575 174.0 3.9944 84 'ONLY'
+POSP 'B016' 29 'B030' 60.0924 261.0 4.7595 87 'ONLY' 11
       85 31 360 1 2 2 0 1 2 2 0
-POSP 'B016' 3 'B011' -60.0924 261.0 4.7594 88 'ONLY' 11
+POSI 'B014' 36 'B030' 59.9575 348.0 3.9945 84 'ONLY'
+POSI 'B027' 8 'B030' 60.9663 0.0 27.2152 90 'ONLY'
+POSI 'B012' 8 'B030' 48.4741 0.0 -52.4931 90 'ONLY'
+POSI 'B014' 35 'B030' -59.9575 -348.0 3.9943 85 'ONLY'
+POSP 'B016' 28 'B030' -60.0924 -261.0 4.7594 89 'ONLY' 11
       85 31 0 1 2 2 0 1 2 2 0
-POSP 'B016' 1 'B011' -60.0924 87.0 4.7594 89 'ONLY' 11
+POSI 'B014' 34 'B030' -59.9575 -174.0 3.9943 85 'ONLY'
+POSP 'B016' 27 'B030' -60.0924 -87.0 4.7594 88 'ONLY' 11
       85 31 0 1 2 2 0 1 2 2 0
-POSP 'B016' 4 'B011' -60.0924 -87.0 4.7594 88 'ONLY' 11
+POSI 'B014' 33 'B030' -59.9575 0.0 3.9944 96 'ONLY'
+POSP 'B016' 26 'B030' -60.0924 87.0 4.7594 89 'ONLY' 11
       85 31 0 1 2 2 0 1 2 2 0
-POSP 'B016' 2 'B011' -60.0924 -261.0 4.7594 89 'ONLY' 11
+POSI 'B014' 32 'B030' -59.9575 174.0 3.9944 85 'ONLY'
+POSP 'B016' 25 'B030' -60.0924 261.0 4.7594 88 'ONLY' 11
       85 31 0 1 2 2 0 1 2 2 0
-POSI 'B018' 2 'B011' 61.8081 0.0 31.714 90 'ONLY'
-POSI 'B018' 1 'B011' -61.8081 0.0 31.7139 91 'ONLY'
-POSI 'B012' 2 'B011' 48.4741 0.0 -52.4931 90 'ONLY'
-POSI 'B012' 1 'B011' -48.4741 0.0 -52.4931 91 'ONLY'
-POSI 'B019' 1 'B011' 0.0 0.0 44.6999 0 'ONLY'
-POSI 'B020' 1 'B011' 0.0 0.0 -8.8 0 'ONLY'
-POSI 'B024' 1 'B011' 0.0 0.0 -56.7 43 'ONLY'
-POSI 'B025' 1 'B011' 0.0 0.0 44.7 0 'ONLY'
-POSI 'B026' 1 'B011' 0.0 0.0 -8.8 0 'ONLY'
+POSI 'B014' 31 'B030' -59.9575 348.0 3.9944 85 'ONLY'
+POSI 'B027' 7 'B030' -60.9663 0.0 27.2152 91 'ONLY'
+POSI 'B012' 7 'B030' -48.4741 0.0 -52.4931 91 'ONLY'
+POSI 'BTO3' 1 'B030' 0.0 0.0 42.7 0 'ONLY'
+POSI 'BTR3' 1 'B030' 0.0 0.0 -10.8 0 'ONLY'
+POSI 'B024' 3 'B030' 0.0 0.0 -56.7 43 'ONLY'
+POSI 'B014' 30 'B029' -59.9575 348.0 3.9944 85 'ONLY'
+POSP 'B016' 24 'B029' -60.0924 261.0 4.7594 88 'ONLY' 11
+      85 31 0 1 2 2 0 1 2 2 0
+POSI 'B014' 29 'B029' 59.9575 -348.0 3.9944 84 'ONLY'
+POSP 'B016' 23 'B029' 60.0924 -261.0 4.7594 86 'ONLY' 11
+      85 31 0 1 2 2 0 1 2 2 0
+POSI 'B014' 28 'B029' 59.9575 -174.0 3.9944 84 'ONLY'
+POSP 'B016' 22 'B029' 60.0924 -87.0 4.7595 87 'ONLY' 11
+      85 31 360 1 2 2 0 1 2 2 0
+POSI 'B014' 27 'B029' 59.9575 0.0 3.9944 84 'ONLY'
+POSP 'B016' 21 'B029' 60.0924 87.0 4.7595 86 'ONLY' 11
+      85 31 360 1 2 2 0 1 2 2 0
+POSI 'B014' 26 'B029' 59.9575 174.0 3.9944 84 'ONLY'
+POSP 'B016' 20 'B029' 60.0924 261.0 4.7595 87 'ONLY' 11
+      85 31 360 1 2 2 0 1 2 2 0
+POSI 'B014' 25 'B029' 59.9575 348.0 3.9945 84 'ONLY'
+POSI 'B027' 6 'B029' 60.9663 0.0 27.2152 90 'ONLY'
+POSI 'B012' 6 'B029' 48.4741 0.0 -52.4931 90 'ONLY'
+POSI 'B027' 5 'B029' -60.9663 0.0 27.2152 91 'ONLY'
+POSI 'B012' 5 'B029' -48.4741 0.0 -52.4931 91 'ONLY'
+POSI 'B014' 24 'B029' -59.9575 -348.0 3.9943 85 'ONLY'
+POSP 'B016' 19 'B029' -60.0924 -261.0 4.7594 89 'ONLY' 11
+      85 31 0 1 2 2 0 1 2 2 0
+POSI 'B014' 23 'B029' -59.9575 -174.0 3.9943 85 'ONLY'
+POSP 'B016' 18 'B029' -60.0924 -87.0 4.7594 88 'ONLY' 11
+      85 31 0 1 2 2 0 1 2 2 0
+POSI 'B014' 22 'B029' -59.9575 0.0 3.9944 96 'ONLY'
+POSP 'B016' 17 'B029' -60.0924 87.0 4.7594 89 'ONLY' 11
+      85 31 0 1 2 2 0 1 2 2 0
+POSI 'B014' 21 'B029' -59.9575 174.0 3.9944 85 'ONLY'
+POSI 'BTO2' 1 'B029' 0.0 0.0 42.7 0 'ONLY'
+POSI 'BTR2' 1 'B029' 0.0 0.0 -10.8 0 'ONLY'
+POSI 'B024' 2 'B029' 0.0 0.0 -56.7 43 'ONLY'
+POSI 'B014' 20 'B028' 59.9575 -348.0 3.9944 84 'ONLY'
+POSP 'B016' 16 'B028' 60.0924 -261.0 4.7594 86 'ONLY' 11
+      85 31 0 1 2 2 0 1 2 2 0
+POSI 'B014' 19 'B028' 59.9575 -174.0 3.9944 84 'ONLY'
+POSP 'B016' 15 'B028' 60.0924 -87.0 4.7595 87 'ONLY' 11
+      85 31 360 1 2 2 0 1 2 2 0
+POSI 'B014' 18 'B028' 59.9575 0.0 3.9944 84 'ONLY'
+POSP 'B016' 14 'B028' 60.0924 87.0 4.7595 86 'ONLY' 11
+      85 31 360 1 2 2 0 1 2 2 0
+POSI 'B014' 17 'B028' 59.9575 174.0 3.9944 84 'ONLY'
+POSP 'B016' 13 'B028' 60.0924 261.0 4.7595 87 'ONLY' 11
+      85 31 360 1 2 2 0 1 2 2 0
+POSI 'B014' 16 'B028' 59.9575 348.0 3.9945 84 'ONLY'
+POSI 'B027' 4 'B028' 60.9663 0.0 27.2152 90 'ONLY'
+POSI 'B012' 4 'B028' 48.4741 0.0 -52.4931 90 'ONLY'
+POSI 'B014' 15 'B028' -59.9575 348.0 3.9944 85 'ONLY'
+POSP 'B016' 12 'B028' -60.0924 261.0 4.7594 88 'ONLY' 11
+      85 31 0 1 2 2 0 1 2 2 0
+POSI 'B014' 14 'B028' -59.9575 174.0 3.9944 85 'ONLY'
+POSP 'B016' 11 'B028' -60.0924 87.0 4.7594 89 'ONLY' 11
+      85 31 0 1 2 2 0 1 2 2 0
+POSI 'B014' 13 'B028' -59.9575 0.0 3.9944 96 'ONLY'
+POSP 'B016' 10 'B028' -60.0924 -87.0 4.7594 88 'ONLY' 11
+      85 31 0 1 2 2 0 1 2 2 0
+POSI 'B014' 12 'B028' -59.9575 -174.0 3.9943 85 'ONLY'
+POSP 'B016' 9 'B028' -60.0924 -261.0 4.7594 89 'ONLY' 11
+      85 31 0 1 2 2 0 1 2 2 0
+POSI 'B014' 11 'B028' -59.9575 -348.0 3.9943 85 'ONLY'
+POSI 'B027' 3 'B028' -60.9663 0.0 27.2152 91 'ONLY'
+POSI 'B012' 3 'B028' -48.4741 0.0 -52.4931 91 'ONLY'
+POSI 'BTO1' 1 'B028' 0.0 0.0 42.7 0 'ONLY'
+POSI 'B024' 1 'B028' 0.0 0.0 -56.7 43 'ONLY'
+POSI 'BTR1' 1 'B028' 0.0 0.0 -10.8 0 'ONLY'
 POSI 'B003' 1 'B002' -0.0025 0.0 0.0 0 'ONLY'
 POSI 'B005' 1 'B004' 0.0 -0.0001 0.0 0 'ONLY'
 POSI 'B007' 1 'B006' 0.0 0.0 0.0 0 'ONLY'
@@ -327,7 +401,7 @@ POSI 'B021' 1 'B024' -49.0 0.0 0.0 0 'ONLY'
 POSI 'B021' 2 'B024' 49.0 0.0 0.0 44 'ONLY'
 POSI 'B023' 8 'B024' 0.1656 0.0 -261.08 94 'ONLY'
 POSI 'B023' 1 'B024' -0.1656 0.0 -261.08 95 'ONLY'
-POSI 'B023' 3 'B024' -0.1656 0.0 -86.8296 95 'ONLY'
+POSI 'B023' 3 'B024' -0.1656 0.0 -86.8296 97 'ONLY'
 POSI 'B023' 2 'B024' 0.1656 0.0 -86.8296 94 'ONLY'
 POSI 'B023' 5 'B024' -0.1656 0.0 87.4204 95 'ONLY'
 POSI 'B023' 4 'B024' 0.1656 0.0 87.4204 94 'ONLY'

diff --git a/STRUCT/AliFRAMEv0.cxx b/STRUCT/AliFRAMEv0.cxx
index 77ef9651cd049be7c18ba5fdb63c86280664d390..0afc43f6f0d2cfdb55f1fbf75a5a27f6912d4ab0 100644 (file)
--- a/STRUCT/AliFRAMEv0.cxx
+++ b/STRUCT/AliFRAMEv0.cxx
@@ -24,7 +24,7 @@ AliFRAMEv0::AliFRAMEv0(const char *name, const char *title)
   : AliFRAME(name,title)
 {
   printf("Create FRAMEv0 object\n");  
-  fEuclidGeometry="$(ALICE_ROOT)/Euclid/frame0399.euc";
+  fEuclidGeometry="$(ALICE_ROOT)/Euclid/frame0799.euc";
   fEuclidMaterial="$(ALICE_ROOT)/Euclid/frame.tme";
 }