silvermy@ornl.gov : reverting to version 1.2

diff --git a/EMCAL/mapping/RCU0.data b/EMCAL/mapping/RCU0.data
index 4591d90e938ca9290c7609bece6ea3591001e822..6d960071b994d689dfa56a52270b2be5143e2584 100644 (file)
--- a/EMCAL/mapping/RCU0.data
+++ b/EMCAL/mapping/RCU0.data
@@ -1,21 +1,21 @@
 1152
 3279
-128 4 2 0
-129 4 2 1
-130 4 3 0
-131 4 3 1
-132 5 2 0
-133 5 2 1
-134 5 3 0
-135 5 3 1
-136 7 3 1
-137 7 3 0
-138 7 2 1
-139 7 2 0
-140 6 3 1
-141 6 3 0
-142 6 2 1
-143 6 2 0
+128 3 2 0
+129 3 2 1
+130 3 3 0
+131 3 3 1
+132 2 2 0
+133 2 2 1
+134 2 3 0
+135 2 3 1
+136 0 3 1
+137 0 3 0
+138 0 2 1
+139 0 2 0
+140 1 3 1
+141 1 3 0
+142 1 2 1
+143 1 2 0
 160 4 0 0
 161 4 0 1
 162 4 1 0
@@ -48,38 +48,38 @@
 189 1 1 0
 190 1 0 1
 191 1 0 0
-192 3 2 0
-193 3 2 1
-194 3 3 0
-195 3 3 1
-196 2 2 0
-197 2 2 1
-198 2 3 0
-199 2 3 1
-200 0 3 1
-201 0 3 0
-202 0 2 1
-203 0 2 0
-204 1 3 1
-205 1 3 0
-206 1 2 1
-207 1 2 0
-256 4 6 0
-257 4 6 1
-258 4 7 0
-259 4 7 1
-260 5 6 0
-261 5 6 1
-262 5 7 0
-263 5 7 1
-264 7 7 1
-265 7 7 0
-266 7 6 1
-267 7 6 0
-268 6 7 1
-269 6 7 0
-270 6 6 1
-271 6 6 0
+192 4 2 0
+193 4 2 1
+194 4 3 0
+195 4 3 1
+196 5 2 0
+197 5 2 1
+198 5 3 0
+199 5 3 1
+200 7 3 1
+201 7 3 0
+202 7 2 1
+203 7 2 0
+204 6 3 1
+205 6 3 0
+206 6 2 1
+207 6 2 0
+256 3 6 0
+257 3 6 1
+258 3 7 0
+259 3 7 1
+260 2 6 0
+261 2 6 1
+262 2 7 0
+263 2 7 1
+264 0 7 1
+265 0 7 0
+266 0 6 1
+267 0 6 0
+268 1 7 1
+269 1 7 0
+270 1 6 1
+271 1 6 0
 288 4 4 0
 289 4 4 1
 290 4 5 0
@@ -112,38 +112,38 @@
 317 1 5 0
 318 1 4 1
 319 1 4 0
-320 3 6 0
-321 3 6 1
-322 3 7 0
-323 3 7 1
-324 2 6 0
-325 2 6 1
-326 2 7 0
-327 2 7 1
-328 0 7 1
-329 0 7 0
-330 0 6 1
-331 0 6 0
-332 1 7 1
-333 1 7 0
-334 1 6 1
-335 1 6 0
-384 4 10 0
-385 4 10 1
-386 4 11 0
-387 4 11 1
-388 5 10 0
-389 5 10 1
-390 5 11 0
-391 5 11 1
-392 7 11 1
-393 7 11 0
-394 7 10 1
-395 7 10 0
-396 6 11 1
-397 6 11 0
-398 6 10 1
-399 6 10 0
+320 4 6 0
+321 4 6 1
+322 4 7 0
+323 4 7 1
+324 5 6 0
+325 5 6 1
+326 5 7 0
+327 5 7 1
+328 7 7 1
+329 7 7 0
+330 7 6 1
+331 7 6 0
+332 6 7 1
+333 6 7 0
+334 6 6 1
+335 6 6 0
+384 3 10 0
+385 3 10 1
+386 3 11 0
+387 3 11 1
+388 2 10 0
+389 2 10 1
+390 2 11 0
+391 2 11 1
+392 0 11 1
+393 0 11 0
+394 0 10 1
+395 0 10 0
+396 1 11 1
+397 1 11 0
+398 1 10 1
+399 1 10 0
 416 4 8 0
 417 4 8 1
 418 4 9 0
@@ -176,38 +176,38 @@
 445 1 9 0
 446 1 8 1
 447 1 8 0
-448 3 10 0
-449 3 10 1
-450 3 11 0
-451 3 11 1
-452 2 10 0
-453 2 10 1
-454 2 11 0
-455 2 11 1
-456 0 11 1
-457 0 11 0
-458 0 10 1
-459 0 10 0
-460 1 11 1
-461 1 11 0
-462 1 10 1
-463 1 10 0
-512 4 14 0
-513 4 14 1
-514 4 15 0
-515 4 15 1
-516 5 14 0
-517 5 14 1
-518 5 15 0
-519 5 15 1
-520 7 15 1
-521 7 15 0
-522 7 14 1
-523 7 14 0
-524 6 15 1
-525 6 15 0
-526 6 14 1
-527 6 14 0
+448 4 10 0
+449 4 10 1
+450 4 11 0
+451 4 11 1
+452 5 10 0
+453 5 10 1
+454 5 11 0
+455 5 11 1
+456 7 11 1
+457 7 11 0
+458 7 10 1
+459 7 10 0
+460 6 11 1
+461 6 11 0
+462 6 10 1
+463 6 10 0
+512 3 14 0
+513 3 14 1
+514 3 15 0
+515 3 15 1
+516 2 14 0
+517 2 14 1
+518 2 15 0
+519 2 15 1
+520 0 15 1
+521 0 15 0
+522 0 14 1
+523 0 14 0
+524 1 15 1
+525 1 15 0
+526 1 14 1
+527 1 14 0
 544 4 12 0
 545 4 12 1
 546 4 13 0
@@ -240,38 +240,38 @@
 573 1 13 0
 574 1 12 1
 575 1 12 0
-576 3 14 0
-577 3 14 1
-578 3 15 0
-579 3 15 1
-580 2 14 0
-581 2 14 1
-582 2 15 0
-583 2 15 1
-584 0 15 1
-585 0 15 0
-586 0 14 1
-587 0 14 0
-588 1 15 1
-589 1 15 0
-590 1 14 1
-591 1 14 0
-640 4 18 0
-641 4 18 1
-642 4 19 0
-643 4 19 1
-644 5 18 0
-645 5 18 1
-646 5 19 0
-647 5 19 1
-648 7 19 1
-649 7 19 0
-650 7 18 1
-651 7 18 0
-652 6 19 1
-653 6 19 0
-654 6 18 1
-655 6 18 0
+576 4 14 0
+577 4 14 1
+578 4 15 0
+579 4 15 1
+580 5 14 0
+581 5 14 1
+582 5 15 0
+583 5 15 1
+584 7 15 1
+585 7 15 0
+586 7 14 1
+587 7 14 0
+588 6 15 1
+589 6 15 0
+590 6 14 1
+591 6 14 0
+640 3 18 0
+641 3 18 1
+642 3 19 0
+643 3 19 1
+644 2 18 0
+645 2 18 1
+646 2 19 0
+647 2 19 1
+648 0 19 1
+649 0 19 0
+650 0 18 1
+651 0 18 0
+652 1 19 1
+653 1 19 0
+654 1 18 1
+655 1 18 0
 672 4 16 0
 673 4 16 1
 674 4 17 0
@@ -304,38 +304,38 @@
 701 1 17 0
 702 1 16 1
 703 1 16 0
-704 3 18 0
-705 3 18 1
-706 3 19 0
-707 3 19 1
-708 2 18 0
-709 2 18 1
-710 2 19 0
-711 2 19 1
-712 0 19 1
-713 0 19 0
-714 0 18 1
-715 0 18 0
-716 1 19 1
-717 1 19 0
-718 1 18 1
-719 1 18 0
-768 4 22 0
-769 4 22 1
-770 4 23 0
-771 4 23 1
-772 5 22 0
-773 5 22 1
-774 5 23 0
-775 5 23 1
-776 7 23 1
-777 7 23 0
-778 7 22 1
-779 7 22 0
-780 6 23 1
-781 6 23 0
-782 6 22 1
-783 6 22 0
+704 4 18 0
+705 4 18 1
+706 4 19 0
+707 4 19 1
+708 5 18 0
+709 5 18 1
+710 5 19 0
+711 5 19 1
+712 7 19 1
+713 7 19 0
+714 7 18 1
+715 7 18 0
+716 6 19 1
+717 6 19 0
+718 6 18 1
+719 6 18 0
+768 3 22 0
+769 3 22 1
+770 3 23 0
+771 3 23 1
+772 2 22 0
+773 2 22 1
+774 2 23 0
+775 2 23 1
+776 0 23 1
+777 0 23 0
+778 0 22 1
+779 0 22 0
+780 1 23 1
+781 1 23 0
+782 1 22 1
+783 1 22 0
 800 4 20 0
 801 4 20 1
 802 4 21 0
@@ -368,38 +368,38 @@
 829 1 21 0
 830 1 20 1
 831 1 20 0
-832 3 22 0
-833 3 22 1
-834 3 23 0
-835 3 23 1
-836 2 22 0
-837 2 22 1
-838 2 23 0
-839 2 23 1
-840 0 23 1
-841 0 23 0
-842 0 22 1
-843 0 22 0
-844 1 23 1
-845 1 23 0
-846 1 22 1
-847 1 22 0
-896 4 26 0
-897 4 26 1
-898 4 27 0
-899 4 27 1
-900 5 26 0
-901 5 26 1
-902 5 27 0
-903 5 27 1
-904 7 27 1
-905 7 27 0
-906 7 26 1
-907 7 26 0
-908 6 27 1
-909 6 27 0
-910 6 26 1
-911 6 26 0
+832 4 22 0
+833 4 22 1
+834 4 23 0
+835 4 23 1
+836 5 22 0
+837 5 22 1
+838 5 23 0
+839 5 23 1
+840 7 23 1
+841 7 23 0
+842 7 22 1
+843 7 22 0
+844 6 23 1
+845 6 23 0
+846 6 22 1
+847 6 22 0
+896 3 26 0
+897 3 26 1
+898 3 27 0
+899 3 27 1
+900 2 26 0
+901 2 26 1
+902 2 27 0
+903 2 27 1
+904 0 27 1
+905 0 27 0
+906 0 26 1
+907 0 26 0
+908 1 27 1
+909 1 27 0
+910 1 26 1
+911 1 26 0
 928 4 24 0
 929 4 24 1
 930 4 25 0
@@ -432,38 +432,38 @@
 957 1 25 0
 958 1 24 1
 959 1 24 0
-960 3 26 0
-961 3 26 1
-962 3 27 0
-963 3 27 1
-964 2 26 0
-965 2 26 1
-966 2 27 0
-967 2 27 1
-968 0 27 1
-969 0 27 0
-970 0 26 1
-971 0 26 0
-972 1 27 1
-973 1 27 0
-974 1 26 1
-975 1 26 0
-1024 4 30 0
-1025 4 30 1
-1026 4 31 0
-1027 4 31 1
-1028 5 30 0
-1029 5 30 1
-1030 5 31 0
-1031 5 31 1
-1032 7 31 1
-1033 7 31 0
-1034 7 30 1
-1035 7 30 0
-1036 6 31 1
-1037 6 31 0
-1038 6 30 1
-1039 6 30 0
+960 4 26 0
+961 4 26 1
+962 4 27 0
+963 4 27 1
+964 5 26 0
+965 5 26 1
+966 5 27 0
+967 5 27 1
+968 7 27 1
+969 7 27 0
+970 7 26 1
+971 7 26 0
+972 6 27 1
+973 6 27 0
+974 6 26 1
+975 6 26 0
+1024 3 30 0
+1025 3 30 1
+1026 3 31 0
+1027 3 31 1
+1028 2 30 0
+1029 2 30 1
+1030 2 31 0
+1031 2 31 1
+1032 0 31 1
+1033 0 31 0
+1034 0 30 1
+1035 0 30 0
+1036 1 31 1
+1037 1 31 0
+1038 1 30 1
+1039 1 30 0
 1056 4 28 0
 1057 4 28 1
 1058 4 29 0
@@ -496,38 +496,38 @@
 1085 1 29 0
 1086 1 28 1
 1087 1 28 0
-1088 3 30 0
-1089 3 30 1
-1090 3 31 0
-1091 3 31 1
-1092 2 30 0
-1093 2 30 1
-1094 2 31 0
-1095 2 31 1
-1096 0 31 1
-1097 0 31 0
-1098 0 30 1
-1099 0 30 0
-1100 1 31 1
-1101 1 31 0
-1102 1 30 1
-1103 1 30 0
-1152 4 34 0
-1153 4 34 1
-1154 4 35 0
-1155 4 35 1
-1156 5 34 0
-1157 5 34 1
-1158 5 35 0
-1159 5 35 1
-1160 7 35 1
-1161 7 35 0
-1162 7 34 1
-1163 7 34 0
-1164 6 35 1
-1165 6 35 0
-1166 6 34 1
-1167 6 34 0
+1088 4 30 0
+1089 4 30 1
+1090 4 31 0
+1091 4 31 1
+1092 5 30 0
+1093 5 30 1
+1094 5 31 0
+1095 5 31 1
+1096 7 31 1
+1097 7 31 0
+1098 7 30 1
+1099 7 30 0
+1100 6 31 1
+1101 6 31 0
+1102 6 30 1
+1103 6 30 0
+1152 3 34 0
+1153 3 34 1
+1154 3 35 0
+1155 3 35 1
+1156 2 34 0
+1157 2 34 1
+1158 2 35 0
+1159 2 35 1
+1160 0 35 1
+1161 0 35 0
+1162 0 34 1
+1163 0 34 0
+1164 1 35 1
+1165 1 35 0
+1166 1 34 1
+1167 1 34 0
 1184 4 32 0
 1185 4 32 1
 1186 4 33 0
@@ -560,38 +560,38 @@
 1213 1 33 0
 1214 1 32 1
 1215 1 32 0
-1216 3 34 0
-1217 3 34 1
-1218 3 35 0
-1219 3 35 1
-1220 2 34 0
-1221 2 34 1
-1222 2 35 0
-1223 2 35 1
-1224 0 35 1
-1225 0 35 0
-1226 0 34 1
-1227 0 34 0
-1228 1 35 1
-1229 1 35 0
-1230 1 34 1
-1231 1 34 0
-2176 4 38 0
-2177 4 38 1
-2178 4 39 0
-2179 4 39 1
-2180 5 38 0
-2181 5 38 1
-2182 5 39 0
-2183 5 39 1
-2184 7 39 1
-2185 7 39 0
-2186 7 38 1
-2187 7 38 0
-2188 6 39 1
-2189 6 39 0
-2190 6 38 1
-2191 6 38 0
+1216 4 34 0
+1217 4 34 1
+1218 4 35 0
+1219 4 35 1
+1220 5 34 0
+1221 5 34 1
+1222 5 35 0
+1223 5 35 1
+1224 7 35 1
+1225 7 35 0
+1226 7 34 1
+1227 7 34 0
+1228 6 35 1
+1229 6 35 0
+1230 6 34 1
+1231 6 34 0
+2176 3 38 0
+2177 3 38 1
+2178 3 39 0
+2179 3 39 1
+2180 2 38 0
+2181 2 38 1
+2182 2 39 0
+2183 2 39 1
+2184 0 39 1
+2185 0 39 0
+2186 0 38 1
+2187 0 38 0
+2188 1 39 1
+2189 1 39 0
+2190 1 38 1
+2191 1 38 0
 2208 4 36 0
 2209 4 36 1
 2210 4 37 0
@@ -624,38 +624,38 @@
 2237 1 37 0
 2238 1 36 1
 2239 1 36 0
-2240 3 38 0
-2241 3 38 1
-2242 3 39 0
-2243 3 39 1
-2244 2 38 0
-2245 2 38 1
-2246 2 39 0
-2247 2 39 1
-2248 0 39 1
-2249 0 39 0
-2250 0 38 1
-2251 0 38 0
-2252 1 39 1
-2253 1 39 0
-2254 1 38 1
-2255 1 38 0
-2304 4 42 0
-2305 4 42 1
-2306 4 43 0
-2307 4 43 1
-2308 5 42 0
-2309 5 42 1
-2310 5 43 0
-2311 5 43 1
-2312 7 43 1
-2313 7 43 0
-2314 7 42 1
-2315 7 42 0
-2316 6 43 1
-2317 6 43 0
-2318 6 42 1
-2319 6 42 0
+2240 4 38 0
+2241 4 38 1
+2242 4 39 0
+2243 4 39 1
+2244 5 38 0
+2245 5 38 1
+2246 5 39 0
+2247 5 39 1
+2248 7 39 1
+2249 7 39 0
+2250 7 38 1
+2251 7 38 0
+2252 6 39 1
+2253 6 39 0
+2254 6 38 1
+2255 6 38 0
+2304 3 42 0
+2305 3 42 1
+2306 3 43 0
+2307 3 43 1
+2308 2 42 0
+2309 2 42 1
+2310 2 43 0
+2311 2 43 1
+2312 0 43 1
+2313 0 43 0
+2314 0 42 1
+2315 0 42 0
+2316 1 43 1
+2317 1 43 0
+2318 1 42 1
+2319 1 42 0
 2336 4 40 0
 2337 4 40 1
 2338 4 41 0
@@ -688,38 +688,38 @@
 2365 1 41 0
 2366 1 40 1
 2367 1 40 0
-2368 3 42 0
-2369 3 42 1
-2370 3 43 0
-2371 3 43 1
-2372 2 42 0
-2373 2 42 1
-2374 2 43 0
-2375 2 43 1
-2376 0 43 1
-2377 0 43 0
-2378 0 42 1
-2379 0 42 0
-2380 1 43 1
-2381 1 43 0
-2382 1 42 1
-2383 1 42 0
-2432 4 46 0
-2433 4 46 1
-2434 4 47 0
-2435 4 47 1
-2436 5 46 0
-2437 5 46 1
-2438 5 47 0
-2439 5 47 1
-2440 7 47 1
-2441 7 47 0
-2442 7 46 1
-2443 7 46 0
-2444 6 47 1
-2445 6 47 0
-2446 6 46 1
-2447 6 46 0
+2368 4 42 0
+2369 4 42 1
+2370 4 43 0
+2371 4 43 1
+2372 5 42 0
+2373 5 42 1
+2374 5 43 0
+2375 5 43 1
+2376 7 43 1
+2377 7 43 0
+2378 7 42 1
+2379 7 42 0
+2380 6 43 1
+2381 6 43 0
+2382 6 42 1
+2383 6 42 0
+2432 3 46 0
+2433 3 46 1
+2434 3 47 0
+2435 3 47 1
+2436 2 46 0
+2437 2 46 1
+2438 2 47 0
+2439 2 47 1
+2440 0 47 1
+2441 0 47 0
+2442 0 46 1
+2443 0 46 0
+2444 1 47 1
+2445 1 47 0
+2446 1 46 1
+2447 1 46 0
 2464 4 44 0
 2465 4 44 1
 2466 4 45 0
@@ -752,38 +752,38 @@
 2493 1 45 0
 2494 1 44 1
 2495 1 44 0
-2496 3 46 0
-2497 3 46 1
-2498 3 47 0
-2499 3 47 1
-2500 2 46 0
-2501 2 46 1
-2502 2 47 0
-2503 2 47 1
-2504 0 47 1
-2505 0 47 0
-2506 0 46 1
-2507 0 46 0
-2508 1 47 1
-2509 1 47 0
-2510 1 46 1
-2511 1 46 0
-2560 12 2 0
-2561 12 2 1
-2562 12 3 0
-2563 12 3 1
-2564 13 2 0
-2565 13 2 1
-2566 13 3 0
-2567 13 3 1
-2568 15 3 1
-2569 15 3 0
-2570 15 2 1
-2571 15 2 0
-2572 14 3 1
-2573 14 3 0
-2574 14 2 1
-2575 14 2 0
+2496 4 46 0
+2497 4 46 1
+2498 4 47 0
+2499 4 47 1
+2500 5 46 0
+2501 5 46 1
+2502 5 47 0
+2503 5 47 1
+2504 7 47 1
+2505 7 47 0
+2506 7 46 1
+2507 7 46 0
+2508 6 47 1
+2509 6 47 0
+2510 6 46 1
+2511 6 46 0
+2560 11 2 0
+2561 11 2 1
+2562 11 3 0
+2563 11 3 1
+2564 10 2 0
+2565 10 2 1
+2566 10 3 0
+2567 10 3 1
+2568 8 3 1
+2569 8 3 0
+2570 8 2 1
+2571 8 2 0
+2572 9 3 1
+2573 9 3 0
+2574 9 2 1
+2575 9 2 0
 2592 12 0 0
 2593 12 0 1
 2594 12 1 0
@@ -816,38 +816,38 @@
 2621 9 1 0
 2622 9 0 1
 2623 9 0 0
-2624 11 2 0
-2625 11 2 1
-2626 11 3 0
-2627 11 3 1
-2628 10 2 0
-2629 10 2 1
-2630 10 3 0
-2631 10 3 1
-2632 8 3 1
-2633 8 3 0
-2634 8 2 1
-2635 8 2 0
-2636 9 3 1
-2637 9 3 0
-2638 9 2 1
-2639 9 2 0
-2688 12 6 0
-2689 12 6 1
-2690 12 7 0
-2691 12 7 1
-2692 13 6 0
-2693 13 6 1
-2694 13 7 0
-2695 13 7 1
-2696 15 7 1
-2697 15 7 0
-2698 15 6 1
-2699 15 6 0
-2700 14 7 1
-2701 14 7 0
-2702 14 6 1
-2703 14 6 0
+2624 12 2 0
+2625 12 2 1
+2626 12 3 0
+2627 12 3 1
+2628 13 2 0
+2629 13 2 1
+2630 13 3 0
+2631 13 3 1
+2632 15 3 1
+2633 15 3 0
+2634 15 2 1
+2635 15 2 0
+2636 14 3 1
+2637 14 3 0
+2638 14 2 1
+2639 14 2 0
+2688 11 6 0
+2689 11 6 1
+2690 11 7 0
+2691 11 7 1
+2692 10 6 0
+2693 10 6 1
+2694 10 7 0
+2695 10 7 1
+2696 8 7 1
+2697 8 7 0
+2698 8 6 1
+2699 8 6 0
+2700 9 7 1
+2701 9 7 0
+2702 9 6 1
+2703 9 6 0
 2720 12 4 0
 2721 12 4 1
 2722 12 5 0
@@ -880,38 +880,38 @@
 2749 9 5 0
 2750 9 4 1
 2751 9 4 0
-2752 11 6 0
-2753 11 6 1
-2754 11 7 0
-2755 11 7 1
-2756 10 6 0
-2757 10 6 1
-2758 10 7 0
-2759 10 7 1
-2760 8 7 1
-2761 8 7 0
-2762 8 6 1
-2763 8 6 0
-2764 9 7 1
-2765 9 7 0
-2766 9 6 1
-2767 9 6 0
-2816 12 10 0
-2817 12 10 1
-2818 12 11 0
-2819 12 11 1
-2820 13 10 0
-2821 13 10 1
-2822 13 11 0
-2823 13 11 1
-2824 15 11 1
-2825 15 11 0
-2826 15 10 1
-2827 15 10 0
-2828 14 11 1
-2829 14 11 0
-2830 14 10 1
-2831 14 10 0
+2752 12 6 0
+2753 12 6 1
+2754 12 7 0
+2755 12 7 1
+2756 13 6 0
+2757 13 6 1
+2758 13 7 0
+2759 13 7 1
+2760 15 7 1
+2761 15 7 0
+2762 15 6 1
+2763 15 6 0
+2764 14 7 1
+2765 14 7 0
+2766 14 6 1
+2767 14 6 0
+2816 11 10 0
+2817 11 10 1
+2818 11 11 0
+2819 11 11 1
+2820 10 10 0
+2821 10 10 1
+2822 10 11 0
+2823 10 11 1
+2824 8 11 1
+2825 8 11 0
+2826 8 10 1
+2827 8 10 0
+2828 9 11 1
+2829 9 11 0
+2830 9 10 1
+2831 9 10 0
 2848 12 8 0
 2849 12 8 1
 2850 12 9 0
@@ -944,38 +944,38 @@
 2877 9 9 0
 2878 9 8 1
 2879 9 8 0
-2880 11 10 0
-2881 11 10 1
-2882 11 11 0
-2883 11 11 1
-2884 10 10 0
-2885 10 10 1
-2886 10 11 0
-2887 10 11 1
-2888 8 11 1
-2889 8 11 0
-2890 8 10 1
-2891 8 10 0
-2892 9 11 1
-2893 9 11 0
-2894 9 10 1
-2895 9 10 0
-2944 12 14 0
-2945 12 14 1
-2946 12 15 0
-2947 12 15 1
-2948 13 14 0
-2949 13 14 1
-2950 13 15 0
-2951 13 15 1
-2952 15 15 1
-2953 15 15 0
-2954 15 14 1
-2955 15 14 0
-2956 14 15 1
-2957 14 15 0
-2958 14 14 1
-2959 14 14 0
+2880 12 10 0
+2881 12 10 1
+2882 12 11 0
+2883 12 11 1
+2884 13 10 0
+2885 13 10 1
+2886 13 11 0
+2887 13 11 1
+2888 15 11 1
+2889 15 11 0
+2890 15 10 1
+2891 15 10 0
+2892 14 11 1
+2893 14 11 0
+2894 14 10 1
+2895 14 10 0
+2944 11 14 0
+2945 11 14 1
+2946 11 15 0
+2947 11 15 1
+2948 10 14 0
+2949 10 14 1
+2950 10 15 0
+2951 10 15 1
+2952 8 15 1
+2953 8 15 0
+2954 8 14 1
+2955 8 14 0
+2956 9 15 1
+2957 9 15 0
+2958 9 14 1
+2959 9 14 0
 2976 12 12 0
 2977 12 12 1
 2978 12 13 0
@@ -1008,38 +1008,38 @@
 3005 9 13 0
 3006 9 12 1
 3007 9 12 0
-3008 11 14 0
-3009 11 14 1
-3010 11 15 0
-3011 11 15 1
-3012 10 14 0
-3013 10 14 1
-3014 10 15 0
-3015 10 15 1
-3016 8 15 1
-3017 8 15 0
-3018 8 14 1
-3019 8 14 0
-3020 9 15 1
-3021 9 15 0
-3022 9 14 1
-3023 9 14 0
-3072 12 18 0
-3073 12 18 1
-3074 12 19 0
-3075 12 19 1
-3076 13 18 0
-3077 13 18 1
-3078 13 19 0
-3079 13 19 1
-3080 15 19 1
-3081 15 19 0
-3082 15 18 1
-3083 15 18 0
-3084 14 19 1
-3085 14 19 0
-3086 14 18 1
-3087 14 18 0
+3008 12 14 0
+3009 12 14 1
+3010 12 15 0
+3011 12 15 1
+3012 13 14 0
+3013 13 14 1
+3014 13 15 0
+3015 13 15 1
+3016 15 15 1
+3017 15 15 0
+3018 15 14 1
+3019 15 14 0
+3020 14 15 1
+3021 14 15 0
+3022 14 14 1
+3023 14 14 0
+3072 11 18 0
+3073 11 18 1
+3074 11 19 0
+3075 11 19 1
+3076 10 18 0
+3077 10 18 1
+3078 10 19 0
+3079 10 19 1
+3080 8 19 1
+3081 8 19 0
+3082 8 18 1
+3083 8 18 0
+3084 9 19 1
+3085 9 19 0
+3086 9 18 1
+3087 9 18 0
 3104 12 16 0
 3105 12 16 1
 3106 12 17 0
@@ -1072,38 +1072,38 @@
 3133 9 17 0
 3134 9 16 1
 3135 9 16 0
-3136 11 18 0
-3137 11 18 1
-3138 11 19 0
-3139 11 19 1
-3140 10 18 0
-3141 10 18 1
-3142 10 19 0
-3143 10 19 1
-3144 8 19 1
-3145 8 19 0
-3146 8 18 1
-3147 8 18 0
-3148 9 19 1
-3149 9 19 0
-3150 9 18 1
-3151 9 18 0
-3200 12 22 0
-3201 12 22 1
-3202 12 23 0
-3203 12 23 1
-3204 13 22 0
-3205 13 22 1
-3206 13 23 0
-3207 13 23 1
-3208 15 23 1
-3209 15 23 0
-3210 15 22 1
-3211 15 22 0
-3212 14 23 1
-3213 14 23 0
-3214 14 22 1
-3215 14 22 0
+3136 12 18 0
+3137 12 18 1
+3138 12 19 0
+3139 12 19 1
+3140 13 18 0
+3141 13 18 1
+3142 13 19 0
+3143 13 19 1
+3144 15 19 1
+3145 15 19 0
+3146 15 18 1
+3147 15 18 0
+3148 14 19 1
+3149 14 19 0
+3150 14 18 1
+3151 14 18 0
+3200 11 22 0
+3201 11 22 1
+3202 11 23 0
+3203 11 23 1
+3204 10 22 0
+3205 10 22 1
+3206 10 23 0
+3207 10 23 1
+3208 8 23 1
+3209 8 23 0
+3210 8 22 1
+3211 8 22 0
+3212 9 23 1
+3213 9 23 0
+3214 9 22 1
+3215 9 22 0
 3232 12 20 0
 3233 12 20 1
 3234 12 21 0
@@ -1136,19 +1136,19 @@
 3261 9 21 0
 3262 9 20 1
 3263 9 20 0
-3264 11 22 0
-3265 11 22 1
-3266 11 23 0
-3267 11 23 1
-3268 10 22 0
-3269 10 22 1
-3270 10 23 0
-3271 10 23 1
-3272 8 23 1
-3273 8 23 0
-3274 8 22 1
-3275 8 22 0
-3276 9 23 1
-3277 9 23 0
-3278 9 22 1
-3279 9 22 0
+3264 12 22 0
+3265 12 22 1
+3266 12 23 0
+3267 12 23 1
+3268 13 22 0
+3269 13 22 1
+3270 13 23 0
+3271 13 23 1
+3272 15 23 1
+3273 15 23 0
+3274 15 22 1
+3275 15 22 0
+3276 14 23 1
+3277 14 23 0
+3278 14 22 1
+3279 14 22 0

diff --git a/EMCAL/mapping/RCU1.data b/EMCAL/mapping/RCU1.data
index 35a7b2aa50da813ae0f4d391913fde9a470668c0..d4c1c40ca812946af0da5e5968c90579784a3c13 100644 (file)
--- a/EMCAL/mapping/RCU1.data
+++ b/EMCAL/mapping/RCU1.data
@@ -1,21 +1,21 @@
 1152
 3279
-128 12 26 0
-129 12 26 1
-130 12 27 0
-131 12 27 1
-132 13 26 0
-133 13 26 1
-134 13 27 0
-135 13 27 1
-136 15 27 1
-137 15 27 0
-138 15 26 1
-139 15 26 0
-140 14 27 1
-141 14 27 0
-142 14 26 1
-143 14 26 0
+128 11 26 0
+129 11 26 1
+130 11 27 0
+131 11 27 1
+132 10 26 0
+133 10 26 1
+134 10 27 0
+135 10 27 1
+136 8 27 1
+137 8 27 0
+138 8 26 1
+139 8 26 0
+140 9 27 1
+141 9 27 0
+142 9 26 1
+143 9 26 0
 160 12 24 0
 161 12 24 1
 162 12 25 0
@@ -48,38 +48,38 @@
 189 9 25 0
 190 9 24 1
 191 9 24 0
-192 11 26 0
-193 11 26 1
-194 11 27 0
-195 11 27 1
-196 10 26 0
-197 10 26 1
-198 10 27 0
-199 10 27 1
-200 8 27 1
-201 8 27 0
-202 8 26 1
-203 8 26 0
-204 9 27 1
-205 9 27 0
-206 9 26 1
-207 9 26 0
-256 12 30 0
-257 12 30 1
-258 12 31 0
-259 12 31 1
-260 13 30 0
-261 13 30 1
-262 13 31 0
-263 13 31 1
-264 15 31 1
-265 15 31 0
-266 15 30 1
-267 15 30 0
-268 14 31 1
-269 14 31 0
-270 14 30 1
-271 14 30 0
+192 12 26 0
+193 12 26 1
+194 12 27 0
+195 12 27 1
+196 13 26 0
+197 13 26 1
+198 13 27 0
+199 13 27 1
+200 15 27 1
+201 15 27 0
+202 15 26 1
+203 15 26 0
+204 14 27 1
+205 14 27 0
+206 14 26 1
+207 14 26 0
+256 11 30 0
+257 11 30 1
+258 11 31 0
+259 11 31 1
+260 10 30 0
+261 10 30 1
+262 10 31 0
+263 10 31 1
+264 8 31 1
+265 8 31 0
+266 8 30 1
+267 8 30 0
+268 9 31 1
+269 9 31 0
+270 9 30 1
+271 9 30 0
 288 12 28 0
 289 12 28 1
 290 12 29 0
@@ -112,38 +112,38 @@
 317 9 29 0
 318 9 28 1
 319 9 28 0
-320 11 30 0
-321 11 30 1
-322 11 31 0
-323 11 31 1
-324 10 30 0
-325 10 30 1
-326 10 31 0
-327 10 31 1
-328 8 31 1
-329 8 31 0
-330 8 30 1
-331 8 30 0
-332 9 31 1
-333 9 31 0
-334 9 30 1
-335 9 30 0
-384 12 34 0
-385 12 34 1
-386 12 35 0
-387 12 35 1
-388 13 34 0
-389 13 34 1
-390 13 35 0
-391 13 35 1
-392 15 35 1
-393 15 35 0
-394 15 34 1
-395 15 34 0
-396 14 35 1
-397 14 35 0
-398 14 34 1
-399 14 34 0
+320 12 30 0
+321 12 30 1
+322 12 31 0
+323 12 31 1
+324 13 30 0
+325 13 30 1
+326 13 31 0
+327 13 31 1
+328 15 31 1
+329 15 31 0
+330 15 30 1
+331 15 30 0
+332 14 31 1
+333 14 31 0
+334 14 30 1
+335 14 30 0
+384 11 34 0
+385 11 34 1
+386 11 35 0
+387 11 35 1
+388 10 34 0
+389 10 34 1
+390 10 35 0
+391 10 35 1
+392 8 35 1
+393 8 35 0
+394 8 34 1
+395 8 34 0
+396 9 35 1
+397 9 35 0
+398 9 34 1
+399 9 34 0
 416 12 32 0
 417 12 32 1
 418 12 33 0
@@ -176,38 +176,38 @@
 445 9 33 0
 446 9 32 1
 447 9 32 0
-448 11 34 0
-449 11 34 1
-450 11 35 0
-451 11 35 1
-452 10 34 0
-453 10 34 1
-454 10 35 0
-455 10 35 1
-456 8 35 1
-457 8 35 0
-458 8 34 1
-459 8 34 0
-460 9 35 1
-461 9 35 0
-462 9 34 1
-463 9 34 0
-512 12 38 0
-513 12 38 1
-514 12 39 0
-515 12 39 1
-516 13 38 0
-517 13 38 1
-518 13 39 0
-519 13 39 1
-520 15 39 1
-521 15 39 0
-522 15 38 1
-523 15 38 0
-524 14 39 1
-525 14 39 0
-526 14 38 1
-527 14 38 0
+448 12 34 0
+449 12 34 1
+450 12 35 0
+451 12 35 1
+452 13 34 0
+453 13 34 1
+454 13 35 0
+455 13 35 1
+456 15 35 1
+457 15 35 0
+458 15 34 1
+459 15 34 0
+460 14 35 1
+461 14 35 0
+462 14 34 1
+463 14 34 0
+512 11 38 0
+513 11 38 1
+514 11 39 0
+515 11 39 1
+516 10 38 0
+517 10 38 1
+518 10 39 0
+519 10 39 1
+520 8 39 1
+521 8 39 0
+522 8 38 1
+523 8 38 0
+524 9 39 1
+525 9 39 0
+526 9 38 1
+527 9 38 0
 544 12 36 0
 545 12 36 1
 546 12 37 0
@@ -240,38 +240,38 @@
 573 9 37 0
 574 9 36 1
 575 9 36 0
-576 11 38 0
-577 11 38 1
-578 11 39 0
-579 11 39 1
-580 10 38 0
-581 10 38 1
-582 10 39 0
-583 10 39 1
-584 8 39 1
-585 8 39 0
-586 8 38 1
-587 8 38 0
-588 9 39 1
-589 9 39 0
-590 9 38 1
-591 9 38 0
-640 12 42 0
-641 12 42 1
-642 12 43 0
-643 12 43 1
-644 13 42 0
-645 13 42 1
-646 13 43 0
-647 13 43 1
-648 15 43 1
-649 15 43 0
-650 15 42 1
-651 15 42 0
-652 14 43 1
-653 14 43 0
-654 14 42 1
-655 14 42 0
+576 12 38 0
+577 12 38 1
+578 12 39 0
+579 12 39 1
+580 13 38 0
+581 13 38 1
+582 13 39 0
+583 13 39 1
+584 15 39 1
+585 15 39 0
+586 15 38 1
+587 15 38 0
+588 14 39 1
+589 14 39 0
+590 14 38 1
+591 14 38 0
+640 11 42 0
+641 11 42 1
+642 11 43 0
+643 11 43 1
+644 10 42 0
+645 10 42 1
+646 10 43 0
+647 10 43 1
+648 8 43 1
+649 8 43 0
+650 8 42 1
+651 8 42 0
+652 9 43 1
+653 9 43 0
+654 9 42 1
+655 9 42 0
 672 12 40 0
 673 12 40 1
 674 12 41 0
@@ -304,38 +304,38 @@
 701 9 41 0
 702 9 40 1
 703 9 40 0
-704 11 42 0
-705 11 42 1
-706 11 43 0
-707 11 43 1
-708 10 42 0
-709 10 42 1
-710 10 43 0
-711 10 43 1
-712 8 43 1
-713 8 43 0
-714 8 42 1
-715 8 42 0
-716 9 43 1
-717 9 43 0
-718 9 42 1
-719 9 42 0
-768 12 46 0
-769 12 46 1
-770 12 47 0
-771 12 47 1
-772 13 46 0
-773 13 46 1
-774 13 47 0
-775 13 47 1
-776 15 47 1
-777 15 47 0
-778 15 46 1
-779 15 46 0
-780 14 47 1
-781 14 47 0
-782 14 46 1
-783 14 46 0
+704 12 42 0
+705 12 42 1
+706 12 43 0
+707 12 43 1
+708 13 42 0
+709 13 42 1
+710 13 43 0
+711 13 43 1
+712 15 43 1
+713 15 43 0
+714 15 42 1
+715 15 42 0
+716 14 43 1
+717 14 43 0
+718 14 42 1
+719 14 42 0
+768 11 46 0
+769 11 46 1
+770 11 47 0
+771 11 47 1
+772 10 46 0
+773 10 46 1
+774 10 47 0
+775 10 47 1
+776 8 47 1
+777 8 47 0
+778 8 46 1
+779 8 46 0
+780 9 47 1
+781 9 47 0
+782 9 46 1
+783 9 46 0
 800 12 44 0
 801 12 44 1
 802 12 45 0
@@ -368,38 +368,38 @@
 829 9 45 0
 830 9 44 1
 831 9 44 0
-832 11 46 0
-833 11 46 1
-834 11 47 0
-835 11 47 1
-836 10 46 0
-837 10 46 1
-838 10 47 0
-839 10 47 1
-840 8 47 1
-841 8 47 0
-842 8 46 1
-843 8 46 0
-844 9 47 1
-845 9 47 0
-846 9 46 1
-847 9 46 0
-896 20 2 0
-897 20 2 1
-898 20 3 0
-899 20 3 1
-900 21 2 0
-901 21 2 1
-902 21 3 0
-903 21 3 1
-904 23 3 1
-905 23 3 0
-906 23 2 1
-907 23 2 0
-908 22 3 1
-909 22 3 0
-910 22 2 1
-911 22 2 0
+832 12 46 0
+833 12 46 1
+834 12 47 0
+835 12 47 1
+836 13 46 0
+837 13 46 1
+838 13 47 0
+839 13 47 1
+840 15 47 1
+841 15 47 0
+842 15 46 1
+843 15 46 0
+844 14 47 1
+845 14 47 0
+846 14 46 1
+847 14 46 0
+896 19 2 0
+897 19 2 1
+898 19 3 0
+899 19 3 1
+900 18 2 0
+901 18 2 1
+902 18 3 0
+903 18 3 1
+904 16 3 1
+905 16 3 0
+906 16 2 1
+907 16 2 0
+908 17 3 1
+909 17 3 0
+910 17 2 1
+911 17 2 0
 928 20 0 0
 929 20 0 1
 930 20 1 0
@@ -432,38 +432,38 @@
 957 17 1 0
 958 17 0 1
 959 17 0 0
-960 19 2 0
-961 19 2 1
-962 19 3 0
-963 19 3 1
-964 18 2 0
-965 18 2 1
-966 18 3 0
-967 18 3 1
-968 16 3 1
-969 16 3 0
-970 16 2 1
-971 16 2 0
-972 17 3 1
-973 17 3 0
-974 17 2 1
-975 17 2 0
-1024 20 6 0
-1025 20 6 1
-1026 20 7 0
-1027 20 7 1
-1028 21 6 0
-1029 21 6 1
-1030 21 7 0
-1031 21 7 1
-1032 23 7 1
-1033 23 7 0
-1034 23 6 1
-1035 23 6 0
-1036 22 7 1
-1037 22 7 0
-1038 22 6 1
-1039 22 6 0
+960 20 2 0
+961 20 2 1
+962 20 3 0
+963 20 3 1
+964 21 2 0
+965 21 2 1
+966 21 3 0
+967 21 3 1
+968 23 3 1
+969 23 3 0
+970 23 2 1
+971 23 2 0
+972 22 3 1
+973 22 3 0
+974 22 2 1
+975 22 2 0
+1024 19 6 0
+1025 19 6 1
+1026 19 7 0
+1027 19 7 1
+1028 18 6 0
+1029 18 6 1
+1030 18 7 0
+1031 18 7 1
+1032 16 7 1
+1033 16 7 0
+1034 16 6 1
+1035 16 6 0
+1036 17 7 1
+1037 17 7 0
+1038 17 6 1
+1039 17 6 0
 1056 20 4 0
 1057 20 4 1
 1058 20 5 0
@@ -496,38 +496,38 @@
 1085 17 5 0
 1086 17 4 1
 1087 17 4 0
-1088 19 6 0
-1089 19 6 1
-1090 19 7 0
-1091 19 7 1
-1092 18 6 0
-1093 18 6 1
-1094 18 7 0
-1095 18 7 1
-1096 16 7 1
-1097 16 7 0
-1098 16 6 1
-1099 16 6 0
-1100 17 7 1
-1101 17 7 0
-1102 17 6 1
-1103 17 6 0
-1152 20 10 0
-1153 20 10 1
-1154 20 11 0
-1155 20 11 1
-1156 21 10 0
-1157 21 10 1
-1158 21 11 0
-1159 21 11 1
-1160 23 11 1
-1161 23 11 0
-1162 23 10 1
-1163 23 10 0
-1164 22 11 1
-1165 22 11 0
-1166 22 10 1
-1167 22 10 0
+1088 20 6 0
+1089 20 6 1
+1090 20 7 0
+1091 20 7 1
+1092 21 6 0
+1093 21 6 1
+1094 21 7 0
+1095 21 7 1
+1096 23 7 1
+1097 23 7 0
+1098 23 6 1
+1099 23 6 0
+1100 22 7 1
+1101 22 7 0
+1102 22 6 1
+1103 22 6 0
+1152 19 10 0
+1153 19 10 1
+1154 19 11 0
+1155 19 11 1
+1156 18 10 0
+1157 18 10 1
+1158 18 11 0
+1159 18 11 1
+1160 16 11 1
+1161 16 11 0
+1162 16 10 1
+1163 16 10 0
+1164 17 11 1
+1165 17 11 0
+1166 17 10 1
+1167 17 10 0
 1184 20 8 0
 1185 20 8 1
 1186 20 9 0
@@ -560,38 +560,38 @@
 1213 17 9 0
 1214 17 8 1
 1215 17 8 0
-1216 19 10 0
-1217 19 10 1
-1218 19 11 0
-1219 19 11 1
-1220 18 10 0
-1221 18 10 1
-1222 18 11 0
-1223 18 11 1
-1224 16 11 1
-1225 16 11 0
-1226 16 10 1
-1227 16 10 0
-1228 17 11 1
-1229 17 11 0
-1230 17 10 1
-1231 17 10 0
-2176 20 14 0
-2177 20 14 1
-2178 20 15 0
-2179 20 15 1
-2180 21 14 0
-2181 21 14 1
-2182 21 15 0
-2183 21 15 1
-2184 23 15 1
-2185 23 15 0
-2186 23 14 1
-2187 23 14 0
-2188 22 15 1
-2189 22 15 0
-2190 22 14 1
-2191 22 14 0
+1216 20 10 0
+1217 20 10 1
+1218 20 11 0
+1219 20 11 1
+1220 21 10 0
+1221 21 10 1
+1222 21 11 0
+1223 21 11 1
+1224 23 11 1
+1225 23 11 0
+1226 23 10 1
+1227 23 10 0
+1228 22 11 1
+1229 22 11 0
+1230 22 10 1
+1231 22 10 0
+2176 19 14 0
+2177 19 14 1
+2178 19 15 0
+2179 19 15 1
+2180 18 14 0
+2181 18 14 1
+2182 18 15 0
+2183 18 15 1
+2184 16 15 1
+2185 16 15 0
+2186 16 14 1
+2187 16 14 0
+2188 17 15 1
+2189 17 15 0
+2190 17 14 1
+2191 17 14 0
 2208 20 12 0
 2209 20 12 1
 2210 20 13 0
@@ -624,38 +624,38 @@
 2237 17 13 0
 2238 17 12 1
 2239 17 12 0
-2240 19 14 0
-2241 19 14 1
-2242 19 15 0
-2243 19 15 1
-2244 18 14 0
-2245 18 14 1
-2246 18 15 0
-2247 18 15 1
-2248 16 15 1
-2249 16 15 0
-2250 16 14 1
-2251 16 14 0
-2252 17 15 1
-2253 17 15 0
-2254 17 14 1
-2255 17 14 0
-2304 20 18 0
-2305 20 18 1
-2306 20 19 0
-2307 20 19 1
-2308 21 18 0
-2309 21 18 1
-2310 21 19 0
-2311 21 19 1
-2312 23 19 1
-2313 23 19 0
-2314 23 18 1
-2315 23 18 0
-2316 22 19 1
-2317 22 19 0
-2318 22 18 1
-2319 22 18 0
+2240 20 14 0
+2241 20 14 1
+2242 20 15 0
+2243 20 15 1
+2244 21 14 0
+2245 21 14 1
+2246 21 15 0
+2247 21 15 1
+2248 23 15 1
+2249 23 15 0
+2250 23 14 1
+2251 23 14 0
+2252 22 15 1
+2253 22 15 0
+2254 22 14 1
+2255 22 14 0
+2304 19 18 0
+2305 19 18 1
+2306 19 19 0
+2307 19 19 1
+2308 18 18 0
+2309 18 18 1
+2310 18 19 0
+2311 18 19 1
+2312 16 19 1
+2313 16 19 0
+2314 16 18 1
+2315 16 18 0
+2316 17 19 1
+2317 17 19 0
+2318 17 18 1
+2319 17 18 0
 2336 20 16 0
 2337 20 16 1
 2338 20 17 0
@@ -688,38 +688,38 @@
 2365 17 17 0
 2366 17 16 1
 2367 17 16 0
-2368 19 18 0
-2369 19 18 1
-2370 19 19 0
-2371 19 19 1
-2372 18 18 0
-2373 18 18 1
-2374 18 19 0
-2375 18 19 1
-2376 16 19 1
-2377 16 19 0
-2378 16 18 1
-2379 16 18 0
-2380 17 19 1
-2381 17 19 0
-2382 17 18 1
-2383 17 18 0
-2432 20 22 0
-2433 20 22 1
-2434 20 23 0
-2435 20 23 1
-2436 21 22 0
-2437 21 22 1
-2438 21 23 0
-2439 21 23 1
-2440 23 23 1
-2441 23 23 0
-2442 23 22 1
-2443 23 22 0
-2444 22 23 1
-2445 22 23 0
-2446 22 22 1
-2447 22 22 0
+2368 20 18 0
+2369 20 18 1
+2370 20 19 0
+2371 20 19 1
+2372 21 18 0
+2373 21 18 1
+2374 21 19 0
+2375 21 19 1
+2376 23 19 1
+2377 23 19 0
+2378 23 18 1
+2379 23 18 0
+2380 22 19 1
+2381 22 19 0
+2382 22 18 1
+2383 22 18 0
+2432 19 22 0
+2433 19 22 1
+2434 19 23 0
+2435 19 23 1
+2436 18 22 0
+2437 18 22 1
+2438 18 23 0
+2439 18 23 1
+2440 16 23 1
+2441 16 23 0
+2442 16 22 1
+2443 16 22 0
+2444 17 23 1
+2445 17 23 0
+2446 17 22 1
+2447 17 22 0
 2464 20 20 0
 2465 20 20 1
 2466 20 21 0
@@ -752,38 +752,38 @@
 2493 17 21 0
 2494 17 20 1
 2495 17 20 0
-2496 19 22 0
-2497 19 22 1
-2498 19 23 0
-2499 19 23 1
-2500 18 22 0
-2501 18 22 1
-2502 18 23 0
-2503 18 23 1
-2504 16 23 1
-2505 16 23 0
-2506 16 22 1
-2507 16 22 0
-2508 17 23 1
-2509 17 23 0
-2510 17 22 1
-2511 17 22 0
-2560 20 26 0
-2561 20 26 1
-2562 20 27 0
-2563 20 27 1
-2564 21 26 0
-2565 21 26 1
-2566 21 27 0
-2567 21 27 1
-2568 23 27 1
-2569 23 27 0
-2570 23 26 1
-2571 23 26 0
-2572 22 27 1
-2573 22 27 0
-2574 22 26 1
-2575 22 26 0
+2496 20 22 0
+2497 20 22 1
+2498 20 23 0
+2499 20 23 1
+2500 21 22 0
+2501 21 22 1
+2502 21 23 0
+2503 21 23 1
+2504 23 23 1
+2505 23 23 0
+2506 23 22 1
+2507 23 22 0
+2508 22 23 1
+2509 22 23 0
+2510 22 22 1
+2511 22 22 0
+2560 19 26 0
+2561 19 26 1
+2562 19 27 0
+2563 19 27 1
+2564 18 26 0
+2565 18 26 1
+2566 18 27 0
+2567 18 27 1
+2568 16 27 1
+2569 16 27 0
+2570 16 26 1
+2571 16 26 0
+2572 17 27 1
+2573 17 27 0
+2574 17 26 1
+2575 17 26 0
 2592 20 24 0
 2593 20 24 1
 2594 20 25 0
@@ -816,38 +816,38 @@
 2621 17 25 0
 2622 17 24 1
 2623 17 24 0
-2624 19 26 0
-2625 19 26 1
-2626 19 27 0
-2627 19 27 1
-2628 18 26 0
-2629 18 26 1
-2630 18 27 0
-2631 18 27 1
-2632 16 27 1
-2633 16 27 0
-2634 16 26 1
-2635 16 26 0
-2636 17 27 1
-2637 17 27 0
-2638 17 26 1
-2639 17 26 0
-2688 20 30 0
-2689 20 30 1
-2690 20 31 0
-2691 20 31 1
-2692 21 30 0
-2693 21 30 1
-2694 21 31 0
-2695 21 31 1
-2696 23 31 1
-2697 23 31 0
-2698 23 30 1
-2699 23 30 0
-2700 22 31 1
-2701 22 31 0
-2702 22 30 1
-2703 22 30 0
+2624 20 26 0
+2625 20 26 1
+2626 20 27 0
+2627 20 27 1
+2628 21 26 0
+2629 21 26 1
+2630 21 27 0
+2631 21 27 1
+2632 23 27 1
+2633 23 27 0
+2634 23 26 1
+2635 23 26 0
+2636 22 27 1
+2637 22 27 0
+2638 22 26 1
+2639 22 26 0
+2688 19 30 0
+2689 19 30 1
+2690 19 31 0
+2691 19 31 1
+2692 18 30 0
+2693 18 30 1
+2694 18 31 0
+2695 18 31 1
+2696 16 31 1
+2697 16 31 0
+2698 16 30 1
+2699 16 30 0
+2700 17 31 1
+2701 17 31 0
+2702 17 30 1
+2703 17 30 0
 2720 20 28 0
 2721 20 28 1
 2722 20 29 0
@@ -880,38 +880,38 @@
 2749 17 29 0
 2750 17 28 1
 2751 17 28 0
-2752 19 30 0
-2753 19 30 1
-2754 19 31 0
-2755 19 31 1
-2756 18 30 0
-2757 18 30 1
-2758 18 31 0
-2759 18 31 1
-2760 16 31 1
-2761 16 31 0
-2762 16 30 1
-2763 16 30 0
-2764 17 31 1
-2765 17 31 0
-2766 17 30 1
-2767 17 30 0
-2816 20 34 0
-2817 20 34 1
-2818 20 35 0
-2819 20 35 1
-2820 21 34 0
-2821 21 34 1
-2822 21 35 0
-2823 21 35 1
-2824 23 35 1
-2825 23 35 0
-2826 23 34 1
-2827 23 34 0
-2828 22 35 1
-2829 22 35 0
-2830 22 34 1
-2831 22 34 0
+2752 20 30 0
+2753 20 30 1
+2754 20 31 0
+2755 20 31 1
+2756 21 30 0
+2757 21 30 1
+2758 21 31 0
+2759 21 31 1
+2760 23 31 1
+2761 23 31 0
+2762 23 30 1
+2763 23 30 0
+2764 22 31 1
+2765 22 31 0
+2766 22 30 1
+2767 22 30 0
+2816 19 34 0
+2817 19 34 1
+2818 19 35 0
+2819 19 35 1
+2820 18 34 0
+2821 18 34 1
+2822 18 35 0
+2823 18 35 1
+2824 16 35 1
+2825 16 35 0
+2826 16 34 1
+2827 16 34 0
+2828 17 35 1
+2829 17 35 0
+2830 17 34 1
+2831 17 34 0
 2848 20 32 0
 2849 20 32 1
 2850 20 33 0
@@ -944,38 +944,38 @@
 2877 17 33 0
 2878 17 32 1
 2879 17 32 0
-2880 19 34 0
-2881 19 34 1
-2882 19 35 0
-2883 19 35 1
-2884 18 34 0
-2885 18 34 1
-2886 18 35 0
-2887 18 35 1
-2888 16 35 1
-2889 16 35 0
-2890 16 34 1
-2891 16 34 0
-2892 17 35 1
-2893 17 35 0
-2894 17 34 1
-2895 17 34 0
-2944 20 38 0
-2945 20 38 1
-2946 20 39 0
-2947 20 39 1
-2948 21 38 0
-2949 21 38 1
-2950 21 39 0
-2951 21 39 1
-2952 23 39 1
-2953 23 39 0
-2954 23 38 1
-2955 23 38 0
-2956 22 39 1
-2957 22 39 0
-2958 22 38 1
-2959 22 38 0
+2880 20 34 0
+2881 20 34 1
+2882 20 35 0
+2883 20 35 1
+2884 21 34 0
+2885 21 34 1
+2886 21 35 0
+2887 21 35 1
+2888 23 35 1
+2889 23 35 0
+2890 23 34 1
+2891 23 34 0
+2892 22 35 1
+2893 22 35 0
+2894 22 34 1
+2895 22 34 0
+2944 19 38 0
+2945 19 38 1
+2946 19 39 0
+2947 19 39 1
+2948 18 38 0
+2949 18 38 1
+2950 18 39 0
+2951 18 39 1
+2952 16 39 1
+2953 16 39 0
+2954 16 38 1
+2955 16 38 0
+2956 17 39 1
+2957 17 39 0
+2958 17 38 1
+2959 17 38 0
 2976 20 36 0
 2977 20 36 1
 2978 20 37 0
@@ -1008,38 +1008,38 @@
 3005 17 37 0
 3006 17 36 1
 3007 17 36 0
-3008 19 38 0
-3009 19 38 1
-3010 19 39 0
-3011 19 39 1
-3012 18 38 0
-3013 18 38 1
-3014 18 39 0
-3015 18 39 1
-3016 16 39 1
-3017 16 39 0
-3018 16 38 1
-3019 16 38 0
-3020 17 39 1
-3021 17 39 0
-3022 17 38 1
-3023 17 38 0
-3072 20 42 0
-3073 20 42 1
-3074 20 43 0
-3075 20 43 1
-3076 21 42 0
-3077 21 42 1
-3078 21 43 0
-3079 21 43 1
-3080 23 43 1
-3081 23 43 0
-3082 23 42 1
-3083 23 42 0
-3084 22 43 1
-3085 22 43 0
-3086 22 42 1
-3087 22 42 0
+3008 20 38 0
+3009 20 38 1
+3010 20 39 0
+3011 20 39 1
+3012 21 38 0
+3013 21 38 1
+3014 21 39 0
+3015 21 39 1
+3016 23 39 1
+3017 23 39 0
+3018 23 38 1
+3019 23 38 0
+3020 22 39 1
+3021 22 39 0
+3022 22 38 1
+3023 22 38 0
+3072 19 42 0
+3073 19 42 1
+3074 19 43 0
+3075 19 43 1
+3076 18 42 0
+3077 18 42 1
+3078 18 43 0
+3079 18 43 1
+3080 16 43 1
+3081 16 43 0
+3082 16 42 1
+3083 16 42 0
+3084 17 43 1
+3085 17 43 0
+3086 17 42 1
+3087 17 42 0
 3104 20 40 0
 3105 20 40 1
 3106 20 41 0
@@ -1072,38 +1072,38 @@
 3133 17 41 0
 3134 17 40 1
 3135 17 40 0
-3136 19 42 0
-3137 19 42 1
-3138 19 43 0
-3139 19 43 1
-3140 18 42 0
-3141 18 42 1
-3142 18 43 0
-3143 18 43 1
-3144 16 43 1
-3145 16 43 0
-3146 16 42 1
-3147 16 42 0
-3148 17 43 1
-3149 17 43 0
-3150 17 42 1
-3151 17 42 0
-3200 20 46 0
-3201 20 46 1
-3202 20 47 0
-3203 20 47 1
-3204 21 46 0
-3205 21 46 1
-3206 21 47 0
-3207 21 47 1
-3208 23 47 1
-3209 23 47 0
-3210 23 46 1
-3211 23 46 0
-3212 22 47 1
-3213 22 47 0
-3214 22 46 1
-3215 22 46 0
+3136 20 42 0
+3137 20 42 1
+3138 20 43 0
+3139 20 43 1
+3140 21 42 0
+3141 21 42 1
+3142 21 43 0
+3143 21 43 1
+3144 23 43 1
+3145 23 43 0
+3146 23 42 1
+3147 23 42 0
+3148 22 43 1
+3149 22 43 0
+3150 22 42 1
+3151 22 42 0
+3200 19 46 0
+3201 19 46 1
+3202 19 47 0
+3203 19 47 1
+3204 18 46 0
+3205 18 46 1
+3206 18 47 0
+3207 18 47 1
+3208 16 47 1
+3209 16 47 0
+3210 16 46 1
+3211 16 46 0
+3212 17 47 1
+3213 17 47 0
+3214 17 46 1
+3215 17 46 0
 3232 20 44 0
 3233 20 44 1
 3234 20 45 0
@@ -1136,19 +1136,19 @@
 3261 17 45 0
 3262 17 44 1
 3263 17 44 0
-3264 19 46 0
-3265 19 46 1
-3266 19 47 0
-3267 19 47 1
-3268 18 46 0
-3269 18 46 1
-3270 18 47 0
-3271 18 47 1
-3272 16 47 1
-3273 16 47 0
-3274 16 46 1
-3275 16 46 0
-3276 17 47 1
-3277 17 47 0
-3278 17 46 1
-3279 17 46 0
+3264 20 46 0
+3265 20 46 1
+3266 20 47 0
+3267 20 47 1
+3268 21 46 0
+3269 21 46 1
+3270 21 47 0
+3271 21 47 1
+3272 23 47 1
+3273 23 47 0
+3274 23 46 1
+3275 23 46 0
+3276 22 47 1
+3277 22 47 0
+3278 22 46 1
+3279 22 46 0