From df97c0cdbce6d36b89ea6f3fd69da2b488f213c9 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Sat, 8 Jun 2019 13:21:52 +0200 Subject: [PATCH] Cleanup surfaces files --- geometry/ess_outside_surfaces.i | 7 -- geometry/estia_surfaces.i | 209 ++++---------------------------- 2 files changed, 24 insertions(+), 192 deletions(-) diff --git a/geometry/ess_outside_surfaces.i b/geometry/ess_outside_surfaces.i index 8e2dfaa..8ce883b 100644 --- a/geometry/ess_outside_surfaces.i +++ b/geometry/ess_outside_surfaces.i @@ -68,7 +68,6 @@ c surfaces 100067 pz 175.6 100068 cz 1150 100069 p 0.906307787 -0.422618262 0.0 -80 -c 70 pz -334.4 100070 pz -234.4 100071 pz 370.6 100072 cz 1498.4 @@ -101,11 +100,9 @@ c 70 pz -334.4 100099 pz 351.126316 100100 pz 360.863158 c Building Wall E01 -c 101 p -0.906307787 -0.422618262 0.0 -5.52451529e-14 100101 p -0.866025 -0.5 0.0 80.345 100102 cz 2450 100103 p 0.0 -1 0.0 -80 -c 104 p -0.906307787 -0.422618262 0.0 80 100104 p -0.866025 -0.5 0.0 180.345 100105 pz 375.6 100106 cz 2770 @@ -341,7 +338,6 @@ c 100158 gq 1 1 23.01803079 0 0 0 0 -224 0 -4135.732457 100332 pz 32.9 100333 pz -27.1 100334 pz 44.9 -c 335 pz 7.1 100335 pz 2.1 100336 p 0.5 -0.866025404 0.0 0.0 100337 p 0.866025404 0.5 0.0 -5.4924 @@ -353,8 +349,6 @@ c 335 pz 7.1 100343 p 0.866025404 0.5 0.0 -8.4924 100344 p 0.866025404 0.5 0.0 18.5076 100345 p 0.0 0.0 -1 -7.5 -c 346 p 0.866025404 0.5 0.0 -3 -c 347 p 0.866025404 0.5 0.0 3 100348 p 0.669130606 -0.743144825 0.0 0.0 100349 p 0.743144825 0.669130606 0.0 -7.4993 100350 p 0.743144825 0.669130606 0.0 8 @@ -370,7 +364,6 @@ c 347 p 0.866025404 0.5 0.0 3 100460 pz 32.9 100461 pz -9 100462 pz 34.1 -c 463 pz 13.5 100464 pz 16.5 100554 p 0.669130606 0.743144825 0.0 -8 100556 p 0.669130606 0.743144825 0.0 -7.4 diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index 2813d04..6de3985 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -95,10 +95,7 @@ c SKADI components 201597 102 c/y 24.97748848 -8384.48 8401.5 201598 102 p 0.0 -1 0.0 0.700683672 201599 102 p 0.0 -1 0.0 5.30068367 -c 1600 102 c/y 24.97748848 -8384.48 8397.7 -c 1601 102 c/y 24.97748848 -8384.48 8402.3 -c 1602 102 p 0.99913207 0.0 -0.0416546114 556.475776 -c 1603 102 p 0.99913207 0.0 -0.0416546114 598.475776 +c 201604 102 gq 0.00173510665 1 0.9982648934 5.412337245e-16 -1.387778781e-17 0.0832369162 -1.985889355 6.001367345 -47.63375952 520.9838032 @@ -112,9 +109,7 @@ c 1603 102 p 0.99913207 0.0 -0.0416546114 598.475776 201616 102 c/y 208.0861353 -8392.113945 8401.5 201617 102 c/y 208.0861353 -8392.113945 8397.7 201618 102 c/y 208.0861353 -8392.113945 8402.3 -c 1621 102 gq 0.002154063802 1 0.9978459362 5.689893001e-16 -c -1.387778781e-17 0.09272375771 -2.467922076 6.001367345 -c -53.1170452 659.631885 +c 201622 102 gq 0.002154063802 1 0.9978459362 5.689893001e-16 -1.387778781e-17 0.09272375771 -2.467922076 6.001367345 -53.1170452 651.881885 @@ -123,8 +118,6 @@ c -53.1170452 659.631885 201631 102 p 0.049176586 0.0 0.9987901 21.4474109 201632 102 c/y 210.5835923 -8392.229982 8398.5 201633 102 c/y 210.5835923 -8392.229982 8401.5 -c 1634 102 c/y 210.5835923 -8392.229982 8397.7 -c 1635 102 c/y 210.5835923 -8392.229982 8402.3 201636 102 p 0.999404555 0.0 -0.0345041431 648.125129 201637 102 p 0.999404555 0.0 -0.0345041431 973.625129 201638 102 gq 0.001190535892 1 0.9988094641 4.163336342e-16 @@ -268,57 +261,14 @@ c MirroBor outside 203541 2 cx 16.2 c c -------------Collimators-------------- -c FeNi -c Radii -c 4100 cz 1035.04 -c 4101 cz 1087.4743 -c 4111 cz 1070.0 -c 4112 cz 1140.0 -c 4121 cz 1068.0 -c 4122 cz 1142.0 -c 4131 cz 1095.0 -c 4132 cz 1130.0 -c 4141 cz 1093.0 -c 4142 cz 1132.0 -c Outside -c 4201 p 0.818149 0.575006 -0.000107 1.613 -c 4202 p -0.832920 -0.553394 0.000426 -51.292 -c 4203 p -0.027422 0.038302 -0.998890 -59.783 -c 4204 p -0.013207 0.018447 0.999743 -32.034 -c Inside -c 4301 p -0.818149 -0.575006 0.000107 -11.513 -c 4302 p 0.832920 0.553394 -0.000426 41.392 -c 4303 p 0.027422 -0.038302 0.998890 53.883 -c 4304 p 0.013207 -0.018447 -0.999743 26.134 -c Vaccum Tank -c Outside -c 4401 p 0.813101 0.582123 0.000000 -47.866 -c 4402 p -0.813101 -0.582123 0.000000 -52.134 -c 4403 p 0.007112 -0.009934 -0.999925 -3.640 -c 4404 p -0.007112 0.009934 0.999925 -30.360 -c Inside -c 4501 p -0.813101 -0.582123 0.000000 45.866 -c 4502 p 0.813101 0.582123 0.000000 50.134 -c 4503 p -0.007112 0.009934 0.999925 1.640 -c 4504 p 0.007112 -0.009934 -0.999925 28.360 +c CPC1 c Outside 204601 p 0.813101 0.582123 0.000000 -39.866 -c 4602 pz 16.461 -c 4603 p 0.582123 -0.813101 0.000000 1103.250 -c 204604 c/z 643.3 -895. 42.000 c -c 4611 p 0.579908 -0.810007 -0.087156 1089.499 -c 4612 p -0.582123 0.813101 0. -1110.174 -c 4613 p 0.813101 0.582123 0. -37.116 -c 4614 p -0.813101 -0.582123 0. -41.384 204615 pz 72.761 -c 4616 p 0.579908 -0.810007 -0.087156 1091.499 -c 4617 p -0.582123 0.813101 0. -1107.174 -c 4610 p 0.813101 0.582123 0. -36.116 204619 p -0.813101 -0.582123 0. -40.384 -c 4618 pz 70.761 -c disk +c Chopper disk 204621 p -0.582123 0.813101 0 -1104.474 204622 p -0.582123 0.813101 0 -1105.474 204623 14 c/x 0.000 32.000 35.000 @@ -326,51 +276,11 @@ c spindle 204631 p -0.582123 0.813101 0 -1143.994 204632 14 c/x 0.000 32.000 9.200 c -c 4701 c/z 651.100 -905.200 26.500 -c 4702 c/z 643.3 -895. 40.000 -c -c 4703 pz -53.939 -c 4704 pz -24.139 -c 4705 pz 11.761 204706 p 0.813101 0.582123 0.000000 42.134 204707 p -0.813101 -0.582123 0.000000 37.866 -c 4708 p -0.582123 0.813101 0.000000 -1069.225 c CPB Outside -c 4801 p 0.813101 0.582123 0.000000 -32.146 -c 4802 p -0.813101 -0.582123 0.000000 -55.854 -c 4803 p 0.000000 0.000000 -1.000000 -7.061 -c 4804 pz -75.139 204805 p 0.582123 -0.813101 0.000000 1032.514 204806 p -0.582123 0.813101 0.000000 -1145.514 -c 4807 p 0.582123 -0.813101 0.000000 1033.514 -c Cut-out areas -c 4811 pz -55.939 -c 4812 pz -25.939 -c 4813 pz -13.439 -c 4814 p -0.813101 -0.582123 0.000000 10.666 -c 4815 p 0.813101 0.582123 0.000000 19.334 -c 4816 p -0.582123 0.813101 0.000000 -1048.514 -c 4817 p -0.582123 0.813101 0.000000 -1069.774 -c 4818 p 0.813101 0.582123 0.000000 43.984 -c 4819 p -0.582123 0.813101 0.000000 -1067.014 -c -c 4820 c/z 651.100 -905.200 29.500 -c -c W-Cu_outside -c Radii -c 5100 cz 1120.59 -c 5101 cz 1129.80 -c 5102 cz 1170.56 -c Outside -c 5201 p 0.832920 0.553394 -0.000426 36.242 -c 5202 p -0.818149 -0.575006 0.000107 -16.663 -c 5203 p 0.012583 -0.018884 -0.999743 19.724 -c 5204 p 0.026798 -0.038739 0.998890 47.473 -c Inside -c 5301 p -0.832920 -0.553394 0.000426 -40.742 -c 5302 p 0.818149 0.575006 -0.000107 12.163 -c 5303 p -0.012583 0.018884 0.999743 -24.224 -c 5304 p -0.026798 0.038739 -0.998890 -51.973 c Nose-Outside 205401 p 0.813101 0.582123 0.000000 0.134 205402 p -0.813101 -0.582123 0.000000 -4.134 @@ -378,16 +288,6 @@ c Nose-Outside c 5404 pz -3.739 205405 p 0.582123 -0.813101 0.000000 1122.674 205406 p -0.582123 0.813101 0.000000 -1141.674 -c Cu-frame -c Outside -c 5501 p 0.809017 0.587785 0.000000 -28.900 -c 5502 p -0.809017 -0.587785 0.000000 -14.400 -c 5503 p -0.007112 0.009934 -0.999925 -33.883 -c 5504 pz -24.839 -c 5505 pz 26.361 -c vaccum tube -c 5531 2 c/x 7 0 8.5 -c 5532 2 c/x 7 0 8.0 c Lead Plate shielding c vertical 205601 pz -10.139 @@ -408,8 +308,6 @@ c Virtual Source c 205701 c/z 650.706 -908.432 1.500 205702 c/z 650.869 -902.256 1.500 -c 0 -c 5703 pz -4.500 205704 pz -20.500 c 205711 c/z 651.350 -913.252 6.500 @@ -436,26 +334,6 @@ c vertical planes inside 205745 pz -39.000 205746 pz -46.000 c VS Blades -c 5751 p -0.860742 -0.509041 0.000000 -97.250 -c 5752 p -0.860742 -0.509041 0.000000 -99.250 -c 5753 p 0.860742 0.509041 0.000000 101.750 -c 5754 pz 4.680 -c 5755 pz 0.680 -c 5756 p 0.509041 -0.860742 0.000000 1109.648 -c 5757 p 0.509041 -0.860742 0.000000 1109.948 -c 5761 p -0.860742 -0.509041 0.000000 -96.855 -c 5762 p 0.860742 0.509041 0.000000 99.355 -c 5763 p 0.860742 0.509041 0.000000 101.355 -c 5764 pz 5.480 -c 5765 pz -0.320 -c 5766 p -0.509041 0.860742 0.000000 -1111.143 -c 5767 p -0.509041 0.860742 0.000000 -1111.443 -c -c Wall Reduction -c 6100 cz 1172.00 -c 6101 cz 1201.00 -c 6102 cz 1311.00 -c 6103 cz 1325.00 c Sides 1 206201 p -0.809017 -0.587785 0.000000 29.000 206202 p 0.809017 0.587785 0.000000 14.950 @@ -485,17 +363,10 @@ c Sides 5 206602 p 0.809017 0.587785 0.000000 41.800 206603 pz 96.000 206604 p 0.000000 0.000000 -1.000000 85.000 -c 6605 p 0.587785 -0.809017 0.000000 1470.000 c Cu-collimator c Radii -c 7100 cz 1250.00 -c 7101 cz 1255.00 207102 cz 1271.50 207103 cz 1285.00 -c test surface for poly layer -c 7110 3 c/x -9.5 -2.5 10.0 -c 7111 cz 1256.0 -c 7112 cz 1265.0 c BWC c Outside 207201 p 0.813101 0.582123 0.000000 -23.866 @@ -530,7 +401,6 @@ c Wall radii 208101 cz 2157.17 208102 cz 2149.17 208103 cz 2150.17 -c 8104 cz 2075.58 208111 cz 1655.0 208112 cz 1665.0 208113 cz 1710.0 @@ -547,9 +417,7 @@ c first section outside 208204 pz -200.000 c steel/concrete interface 208205 p 0.813101 0.582123 0.000000 -98.964 -c 8206 p -0.776046 -0.630676 0.000000 21.917 208207 pz 115.900 -c 8208 p -0.776046 -0.630676 0.000000 31.917 208209 pz -300.000 c inside 208211 p -0.813101 -0.582123 0.000000 68.794 @@ -558,10 +426,8 @@ c inside 208214 p 0.000000 0.000000 -1.000000 200.000 c B4C concrete/steel interface 208215 p 0.739506 0.673150 0.000000 -102.437 -c 8216 pz 50.000 208217 p -0.612217 0.790690 0.000000 -1958.974 208218 pz 105.900 -c 8219 p -0.776046 -0.630676 0.000000 111.917 c wall breakthrough 208221 p -0.813101 -0.582123 0.000000 32.866 208222 p 0.813101 0.582123 0.000000 43.134 @@ -569,10 +435,7 @@ c wall breakthrough 208224 p 0.000000 0.000000 -1.000000 41.748 c Optical Cave Part c Outside -c 8301 p 0.813101 0.582123 0.000000 -147.866 208302 p 0.737277 0.675590 0.000000 -80.725 -c 8303 p 0.000000 0.000000 -1.000000 -666 -c -132.500 208304 pz -200.000 208305 pz -150.000 c Inside @@ -580,14 +443,6 @@ c Inside 208312 p -0.737277 -0.675590 0.000000 140.725 208313 pz 102.500 208314 p 0.000000 0.000000 -1.000000 200.000 -c Dose determination spheres for Selene 1 Metrology+Robot -c 8370 s 1211 -1660 -11 10.0 -c 8371 s 1211 -1660 20 10.0 -c 8372 s 1153 -1700 -11 10.0 -c Experimental Cave outside -c -c inside -c c Selene 1 Carrier c Outside 208401 p 0.813101 0.582123 0.000000 -38.666 @@ -631,9 +486,7 @@ c Material 208511 p 0.818149 0.575006 -0.000107 12.113 208512 p 0.807990 0.589196 0.000107 -17.317 208513 p 0.807990 0.589196 0.000107 -17.317 -c 8514 p 0.007112 -0.009934 0.999925 24.400 208515 p 0.007112 -0.009934 0.999925 18.300 -c 8516 p -0.007112 0.009934 -0.999925 -5.400 208517 p -0.007112 0.009934 -0.999925 -11.500 208518 p 0.813101 0.582123 0.000000 0.134 208519 p 0.813101 0.582123 0.000000 -9.866 @@ -647,11 +500,6 @@ c Inside 208611 p 0.813101 0.582123 0.000000 19.1342 208612 p 0.007112 -0.009934 0.999925 38.8829 208613 p -0.007112 0.009934 -0.999925 11.1171 -c Guide field plate -c 8616 p -0.813101 -0.582123 0.000000 -0.1342 -c 8617 p 0.813101 0.582123 0.000000 0.8658 -c 8618 p -0.007112 0.009934 -0.999925 -30.5829 -c 8619 p 0.007112 -0.009934 0.999925 -2.8171 c Selene 2 Vacuum c Outside 208621 p 0.813101 0.582123 0.000000 -30.866 @@ -689,9 +537,6 @@ c Inside 208803 p 0.000000 0.000000 -1.000000 166.960 208804 p 0.813101 0.582123 0.000000 102.134 208805 p -0.582123 0.813101 0.000000 -3414.795 -c 8806 p 0.736097 0.676876 0.000000 -236.513 -c 8807 p -0.813101 -0.582123 0.000000 637.866 -c 8808 p -0.981311 0.192430 0.000000 -1964.017 208806 p 0.736097 0.676876 0.000000 -246.513 208807 p -0.813101 -0.582123 0.000000 627.866 208808 p -0.981311 0.192430 0.000000 -1974.017 @@ -730,13 +575,11 @@ c Vacuum vessels before S1/S1-S2 208941 13 px -30.0 208942 13 px 50.0 c Sphere/disk at sample position to simulate gamma generation -c 9001 15 s 0 0 0 5.0 209001 s 2280 -3180 -30 1.0 209002 15 cx 5.0 209003 15 px -0.05 209004 15 px 0.05 c Sphere/disk at MF position to simulate gamma generation from mask -c 9011 13 s 0 0 0 5.0 209012 13 cx 5.0 209013 13 px -0.05 209014 13 px 0.05 @@ -784,8 +627,6 @@ c c Vacuum Chamber 221101 pz -53.139 221102 pz -24.339 -c 21103 pz -16.239 -c 21104 pz -14.939 221105 pz 11.761 221106 pz 16.461 221107 pz 7.261 @@ -801,7 +642,6 @@ c 21104 pz -14.939 222106 p 0.582123 -0.813101 0.000000 1111.174 222107 p 0.582123 -0.813101 0.000000 1164.624 222108 p 0.582123 -0.813101 0.000000 1165.624 -c 22109 p 0.582123 -0.813101 0.000000 1176.824 222110 p 0.582123 -0.813101 0.000000 1098.974 222111 p 0.582123 -0.813101 0.000000 1109.674 222112 p 0.582123 -0.813101 0.000000 1106.074 @@ -849,7 +689,6 @@ c Copper Blocks 222202 p 0.582123 -0.813101 0.000000 1034.324 222203 p 0.582123 -0.813101 0.000000 1044.774 222204 p 0.582123 -0.813101 0.000000 1050.974 -c 22205 p 0.582123 -0.813101 0.000000 1061.974 222206 p 0.582123 -0.813101 0.000000 1064.274 222207 p 0.582123 -0.813101 0.000000 1068.574 222208 p 0.582123 -0.813101 0.000000 1069.974 @@ -927,27 +766,27 @@ c VS Carry Rods 225422 c/z 630.343 -896.070 3.000 225423 c/z 652.978 -927.687 3.000 c c VS Blades (closed) -c 24501 p -0.860742 -0.509041 0.000000 -97.298 -c 24502 p -0.860742 -0.509041 0.000000 -99.298 -c 24503 p -0.860742 -0.509041 0.000000 -99.398 -c 24504 p 0.860742 0.509041 0.000000 101.798 -c 21501 pz 4.261 -c 21502 pz 0.261 -c 21503 pz -5.539 -c 21504 pz -1.539 -c 24505 p 0.509041 -0.860742 0.000000 1110.096 -c 24506 p 0.509041 -0.860742 0.000000 1110.496 +c 224501 p -0.860742 -0.509041 0.000000 -97.298 +c 224502 p -0.860742 -0.509041 0.000000 -99.298 +c 224503 p -0.860742 -0.509041 0.000000 -99.398 +c 224504 p 0.860742 0.509041 0.000000 101.798 +c 221501 pz 4.261 +c 221502 pz 0.261 +c 221503 pz -5.539 +c 221504 pz -1.539 +c 224505 p 0.509041 -0.860742 0.000000 1110.096 +c 224506 p 0.509041 -0.860742 0.000000 1110.496 c c -c 24511 p -0.860742 -0.509041 0.000000 -96.807 -c 24512 p -0.860742 -0.509041 0.000000 -99.257 -c 24513 p -0.860742 -0.509041 0.000000 -101.307 -c 24514 p -0.860742 -0.509041 0.000000 -99.357 -c 21511 pz 6.061 -c 21512 pz 0.261 -c 21513 pz 2.561 -c 21514 pz -3.739 -c 24515 p -0.509041 0.860742 0.000000 -1110.595 -c 24516 p -0.509041 0.860742 0.000000 -1110.895 +c 224511 p -0.860742 -0.509041 0.000000 -96.807 +c 224512 p -0.860742 -0.509041 0.000000 -99.257 +c 224513 p -0.860742 -0.509041 0.000000 -101.307 +c 224514 p -0.860742 -0.509041 0.000000 -99.357 +c 221511 pz 6.061 +c 221512 pz 0.261 +c 221513 pz 2.561 +c 221514 pz -3.739 +c 224515 p -0.509041 0.860742 0.000000 -1110.595 +c 224516 p -0.509041 0.860742 0.000000 -1110.895 c VS Blades (open) 224501 p -0.936060 -0.351842 0.000000 -288.420 224502 p -0.936060 -0.351842 0.000000 -290.420