1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 5963 5964 5965 5966 5967 5968 5969 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252 6253 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 6267 6268 6269 6270 6271 6272 6273 6274 6275 6276 6277 6278 6279 6280 6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 6299 6300 6301 6302 6303 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401 6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 6701 6702 6703 6704 6705 6706 6707 6708 6709 6710 6711 6712 6713 6714 6715 6716 6717 6718 6719 6720 6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 6774 6775 6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786 6787 6788 6789 6790 6791 6792 6793 6794 6795 6796 6797 6798 6799 6800 6801 6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 6829 6830 6831 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866 6867 6868 6869 6870 6871 6872 6873 6874 6875 6876 6877 6878 6879 6880 6881 6882 6883 6884 6885 6886 6887 6888 6889 6890 6891 6892 6893 6894 6895 6896 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937 6938 6939 6940 6941 6942 6943 6944 6945 6946 6947 6948 6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960 6961 6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030 7031 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 7054 7055 7056 7057 7058 7059 7060 7061 7062 7063 7064 7065 7066 7067 7068 7069 7070 7071 7072 7073 7074 7075 7076 7077 7078 7079 7080 7081 7082 7083 7084 7085 7086 7087 7088 7089 7090 7091 7092 7093 7094 7095 7096 7097 7098 7099 7100 7101 7102 7103 7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 7345 7346 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410 7411 7412 7413 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 7435 7436 7437 7438 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486 7487 7488 7489 7490 7491 7492 7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 7523 7524 7525 7526 7527 7528 7529 7530 7531 7532 7533 7534 7535 7536 7537 7538 7539 7540 7541 7542 7543 7544 7545 7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556 7557 7558 7559 7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 7572 7573 7574 7575 7576 7577 7578 7579 7580 7581 7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 7614 7615 7616 7617 7618 7619 7620 7621 7622 7623 7624 7625 7626 7627 7628 7629 7630 7631 7632 7633 7634 7635 7636 7637 7638 7639 7640 7641 7642 7643 7644 7645 7646 7647 7648 7649 7650 7651 7652 7653 7654 7655 7656 7657 7658 7659 7660 7661 7662 7663 7664 7665 7666 7667 7668 7669 7670 7671 7672 7673 7674 7675 7676 7677 7678 7679 7680 7681 7682 7683 7684 7685 7686 7687 7688 7689 7690 7691 7692 7693 7694 7695 7696 7697 7698 7699 7700 7701 7702 7703 7704 7705 7706 7707 7708 7709 7710 7711 7712 7713 7714 7715 7716 7717 7718 7719 7720 7721 7722 7723 7724 7725 7726 7727 7728 7729 7730 7731 7732 7733 7734 7735 7736 7737 7738 7739 7740 7741 7742 7743 7744 7745 7746 7747 7748 7749 7750 7751 7752 7753 7754 7755 7756 7757 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 7773 7774 7775 7776 7777 7778 7779 7780 7781 7782 7783 7784 7785 7786 7787 7788 7789 7790 7791 7792 7793 7794 7795 7796 7797 7798 7799 7800 7801 7802 7803 7804 7805 7806 7807 7808 7809 7810 7811 7812 7813 7814 7815 7816 7817 7818 7819 7820 7821 7822 7823 7824 7825 7826 7827 7828 7829 7830 7831 7832 7833 7834 7835 7836 7837 7838 7839 7840 7841 7842 7843 7844 7845 7846 7847 7848 7849 7850 7851 7852 7853 7854 7855 7856 7857 7858 7859 7860 7861 7862 7863 7864 7865 7866 7867 7868 7869 7870 7871 7872 7873 7874 7875 7876 7877 7878 7879 7880 7881 7882 7883 7884 7885 7886 7887 7888 7889 7890 7891 7892 7893 7894 7895 7896 7897 7898 7899 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 7921 7922 7923 7924 7925 7926 7927 7928 7929 7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941 7942 7943 7944 7945 7946 7947 7948 7949 7950 7951 7952 7953 7954 7955 7956 7957 7958 7959 7960 7961 7962 7963 7964 7965 7966 7967 7968 7969 7970 7971 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 7987 7988 7989 7990 7991 7992 7993 7994 7995 7996 7997 7998 7999 8000 8001 8002 8003 8004 8005 8006 8007 8008 8009 8010 8011 8012 8013 8014 8015 8016 8017 8018 8019 8020 8021 8022 8023 8024 8025 8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 8037 8038 8039 8040 8041 8042 8043 8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 8102 8103 8104 8105 8106 8107 8108 8109 8110 8111 8112 8113 8114 8115 8116 8117 8118 8119 8120 8121 8122 8123 8124 8125 8126 8127 8128 8129 8130 8131 8132 8133 8134 8135 8136 8137 8138 8139 8140 8141 8142 8143 8144 8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 8161 8162 8163 8164 8165 8166 8167 8168 8169 8170 8171 8172 8173 8174 8175 8176 8177 8178 8179 8180 8181 8182 8183 8184 8185 8186 8187 8188 8189 8190 8191 8192 8193 8194 8195 8196 8197 8198 8199 8200 8201 8202 8203 8204 8205 8206 8207 8208 8209 8210 8211 8212 8213 8214 8215 8216 8217 8218 8219 8220 8221 8222 8223 8224 8225 8226 8227 8228 8229 8230 8231 8232 8233 8234 8235 8236 8237 8238 8239 8240 8241 8242 8243 8244 8245 8246 8247 8248 8249 8250 8251 8252 8253 8254 8255 8256 8257 8258 8259 8260 8261 8262 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284 8285 8286 8287 8288 8289 8290 8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 8305 8306 8307 8308 8309 8310 8311 8312 8313 8314 8315 8316 8317 8318 8319 8320 8321 8322 8323 8324 8325 8326 8327 8328 8329 8330 8331 8332 8333 8334 8335 8336 8337 8338 8339 8340 8341 8342 8343 8344 8345 8346 8347 8348 8349 8350 8351 8352 8353 8354 8355 8356 8357 8358 8359 8360 8361 8362 8363 8364 8365 8366 8367 8368 8369 8370 8371 8372 8373 8374 8375 8376 8377 8378 8379 8380 8381 8382 8383 8384 8385 8386 8387 8388 8389 8390 8391 8392 8393 8394 8395 8396 8397 8398 8399 8400 8401 8402 8403 8404 8405 8406 8407 8408 8409 8410 8411 8412 8413 8414 8415 8416 8417 8418 8419 8420 8421 8422 8423 8424 8425 8426 8427 8428 8429 8430 8431 8432 8433 8434 8435 8436 8437 8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453 8454 8455 8456 8457 8458 8459 8460 8461 8462 8463 8464 8465 8466 8467 8468 8469 8470 8471 8472 8473 8474 8475 8476 8477 8478 8479 8480 8481 8482 8483 8484 8485 8486 8487 8488 8489 8490 8491 8492 8493 8494 8495 8496 8497 8498 8499 8500 8501 8502 8503 8504 8505 8506 8507 8508 8509 8510 8511 8512 8513 8514 8515 8516 8517 8518 8519 8520 8521 8522 8523 8524 8525 8526 8527 8528 8529 8530 8531 8532 8533 8534 8535 8536 8537 8538 8539 8540 8541 8542 8543 8544 8545 8546 8547 8548 8549 8550 8551 8552 8553 8554 8555 8556 8557 8558 8559 8560 8561 8562 8563 8564 8565 8566 8567 8568 8569 8570 8571 8572 8573 8574 8575 8576 8577 8578 8579 8580 8581 8582 8583 8584 8585 8586 8587 8588 8589 8590 8591 8592 8593 8594 8595 8596 8597 8598 8599 8600 8601 8602 8603 8604 8605 8606 8607 8608 8609 8610 8611 8612 8613 8614 8615 8616 8617 8618 8619 8620 8621 8622 8623 8624 8625 8626 8627 8628 8629
|
2012-01-17 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo & Gregory
* Release of fastjet-3.0.2
2012-01-12 Gregory Soyez <soyez@fastjet.fr>
* fastjet-config.in:
used @libdir@ instead of @prefix@/lib and @includedir@ instead
of @prefix@/include for a correct treatment of non-standard
installation location
2011-12-16 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* configure.ac:
added test that prevents user from installing in the build
directory (copied from LHAPDF)
2011-12-13 Gregory Soyez <soyez@fastjet.fr>
* plugins/D0RunICone/D0RunIBaseConePlugin.cc:
* plugins/D0RunIICone/D0RunIIConePlugin.cc:
updated banner to give credit to the D0 collaboration
* COPYING:
* plugins/D0RunIICone/ProtoJet.hpp:
* plugins/D0RunIICone/inline_maths.h:
* plugins/D0RunIICone/ILConeAlgorithm.hpp:
* plugins/D0RunIICone/HepEntity.h:
* plugins/D0RunIICone/ConeSplitMerge.hpp:
* plugins/D0RunIICone/ConeJetInfo.hpp:
* plugins/D0RunICone/inline_maths.h:
* plugins/D0RunICone/HepEntityIpre96.h:
* plugins/D0RunICone/HepEntityI.h:
* plugins/D0RunICone/ConeClusterAlgo.hpp:
added license information (Lars Sonnenschein and the D0
collaboration granted us the permission to distribute the D0
codes under the terms of the GPLv2
2011-12-05 Gregory Soyez <soyez@fastjet.fr>
* configure.ac:
fixed an issue in the "g++ presence test" to cover situations
where the full path to the compiler is specified.
2011-12-03 Gavin Salam <salam@lpthe.jussieu.fr>
* ../contrib: *** ADDED ***
* ../contrib/vermilion/* *** ADDED ***
* ../3rd_party_interfaces/ -> ../contrib/3rd_party_interfaces/
set up some structure for our copy of contrib, including the
code from Chris Vermilion + moved our pythia8 interface into
there.
2011-12-02 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo + Gregory
* RoadMap:
cleaned it up in preparation for transition to 3.1.0-devel
* doc/contrib-policy.txt: *** ADDED ***
added this as a location to start thinking about how the contrib
area will work.
2011-12-02 Gregory Soyez <soyez@fastjet.fr>
* configure.ac:
. added a test for sed
. added an explicit test that the C++ compiler returned by
AC_PROG_CXX (g++ if none found!) really exists (in case g++
is not installed)
2011-12-01 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc:
* include/fastjet/ClusterSequence.hh:
void _print_banner() -> static void print_banner(); i.e. it's
now public and documented in doxygen.
* example/fastjet_timing_plugins.cc:
this now prints a banner early on
* doc/fastjet-doc.tex (section{Error handling}):
added mention of CS::print_banner().
2011-12-01 Gregory Soyez <soyez@fastjet.fr>
* configure.ac:
issued an error message if no C++ compiler is found
2011-11-29 Gavin Salam <salam@lpthe.jussieu.fr>
* CHECKLIST:
updated this to reflect the new scripts/set-version.sh script
* doc/fastjet-doc.tex
added note about comment lines to be removed for automatic
version changes
* scripts/set-version.sh (version): *** ADDED ***
run
./scripts/set-version.sh VERSION-NUMBER
to make all the changes needed to switch to a new
version
* mksnapshot.sh -> scripts/mksnapshot.sh
clean up main directory by having maintenance scripts in the
scripts/ directory.
* tarit.sh -> scripts/old/tarit.sh
* tarit-areas.sh -> scripts/old/tarit-areas.sh
* svntagit.sh -> scripts/old/svntagit.sh
these scripts were out of date in some way of other, so moved
them out of the way
2011-11-28 Gavin SALAM <salam@lpthe.jussieu.fr>
* doc/fastjet-doc.tex:
* Doxyfile (PROJECT_NUMBER):
* include/fastjet/config_win.h (FASTJET_PACKAGE_STRING):
* configure.ac:
version number becomes 3.0.2-devel
* switched SISCone back over to trunk
2011-11-25 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo & Gregory
Release of FastJet 3.0.1
2011-11-25 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo & Gregory
* NEWS:
further small changes.
* plugins/TrackJet/TrackJetPlugin.cc (_print_banner):
rephrased the banner to reflect updated authorship info.
2011-11-25 Gregory Soyez <soyez@fastjet.fr>
* plugins/D0RunIICone/D0RunIIConePlugin.cc (_print_banner):
* plugins/PxCone/PxConePlugin.cc (_print_banner):
* plugins/D0RunICone/D0RunIBaseConePlugin.cc (_print_banner):
* plugins/CMSIterativeCone/CMSIterativeConePlugin.cc (_print_banner):
* plugins/CDFCones/CDFJetCluPlugin.cc (_print_banner):
* plugins/CDFCones/CDFMidPointPlugin.cc (_print_banner):
* plugins/ATLASCone/ATLASConePlugin.cc (_print_banner):
removed the mention to a minimal FJ version (vX.Y upwards)
* plugins/SISCone/SISConeSphericalPlugin.cc:
* plugins/SISCone/SISConePlugin.cc:
redirect the SISCone banner to the same stream as the FastJet
banners.
* plugins/ATLASCone/ATLASConePlugin.cc:
fixed a memory leak in the interface to the ATLAS cone plugin
* example/fastjet_timing_plugins.cc:
inverted the ordering of some tests for the default jet alg to
make sure that the -kt command-line option is processed.
2011-11-24 Gregory Soyez <soyez@fastjet.fr>
* plugins/PxCone/PxConePlugin.cc:
disabled the banner since the fortran code already has one
* plugins/D0RunICone/D0RunIBaseConePlugin.cc:
* plugins/D0RunIICone/D0RunIIConePlugin.cc:
* plugins/ATLASCone/ATLASConePlugin.cc:
* plugins/CMSIterativeCone/CMSIterativeConePlugin.cc:
modified banner message
2011-11-24 Gavin SALAM <salam@lpthe.jussieu.fr>
* COPYING:
have reworded this in various places to give a better overview
at the start of the file and a discussion of references that's
similar to what we have on the "About" page of the website.
* src/Voronoi.cc:
* plugins/ATLASCone/ATLASConePlugin.cc:
typos
* example/fastjet_timing_plugins.cc:
added -all-algs option to run all algorithms and -file option to
read events from a file. You can now also specify multiple
algorithms, e.g. -kt -cam.
NB: the algorithms loop is the outer one, and event-reading is
done in an innter an iev loop; -all-algs must be used in
conjunction with -file if you want the same set of particles to
be used for each jet alg.
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence.hh:
* plugins/D0RunIICone/D0RunIIConePlugin.cc
* plugins/CDFCones/CDFMidPointPlugin.cc
* plugins/CDFCones/CDFJetCluPlugin.cc
* plugins/PxCone/PxConePlugin.cc
* plugins/SISCone/siscone
* plugins/CMSIterativeCone/CMSIterativeConePlugin.cc
* plugins/D0RunICone/D0RunIBaseConePlugin.cc
* plugins/TrackJet/TrackJetPlugin.cc
* plugins/ATLASCone/ATLASConePlugin.cc
access to banner ostream is now through the cleaner
CS::fastjet_banner_stream() member + renamed
CS::fastjet_banner_ostr -> CS::_fastjet_banner_ostr and made it
private.
2011-11-24 Gregory Soyez <soyez@fastjet.fr>
* plugins/D0RunICone/D0RunIBaseConePlugin.cc (_print_banner):
updated the version availability (3.0 rather than 2.4)
2011-11-24 Gavin Salam <salam@lpthe.jussieu.fr>
* NEWS:
prepared preliminary summary of changes
2011-11-24 Gregory Soyez <soyez@fastjet.fr>
* plugins/D0RunIICone/D0RunIIConePlugin.cc:
* plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh:
* plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh:
* plugins/D0RunICone/fastjet/D0RunIConePlugin.hh:
* plugins/D0RunICone/D0RunIBaseConePlugin.cc:
* plugins/D0RunICone/HepEntityIpre96.h:
* plugins/D0RunICone/HepEntityI.h:
* plugins/D0RunICone/ConeClusterAlgo.hpp:
* plugins/D0RunICone/inline_maths.h:
* plugins/D0RunIICone/ILConeAlgorithm.hpp:
* plugins/D0RunIICone/ProtoJet.hpp:
* plugins/D0RunIICone/ConeSplitMerge.hpp:
* plugins/D0RunIICone/ConeJetInfo.hpp:
* plugins/D0RunIICone/HepEntity.h:
* plugins/D0RunIICone/inline_maths.h:
added a history of Changes + a banner
* COPYING:
mentioned the origin of the D0 code
* plugins/TrackJet/fastjet/TrackJetPlugin.hh:
* plugins/TrackJet/TrackJetPlugin.cc:
* plugins/PxCone/fastjet/PxConePlugin.hh:
* plugins/PxCone/PxConePlugin.cc:
* plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh:
* plugins/CMSIterativeCone/CMSIterativeConePlugin.cc:
* plugins/CDFCones/fastjet/CDFMidPointPlugin.hh:
* plugins/CDFCones/fastjet/CDFJetCluPlugin.hh:
* plugins/CDFCones/CDFMidPointPlugin.cc:
* plugins/CDFCones/CDFJetCluPlugin.cc:
* plugins/ATLASCone/fastjet/ATLASConePlugin.hh:
* plugins/ATLASCone/ATLASConePlugin.cc:
print the banner to FJ's ClusterSequence::fastjet_banner_ostr
+ removed 'disable_banner()'
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence.cc (_print_banner):
added ClusterSequence::fastjet_banner_ostr. This is a (pointer
to a) stream where the banner will be printed.
2011-11-23 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc (ClusterSequence::_print_banner):
updated banner following morning's discussion.
2011-11-22 Gavin Salam <salam@lpthe.jussieu.fr>
* example/10-subjets.cc:
sorted out residual warning.
* plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh:
* plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh
* plugins/D0RunICone/fastjet/D0RunIConePlugin.hh:
replaced CONrad -> CONErad.
2011-11-22 Gregory Soyez <soyez@fastjet.fr>
* plugins/ATLASCone/fastjet/ATLASConePlugin.hh:
* plugins/ATLASCone/ATLASConePlugin.cc:
added a banner
* plugins/ATLASCone/Makefile.am (libATLASConePlugin_la_SOURCES):
removed empty source files
* plugins/ATLASCone/CommonUtils.hh:
* plugins/ATLASCone/JetConeFinderTool.cc:
* plugins/ATLASCone/JetConeFinderTool.hh:
* plugins/ATLASCone/JetDistances.hh:
* plugins/ATLASCone/Jet.cc:
* plugins/ATLASCone/Jet.hh:
* plugins/ATLASCone/JetSplitMergeTool.cc:
* plugins/ATLASCone/JetSplitMergeTool.hh:
* plugins/ATLASCone/LorentzVector.hh:
added information about the file origin + a history of changes
* COPYING:
added info about all plugins written by the FastJet authors
* plugins/PxCone/PxConePlugin.cc (_print_banner):
* plugins/CMSIterativeCone/CMSIterativeConePlugin.cc (_print_banner):
* plugins/CDFCones/CDFJetCluPlugin.cc (_print_banner):
* plugins/CDFCones/CDFMidPointPlugin.cc (_print_banner):
* plugins/PxCone/fastjet/PxConePlugin.hh:
* plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh:
* plugins/TrackJet/fastjet/TrackJetPlugin.hh:
removed an unwanted 'const'
2011-11-22 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/PxCone/pxcone.f (PXCONE):
added some info about licensing in this file.
2011-11-22 Gregory Soyez <soyez@fastjet.fr>
* plugins/CDFCones/CDFcode/PhysicsTower.hh:
* plugins/CDFCones/CDFcode/MidPointAlgorithm.hh:
* plugins/CDFCones/CDFcode/JetCluAlgorithm.cc:
* plugins/CDFCones/CDFcode/JetCluAlgorithm.hh:
* plugins/CDFCones/CDFcode/LorentzVector.hh:
* plugins/CDFCones/CDFcode/ClusterComparisons.hh:
* plugins/CDFCones/CDFcode/Cluster.hh:
* plugins/CDFCones/CDFcode/Centroid.hh:
* plugins/CDFCones/CDFcode/CalTower.hh:
added info about permission for distribution + history of
changes
* plugins/CDFCones/CDFcode/Makefile.am:
removed empty files
* plugins/TrackJet/TrackJetPlugin.cc:
* plugins/TrackJet/fastjet/TrackJetPlugin.hh:
added license information + print a banner at first usage
* plugins/PxCone/fastjet/PxConePlugin.hh:
* plugins/PxCone/PxConePlugin.cc:
print a banner at first usage
* plugins/PxCone/README:
mentioned the list of changes in pxcone.f
* plugins/CMSIterativeCone/SortByEt.h:
* plugins/CMSIterativeCone/CMSIterativeConePlugin.cc:
inserted a proper license description and a list of changes
compared to the original CMS code + print a banner at 1st use
* COPYING:
added a series of license agreements for 3rd party plugins
2011-11-21 Gregory Soyez <soyez@fastjet.fr> + Gavin
* tools/MassDropTagger.cc (result):
replaced m() by equivalent expressions using m2()
* tools/fastjet/tools/MassDropTagger.hh:
used a WrappedStructure instead of a CompositeJetStructure for
the base MassDropTaggerStructure class.
2011-11-20 Gregory Soyez <soyez@fastjet.fr>
* configure.ac:
put the extra warnings (-ansi -pedantic -Wextra -Wshadow)
under a --enable-extra-warnings configure flag
2011-11-20 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
added pt(), pt2(), mt() and mt2() methods.
* src/GhostedAreaSpec.cc:
* include/fastjet/GhostedAreaSpec.hh:
switched kt -> pt in default function names; kept copies of
functions with "kt" in name for backwards compatibility.
* test-script-output-orig.txt:
edits of kt -> pt given change in GAS.
2011-11-17 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc:
* include/fastjet/internal/base.hh:
moved the doxygen group list out of base.hh and into
ClusterSequence.cc; also added reference plugins where we mentioned
JetDefinition (otherwise it's a fairly non-obvious two clicks
away from the main page).
2011-11-17 Gregory Soyez <soyez@fastjet.fr>
* src/ClusterSequence.cc (_decant_options):
added a missing call to _decant_options_partial()
(needed for proper initialisation as used e.g. in cases with
area)
2011-11-16 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc:
* include/fastjet/ClusterSequence.hh (template):
constructor now uses an initialisation list for things like the
_jet_def that are substantial and that one doesn't want to be
initialising twice. Also introduced _decant_options_partial()
and _initialise_and_run_no_decant(), which are now used directly
in the constructor. The calls _decant_options(...) and
_initialise_and_run(...) are maintained and just do the relevant
extra bits and pieces before calling _decant_options_partial()
and _initialise_and_run_no_decant() respectively. This shaves
off about 0.1 microseconds (can be relevant at low N).
* src/JetDefinition.cc (JetDefinition::JetDefinition):
removed function-wide ostringstream (for errors) in constructor,
which was causing a 0.6 microsecond time penalty, and replaced
it with oss's created only when an error condition is actually
seen.
2011-11-16 Gregory Soyez <soyez@fastjet.fr>
* example/fastjet_timing_plugins.cc:
added a -repeat-incl <ptmin> option to show the jets above ptmin
at each repetition of the clustering
[modified it so that the jets are just extracted and sorted but
not printed]
* configure.ac:
increased the level of warnings in the default compilation flags
* example/10-subjets.cc:
* example/04-constituents.cc:
* example/fastjet_timing_plugins.cc:
* example/fastjet_areas.cc (print_jets):
replaced/cast size_t by/to unsigned int
(this is mostly to avoid a compiler warning related to the fact
that size_t is equivalent to ungigned int on 32-bit machines and
long unsigned int on 64)
2011-11-16 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc:
lowered switchover point from N2Plain -> N2Tiled based on
observations from Gregory and me on more modern computers than
were used in the original studies (presumably larger cache is at
play).
2011-11-15 Gregory Soyez <soyez@fastjet.fr>
* src/ClusterSequence_TiledN2.cc (_minheap_faster_tiled_N2_cluster):
added a note about a gcc "may-be-used-uninitialised" warning
which is irrelevant.
* include/fastjet/NNH.hh (set_NN_nocross):
replaced 'head' and 'tail' by the parameters 'begin' and 'end'
(respectively). Note that all the calls to set_NN_nocross have
begin==head and end==tail so this is equivalent. But it is cleaner
and avoids a compiler warning.
* plugins/PxCone/fastjet/PxConePlugin.hh (ctor):
renamed arguments to avoid shadowing class members
* plugins/SISCone/fastjet/SISConeSphericalPlugin.hh:
removed extraneous ;
* src/CompositeJetStructure.cc (ctor):
renamed a local var to avoid shadowing a class member
2011-11-14 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/Filter.cc:
* tools/fastjet/tools/Filter.hh:
Reworked use of _subjet_def and _selector so that they are no
longer mutable. Also arranged for description to be more
accurate.
2011-11-14 Gregory Soyez <soyez@fastjet.fr>
* tools/Filter.cc (_get_all_pieces, ...):
removed the internal mutable all_pieces variable and pass
instead an argument to the appropriate functions
* plugins/D0RunICone/HepEntityIpre96.h:
* plugins/D0RunICone/HepEntityI.h:
* plugins/ATLASCone/Jet.hh:
* plugins/ATLASCone/LorentzVector.hh:
* plugins/D0RunIICone/ILConeAlgorithm.hpp:
* plugins/D0RunIICone/ProtoJet.hpp:
* plugins/D0RunIICone/ConeJetInfo.hpp:
* plugins/CDFCones/CDFcode/LorentzVector.hh:
* include/fastjet/internal/Voronoi.hh:
* src/Voronoi.cc:
started/completed a history of Changes to 3rd party code
* plugins/CDFCones/CDFcode/CalTower.hh (ctor):
added a few () to get rid of a gcc warning
* src/ClusterSequence_DumbN3.cc (_really_dumb_cluster):
marked as obsolete a part of the code that was associated with
another obsolete part of the code
* tools/fastjet/tools/Filter.hh:
* tools/Filter.cc:
removed all_pieces as the 2nd argument of get_all_pieces: this
is a member variable of the class so there is no need to pass it
as an argument.
* src/ClusterSequence_TiledN2.cc (_tiled_N2_cluster,
_minheap_faster_tiled_N2_cluster, _faster_tiled_N2_cluster):
replaced Tile * tile by Tile * tile_ptr to avoid a
shadowing (gcc -Wshadow warning)
* example/09-user_info.cc (MyUserInfo ctor):
* example/fastjet_timing_plugins.cc (main):
* plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh (ctor):
* plugins/D0RunICone/fastjet/D0RunIConePlugin.hh (ctor):
* plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh (ctor):
* plugins/D0RunICone/HepEntityIpre96.h (ctor, Fill):
* plugins/D0RunICone/HepEntityI.h (ctor, Fill):
* plugins/EECambridge/fastjet/EECambridgePlugin.hh (ctor):
* plugins/ATLASCone/fastjet/ATLASConePlugin.hh (ctor):
* plugins/ATLASCone/Jet.hh (ctor):
* plugins/ATLASCone/LorentzVector.hh (ctor):
* plugins/D0RunIICone/ILConeAlgorithm.hpp (TemporaryJet ctor, midpoint):
* plugins/D0RunIICone/ProtoJet.hpp (ctor,setJet):
* plugins/D0RunIICone/ConeJetInfo.hpp (ctors):
* plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh (ctor):
* plugins/CDFCones/fastjet/CDFMidPointPlugin.hh (ctors):
* plugins/CDFCones/fastjet/CDFJetCluPlugin.hh (ctors):
* plugins/CDFCones/CDFcode/LorentzVector.hh (ctor):
* plugins/SISCone/fastjet/SISConePlugin.hh (ctors):
* plugins/SISCone/fastjet/SISConeSphericalPlugin.hh (ctor):
* include/fastjet/NNH.hh (init, other_init):
* tools/TopTaggerBase.cc (_cos_theta_W):
* tools/JHTopTagger.cc (result, _split_once):
* tools/CASubJetTagger.cc (result):
* tools/RestFrameNSubjettinessTagger.cc (result):
* tools/fastjet/tools/JHTopTagger.hh (ctor):
* tools/fastjet/tools/TopTaggerBase.hh (description_of_selectors):
* tools/fastjet/tools/Boost.hh (result):
* tools/fastjet/tools/RestFrameNSubjettinessTagger.hh (ctor):
* tools/MassDropTagger.cc (result):
* tools/fastjet/tools/MassDropTagger.hh (ctor):
* tools/Pruner.cc (result):
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh (set_rescaling_class):
* tools/GridMedianBackgroundEstimator.cc (set_rescaling_class):
* tools/JetMedianBackgroundEstimator.cc (set_jet_density_class):
* tools/fastjet/tools/BackgroundEstimatorBase.hh (set_rescaling_class):
* include/fastjet/ClusterSequenceArea.hh (initialize_and_run_cswa):
* src/Error.cc (ctor):
* src/ClusterSequence1GhostPassiveArea.cc (_initialise_and_run_1GPA):
* src/ClusterSequencePassiveArea.cc (_initialise_and_run_PA):
* src/ClusterSequenceVoronoiArea.cc (_initializeVA):
* include/fastjet/ClusterSequenceVoronoiArea.hh (ctor):
* src/Voronoi.cc (generateVoronoi):
* src/ClusterSequenceActiveArea.cc (_initialise_and_run_AA,
_initialise_AA, _transfer_areas):
* src/GhostedAreaSpec.cc (ctor):
* src/PseudoJet.cc (ctor, boost, unboostm set_cached_rap_phi,
set_structure_shared_ptr, reset_momentum_PtYPhiM):
* src/JetDefinition.cc (ctor):
* include/fastjet/ClusterSequenceArea.hh (ctors):
* include/fastjet/AreaDefinition.hh (VoronoiAreaSpec):
* include/fastjet/ClusterSequence1GhostPassiveArea.hh (ctor):
* include/fastjet/ClusterSequencePassiveArea.hh (ctor):
* include/fastjet/ClusterSequenceActiveArea.hh (ctor):
* src/ClusterSequenceActiveAreaExplicitGhosts.cc (empty_area):
* include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh (ctors,
_initialise):
* include/fastjet/ClusterSequenceAreaBase.hh (ctor):
* src/ClusterSequenceAreaBase.cc (subtracted_jets):
* src/Selector.cc (count, operator(), sift):
* include/fastjet/GhostedAreaSpec.hh (ctors):
* src/ClusterSequence.cc (_initialise_and_run, _decant_options,
inclusive_jets, exclusive_jets_up_to, print_jets_for_root,
particle_jet_indices):
* include/fastjet/ClusterSequence.hh (ctor):
* include/fastjet/Selector.hh (ctor):
* include/fastjet/JetDefinition.hh (ctors):
* include/fastjet/internal/DynamicNearestNeighbours.hh (ctor):
* include/fastjet/PseudoJet.hh (reset_PtYPhiM, reset, reset_momentum):
added a '_in' suffix to some variables passed as argument to
avoid a shadowing gcc warning, and a '_local' suffix for similar
local variables.
Note that these warnings were anyway harmless as they were
shadowing unused methods.
* include/fastjet/internal/Voronoi.cc:
* src/Voronoi.cc:
- removed 'plot' and 'triangulate' (were always 0)
- removed unused plot functions (openpl, circle, range,
out_bisector, out_ep, out_vertex, out_site, out_triple)
- removed unused 'VPoint p' in 'intersect'
- fixed missing changes in earlier history
* include/fastjet/internal/Voronoi.cc:
* src/Voronoi.cc:
added a summary of changes compared to the original code by
S. O'Sullivan
* example/14-groomers.cc:
* example/13-boosted_top.cc:
* example/12-boosted_higgs.cc:
* example/11-filter.cc:
* example/09-user_info.cc:
* example/08-selector.cc:
* example/07-subtraction.cc:
* example/06-area.cc:
* example/05-eplus_eminus.cc:
* example/04-constituents.cc:
* example/03-plugin.cc:
* example/02-jetdef.cc:
* example/01-basic.cc:
* example/fastjet_example.cc:
* example/fastjet_areas.cc:
* example/fastjet_timing_plugins.cc:
. removed some unused method parameters
. fixed format warnings for fprintf
* tools/Filter.cc:
* include/fastjet/ClusterSequenceVoronoiArea.hh:
* tools/fastjet/tools/BackgroundEstimatorBase.hh:
commented out unused method parameters
removed extraneous ';'
* include/fastjet/NNH.hh:
removed some unused method parameters
2011-11-13 Gregory Soyez <soyez@fastjet.fr>
* src/CompositeJetStructure.cc:
* src/JetDefinition.cc:
* include/fastjet/CompositeJetStructure.hh:
commented out unused method parameters
* src/PseudoJetStructureBase.cc:
commented out the name of unused parameters in a few methods to
remove a compiler warning coming with -Wunused-parameter (and
-Wextra)
* src/Selector.cc (SelectorWorker):
removed the name of unused parameters in a few methods to remove
a compiler warning coming with -Wunused-parameter (and -Wextra)
2011-11-12 Gregory Soyez <soyez@fastjet.fr>
* src/Selector.cc (SelectorWorker):
typo in comment
* include/fastjet/SharedPtr.hh (SharedPtr):
. in the postfix increment and decrement operators, replaced
"int unused" by "int" to avoid a compiler warning. Note that
this dummy var is just a C++ trick to differentiate the
postfix from the prefix operators.
. used the prefix operator instead of the postfix one whenever
possible
2011-11-12 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/fastjet/tools/Filter.hh:
added reference to manual for a simple example of a Filter
implementation.
* include/fastjet/PseudoJet.hh:
added a bunch of shorthands such as has_valid_cs() so as to
coincide with table 3.
* include/fastjet/SharedPtr.hh:
fixed typo in comment.
2011-11-11 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence.cc:
moved main page of doxygen documentation into .cc file
to avoid big recompilation at every change.
* include/fastjet/Selector.hh:
* include/fastjet/PseudoJet.hh:
* include/fastjet/SharedPtr.hh:
* include/fastjet/PseudoJetStructureBase.hh:
commented out unused dummy arguments to avoid compiler warnings.
2011-11-09 Gavin Salam <gsalam@macth69.cern.ch>
* plugins/PxCone/README:
added copy of email from Mike Seymour granting authorization to
distribute under GPLv2.
2011-11-08 Gregory Soyez <soyez@fastjet.fr>
* autogen.sh:
* configure.ac:
* config.h.siscone.in: *** ADDED ***
added the necessary steps to configure/build SISCone directly
from the FastJet configure/build system. This has mailny the
advantage to reduce the size of the distribution (1.7MB instead
of 2.0MB) and save a bit of time during configuration. However
it comes at the expense that we have to hardcode the SISCone
version in a new configuration (auto)header --- since it would
no longer be obtained from SISCone's configure.ac. Therefore, we
stick to the old situation and comment out the inclusion of
SISCone configuration into FastJet's.
2011-11-07 Gregory Soyez <soyez@fastjet.fr>
* configure.ac (AC_PROG_FC):
when searching for a Fortran compiler, make sure one is actually
found or exit with an error message.
2011-11-07 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo & Gregory
* plugins/SISCone/SISConeSphericalPlugin.cc (run_clustering):
* plugins/SISCone/SISConePlugin.cc (run_clustering):
jets' user indices are no longer set to the pass from which they
come.
* include/fastjet/PseudoJet.hh (P):
added validated_cluster_sequence() and
validated_cluster_sequence_area_base().
2011-10-31 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* doc/fastjet-doc.tex:
- moved strategies into an appendix of their own; we should add
timing fig. there
- documented deprecation of JetFinder and JD(jet_alg, R,
strategy) in relevant appendix
- various other small changes up to end of section 3.3;
next question is whether to move reco-schemes into an
appendix.
* include/fastjet/JetDefinition.hh:
removed some old commented code
* src/PseudoJet.cc (description):
fixed typo in default description
2011-10-28 Gregory Soyez <soyez@fastjet.fr> & Matteo
* doc/fastjet-doc.tex:
reworked Section 7 (jet areas):
- rephrased slightly the introduction (mostly added a brief
usage example) to avoid being too technical
- reorganised the description of ClusterSequenceArea to reflect
the fact that jet-area information can directly be accessed
through PseudoJet.
reworked Section 8 (background estim+subtraction):
- moved the section about the subtraction higher up (in Section
on general usage)
- positional dependence: made explicit that rho(jet) and
sigma(jet) work for both the JMBGE and the GMBGE, as well as
for both techniques (selector-based and rescaling-based)
* include/fastjet/ClusterSequenceArea.hh:
fixed a typo in the Doxygen comments
2011-10-21 Gregory Soyez <soyez@fastjet.fr>
* BUGS:
mention the release of CGAL-3.9
2011-10-09 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/ClusterSequence.hh:
changed link to fastjet main page in doxygen main page.
* Doxyfile (PROJECT_NUMBER):
* doc/fastjet-doc.tex:
* configure.ac:
switched version over to 3.0.1-devel
* plugins/SISCone:
switched it back to trunk
2011-10-09 Gregory Soyez <soyez@fastjet.fr> & Matteo & Gavin
Release of FastJet 3.0.0
2011-10-09 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequenceActiveAreaExplicitGhosts.cc (ClustSeqActAreaEG::_post_process):
replaced area_4vectors[i] = _jets[i] with
_area_4vectors[i].reset_momentum(_jets[i]);
so that areas are structure-free (and so they don't mess
up the use count, leading to potential memory leaks). Checked
this solves the leak found in the 11-filter example.
* INSTALL: added a note about the old compilation system not
working.
* NEWS: updated release date
* BUGS: fixed some wording in a few places.
* CHECKLIST included a line for checks on the examples.
2011-10-09 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* INSTALL: reworked a bit the initial part, updated the list
of examples
2011-10-08 Gregory Soyez <soyez@fastjet.fr>
* TODO: removed done items
2011-10-06 Gregory Soyez <soyez@fastjet.fr>
* plugins/D0RunICone/D0RunIBaseConePlugin.cc:
inverted the order of the include files (this works
around an anonymous enum bug in gcc-4.0.1 on Macs)
* plugins/SISCone"
switched to SISCone 2.0.3
* doc/fastjet-doc.tex:
* include/fastjet/config_win.h:
* Doxyfile-devel:
* Doxyfile:
* configure.ac:
switched version number to 3.0.0
* plugins/D0RunICone/inline_maths.h:
* plugins/D0RunICone/HepEntityI.h:
* plugins/D0RunICone/ConeClusterAlgo.hpp:
* plugins/D0RunICone/HepEntityIpre96.h:
put the d0runi namespace inside the FastJet namespace
* plugins/D0RunICone/ConeClusterAlgo.hpp:
reverted a misordered #endif and namespace }
* include/fastjet/internal/IsBase.hh:
fised a typo in a class name in a doxygen comment
* src/genconfig.sh:
added the FASTJET_ prefix for the GridJet plugin
2011-09-29 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/*.cc:
* tools/fastjet/tools/*.hh:
replaced tabs with spaces
2011-09-28 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo + Gregory
* example/fastjet_areas.cc:
* test-script-output-orig.txt:
switched "make check" area test over to active area (new ghost
placement).
* example/07 upwards-*.cc updates:
added using namespace fastjet and removed redundant fastjet::
* example/14-groomers.cc:
small changes to comments + addition of header
* example/11-filter.cc:
addition of header
2011-09-28 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* example/14-groomers.cc ** ADDED **
added example showing unified use of filtering, trimming,
pruning
2011-09-28 Gregory Soyez <soyez@fastjet.fr>
* NEWS:
mentioned libfastjettools
2011-09-27 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/Pruner.cc (Pruner::result):
removed extraneous cout.
2011-09-26 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo & Gregory
* include/fastjet/GhostedAreaSpec.cc:
* src/GhostedAreaSpec.cc:
added warning for when set_fj2_placement(true) is called.
2011-09-25 Gregory Soyez <soyez@fastjet.fr>
* tools/JetMedianBackgroundEstimator.cc (set_particles):
Bug fixed: simply set _uptodate to false instead of calling
reset(). This avoids that in code like
jmbge.set_rescaling_class(...);
jmbge.set_particles(...)\
the 2nd call resets the rescaling class to NULL (erasing the
effect of the 1st one)
2011-09-23 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo & Gregory
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence.cc:
removed old (and objectionable) constructor that took just R
rather than a jet_def; also removed set_jet_algorithm and
set_jet_def and related _default_jet_algorithm private variable.
* include/fastjet/internal/Triangulation.hh:
moved the include guards.
* tools/Makefile.am:
* tools/JHTopTagger.cc:
* tools/TopTaggerBase.cc (_cos_theta_W): *** ADDED ***
moved the _cos_theta_W(...) call into a new file
TopTaggerBase.cc (also modified the .hh files)
2011-09-17 Gavin Salam <salam@lpthe.jussieu.fr>
* src/JetDefinition.cc:
* include/fastjet/JetDefinition.hh:
moved max_allowable_R value into .cc file to try and resolve
problem on karnak.
2011-09-16 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* tools/Filter.cc:
fixed a bug whereby the recombiner in the internal jet def may
point to a default recombiner that gets deleted before retuning
the filtered jet to the user; see also the BUGS file for a
residual issue in the case of recombiners that delete
themselves.
* tools/Pruner.cc (and .hh):
- added "minimal" constructor that takes a jet_alg (rather than
jet_def), automatically sets the R to
JetDefinition::max_allowable_R and deduces the recombiner
from the jet that is being Pruned.
- removed _recursively_mark_as_rejected, since no longer needed.
- added a "return true" in _check_explicit_ghosts to fix a bug
in the case of jets with pieces, so that areas were not available
- fixed a bug whereby internal pruning plugin was being deleted
too early
* include/fastjet/JetDefinition.hh:
* include/fastjet/JetDefinition.cc:
changed hard-coded limit for R of 1000 into
JetDefinition::max_allowable_R, with extra comments;
replaced assertion with throw for when the condition is not
satisfied.
2011-09-13 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* tools/fastjet/tools/RestFrameNSubjettinessTagger.hh:
* tools/fastjet/tools/BackgroundEstimatorBase.hh:
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh:
* tools/fastjet/tools/GridMedianBackgroundEstimator.hh:
small mods and fixes to doxygen
* all files:
Changed the GPL pointer to be to the website
http://www.gnu.org/licenses/ rather than a physical address.
Updated the copyright line to make sure Gregory is always
included and have the latest date as 2011.
2011-09-12 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* tools/fastjet/tools/JHTopTagger.hh:
* tools/fastjet/tools/MassDropTagger.hh:
small changes to comments
* tools/fastjet/tools/Filter.hh:
reworked the doxygen documentation.
* tools/fastjet/tools/Transformer.hh (class Transformer):
rewrote the main doxygen comment, aiming it at users rather than
developers.
* tools/Pruner.cc:
* tools/fastjet/tools/Pruner.hh:
- worked on the comments a bit + switched it over to
childless_pseudojets();
- moved constructor with dynamic Rcut and zcut to .cc file and
asserted that the two pointers are non-zero.
- got description working in case of dynamic Rcut and zcut
* src/ClusterSequence.cc:
* include/fastjet/ClusterSequence.hh:
renamed CS::orphaned() -> CS::childless_pseudojets()
2011-09-08 Gregory Soyez <soyez@fastjet.fr>
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence.cc:
added an "orphaned()" member that returns all the objects in the
ClusterSequence that have not made it into a jet (i.e. that have
no child and are not a recombination with the beam)
* src/Selector.cc:
* include/fastjet/Selector.hh:
added SelectorIsZero that selects PseudoJet's with zero momentum
* tools/Pruner.cc (PruningPlugin):
when a branch of the internal ClsuterSequence is vetoed, keep it
until the point where is has been vetoed (instead of leaving its
constituents unclustered)
* BUGS:
added a mention about the known assertion violation we noticed
in CGAL 3.7, 3.8 and 3,9-beta and that will be fixed in CGAL 3.9
2011-09-05 Gregory Soyez <soyez@fastjet.fr>
* tools/Pruner.cc:
added a couple of missing ';'
2011-09-04 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* tools/fastjet/tools/Pruner.hh:
* tools/Pruner.cc:
Some work on the doxygen comments and the description functions
2011-09-02 Gregory Soyez <soyez@fastjet.fr>
* tools/Pruner.cc:
* tools/fastjet/tools/Pruner.hh:
. fixed a wrong typedef syntax in Pruner
. used the radius of the specified jet definition to do the
re-clustering (updated comments accordingly)
. used Rcut_factor instead of Rcut in the Pruner. The Rcut is
determined from the jet being pruned using Rcut_factor * 2m/pt
. replaced the requirement that the jet must have an associated
CS by the requirement that the jet must have constituents
. added a PrunerStructure that allows access to the rejected
constituents and the other jets that may have been found
during the re-clustering.
. added support for areas (provided the jet being pruned has
explicit ghosts)
. allowed the Rcut and zcut to be functions of the PseudoJet
being pruned
2011-09-02 Gregory Soyez <soyez@fastjet.fr>
* include/fastjet/RangeDefinition.hh:
* tools/RestFrameNSubjettinessTagger.cc:
* tools/CASubJetTagger.cc:
* tools/fastjet/tools/CASubJetTagger.hh:
removed some unnecessary 'fastjet::'
2011-09-01 Gregory Soyez <soyez@fastjet.fr> + Matteo
* tools/fastjet/tools/Pruner.hh: *** ADDED ***
* tools/Pruner.cc: *** ADDED ***
* tools/fastjet/tools/Makefile.am:
* tools/Makefile.am:
added a Pruner transformer (arXiv:0903.5081) using an internal
PruningPlugin and PruningRecombiner. Note that the
implementation differs from the FastPrune plugin from
arXiv:0903.5081: for uniformity we provide Pruner as a
Transformer rather than a Plugin (as a consequence, our internal
Plugin just reclusters the constituents of a single jet and not
the whole event as in FastPrune).
* example/11-filter.cc (main):
fixed comment+requirement to have at least 3 (and not 2) jets
above 5 GeV
2011-08-31 Gavin Salam <salam@lpthe.jussieu.fr>
* fortran_wrapper/fastjetfortran.cc:
replaced RangeDefinition with a Selector (is more uptodate and
avoids a deprecated warning).
* fortran_wrapper/Makefile.alt:
changed FC and F77 to refer to gfortran without a path (to avoid
risk of picking up one that differs from the user's default choice)
* include/fastjet/LimitedWarning.hh:
* src/LimitedWarning.cc:
added set_default_max_warn(...) static member function;
changed interface to warn(warning, ostr) so that ostr must
now be a pointer; if it's null there is no output;
similarly if the default stream is null there's no output
(unless a different stream is requested in an individual warn call).
* src/Error.cc:
* include/fastjet/Error.hh:
changed meaning of a null default stream choice, so that it now
suppressed output (as with change to LimitedWarning).
2011-08-29 Gavin Salam <salam@lpthe.jussieu.fr>
* src/LimitedWarning.cc (LimitedWarning::warn):
* include/fastjet/LimitedWarning.hh (class LimitedWarning):
bug fix: previously when the max warning count was set to zero,
there would be one summary entry for each call to the warning.
Fixed this by zeroing the summary pointer in the constructor and
using its zero status to decide whether to allocate it or not.
2011-08-22 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh:
* plugins/D0RunICone/fastjet/D0RunIConePlugin.hh:
* plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh:
put "v3.0 or later" in all three files. Perhaps not necessary
for the base class, but seems sensible to have the same everywhere.
Also modified slightly the doxygen comments.
* include/fastjet/Error.hh
renamed set_backtrace() -> set_print_backtrace(), fixed
its doxygen comment
Reworked some doxygen comments, also to reflect the fact
that printing of backtrace is "off" by default
* include/fastjet/Error.hh
* include/fastjet/Error.cc
added set_default_stream() for a user-set output stream
for errors
* include/fastjet/LimitedWarning.cc
added ostr.flush() in warn(), so as to get something written
to a file even in the event of the program aborting because of an
error
2011-08-16 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* include/fastjet/internal/LimitedWarning.hh:
* include/fastjet/LimitedWarning.hh: *** ADDED ***
* src/LimitedWarning.cc: *** ADDED ***
moved LimitedWarning from internal to standard include space;
added two static functions:
- LimitedWarning::set_default_stream(...)
- LimitedWarning::summary(...) // for summary of all warnings issued
Also moved the class into the error_handling part of doxygen
* <many other classes>
changed them to access limited warning through the new location
* include/fastjet/Error.hh (Error):
typo in comments
2011-08-11 Gregory Soyez <soyez@fastjet.fr>
* tools/fastjet/tools/TopTaggerBase.hh:
fixed some doxygen comments
2011-08-10 Gregory Soyez <soyez@fastjet.fr>
* configure.ac:
* include/fastjet/config_win.h:
* doc/fastjet-doc.tex:
* Doxyfile:
* Doxyfile-devel:
moved version number to 3.0beta2-devel
2011-08-10 Gregory Soyez <soyez@fastjet.fr> & Matteo & Gavin
Release of FastJet 3.0beta1
2011-08-09 Gregory Soyez <soyez@fastjet.fr>
* plugins/GridJet/fastjet/GridJetPlugin.hh:
put the GridJet plugin in the "plugins" documentation module
* plugins/D0RunICone/fastjet/D0RunIConePlugin.hh:
* plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh:
"from version 2.4 onwards" -> "from version 3.0 onwards"
2011-08-09 Gregory Soyez <soyez@fastjet.fr>
* configure.ac:
* include/fastjet/config_win.h:
* doc/fastjet-doc.tex:
* Doxyfile:
* Doxyfile-devel:
set the version number to 3.0beta1 in preparation of the release
2011-08-09 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo & Gregory
* NEWS:
prepared the NEWS for the release of FastJet 3.0beta1
2011-08-09 Gavin SALAM <salam@lpthe.jussieu.fr>
* CHECKLIST:
started the checklist for the 3.0beta1 release.
2011-08-08 Gregory Soyez <soyez@fastjet.fr>
* configure.ac:
sorted out quotation issues
2011-08-08 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
added has_user_info() and has_user_info<...>() functions;
(also documented this).
2011-08-08 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo & Gregory
* plugins/GridJet/fastjet/GridJetPlugin.hh:
expanded the documentation a little.
2011-08-08 Gregory Soyez <soyez@fastjet.fr>
* configure.ac:
print "/usr/local" instead of "NONE" as installation dir
if none is specified.
* configure.ac:
* fastjet-config.in:
. replaced "echo -e" with the more portable "printf"
. added the configuration invocation arguments to the summary
printted for fastjet-config --config
2011-08-08 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/fastjet/tools/TopTaggerBase.hh:
added note about need to derive top tagger structures also from
something related to PseudoJetStructureBase
2011-08-05 Gavin Salam <salam@lpthe.jussieu.fr>
* configure.ac:
exchanged order of -lsiscone and -lsiscone_spherical in
fastjet-config --libs (spherical first now), because the
spherical one needs elements from the standard one.
2011-08-04 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* tools/Makefile.am:
* tools/fastjet/tools/Makefile.am:
* tools/fastjet/tools/RestFrameNSubjettinessTagger.hh: (renamed)
* tools/RestFrameNSubjettinessTagger.hh: (renamed)
renamed NSubjettinessTagger -> RestFrameNSubjettinessTagger to
avoid confusion with the other NSubjettiness based tagger.
2011-08-03 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* example/11-filter.cc:
Added examples of filters with subtraction.
Revamped the output.
* tools/fastjet/tools/Filter.hh:
* tools/Filter.cc:
added a set_subtractor(...) option to the Filter.
* AUTHORS:
* doc/fastjet-doc.tex:
a common (and longer) acknowledgements list now present in both
files. Still not complete.
* src/Selector.cc:
* include/fastjet/Selector.hh:
renamed SelectorM{Max,Min,Range} -> SelectorMass{Max,Min,Range},
to enhance code readability (as found when handling top tagging
examples).
* tools/fastjet/tools/JHTopTagger.hh:
* tools/JHTopTagger.cc:
worked on the documentation so that it corresponds to the new
structure; description now include details of the top and W mass
selectors if they're present.
2011-08-02 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* tools/fastjet/tools/TopTaggerBase.hh: *** ADDED ***
* tools/fastjet/tools/JHTopTagger.hh:
* tools/JHTopTagger.cc:
experimenting with a structure whereby the JHTopTagger derives
from a TopTaggerBase, as requested by Chris Vermilion.
* tools/fastjet/tools/BackgroundEstimatorBase.hh:
added a virtual destructor that does nothing.
* tools/fastjet/tools/Subtractor.hh:
* tools/Subtractor.cc:
tried moving a const static invalid_rho definition into the .cc
file to work around problems on karnak. Changed the value so
that it's equal to -infinity.
2011-08-01 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* tools/Subtractor.cc:
* tools/fastjet/tools/Subtractor.hh:
worked a bit on the documentation and allowed for construction
with a constant value of rho. Added a sensible description().
* src/Selector.cc:
* include/fastjet/Selector.hh:
changed some documentation and argument names in parts related
to selector areas.
2011-07-26 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* doc/fastjet-doc.tex
Moved Internal pseudojet structure to appendix, revised Selectors.
* Doxyfile
added "Selected additional tools" to Doxygen main page
2011-07-26 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* tools/fastjet/tools/MassDropTagger.hh
* tools/fastjet/tools/CASubJetTagger.hh
* tools/fastjet/tools/NSubjettinessTagger.hh
* tools/fastjet/tools/JHTopTagger.hh
* tools/fastjet/tools/Filter.hh
* tools/MassDropTagger.cc
* tools/CASubJetTagger.cc
* tools/NSubjettinessTagger.cc
* tools/JHTopTagger.cc
* tools/Filter.cc
commented out _original_jet and function returning it
2011-07-26 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* example/07-subtraction.cc
* tools/GridMedianBackgroundEstimator.cc
* tools/JetMedianBackgroundEstimator.cc
* tools/fastjet/tools/BackgroundEstimatorBase.hh
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh
* tools/fastjet/tools/GridMedianBackgroundEstimator.hh
added description() to base class and derived ones. Modified
subtraction example accordingly.
* tools/fastjet/tools/MassDropTagger.hh
* tools/fastjet/tools/CASubJetTagger.hh
* tools/fastjet/tools/NSubjettinessTagger.hh
* tools/fastjet/tools/JHTopTagger.hh
made doxygen comment to description() uniform through the taggers
2011-07-25 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* tools/CASubJetTagger.cc
* tools/JHTopTagger.cc
* tools/MassDropTagger.cc
* tools/NSubjettinessTagger.cc
* tools/fastjet/tools/CASubJetTagger.hh
* tools/fastjet/tools/JHTopTagger.hh
* tools/fastjet/tools/MassDropTagger.hh
* tools/fastjet/tools/NSubjettinessTagger.hh
added original() to all Taggers, like it exists in Filter,
as a step to make it uniform across Transformers
2011-07-25 Gregory Soyez <soyez@fastjet.fr>
* doc/fastjet-doc.tex:
. fixed typo, reworked the description of PseudoJet::reset()
. inverted 2 class names in footnote 13 to make the text
alignemt a bit better.
2011-07-22 Gregory Soyez <soyez@fastjet.fr>
* include/fastjet/internal/Voronoi.hh:
* src/Voronoi.cc:
* src/ClusterSequenceVoronoiArea.cc:
Renamed Point into VPoint to avoid any potential interference
with the fastjet::Point defined in Triangulation.hh (note that
both are only used internally)
2011-07-22 Gavin Salam <salam@lpthe.jussieu.fr>
* doc/fastjet-doc.tex:
changed last paragraph of 9.1 (it didn't reflect the structure
of the many plugins in the following two subsections). Also
mentioned the stable_sort in the documentation of the ATLASCone
and TrackJet plugins.
Also documented delete_recombiner_when_unused(),
delete_plugin_when_unused() and reshuffled some parts of the
plugin section so that plugin use now comes before explanations
about the structure of the plugin class.
* tools/fastjet/tools/MassDropTagger.hh:
* tools/fastjet/tools/JHTopTagger.hh:
* tools/fastjet/tools/CASubJetTagger.hh:
* tools/fastjet/tools/NSubjettinessTagger.hh:
reowrked some doxygen comments a little.
2011-07-21 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo & Gregory
* example/fastjet_subtraction.cc:
removed deprecated things
* NEWS:
prepared draft of news for 3.0b1
* include/fastjet/PseudoJet.hh:
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh:
removed some old commented code.
2011-07-21 Gregory Soyez <soyez@fastjet.fr>
* fastjet/tools/MassDropTagger.hh:
* fastjet/tools/CASubJetTagger.hh:
* fastjet/tools/NSubjettinessTagger.hh:
* fastjet/tools/JHTopTagger.hh:
* JHTopTagger.cc:
* MassDropTagger.cc:
* CASubJetTagger.cc:
Renamed the structure associated with XYZTagger,
XYZTaggerStructure (was XYZStructure)
* tools/fastjet/tools/JHTopTagger.hh:
fixed documentation of the cos_theta_W member
2011-07-21 Gregory Soyez <soyez@fastjet.fr>
* tools/BackgroundEstimatorBase.cc:
* tools/fastjet/tools/BackgroundEstimatorBase.hh:
declared the nempty argument of percentile(...) as a double
instead of an unsigned int.
2011-07-20 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/fastjet/tools/JHTopTagger.hh:
* tools/JHTopTagger.cc:
removed the mutable _jet in JHTopTagger; other small changes to
details of ways things are written.
* include/fastjet/ClusterSequenceWithArea.hh:
small change to C-preprocessor warning message
2011-07-20 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* regression-tests/test-all-algs.pl:
added gridjet to default checks and also added the relevant
checksums.
* plugins/GridJet/GridJetPlugin.cc:
* plugins/GridJet/fastjet/GridJetPlugin.hh: exchanged rapidity
extent and spacing in constructor (spacing now comes second),
for consistency with the GridMedianBGE. Added a consistency
check that extent>spacing to catch possible wrong order of
arguments.
* example/fastjet_timing_plugins.cc:
added -bkgd:gridmedian option
* tools/JetMedianBackgroundEstimator.cc:
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh:
for the CSAB,Selector constructor exchanged arguments, so it's
now Selector,CSAB (that way Selector always comes first).
* tools/fastjet/tools/GridMedianBackgroundEstimator.hh:
* tools/GridMedianBackgroundEstimator.cc:
exchanged ymax and grid_spacing arguments in constructor
(grid_spacing now goes first, like the selector goes first
elsewhere). Added a consistency check that extent>spacing to
catch possible wrong order of arguments.
included a check that particles have been set (throw an error
otherwise).
2011-07-20 Gregory Soyez <soyez@fastjet.fr>
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh:
* tools/JetMedianBackgroundEstimator.cc:
. removed the ctor that sets the jets & the selector
. merged the "empty" ctor and the one setting just rho_range (by
using an identity range by default)
* regression-tests/test-all-algs.pl:
* regression-tests/nightly-check.pl:
added support for area tests
2011-07-18 Gregory Soyez <soyez@fastjet.fr>
* Doxyfile:
removed inline source and reference relations in class member
documentation
* tools/fastjet/tools/BackgroundEstimatorBase.hh:
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh:
* tools/JetMedianBackgroundEstimator.cc:
. declared jet_density_class() and rescaling_class() as const
. moved rescaling_class() to the base class
. marked the density classes as preliminarry in doxygen
(+ minor midifocations to doxugen declarations)
. added a warning that this is still some preliminary work when
one tries to set the density class
2011-07-16 Gavin Salam <salam@lpthe.jussieu.fr>
* regression-tests/test-all-algs.pl (setDefaults):
commented out areaConfigs for now, to prevent warnings, which
give issues with the nightly check.
2011-07-15 Gavin Salam <salam@lpthe.jussieu.fr>
* regression-tests/test-all-algs.pl (setDefaults):
added a bunch of "areaConfigs", indicating how we might run area
tests.
2011-07-15 Gregory Soyez <soyez@fastjet.fr> & Matteo
* tools/fastjet/tools/GridMedianBackgroundEstimator.hh:
* tools/GridMedianBackgroundEstimator.cc:
added the computation of sigma (and sigma(jet))
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh:
* tools/JetMedianBackgroundEstimator.cc:
put the same description of rho_range everywhere
* tools/fastjet/tools/JHTopTagger.hh:
* tools/fastjet/tools/MassDropTagger.hh:
* tools/fastjet/tools/Filter.hh:
pointed the link to the correct example
2011-07-14 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* tools/fastjet/tools/BackgroundEstimatorBase.hh:
* tools/BackgroundEstimatorBase.cc:
fixed the comment in front of _percentile()
2011-07-14 Gavin Salam <salam@lpthe.jussieu.fr>
* example/fastjet_timing_plugins.cc:
added support for areas and background estimation (intended as a
prelude to their inclusion in night checks).
* src/ClusterSequenceAreaBase.cc:
fixed warning message for large -ve area.
* tools/fastjet/tools/BackgroundEstimatorBase.hh:
* tools/BackgroundEstimatorBase.cc:
fixed bug whereby n_empty_jets was not being used in the new
percentile determination code; fixed missing bits of fj2
compliance (was present in earlier code, but got lost), moving
it all into _percentile; put in the safety checks (for -ve empty
area) that were already present in CSAB; fixed large -ve area
warning message.
2011-07-13 Gregory Soyez <soyez@fastjet.fr>
* tools/fastjet/tools/BackgroundEstimatorBase.hh:
* tools/BackgroundEstimatorBase.cc:
. added support for rescaling
. added a bunch of comments
. moved BackgroundRescalingYPolynomial from
JetMedianBackgroundEstimator
* tools/fastjet/tools/GridMedianBackgroundEstimator.hh:
* tools/GridMedianBackgroundEstimator.cc:
. dosumented the class
. implemented support for rescaling (applied on each particles;
set_rescaling needs to be called before set_particles)
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh:
* tools/JetMedianBackgroundEstimator.cc:
. moved parts of the code from the header to the source
. sorted out come of the comments
2011-07-08 Gavin Salam <gavin.salam@cern.ch> + Matteo
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh:
reordered classes so that JMBGE appears first and all the helper
ones comes later. Reworked some of the comments a little.
2011-07-08 Gavin Salam <gavin.salam@cern.ch>
* include/fastjet/GhostedAreaSpec.hh:
* include/fastjet/ActiveAreaSpec.hh:
moved typedef of ActiveAreaSpec into GhostedAreaSpec; that way
people who used to get it indirectly still do, but anyone who
used the header itself will get a warning, without that warning
appearing indirectly from inclusion of other headers.
2011-07-08 Gregory Soyez <soyez@fastjet.fr>
* example/12-boosted_higgs-new.cc: *** REMOVED ***
* example/12-boosted_higgs.cc: *** ADDED ***
* example/07-subtraction-new.cc: *** REMOVED ***
* example/07-subtraction.cc: *** ADDED ***
removed the "-old" of the new versions of the examples
* example/12-boosted_higgs.cc: *** REMOVED ***
* example/12-boosted_higgs-old.cc: *** ADDED ***
* example/07-subtraction.cc: *** REMOVED ***
* example/07-subtraction-old.cc: *** ADDED ***
appended "-old" to the deprecated examples
* tools/BackgroundEstimatorBase.cc: *** ADDED ***
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh:
* tools/fastjet/tools/GridMedianBackgroundEstimator.hh:
* tools/JetMedianBackgroundEstimator.cc:
* tools/GridMedianBackgroundEstimator.cc:
. moved _percentile and _median_and_stddev to the base class
. added 'nempty' support to _percentile
. made _median_and_stddev use _percentile
* tools/fastjet/tools/Subtractor.hh:
Use a BackgroundEstimatorBase
* tools/fastjet/tools/BackgroundEstimator.hh: *** REMOVED ***
* tools/fastjet/tools/JetMedianBackgroundEstimator.hh: *** ADDED ***
* tools/BackgroundEstimator.cc: *** REMOVED ***
* tools/JetMedianBackgroundEstimator.cc: *** ADDED ***
renamed BackgroundEstimator -> JetMedianBackgroundEstimator
* example/Makefile.am:
* example/11-boosted_higgs-new.cc: *** REMOVED ***
* example/12-boosted_higgs-new.cc: *** ADDED ***
* example/11-boosted_higgs.cc: *** REMOVED ***
* example/12-boosted_higgs.cc: *** ADDED ***
* example/12-filter.cc: *** REMOVED ***
* example/11-filter.cc: *** ADDED ***
inverted examples 11 ad 12 (so that the two "boosted taggers"
examples have consecutive numbers
2011-07-07 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* example/13-boosted_top.cc:
* tools/JHTopTagger.cc:
* tools/fastjet/tools/JHTopTagger.hh:
changed default mW to 80.4; reworked some of the comments to
help illustrate usage more explicitly; added mW and
cost_theta_W_max to description() output. JHTopStructure.W()
[etc] now returns a const reference rather than a copy.
2011-07-07 Gregory Soyez <soyez@fastjet.fr>
* configure.ac:
tested a series of autoconf versions.
To be on the safe side, set pre-required version number to 2.59
as it is the lowest we could easily find (was 2.57). Note that
this only impacts the version used to produce configure.
* tools/fastjet/tools/JHTopTagger.hh:
worked on the comments
* configure.ac:
used AC_LANG_TEST(...) to enclose code excerpts (as advised by
autoconf)
* include/fastjet/JetDefinition.hh:
* src/JetDefinition.cc:
added delete_plugin_when_unused and
delete_recombiner_when_unused for easier memory management
* fastjet-config.in:
* m4/plugin.m4:
* configure.ac:
fastjet-config --config now prints a summary of the fastjet
configuration
* tools/fastjet/tools/JHTopTagger.hh:
* tools/JHTopTagger.cc:
added a cut on cos(theta_W) directly in the tagger.
* example/07-subtraction-new.cc:
used BGE::set_particles() + revised some of the comments
* tools/fastjet/tools/BackgroundEstimator.hh:
* tools/BackgroundEstimator.cc:
added support for set_particles
2011-07-07 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
updated karnak gcc-4.4 tests to 4.4.3
2011-07-06 Gregory Soyez <soyez@fastjet.fr>
* example/13-boosted_top.cc: *** ADDED ***
added an example on how to use the JHTopTagger
* tools/JHTopTagger.cc: *** ADDED ***
* tools/fastjet/tools/JHTopTagger.hh: *** ADDED ***
added an implementation of the Johns Hopkins boosted top tagger
2011-07-06 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
added option to modify fastjet_timing_plugin compilation options
(anything that appeats after a ":" in the "link" options).
switched karnak non-shared tests over to -O2 compilation (with
gridjet in), to work around the 4.0.1 non-caught throw issue.
added output of the URL of the directory (to help with tracking
whether we run on trunk or on a branch).
fixed issue with -only 0
2011-07-06 Gregory Soyez <soyez@fastjet.fr>
* include/fastjet/WrappedStructure.hh:
included Error.hh
2011-07-05 Gregory Soyez <soyez@fastjet.fr>
* include/fastjet/CircularRange.hh:
* include/fastjet/RangeDefinition.hh:
* src/RangeDefinition.cc:
declared RangeDefinition and Circular range as deprecated (use
Selector and SelectorCircle instead)
* example/07-subtraction-new.cc:
* example/07-subtraction.cc:
ActiveAreaSpec -> GhostedAreaSpec (the former being deprecated)
* include/fastjet/ActiveAreaSpec.hh:
declared as deprecated
* include/fastjet/ClusterSequenceActiveArea.hh:
do not include deprecated headers ClusterSequenceWithArea.hh
and ActiveAreaSpec
* include/fastjet/ClusterSequenceWithArea.hh:
removed an unnecessary #ifndef
* include/fastjet/Makefile.am:
do not install config_win.h (just put it in the distribution)
* tools/fastjet/tools/MassDropTagger.hh:
* tools/MassDropTagger.cc:
warned when the jet being tagged does not come from a
Cambridge/Aachen clustering
* testsuite/TestPseudoJet.hh (TestBase):
added tests of PJ::has_structure_of<ClusterSequence>()
* include/fastjet/ClusterSequence.hh:
included ClusterSequenceStructure so that CS::StructureType
is well-defined and PJ::has_structure_of<ClusterSequence>() works.
* include/fastjet/ClusterSequenceWithArea.hh:
declared as deprecated
2011-07-05 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
added --disable-gridjet to the --disable-shared karnak run; also
added a --disable-shared option to the g++-4.4 run on karnak.
2011-07-04 Gavin Salam <salam@lpthe.jussieu.fr>
* doc/trial-progs/README: *** ADDED ***
* doc/trial-progs/checks-for-3.0b1.cc: *** ADDED ***
add the doc/trial-progs directory for internal testing
of elements that will go into the documentation.
2011-07-03 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
-only can now take a comma-separated list.
Provided more output in cases where ssh reports failure
(including the messages and summary outputs if they exist).
2011-07-02 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
add -list option to get a list of the different setups that are
encoded (together with their index, to facilitate usage of -only)
2011-07-01 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* tools/Makefile.am:
* tools/fastjet/tools/Makefile.am:
* tools/fastjet/tools/BackgroundEstimator.hh:
* tools/fastjet/tools/BackgroundEstimatorBase.hh: *** ADDED ***
* tools/GridMedianBackgroundEstimator.cc: *** ADDED ***
* tools/fastjet/tools/GridMedianBackgroundEstimator.hh: *** ADDED ***
Introduced a base class for background estimation, arranged for
BackgroundEstimator to derive from it and also added
GridMedianBackgroundEstimator (which is what has been used for
some of the grid rho tests).
* example/fastjet_timing_plugins.cc (main):
switched grid_ymax to 4.99999999 to avoid rounding error issues
in determining the number of grid cells in y (with R=0.4).
* include/fastjet/WrappedStructure.hh:
updated the exclusive_subjets_up_to here too.
2011-06-30 Gavin Salam <salam@lpthe.jussieu.fr> [later, on the train]
* src/ClusterSequence.cc:
* include/fastjet/ClusterSequence.hh:
Wrote an explicit copy constructor, which just uses
transfer_from_sequence. Until now, there had been a default copy
constructor, which failed to update the structural pointers
within the copied jets (so they pointed to the wrong CS,
i.e. the original one, and if the original CS went out of scope,
the jets from the copy could no longer access their structure).
Also modified transfer_from_sequence(...) so as to make its CS
argument const. One side effect was that this required _extras
to be converted from an auto_ptr to a SharedPtr, because until
now the auto_ptr in the original CS was being zeroed as part of
an ownership transfer (the call to set _extras from a plugin remains
auto_ptr based for now).
2011-06-30 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* regression-tests/test-all-algs.pl:
added a -verbose option.
* test-script-output-orig.txt:
added gridjet output.
* example/fastjet_timing_plugins.cc:
* test-compare.sh:
put a FASTJET_ in front of some preprocessor variables (had been
missed in earlier tests).
* include/fastjet/PseudoJet.hh:
* src/PseudoJet.cc (PtYPhiM, PseudoJet::set_cached_rap_phi):
can now legitimately be called with -2pi<phi<4pi (before was
only up to 2pi) and now explicitly enfore this in PtYPhiM.
* src/ClusterSequence_Delaunay.cc:
solved potential memory leak for rare cases when this throws an
error (e.g. for coincident points) by using an auto_ptr for DNN.
2011-06-30 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo + Gregory
* m4/plugin.m4
* Doxyfile
* src/genconfig.sh
* example/makefile.static
* example/fastjet_timing_plugins.cc
* example/Makefile.am
* configure.ac
* test-compare.sh
* Doxyfile-devel
* plugins/GridJet
* plugins/GridJet/fastjet
* plugins/GridJet/fastjet/GridJetPlugin.hh
* plugins/GridJet/fastjet/Makefile.am
* plugins/GridJet/makefile.static
* plugins/GridJet/Makefile.am
* plugins/GridJet/GridJetPlugin.cc
* plugins/SISCone/siscone
* plugins/makefile.static
* plugins/Makefile.am
* ChangeLog
* experimental/plugins/Makefile
* config.h.in
Did most of the work of adding the GridJet plugin. Still not
functional though.
2011-06-30 Gregory Soyez <soyez@fastjet.fr>
* tools/fastjet/tools/Filter.hh:
* tools/Filter.cc:
For situations with C/A subjets with rho==0 and without explicit
ghosts, removed the "area" support since one cannot trust the area
of subjets without explicit ghosts.
* Doxyfile:
* Doxyfile-devel:
fixed header path in the doc
2011-06-30 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo & Gregory
* doc/fastjet-doc.tex:
* src/ClusterSequenceStructure.cc
* src/PseudoJet.cc
* src/ClusterSequence.cc
* src/PseudoJetStructureBase.cc
* include/fastjet/ClusterSequenceStructure.hh
* include/fastjet/PseudoJet.hh
* include/fastjet/ClusterSequence.hh
* include/fastjet/PseudoJetStructureBase.hh
added exclusive_subjets_up_to(int) to CS & PJ, replaced
exclusive_subjets(int) with exclusive_subjets_up_to(int) in CSS
and PJSB and added exclusive_jets_up_to(int) to CS.
We now consistently have the behaviour that
exclusive_subjets(int) and exclusive_jets(int) throw errors if
you request more subjets than there are available particles;
exclusive_subjets_up_to(int) and exclusive_jets_up_to(int) in
this case just return all available particles.
* src/FunctionOfPseudoJet.cc:
* include/fastjet/FunctionOfPseudoJet.hh:
removed the operator>(FOPJ<double> &, cut) [etc] functions for
now.
2011-06-30 Gregory Soyez <soyez@fastjet.fr>
* tools/Filter.cc:
for rho!=0, if the jet has support for area but has no explicit
ghosts, do not compute the areas for the filtered elements (Note
that this is true when re-clustering is needed, for C/A
filtering, area support for the filtered elements is inherited
from the original cluster sequence.
2011-06-29 Gregory Soyez <soyez@fastjet.fr>
* tools/Filter.cc:
- added support for recombination schemes
- improved various tests (including caching the pieces)
2011-06-29 Gavin SALAM <salam@pallas.lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
got compilation of "external" program to use CXXFLAGS and also
arranged for icpc to have flags to make it use the gcc34 stdlib
(as suggested by Gregory).
2011-06-29 Gregory Soyez <soyez@fastjet.fr>
* tools/fastjet/tools/Filter.hh:
* tools/Filter.cc:
. added support for jet areas to the subjets for the case where
the parent jet has area support and rho=0
. added support for subtraction for composite jets
* include/fastjet/Selector.hh:
* src/Selector.cc:
added support for &= and |=
2011-06-29 Gavin SALAM <salam@pallas.lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
removed icpc checks (issues with gcc-4.6.0 STL), updated CGAL_DIR
2011-06-29 Gregory Soyez <soyez@fastjet.fr>
* tools/fastjet/tools/BackgroundEstimator.hh:
* tools/BackgroundEstimator.cc (_median_and_stddev):
same modification as below
* src/ClusterSequenceAreaBase.cc:
* include/fastjet/ClusterSequenceAreaBase.hh:
dealt with a potential overflow when the estimated number of
empty jets becomes large and negative:
- we issue a warning when n_empty < -pt_over_areas_size/4.0
- we make sure int_nj_median <= pt_over_areas_size-2
with int pt_over_areas_size = pt_over_areas.size(); this avoids
the issue of subtraction and negation operations on unsigned
int, which give nonsense, and also eliminates inappropriate
warnings about empty areas being too negative.
(imported from FastJet 2.4.4)
2011-06-28 Gregory & Thiago Soyez <soyez@fastjet.fr>
* include/fastjet/internal/Voronoi.hh:
* src/Voronoi.cc:0000000000000000000000000000000000000000000000000000
imported the fixes to the Fortune/O'Sullivan code for the
Voronoi diagram generator from the fastjet-2.4.X (2.4.4) branch:
- dealt with nearly-degenerate parent points in "intersection"
- handled coniciding particles (assign the full cell to the
first of the coinciding particles + print a warning).
- solved an overflow issue.
* regression-tests/test-all-algs.pl:
updated the reference results using "stable_sort"
* BUGS:
* plugins/ATLASCone/Jet.hh:
* plugins/TrackJet/TrackJetPlugin.cc:
used stable_sort instead of sort to avoid potential issue for
"equal cases" (see "Other issues to be aware of", point 2 in
BUGS). Note that this would solve the issues in BUGS but would
still make the result dependent on the ordering of the particles
in case of a degeneracy.
2011-06-28 Gavin Salam <gavin.salam@cern.ch>
* regression-tests/test-all-algs.pl:
updated this so that it looks for data file in the correct place
on cern mac.
2011-06-28 Gregory Soyez <soyez@fastjet.fr>
* include/fastjet/internal/LimitedWarning.hh:
put the LimitedWarning class in the fastjet namespace
2011-06-28 Gavin SALAM <salam@lpthe.jussieu.fr>
* src/GhostedAreaSpec.cc (GhostedAreaSpec):
fixed non-initialisation of _fj2_placement in one of the several
constructors.
2011-06-23 Gavin Salam <salam@lpthe.jussieu.fr>
* regression-tests/test-all-algs.pl:
$refResults{$name} can now be a reference to an array of valid
checksum results or a single checksum result. Exploited this for
the trackjet 1000 run, including the result corresponding to the
new recombination code (checked manually that differences are
just at the level of rounding errors).
2011-06-21 Gavin Salam <salam@lpthe.jussieu.fr>
* example/fastjet_areas.cc:
made a call set set_fj2_placement(true) so that make check
continues to work.
* include/fastjet/GhostedAreaSpec.hh:
* src/GhostedAreaSpec.cc:
Changed default ghost placement so that
- number of phi and rapidity intervals rounded to nearest
integer (rather than up, which is less stable)
- rapidities offset by sqrt(area)/2 so that total area of
ghosts matches 2*rapmax.
- phi placed sensibly (i.e. no longer reproduce funny FJ2 phi definition)
Old behaviour can be obtained by calling
set_fj2_placement(true). The new behaviour produces ghosts that
should match nicely onto centres of the GridJet tiles.
* src/JetDefinition.cc (DefaultRecombiner::preprocess):
modified some of the preprocessing code for non-E-scheme
clustering and also got the recombination code to use
reset_PtYPhiM; checked that results don't change.
* src/ClusterSequenceActiveAreaExplicitGhosts.cc
(ClustSeqActAreaEG::_post_process):
tried to avoid some temporary PJs, but not clear this helps much.
* include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh:
added an extra couple of reserve statements, that give some
speed gain in tests.
* src/PseudoJet.cc
* include/fastjet/PseudoJet.hh (PseudoJet::reset_momentum):
added reset_momentum(const PJ & );
added PseudoJet::reset_momentum_PtYPhiM(...),
PseudoJet::reset_PtYPhiM(...),
which can bring speed advantages in some cases (e.g. recombiner).
2011-06-20 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
introduced a new constructor that takes a bool as an argument;
its value is ignored, while but its presence indicates that
there should be no initialisation of anything other than the
shared pointers.
* src/JetDefinition.cc (DefaultRecombiner::recombine):
replaced pab=pa+pb with pab.reset(x,y,z,E), which gives some
speed gain when this is a time-critical step (a factor of 1.2 to
1.7 in tests of CCN32-83). Also made use of the non-initialising
constructor for the temporary result variable, to gain a few
more percent in speed.
* src/JetDefinition.cc (DefaultRecombiner::preprocess):
fixed this to use reset_momentum for non-E schemes (more
efficient + touches neither user index nor user info).
2011-06-15 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/SharedPtr.hh:
speeded up the constructor from another SharedPtr.
2011-06-14 Gregory Soyez <soyez@fastjet.fr>
* src/Voronoi.cc:
- fixed potential overflow issue when computing buckets in the
hash: we compare the position to the boundaries before making
the conversion to an int (avoids potential overflow issues)
- fixed completion test in the main loop (if there were still
some events to be processed in the priority queue after the
last site was considered, the previous version was stopping,
leaving an incomplete VD)
2011-06-05 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/fastjet/tools/BackgroundEstimator.hh:
rho(jet) was taking a copy rather than a const reference to the
jet. In the comments to set_rescaling_class, mentioned the
BackgroundRescalingYPolynomial class as an example, and in the
docuementation for the latter, included the rapidity dependence
that we've been using the LHC7 Pythia8 4C tune
2011-06-03 Gregory Soyez <soyez@fastjet.fr> & Gavin
* NEWS:
* include/fastjet/config_win.h (FASTJET_PACKAGE_STRING):
* configure.ac:
* doc/fastjet-doc.tex:
* Doxyfile-devel (PROJECT_NUMBER):
* Doxyfile (PROJECT_NUMBER):
switched to version number 3.0beta1-devel
2011-06-03 Gregory Soyez <soyez@fastjet.fr> & Gavin
Release of FastJet 3.0alpha3
2011-06-03 Gregory Soyez <soyez@fastjet.fr>
* NEWS:
put the v3.0alpha3 release date
* doc/fastjet-doc.tex:
* configure.ac:
* Doxyfile:
updated the version number
* Doxyfile-devel:
updated the version number; enabled the search engine
* include/fastjet/config_win.h:
updated for v3.0alpha3
* example/11-boosted_higgs-new.cc:
explicitly set the recombiner to use by the filter
* tools/Filter.cc (_finalise):
do not reset the user and clust_seq_index of the result of the
Filter to those of the original jet
2011-06-03 Gavin Salam <salam@lpthe.jussieu.fr>
* doc/fastjet-doc.tex:
sorted out documentation of the subtraction (referring readers
to the relevant example).
* tools/fastjet/tools/Transformer.hh (class Transformer):
clarified some comments
* README:
mods for 3.0, including updated references, mention of new
directories, etc.
2011-06-03 Gregory Soyez <soyez@fastjet.fr>
* example/Makefile.am:
* example/11-boosted_higgs-new.cc: *** ADDED ***
added a new version of the boosted Higgs example using the new
available tools: MassDropTagger and Filter
* example/12-filter.cc:
take the 2nd and 3rd jets for the composite-jet example rather
than the two hardest
* BUGS:
added a comment about potential issues with plugins relying on
Et ordering of the input particles (due to the undefined
behaviour of sort(...) for equal entities). This applies for the
TrackJet plugin, for which it happens when 2 particles have
exactly the same Et (so it should not be too much of an issue
for the final jets); and for the ATLAS cone plugin where the
result could be affected in some situations (since 2 particles
with an difference in Et < 0.001 are considered equal)
* plugins/ATLASCone/JetConeFinderTool.cc:
added a comment about an instability in the ATLAS stable cone
search due to the Et ordering
2011-06-03 Gavin Salam <salam@lpthe.jussieu.fr>
* example/12-filter.cc:
RfiltDyn -> DynamicRfilt, which now takes two arguments (Rmax,
deltaR_factor).
* example/07-subtraction.cc:
* example/07-subtraction-new.cc:
changes to comments and default values
* example/09-user_info.cc:
changes to comments
* include/fastjet/PseudoJet.hh:
changes to comments + plus addition of delta_R(other) member
2011-06-03 Gregory Soyez <soyez@fastjet.fr>
* plugins/Makefile.am (DIST_SUBDIRS):
removed the usage examples, since they are mostly covered by the
examples
* include/fastjet/JetDefinition.hh:
* src/JetDefinition.cc (have_same_recombiner):
have_same_recombiner -> has_same_recombiner
* include/fastjet/JetDefinition.hh:
* src/JetDefinition.cc (have_same_recombiner):
moved in jet definition:
JetDefinition::have_same_recombiner(other_jd)
2011-06-02 Gregory Soyez <soyez@fastjet.fr> & Gavin
* include/fastjet/WrappedStructure.hh:
throws an error if constructed from an empty (NULL) structure
* tools/Filter.cc (_recursively_check_ca):
* src/ClusterSequence.cc (contains):
* src/ClusterSequenceStructure.cc:
* src/PseudoJet.cc:
* include/fastjet/WrappedStructure.hh:
* include/fastjet/ClusterSequenceStructure.hh:
* include/fastjet/PseudoJetStructureBase.hh:
* include/fastjet/PseudoJet.hh:
has_validated_cluster_sequence() -> has_valid_cluster_sequence()
2011-06-02 Gavin Salam <salam@lpthe.jussieu.fr> & Gregory
* NEWS: tried to compactify it.
* include/fastjet/FunctionOfPseudoJet.hh:
worked on documentation
* src/JetDefinition.cc (DefaultRecombiner::recombine):
user_index used to be set to 0 on recombination. This should be
considered a bug (dates to 27 November 2006 and was never
updated to reflect the default user index of -1 that was set on
24 February 2007. The user index from recombination is now the
default that comes out of addition / initialisation (i.e. -1).
2011-06-02 Gregory Soyez <soyez@fastjet.fr>
* src/CompositeJetStructure.cc:
* include/fastjet/CompositeJetStructure.hh:
get the scalar area and its error from the pieces rather than
caching it + added support for is_pure_ghost (true if all pieces
are).
* tools/MassDropTagger.cc:
* tools/NSubjettinessTagger.cc:
returned an empty PseudoJet when the tagger fails
2011-06-02 Gavin Salam <salam@lpthe.jussieu.fr>
* testsuite/run_tests.cc:
* testsuite/TestSubStructure.hh: *** ADDED ***
added some tests of CASubJetTagger and MassDropTagger
* testsuite/TestBase.hh:
verify function all return a boolean now; verify_equal for
PseudoJets takes an option to ignore the substructure; and added
a specific verify_null for PseudoJets that checks == 0
* tools/CASubJetTagger.cc:
* tools/fastjet/tools/CASubJetTagger.hh:
made CASubJetTagger::JetAux private and updated some comments;
got rid of the mutable member and cleaned up some behaviour
(including correct failure on jet that should not be tagged).
Changed the default scale to be jade (also put a non-zero
z_threshold). Changed error -> warning when alg passed is not
C/A.
2011-06-02 Gregory Soyez <soyez@fastjet.fr>
* doc/fastjet-doc.tex:
added a table corresponding to the structure associated with a
PseudoJet for different types of PseudoJet.
* configure.ac:
* plugins/Makefile.ac:
* plugins/usage_examples: *** REMOVED ***
removed usage_example for plugins (we have some examples in the
example dir!)
2011-06-02 Gregory Soyez <soyez@lpthe.jussieu.fr>
* NEWS + RoadMap:
included changes up to here in the NEWS.
updated the RoadMap with open questions/tasks before 3.0a3
* tools/fastjet/tools/CASubJetTagger.hh:
added the StructureType (typedef'ed to CASubJetStructure)
2011-06-01 Gregory Soyez <soyez@fastjet.fr>
* src/ClusterSequence.cc (contains):
instead of testing if jet structure shared pointer is equal to
the ClusterSequence one, compare directly the pointer to the
cluster sequence itself. This would work also with the wrapped
structure.
* tools/fastjet/tools/CASubJetTagger.hh: *** ADDED ***
* tools/CASubJetTagger.c: *** ADDED ***
* tools/fastjet/tools/Makefile.am:
* tools/Makefile.am:
added a tagger searching for a maximal scale (distance) in a
Cambridge/Aachen cluster sequence history
* include/fastjet/WrappedStructure.hh: *** ADDED ***
* include/fastjet/Makefile.am:
added a wrapper around another structure (makes feasible the
addition of extra features to a structure while keeping sharing
the memry of the wrapped structure)
2011-05-31 Gregory Soyez <soyez@fastjet.fr>
* tools/Filter.cc (_finalise):
do not set the structure share pointer at the end (this is
already done by the call to join() and would lead to a memory
problem)
* include/fastjet/Selector.hh:
* src/Selector.cc:
removed SelectorIsZero (not needed now + could introduce some
confusion)
2011-05-30 Gregory Soyez <soyez@fastjet.fr>
* tools/fastjet/tools/MassDropTagger.hh:
relaxed the input condition (has_parents is the only thing we
really use/need)
* tools/Filter.cc:
used has_validated_cluster_sequence instead of has_associated_cs
when apropriate
* include/fastjet/PseudoJet.hh:
* src/PseudoJet.cc:
. adapted to the new has_associated_cs vs. has_validated_cs
. adapted to the argument added to has_pieces (in the structure)
. pieces() now relies entirely on the implementation in the
structure (before it was making sire that the structure had
support for pieces and throwing an error otherwise)
* include/fastjet/CompositeJetStructure.hh:
* src/CompositeJetStructure.cc:
. adapted to the additional argument in has_pieces()
. considered pieces without constituents as their own
constituent. This means that except for composite jets with no
pieces (for which constituents() will return an empty vector)
all composite jets have constituents. constituents() will
recurse into pieces that have constituents support.
* include/fastjet/ClusterSequenceStructure.hh:
* src/ClusterSequenceStructure.cc:
. pieces() for jets associated with a ClusterSequence will now
return the jets parent's (or an empty vector if the jet has no
parents). has_pieces() would return true in the first case and
false in the second.
. adapted to the new has_associated_cs vs. has_validated_cs
* include/fastjet/PseudoJetStructureBase.hh:
. added has_validated_cluster_sequence(). Now,
has_associated_cluster_sequence() just check if the structure
is associated with a CS. It no longer check if it is valid.
The added method is the one that also checks if it is valid.
That way we can disentangle between jets with no associated
cluster sequence and jets for which the cluster sequence has
gone out of scope
. added a reference argument to 'has_pieces()'
* src/PseudoJetStructureBase.cc:
slightly modified the messages for thrown errors
* tools/MassDropTagger.cc:
* tools/MassDropTagger.hh:
added support for user-defined recombiners (in the tagged jets)
* src/JetDefinition.cc (have_same_recombiner):
* include/fastjet/JetDefinition.hh:
added a test that different jet definitions share the same
recombiner
* tools/fastjet/tools/MassDropTagger.hh:
* tools/MassDropTagger.cc:
used the parent ClusterSequence recombiner to build the final
composite jet
* tools/Filter.cc:
* tools/MassDropTagger.cc:
* tools/NSubjettinessTagger.cc:
used the non-const access to the structure to build the final
jet more transparently
* tools/fastjet/tools/MassDropTagger.hh:
* tools/fastjet/tools/NSubjettinessTagger.hh:
removed the "mutable" qualifier for the structure data (no
longer needed with the non-const access to the
* src/PseudoJet.cc:
* include/fastjet/PseudoJet.hh:
added structure_non_const_ptr() to get a "write" access to the
PseudoJet's underlying structure.
Only use this if you know what you are doing!
* src/JetDefinition.cc (join):
avoided the risk that the recombiner does not handle properly
plus_equal for uninitialised jets.
* include/fastjet/CompositeJetStructure.hh:
added a templated version of join (as the first one, for use
together with structures derived from CompositeJetStructure)
with support for an external recombination scheme
* tools/Transformer.cc:
* tools/Subtractor.cc:
* tools/NSubjettinessTagger.cc:
* tools/MassDropTagger.cc:
* tools/Filter.cc:
* tools/BackgroundEstimator.cc:
* tools/fastjet/tools/Transformer.hh:
* tools/fastjet/tools/Subtractor.hh:
* tools/fastjet/tools/NSubjettinessTagger.hh:
* tools/fastjet/tools/MassDropTagger.hh:
* tools/fastjet/tools/Filter.hh:
* tools/fastjet/tools/BackgroundEstimator.hh:
* tools/fastjet/tools/Boost.hh:
renamed 'apply()' into 'result()'
* include/fastjet/FunctionOfPseudoJet.hh:
renamed 'apply()' into 'result()'
* include/fastjet/PseudoJet.hh:
* srcPseudoJet.cc:
added a comparison (== and !=) between a PseudJEt and a constant
(double). It tests if a PseudoJet has zero momentum (the
operator == can only be called with a zero double value, an error
is thrown otherwise)
2011-05-26 Gregory Soyez <soyez@fastjet.fr>
* src/FunctionOfPseudoJet.cc: *** ADDED ***
* include/fastjet/FunctionOfPseudoJet.hh:
added a series of Selectors implementing ordering between a
FunctionOfPseudoJet<double> and a double.
* src/Selector.cc:
* include/fastjet/Selector.hh:
added a SelectorIsZero selecting zero PseudoJet
* tools/fastjet/tools/Filter.hh:
* tools/Filter.cc:
* example/12-filter.cc:
renamed FilteredJetStructure into FilterStructure
* example/09-user_info.cc:
removed unneeded header
* example/12-filter.cc:
typos in comments
* include/fastjet/CompositeJetStructure.hh:
* include/fastjet/PseudoJet.hh:
* include/fastjet/JetDefinition.hh:
* src/CompositeJetStructure.cc:
* src/PseudoJet.cc:
* src/JetDefinition.cc:
join(pieces, Recombiner*) has been split into a join(pieces) in
PseudoJet.(hh,cc) and a join(pieces, Recombiner&) in
JetDefinition.(hh,cc). The advantage of this is that an end-user
that want to use join does not explicitly need to include any
header. If he wants the "basic" version then PseudoJet should
anyway already be available, and if he wants the version with
the recombiner then JetDefinition should already have been
included.
2011-05-20 Gregory Soyez <soyez@fastjet.fr>
* src/PseudoJet.cc (has_area):
we were imposing an associated cluster sequence then calling the
underlying structure for area. This is overdoing it: just checking
if there is a structure and if it has area is what we need (we may
have area support in jets wo an associated ClusterSequence)
* example/09-user_info.cc:
included the CompositeJetStructure header
* src/PseudoJet.cc:
* src/CompositeJetStructure.cc:
* include/fastjet/PseudoJet.hh:
* include/fastjet/CompositeJetStructure.hh:
added support for a user-specified recombiner in join(...).
Since this requires the inclusion of JetDefinition.hh (for
JetDefiniton::Recombiner), we have moved the declaration of
join() in CompositeJetStructure.{hh,cc}. One thus needs to
include that header (on top of PseudoJet.hh) if one needs
join(...).
The computation of the area (when applicable) is done in the
constructor of CompositeJetStructure and cached (as for areas in
ClusterSequenceArea).
* example/11-boosted_higgs.cc:
In the recombiner, considered negative user indices as
0 (particles with a default user index, such as potential ghosts
added to the computation, should not be considered as b-tagged)
* tools/Filter.cc (_check_ca):
slightly changed the coding style.
added a safety check in case one passes a composite jet with 0
pieces
2011-05-19 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc (transfer_from_sequence):
put in protection to make sure transfer_from_sequence will throw
an error if the CS deletes_self_when_unused (which would cause
complications we don't want to worry about right now).
2011-05-19 Gregory Soyez <soyez@fastjet.fr>
* tools/Filter.cc:
added the condition that all the pieces must share the same
cluster sequence for the C/A simplification to be applicable.
* tools/Filter.cc:
* tools/fastjet/tools/Filter.hh:
improved the test for the simple CA trick: when the jet is made
of pieces, we ask that the maximal distance between the pieces
should not be smaller than the filtering radius. If that
requirement fails, we just recluster all the constituents
* example/12-filter.cc:
fixed a bug in the dynamic filter case (max(Rbb,0.3) was
implemented instead of min(Rbb,0.3))
* tools/NSubjettinessTagger.cc:
passed a pointer to the boost transformation rather than a
reference
* src/ClusterSequence.cc (transfer_from_sequence):
* include/fastjet/ClusterSequence.hh:
merged the 2 versions of transfer_from_sequence into a single
one taking a pointer to a FunctionPOfPseudoJet<PseudoJet> (instead
of a reference) which is NULL by default.
made the implementation a bit more robust in case action_on_jets
messes up with the structural information
* tools/Makefile.am:
* tools/Transformer.cc: *** REMOVED ***
no longer needed (empty file)
* tools/fastjet/tools/Transformer.hh:
set apply() and description() as purely virtual: one has to
implement them in derived classes
* include/fastjet/FunctionOfPseudoJet.hh:
removed the virtual for operator(). This highlights the fact
that apply() is the one to be overloaded.
2011-05-18 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/fastjet/tools/NSubjettinessTagger.hh:
* tools/NSubjettinessTagger.cc:
small changes to comments
* include/fastjet/FunctionOfPseudoJet.hh:
typos + other small changes in comments
* src/ClusterSequence.cc (ClusterSequence::transfer_from_sequence):
typo in comments
* tools/MassDropTagger.cc:
slight reworking of some comments
* tools/fastjet/tools/MassDropTagger.hh:
fixed the descriptions of mu() and y() for MassDropStructure
* tools/fastjet/tools/BackgroundEstimator.hh:
typos in comments
* testsuite/TestPseudoJet.hh (class TestPJCSaccess):
added a class to help help maintain consistency of behaviours
wrt constituents etc. once the CS goes out of scope
2011-05-18 Gregory Soyez <soyez@fastjet.fr>
* doc/fastjet-doc.tex (algorithms):
. added a description of SelectorIdentity and
SelectorIsPureGhost
. put the correct ref to FunctionOfPseudoJet<> in the
documentation of BackgroundEstimator
. documented the Filter
. started to document the boosted taggers
* tools/NSubjettinessTagger.cc:
made sure that the subjets returned as the pieces of the result
refer to the ClusterSequence boostedback in the lab frame
* example/Makefile.am:
. added the example illustrating the "new" subtraction
. updated the comments
* example/07-subtraction-new.cc:
made subtractor take a pointer to the background estimator
* tools/MassDropTagger.cc:
* tools/NSubjettinessTagger.cc:
* example/12-filter.cc:
adapted to the renaming mentioned just below.
* include/fastjet/PseudoJet.hh:
renamed 'has_properties_of' -> 'has_structure_of' and
'extra_properties' -> 'structure_of'. This is hopefully more
indicative of the fact that it deals with the structure of the
jet.
2011-05-17 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/fastjet/tools/MassDropTagger.hh:
tiny change to comment.
2011-05-17 Gregory Soyez <soyez@fastjet.fr>
* doc/fastjet-doc.tex (algorithms):
started to document the Transformer's; added FunctionOfPseudoJet<>
as an appendix.
* tools/fastjet/tools/Transformer.hh (>):
added a missing "virtual" in Transformer
2011-05-17 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/Filter.cc (Filter::apply):
compactified the apply(...) code somewhat, making use of
Selector::sift(...).
2011-05-17 Gregory Soyez <soyez@fastjet.fr>
* tools/fastjet/tools/Subtractor.hh:
* tools/Subtractor.cc:
reinserted the change made by Gavin on May 14th and somehow lost
during the insertion of FunctionOfPseudoJet<>. Checked that the
rest of the modifications are OK.
2011-05-16 Gregory Soyez <soyez@fastjet.fr>
* tools/fastjet/tools/BackgroundEstimator.hh:
* tools/BackgroundEstimator.cc:
replaced BackgroundDensityBase and BackgroundRescalingBase by
FunctionOfPseudoJet<double>
* tools/fastjet/tools/MassDropTagger.hh:
* tools/fastjet/tools/NsubjettinessTagger.hh:
updated the info about what is included in the associated
structure
* tools/NSubjettinessTagger.cc:
kept the information about the internal cluster sequence
(boosted back to the lab frams)
* tools/NSubjettinessTagger.cc: *** ADDED ***
* tools/fastjet/tools/NSubjettinessTagger.hh: *** ADDED ***
added a tagger using 2-subjettiness in the rest-frame of the fat
jet
* tools/MassDropTagger.cc: *** ADDED ***
* tools/fastjet/tools/MassDropTagger.hh: *** ADDED ***
added a tagger based on the mass-drop criterion
* tools/fastjet/tools/Boost.hh: *** ADDED ***
added a couple of classes (FunctionOfPseudoJet<PseudoJet>) with
the action of boosting and unboosting a PseudoJet
* src/ClusterSequence.cc:
* include/fastjet/ClusterSequence.hh:
added a version of transfer_from_sequence() that takes, as a
second argument, a FunctionOfPseudoJet<PseudoJet> that would be
an action applied on all the jets of the cluster sequence after
the transfer.
* include/fastjet/CompositeJetStructure.hh:
added a template version of join() to help create composite jets
with a Structure derived from CompositeJet Structure.
* tools/fastjet/tools/Makefile.am:
* include/fastjet/Makefile.am:
* tools/fastjet/tools/Transformer.hh:
* include/fastjet/FunctionOfPseudoJet.hh: *** ADDED ***
* tools/fastjet/tools/FunctionOfPseudoJet.hh: *** DELETED ***
moved FunctionOfPseudoJet<> to the core of FastJet.
made apply() purely virtual to make sure one overloads it in
derived classes.
* tools/fastjet/tools/Subtractor.hh:
* tools/fastjet/tools/Filter.hh:
declared the description as virtual (more consistent)
* tools/Subtractor.cc:
* tools/fastjet/tools/Subtractor.hh:
overloaded apply instead of operator() to fit the new
Transformer.
* example/12-filter.cc:
added an example of the specification of a dynamic Rfilt
* tools/Filter.cc:
* tools/fastjet/tools/Filter.hh:
. added a ctor specifying just Rfilt (Cambridge/Aachen used by
default)
. added a ctor with Rfilt specified using a
FunctionOfPseudoJet<double>. In that case, Rfilt will be
computed dynamically as a function of the jet being filtered
* tools/fastjet/tools/Transformer.hh:
Declared Transformer as a FunctionOfPseudoJet<PseudoJet> i.e. a
special function that returns a PseudoJet from a PseudoJet. This
also has a description and a structure type as before.
* tools/fastjet/tools/Makefile.am:
* tools/fastjet/tools/FunctionOfPseudoJet.hh: *** ADDED ***
added a generic FunctionOfPseudoJet<TOut> class allowing to
define a function returning a result ot type TOut from
a PseudoJet input.
These functions have a virtual member 'apply()' that one can
overload to define any function.
The operator() will have the same effect as apply when called
from a single object but can also be called on a vector of
objects.
* include/fastjet/CompositeJetStructure.hh:
added area support for CompositeJet.
Note that the area error is estimated (conservatively) as the
sum of the errors on each of the pieces.
2011-05-14 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/Subtractor.cc:
* tools/fastjet/tools/Subtractor.hh:
subtractor now takes a pointer to a bge
* tools/fastjet/tools/BackgroundEstimator.hh:
fixed bug in BackgroundJetPtMDensity return value (excess sqrt)
* include/fastjet/PseudoJet.hh:
corrected typo in first sentence of doc...
* Doxyfile (SEARCHENGINE):
turned on the javascript-based search -- we should play with it
a little to see how it performs, especially over a web connection.
* doc/fastjet-doc.tex:
new documentation section for the BackgroundEstimator (and some
mods to the subdivision of the areas section as a whole)
* tools/fastjet/tools/BackgroundEstimator.hh:
worked on some comments and (for now) commented out all the
alternative calls to set_rescaling_class
2011-05-13 Gavin Salam <salam@lpthe.jussieu.fr> + Gregory
* NEWS: prepared a summary of what we've done so far towards 3.0b1
* RoadMap:
a series of updates reflect needs for 3.0b1
2011-05-13 Gregory Soyez <soyez@lpthe.jussieu.fr>
* include/fastjet/CompositeJetStructure.hh:
added area support for CompositeJet.
Note that the area error is estimated (conservatively) as the
sum of the errors on each of the pieces.
* tools/Subtractor.cc:
* tools/fastjet/tools/Subtractor.hh:
overloaded apply instead of operator() to fit the new
Transformer.
* example/12-filter.cc:
added an example of the specification of a dynamic Rfilt
* tools/Filter.cc:
* tools/fastjet/tools/Filter.hh:
. added a ctor specifying just Rfilt (Cambridge/Aachen used by
default)
. added a ctor with Rfilt specified using a
FunctionOfPseudoJet<double>. In that case, Rfilt will be
computed dynamically as a function of the jet being filtered
* tools/fastjet/tools/Transformer.hh:
Declared Transformer as a FunctionOfPseudoJet<PseudoJet> i.e. a
special function that returns a PseudoJet from a PseudoJet. This
also has a description and a structure type as before.
* tools/fastjet/tools/Function.hh: *** ADDED ***
added a generic Function<TIn,TOut> class allowing to define an
object returning a result ot type TOut from an object of type
TIn.
Defined FunctionOfPseudoJet<TOut> allowing to define functions
of PseudoJet returning any desired type.
These functions have a virtual member 'apply()' that one can
overload to define any function.
The operator() will have the same effect as apply when called
from a single object but can also be called on a vector of
objects.
* tools/BackgroundEstimator.cc:
* tools/fastjet/tools/BackgroundEstimator.hh:
Fixed policy regarding constness and selectors taking (or not) a
reference:
- rho(),sigma(): const; throws for selectors taking a reference
- rho(jet),sigma(jet): non-const; (allowed too for selectors
not taking a reference)
- mean_area(),...: const: return the result of the last
computation, do the computation if there's none available, in
the last case throws an error if there is a selector with an
unset reference.
All const calls leave the behaviour unchanged (only mutable
cached data could change)
* src/Selector.cc (SelectorWorker):
fixed an issue with setting the reference for negated selectors
--- set_reference was missing in SW_Not.
2011-05-13 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
added operator==(const PseudoJet& a, const PseudoJet& b) and
corresponding !=.
* tools/fastjet/tools/BackgroundEstimator.hh:
* tools/BackgroundEstimator.cc:
added set_jets, set_cluster_sequence, set_selector calls and
allowed for constructors in which the jets/CS or selector are unset.
* tools/fastjet/tools/BackgroundEstimator.hh:
a few games with the range of set_rescaling_class(...) calls
* src/ClusterSequence.cc:
* include/fastjet/ClusterSequence.hh:
added CS::_set_structure_shared_ptr(jet), to make sure use count
is kept updated any time a jet is associated with the CS
internally (all calls to jet.set_structure_shared_ptr(...) were
correspondingly replaced). This should ensure that the
delete_self_when_unused() call will work also with CSArea
etc. without mods all over the place.
* src/ClusterSequenceStructure.cc:
added a check in destructor that when _associated_cs is not
NULL, it is only deleted if CS::will_delete_self_when_unused()
is true. Previously we relied on the CS setting the
associated_cs pointer to null in its destructor. But if the CS
constructor throws an error, then ~CS never gets called and this
extra check becomes necessary.
* src/ClusterSequenceAreaBase.cc (subtracted_jet):
just added a comment about the set_structure call
2011-05-12 Gregory Soyez <soyez@lpthe.jussieu.fr>
* tools/fastjet/tools/Filter.hh:
* tools/Filter.cc:
got rid of the internal_cs in FilteredJetStructure and at
various places in the Filter by using the new
CS::delete_self_when_unused().
2011-05-12 Gavin Salam <salam@lpthe.jussieu.fr>
* src/Error.cc:
turned off backtrace by default
* src/ClusterSequenceStructure.cc (ClusterSequenceStructure):
* include/fastjet/ClusterSequenceStructure.hh (PseudoJetStructureBase):
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence.cc:
added CS::delete_self_when_unused() allowing FastJet to look
after deletion of a CS when there are no longer any jets or
other objects associated with it. (+small fix to SharedPtr)
2011-05-12 Gregory Soyez <soyez@lpthe.jussieu.fr>
* include/fastjet/SharedPtr.hh:
added the option to force the count to a user-specified value
(USE AT YOUR OWN RISKS). Note that this is certainly not in the
standard shared_ptr specification.
2011-05-12 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh (class PseudoJet):
changed the default constructor so that it provides a
sensibly-initialised PseudoJet (with zero momentum). No speed
penalty and some significant speed improvement on some systems.
* testsuite/PJtiming.cc: *** ADDED ***
small program for testing timing of default PseudoJet constructor
* testsuite/TestBase.hh:
* testsuite/TestPseudoJet.hh:
* testsuite/run_tests.cc:
a bunch more tests, including one that found the _user_info not
being reset by reset_indices.
* include/fastjet/PseudoJet.hh (reset_indices):
ensured that _user_info also gets reset
2011-05-12 Gregory Soyez <soyez@lpthe.jussieu.fr>
* include/fastjet/internal/Makefile.am (fastjetincludeinternal_HEADERS):
* include/fastjet/internal/DerivedPseudoJetHelper.hh: *** REMOVED ***
no longer needed
* include/fastjet/PseudoJet.hh:
instead of having the template ctor decide whether the object is
derived from PseudoJet, do that in reset (that way, reset<L> also
handles properly the case where L derives from PseudoJet).
We also switched to the use of cast_if_derived which avoid the
need for the DerivedPseudoJetHelper class
* include/fastjet/internal/IsBase.hh:
added a "cast_if_derived<B,D>" that, from a pointer of type D,
converts it into a pointer of type B if D is derived from B and
returns NULL otherwise (as dynamic_cast except that it works for
non-polymorphic types)
2011-05-12 Gavin Salam <salam@lpthe.jussieu.fr>
* testsuite/run_tests.cc:
* testsuite/TestBase.hh:
* testsuite/TestPseudoJet.hh: *** ADDED ***
added some more infrastructure for running tests and beefed-up
the PtYPhiM test.
2011-05-10 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/fastjet/tools/BackgroundEstimator.hh:
added (perhaps temporary) illustration of a templated
set_rescaling.
2011-05-09 Gavin Salam <salam@lpthe.jussieu.fr> & Matteo
* tools/BackgroundEstimator.cc:
* tools/fastjet/tools/BackgroundEstimator.hh
added BackgroundRescalingBase and BackgroundRescalingYPolynomial
classes, and corresponding support within BackgroundEstimator
(both in the background estimation part and the local rho part,
so that overall normalisation should cancel).
2011-05-09 Gregory Soyez <soyez@lpthe.jussieu.fr>
* tools/fastjet/tools/BackgroundEstimator.hh:
added a use_area_4vector method returning true if the background
estimation is currently using 4-vector area
2011-05-09 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* tools/BackgroundEstimator.cc:
* tools/fastjet/tools/BackgroundEstimator.hh:
added facility for using the background estimator to get
estimates of quantities other than just pt/area, with a few
classes to help with this (e.g. for PtM). Docs etc. to follow
* tools/BackgroundEstimator.cc ():
* tools/fastjet/tools/BackgroundEstimator.hh:
factored median calculation out into _median_and_stddev(...), in
anticipation of other future modifications (e.g. medians of
quantities other than pt/area).
Also modified calculation of sigma so that it deals with the
"bin width" associated with each jet. To obtain the old FJ2
calculation of sigma, first call the new function
set_provide_fj2_sigma().
* testsuite/TestBase.hh: *** ADDED ***
* testsuite/run_tests.cc: *** ADDED ***
just some first structural thoughts about tests
* src/PseudoJet.cc:
* include/fastjet/PseudoJet.hh:
renamed hint_associated_rap_phi() -> set_cached_rap_phi() [this
is hopefully a clearer name].
* src/GhostedAreaSpec.cc (add_ghosts):
renamed the old (wrong) phi as phi_fj2 and now use a phi that
has the correct px,py use. Also speeded up the ghost generation
a little (exprap) and added a hint to set the ghost rapidity and
phi. Checked that active results are unchanged.
2011-05-02 Gregory Soyez <soyez@lpthe.jussieu.fr>
* src/PseudoJet.cc (PtYPhiM):
fixed serious bug where PtYPhiM was using ptm (=mt) to generate
x and y components (making pt wrong and m=0 when a non-zero m
was asked)
2011-04-28 Gavin Salam <salam@lpthe.jussieu.fr>
* src/PseudoJet.cc (PtYPhiM):
fixed serious bug where PtYPhiM was generating exchanged x and y
components (making it inconsistent with the hinted phi). Pointed
out by Gregory.
2011-04-21 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc (ClusterSequence::_initialise_and_run):
* src/JetDefinition.cc:
* include/fastjet/JetDefinition.hh:
added an undefined_jet_algorithm entry to the JetAlgorithm enum;
this is now set in the default constructor to JetDefinition;
corresponding entries/error-messages have been added to
JetDefinition::description() and
ClusterSequence::_initialise_and_run.
2011-04-18 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
added the new hint_associated_rap_phi(rap,phi) routine, which
allows a user to tell the PseudoJet what its rapidity and phi
are, thus sometimes avoiding expensive recalculations.
* src/PseudoJet.cc (PtYPhiM):
made this significantly more efficient, by directly calculating
exp(y) rather than calling sinh and cosh; also avoided a
sqrt(pt^2+m^2) if the mass is zero and called
PseudoJet::hint_associated_rap_phi so that rapidity and phi info
are passed to the PseudoJet for free.
2011-04-16 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh (PseudoJet::reset_momentum):
added reset_momentum(...), which changes the momentum but
leaves all other information untouched.
2011-04-14 Gregory Soyez <soyez@lpthe.jussieu.fr> + Matteo & Gavin
* src/ClusterSequence.cc (_print_banner):
updated the banner
* doc/fastjet-doc.tex (Note):
fixed name in the acks
2011-04-12 Gavin Salam <salam@lpthe.jussieu.fr>
* COPYING:
fixed a typo; added SISCone reference
2011-04-12 Gregory Soyez <soyez@fastjet.fr>
* src/ClusterSequenceAreaBase.cc:
only imposes a finite area if the area has no explicit ghosts
* include/fastjet/ClusterSequenceAreaBase.hh:
* include/fastjet/ClusterSequenceArea.hh:
* include/fastjet/ClusterSequenceActiveArea.hh:
* include/fastjet/ClusterSequencePassiveArea.hh:
* include/fastjet/ClusterSequence1GhostPassiveArea.hh:
* include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh:
* include/fastjet/Makefile.am:
* src/GhostedAreaSpec.cc:
* src/ClusterSequenceAreaBase.cc:
* src/ClusterSequenceArea.cc:
* src/ClusterSequencePassiveArea.cc:
* src/ClusterSequenceActiveArea.cc:
* src/ClusterSequenceActiveAreaExplicitGhosts.cc:
* src/Makefile.am:
replaced the use of RangeDefinition by Selector. From
ClusterSequenceArea, the selector is required to be geometric
and to have a finite area. For more advanced usage, use
BackgroundEstimator and Subtractor.
Note that from now on, the use of RangeDefinition is considered
obsolete and should be disfavoured. Use Selector instead.
* include/fastjet/Selector.hh:
* src/Selector.cc:
* tools/BackgroundEstimator.cc:
replaced the has_area test by is_geometric() that tests if the
selector only puts constraints on the geometry of the PseudoJet
(y and phi) and has_finite_area() that checks if the selector
has a finite area
* include/fastjet/Selector.hh:
* src/Selector.cc:
. added a SW_RangeDefinition that works from a RangeDefinition
. added a Selector ctor from a RangeDefinition [provided for
backward compatibility only]
* include/fastjet/RangeDefinition.hh (RangeDefinition):
removed the ctor from a Selector
* include/fastjet/Makefile.am (fastjetinclude_HEADERS):
removed PseudoJetPlusInfo.hh from the list of headers
since the file is no longer included.
* example/12-filter.cc:
adapted the example to the fact that extra_properties now
returns a reference
2011-04-12 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/PxCone/Makefile.am:
* plugins/SISCone/Makefile.am:
* plugins/CDFCones/Makefile.am:
* plugins/CDFCones/CDFJetCluPlugin.hh: *** DELETED ***
* plugins/CDFCones/CDFMidPointPlugin.hh: *** DELETED ***
* plugins/PxCone/PxConePlugin.hh: *** DELETED ***
* plugins/SISCone/SISConePlugin.hh: *** DELETED ***
removed all of these deprecated headers; access now must be via
fastjet/PluginName.hh
2011-04-11 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
extra_properties<T>() now returns a reference rather than a
pointer.
* include/fastjet/PseudoJetPlusInfo.hh: *** DELETED ***
we decided there wasn't much benefit from this
* example/07-subtraction-new.cc: *** ADDED ***
an example with the new form of subtraction; not yet compiled by
default; comments still need work.
* tools/Makefile.am:
* tools/fastjet/tools/Subtractor.hh:
* tools/Subtractor.cc: *** ADDED ***
modified comments; moved some of the code to .cc and ensured
that the resulting subtracted jets have their pt set to zero if the
subtraction would take away too much pt and that they retain
their structural information.
* tools/fastjet/tools/BackgroundEstimator.hh:
* tools/BackgroundEstimator.cc:
made rho() and sigma() calls const, which necessitated making a
number of member variables mutable.
2011-04-06 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
re-enabled karnak
2011-03-30 Gregory Soyez <soyez@lpthe.jussieu.fr>
* tools/fastjet/tools/Subtractor.hh:
passed the ctor argument as a reference
* tools/BackgroundEstimator.cc (_compute):
fixed typo in error message
2011-03-27 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* fortran_wrapper/fastjetfortran.cc
* fortran_wrapper/fastjet_fortran_example.f
Added subroutine for rho determination from fortran
2011-03-24 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* fortran_wrapper/fastjetfortran.cc
* fortran_wrapper/fastjet_fortran_example.f
Added fortran interface to calculate and retrieve
active jet areas (subroutines fastjetsisconewitharea(),
fastjetppgenktwitharea() and function fastjetarea()).
Also moved some code in new helper routine transfer_cluster_transfer()
2011-03-23 Gavin Salam <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
removed karnak from nightly check
* include/fastjet/GhostedAreaSpec.hh:
* GhostedAreaSpec.cc:
GhostedAreaSpec can now take a Selector in the constructor and
do the sensible thing with it (+later, got description working
for it)
* include/fastjet/Selector.hh:
* Selector.cc:
Set up separate area() and area(ghost_area) calls, so that we do
not need to provide a default area in the include file (this was
causing circularity in the includes with GhostedAreaSpec)
Reorganised order of some methods (so everything public is
together).
2011-03-21 Gregory Soyez <soyez@lpthe.jussieu.fr>
* tools/BackgroundEstimator.cc (_compute):
. use systematically scalar area to estimate the empty area
. fixed a bug in the computation of the empty area (dividing
by R^2 rather than R)
Note that the method to compute the empty area when there is no
explicit ghost works as for ClusterSequenceAreaBase. This would
differ to what is implemented in ClusterSequenceActiveArea.
2011-03-20 Gregory Soyez <soyez@lpthe.jussieu.fr>
* src/Selector.cc:
provide a virtual dtor to QuantityBase (so that the derived
quantities also have a virtual dtor).
2011-03-20 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequenceVoronoiArea.cc:
fixed rounding-error issue in VAC::circle_area(...), which was
causing nan Voronoi areas in some circumstances for particles on
a calorimeter. (Problem reported by Sue Ann Koay, with example
event sent on 2011-03-20).
* src/Selector.cc (SelectorM*, SelectorEt*):
these were incorrectly interpreting their arguments as the
square-root of mass and Et. Should now be fixed.
2011-03-17 Gavin Salam <salam@lpthe.jussieu.fr>
* src/Selector.cc:
* include/fastjet/Selector.hh:
added two new Selector methods
- Selector::count(jets), which returns a count of
the number of jets that pass the selection; intended to be a
a bit more efficient that getting a results vector and
evaluating its size.
- Selector::sift(jets, jets_that_pass, jets_that_fail), which
sifts the input jets into two vectors, which respectively pass
and fail the selector.
Also eliminated some operator indirection in the main selection
routine.
* regression-tests/nightly-check.pl:
removed zetes from nightly check since it's down.
2011-03-16 Gregory Soyez <soyez@lpthe.jussieu.fr>
* tools/fastjet/tools/Subtractor.hh: *** ADDED ***
* tools/fastjet/tools/Makefile.am:
added a transformer that performs subtraction (taking a
BackgroudEstimetor as a ctor parameter)
* tools/BackgroundEstimator.cc:
* tools/fastjet/tools/BackgroundEstimator.hh:
added the "traditional" FastJet header.
2011-03-15 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/fastjet/tools/Filter.hh:
small change in description to take into account the two
possible scales "offered" with trimming.
2011-03-11 Gregory Soyez <soyez@lpthe.jussieu.fr>
* example/01-basic.cc:
* example/02-jetdef.cc:
* example/04-constituents.cc:
* example/06-area.cc:
* example/08-selector.cc:
* example/09-user_info.cc:
* example/12-filter.cc:
sorted out the links in the Doxygen doc (class names had to be
prefixed by fastjet::)
2011-03-11 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/fastjet/tools/BackgroundEstimator.hh:
* tools/BackgroundEstimator.cc:
reworked some of the comments in BackgroundEstimator.
2011-03-10 Gavin SALAM <salam@lpthe.jussieu.fr>
* configure.ac:
switched version number fo 3.0alpha3-devel
2011-03-10 Gavin SALAM <salam@lpthe.jussieu.fr>
Release of fastjet-3.0alpha2
2011-03-10 Gavin Salam <salam@lpthe.jussieu.fr>
* configure.ac:
* NEWS:
* plugins/SISCone: [externals]
* ...
preparing for 3.0alpha2
* tools/Makefile.am:
* tools/fastjet/tools/Makefile.am:
* tools/fastjet/tools/BackgroundEstimator.hh:
* tools/BackgroundEstimator.cc:
moved BackgroundEstimator into core from experimental area to
allow people to play with them in 3.0a2; adapted it to work with
latest naming of PseudoJet structure information
2011-03-10 Gregory Soyez <soyez@lpthe.jussieu.fr>
* tools/Filter.cc:
* tools/fastjet.tools/Filter.hh:
declared _selector as mutable to better handle the case of
selectors taking a reference
* src/Selector.cc (SW_WithReference):
added the missing copy() method.
* example/Makefile.am:
* example/09-extra_info.cc: *** REMOVED ***
* example/09-user_info.cc: *** ADDED ***
renamed according to the renaming of the class. Note that the
example itself is still to be written!
* tools/fastjet/tools/Filter.hh:
- added a link in the Doxygen doc to the example 12
* example/12-filter.cc:
- updated description
- we now show 2 filters: "filtering" and "trimming"
* example/08-selector.cc:
fixed typo in description
* tools/fastjet/tools/Filter.hh:
use the jet being filtered as a reference if the selector takes
one.
2011-03-10 Gavin Salam <salam@lpthe.jussieu.fr>
* doc/fastjet-doc.tex:
documented composite jets
* tools/fastjet/tools/Filter.hh:
worked on doxygen documentation of Filter.hh
* tools/fastjet/tools/Transformer.hh:
fixed a minor issue in doxygen output from this file
* NEWS:
working on this in view of 3.0alpha2
* doc/fastjet-doc.tex:
incomplete treatment UserInfoBase renaming
* example/fastjet_example.cc:
completed list of examples for doxygen
* src/ClusterSequence.cc (~ClusterSequence):
documenting use of assert
* various
updates to copyright dates
* Roadmap gets some completion
* include/fastjet/Selector.hh:
* include/fastjet/internal/base.hh
added a new selectors "module" for doxygen
2011-03-10 Gregory Soyez <soyez@lpthe.jussieu.fr>
* fastjet-config.in:
fixed portability issue with sed and newlines
2011-03-09 Gregory Soyez <soyez@lpthe.jussieu.fr>
* include/fastjet/PseudoJetInterfaceBase.hh: *** REMOVED ***
* include/fastjet/PseudoJetStructureBase.hh: *** ADDED ***
* include/fastjet/ClusterSequenceInterface.hh: *** REMOVED ***
* include/fastjet/ClusterSequenceStructure.hh: *** ADDED ***
* include/fastjet/MergedJetInterface.hh: *** REMOVED ***
* include/fastjet/CombinedJetStructure.hh: *** ADDED ***
* src/PseudoJetInterfaceBase.cc: *** REMOVED ***
* src/PseudoJetStructureBase.cc: *** ADDED ***
* src/ClusterSequenceInterface.cc: *** REMOVED ***
* src/ClusterSequenceStructure.cc: *** ADDED ***
* src/MergedJetInterface.cc: *** REMOVED ***
* src/CombinedJetStructure.cc: *** ADDED ***
* include/fastjet/PseudoJet.hh:
* src/PseudoJet.cc:
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence.cc:
* src/ClusterSequenceAreaBase.cc (subtracted_jet):
* tools/fastjet/tools/Transformer.hh:
* tools/fastjet/tools/Filter.hh:
* tools/Transformer.cc:
* tools/Filter.cc:
* example/12-filter.cc:
done some renaming:
+ Interface -> Structure
+ ClusterSequenceInterface -> ClusterSequenceStructure
+ MergedJetInferface -> CompositeJetStructure
+ merge -> join
+ FilteredJetInterface -> FilteredJetStructure
+ UserInfo -> UserInfoBase
In PseudoJet: set the structure methods to
bool has_structure() const;
const PJSB * structure_ptr() const;
const PJSB * validated_structure_ptr() const;
const SharedPtr<PJSB> structure_shared_ptr() const;
const T & structure<T>() const;
_associated_interface -> _structure
In ClusterSequence.hh:
_interface_to_this -> _structure_shared_ptr
const SharedPtr<PJSB> structure_shared_ptr()
* include/fastjet/Selector.hh:
* src/Selector.cc:
- pure-ghost selector: fixed comment; fixed return value for
jets with no area (false is returned as they are certainly
not ghosts)
- added a SelectorPtFractionMin that keeps the jets carrying
at least a given fraction of a reference jet.
2011-03-08 Gregory Soyez <soyez@lpthe.jussieu.fr>
* include/fastjet/Selector.hh:
* src/Selector.xx:
added SelectorIdentity and SelectorIsPureGhost
2011-03-08 Gavin SALAM <salam@lpthe.jussieu.fr> & Matteo
* example/Makefile.am:
* experimental/tools/test.cc -> example/12-filter.cc:
moved the test program for filter to example/
Note, this will probably need reworking a little in the future.
* include/fastjet/PseudoJetInterfaceBase.hh:
removed some extraneous semicolons.
* experimental/tools/Transformer.* -> tools/
* experimental/tools/Filter.* -> tools/
* tools/**/Makefile.am
moved the Filter (and Transformer) into tools/ directory of the
core structure.
Removed TransformerInterface (it seemed to be unused and
redundant) + worked a little bit on comments.
2011-03-07 Gavin SALAM <salam@lpthe.jussieu.fr> & Matteo
* src/PseudoJet.cc:
* include/fastjet/PseudoJet.hh:
* doc/fastjet-doc.tex:
renamed ExtraInfo -> UserInfo (and similarly for all occurrences
of extra_info -> user_info). Also changed some of the other
naming aspects:
- user_info<L>() is now a template and returns a const ref
- user_info_ptr() returns the pointer
- user_info_shared_ptr() returns the shared pointer
Updated documentation and included a simple usage example as
well.
2011-02-28 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/dummy.cc: *** ADDED ***
added missing file here.
2011-02-28 Gregory Soyez <soyez@lpthe.jussieu.fr>
* src/PseudoJet.cc:
* include/fastjet/PseudoJetInterfaceBase.hh:
* include/fastjet/ClusterSequenceInterface.hh:
* src/PseudoJetInterfaceBase.cc:
* src/ClusterSequenceInterface.cc:
contains() + is_inside() -> object_in_jet() in the interface
(not in PseudoJet)
* include/fastjet/PseudoJetInterfaceBase.hh:
made pieces() throw an error when no pieces associated
* src/MergedJetInterface.cc:
trivial typo
2011-02-28 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequenceInterface.cc:
changed the validated_cs Error messages to refer only to the CS
having gone out of scope (since anything that reaches CSI
necessarily has assoc CSI).
* src/ClusterSequence.cc:
* include/fastjet/ClusterSequence.hh:
_potentially_valid(jet) replaced with contains(jet), and added a
check for all the exclusive_subjet calls.
2011-02-27 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/dummy.cc: *** ADDED ***
added this file (with one dummy function) to avoid problems with
nightly checks on OS X.
2011-02-25 Gregory Soyez <soyez@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
added template methods to help accessing the interface:
+ associated_interface_ptr<IfaceType> returns a pointer
of type IfaceType* or NULL if the interface is incompatible
+ extra_properties<TransformerType> returns a pointer to
a interface of type TransformerType::InterfaceType (or
NULL if incompatible)
+ has_properties_of<TransformerType> check that the
interface of the type TransformerType::InterfaceType
can be returned.
2011-02-24 Gregory Soyez <soyez@lpthe.jussieu.fr>
* include/fastjet/MergedJetInterface.hh:
adjusted references and constness.
* include/fastjet/ClusterSequenceInterface.hh (PseudoJetInterfaceBase):
has_constituents() and has_exclusive_subjets() will throw an
Error if the associated CS has gone out of scope
* include/fastjet/Makefile.am (fastjetinclude_HEADERS):
* src/Makefile.am (libfastjet_la_SOURCES):
* include/fastjet/PseudoJet.hh:
* src/PseudoJet.cc:
* include/fastjet/MergedJetInterface.hh: *** ADDED ***
* src/MergedJetInterface.cc: *** ADDED ***
added the interface for a jet made of pieces (copied and adapted
from Merger in experimental/tools)
* src/ClusterSequenceInterface.cc:
for contains and is_inside, check that the two jets belong to the
same ClusterSequence (failing which false is returned)
* include/fastjet/ClusterSequenceInterface.hh:
all the has_* methods that were simply returning 'true' now
return true only if the associated ClusterSequence is still
available (and false otherwise).
That way, if has_xyz() returns true, xyz() can safely be applied
to get the result.
* include/fastjet/PseudoJetInterfaceBase.hh:
* src/PseudoJetInterfaceBase.cc:
updated some of the default behaviours (e.g. a jet has no pieces
by default and pieces() throws an Error); updated comments
* include/fastjet/Makefile.am (fastjetinclude_HEADERS):
* src/Makefile.am (libfastjet_la_SOURCES):
* include/fastjet/PseudoJet.hh:
* include/fastjet/ClusterSequenceInterface.hh:
* src/ClusterSequenceInterfaceBase.cc: *** DELETED ***
* include/fastjet/ClusterSequenceInterfaceBase.hh: *** DELETED ***
* src/PseudoJetInterfaceBase.cc: *** ADDED ***
* include/fastjet/PseudoJetInterfaceBase.hh: *** ADDED ***
renamed the files ClusterSequenceInterfaceBase.* into
PseudoJetInterfaceBase.*
* src/ClusterSequenceAreaBase.cc:
* src/ClusterSequence.cc:
* src/ClusterSequenceInterfaceBase.cc:
* src/PseudoJet.cc:
* include/fastjet/PseudoJet.hh:
* include/fastjet/ClusterSequence.hh:
* include/fastjet/ClusterSequenceInterface.hh:
* include/fastjet/ClusterSequenceInterfaceBase.hh:
done some renaming:
ClusterSequenceInterfaceBase -> PseudoJetInterfaceBase
*_csi -> *_interface
2011-02-23 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* doc/fastjet-doc.tex:
* src/Selector.cc:
* include/fastjet/Selector.hh:
changed relocate(...) and is_relocatable() to set_reference(...)
and takes_reference(...) + other small mods to wording of
documentation.
* example/08-selector.cc:
* tools/Selector.cc -> src/Selector.cc
* tools/fastjet/tools/Selector.hh -> include/fastjet/Selector.hh
* various Makefile.am:
* doc/fastjet-doc.tex:
moved Selector into core of distribution. For doxygen, left it
@ingroup tools. Revisit this later?
2011-02-23 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/Makefile.am:
* include/FjPseudoJet.hh: *** DELETED ***
* include/FjClusterSequence.hh: *** DELETED ***
removed these legacy headers
2011-02-22 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/ClusterSequenceInterface.hh:
tiny mods (extraneous semicolons)
2011-02-22 Gregory Soyez <soyez@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
include/fastjet/ClusterSequenceInterface.hh:
include/fastjet/ClusterSequenceInterfaceBase.hh:
src/PseudoJet.cc:
src/ClusterSequenceInterfaceBase.cc:
added a few extra methods:
. has_constituents() that tells if the interface
supports constituents
. has_exclusive_subjets() that tells if the interface
supports constituents
. pieces() that returns the pieces of a jet (by default
both "input particles" and clustering products are
considered as made of a single piece, the object itself.
2011-02-20 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/ClusterSequence.hh:
adjusted comments
2011-02-17 Gregory Soyez <soyez@lpthe.jussieu.fr>
* src/PseudoJet.cc
* include/fastjet/ClusterSequenceInterfaceBase.hh
* include/fastjet/ClusterSequenceInterface.hh
* include/fastjet/PseudoJet.hh:
PseudoJet (and the various CSInterfaces) acquired a
description()
2011-02-09 Gregory Soyez <soyez@lpthe.jussieu.fr>
* include/fastjet/ClusterSequenceWrapper.hh: *** REMOVED ***
* src/ClusterSequenceInterface.cc:
Fixed the removal of ClusterSequenceWrapper (that apparently
went wrong during the branch merging.)
2011-02-08 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* src/ClusterSequence_CP2DChan.cc (_CP2DChan_limited_cluster):
same bugfix (make_mirror(... Dlim4mirror) as earlier today (I
had forgotten one)
2011-02-08 Gregory Soyez <soyez@lpthe.jussieu.fr>
* merged the fastjet-2.5.X-clusterinfo-devel branch into the trunk
=========================================================================
MERGING the devel-clusterinfo branch
Here starts the ChangeLog for the modifications in the branch
=========================================================================
2011-02-08 Gregory Soyez <soyez@lpthe.jussieu.fr>
* merged the (remaining) changes from the trunk into the branch
created at revision 1804. It should now be ready for a
reinsertion in the trunk.
2011-02-02 Gregory Soyez <soyez@lpthe.jussieu.fr>
* src/ClusterSequence.cc:
* include/fastjet/ClusterSequenceInterface.hh (ClusterSequenceInterfaceBase):
. removed the friendiness w CS: set_associated_cs can
be used instead
. added a missing const in the ctor
2011-02-01 Gregory Soyez <soyez@lpthe.jussieu.fr>
* plugins/usage_examples/pxcone_example.cc:
prefixed ENABLE_PLUGIN_PXCONE with FASTJET_
2011-01-31 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* tools/Selector.cc (SW_NHardest):
first check if the size of the vector is larger than the cut.
2011-01-31 Gregory Soyez <soyez@lpthe.jussieu.fr>
* src/Error.cc (Error):
* configure.ac:
checked for the presence of execinfo.h
added a corresponding #ifdef in Error.cc
* src/Error.cc (Error):
prefixed the index in the stack with a hash
* include/fastjet/ClusterSequence.hh (ClusterSequence):
added a method to extraced the associated CSW (rename?)
* m4/ax_prefix_config_h.m4: *** ADDED ***
apparently this is missing on some installations of autoconf
just adding it to our own m4 dir seems to solve the problem
* configure.ac:
made sure AC_CONFIG_HEADER outputs its (intermediate) header in
include/fastjet in order to have the correct -I compilation flags
* Makefile.am:
extended the target distclean to remove leftovers from
AX_PERFIX_CONFIG_H
2011-01-31 Gregory Soyez <soyez@lpthe.jussieu.fr>
* src/ClusterSequence.cc (plugin_record_ij_recombination):
replaced wrapper- > interface (comes from a bugfix in the branch
that needed an update to the new nomenclature)
* src/PseudoJet.cc (has_area):
replaced NULL by 0 to avoid a warning.
2010-11-27 Gregory Soyez <soyez@cern.ch>
* src/Makefile.am:
* include/fastjet/Makefile.am:
included the previously added files in the build system
* include/fastjet/ClusterSequenceInterfaceBase.hh: *** ADDED ***
* include/fastjet/ClusterSequenceInterface.hh: *** ADDED ***
* src/ClusterSequenceInterfaceBase.cc: *** ADDED ***
* src/ClusterSequenceInterface.cc: *** ADDED ***
* src/PseudoJet.cc:
* src/ClusterSequence.cc:
* include/fastjet/PseudoJet.hh:
* include/fastjet/ClusterSequence.hh:
* include/fastjet/ClusterSequenceWrapper.hh:
* include/fastjet/ClusterSequenceInfo.hh: *** REMOVED ***
* src/ClusterSequenceInfo.hh: *** REMOVED ***
Merged the ClusterSequenceWrapper+ClusterSequenceInfo in a
single ClusterSequenceInterface. at the same time, we've added a
base calss ClusterSequenceInterfaceBase that allows to define
other bahaviours than the default one in
ClusterSequenceInterface.
2010-11-04 Gregory Soyez <soyez@cern.ch>
* include/fastjet/ClusterSequenceInfo.hh:
added a series of missing 'virtual' declarations
2010-11-03 Gregory Soyez <soyez@cern.ch>
* src/Makefile.am:
* include/fastjet/Makefile.am:
included the previously added files in the build system
* include/fastjet/ClusterSequenceInfo.hh: *** ADDED ***
* src/ClusterSequenceInfo.cc: *** ADDED ***
* src/ClusterSequenceAreaBase.cc:
* src/PseudoJet.cc:
* src/ClusterSequence.cc:
* include/fastjet/PseudoJet.hh:
* include/fastjet/ClusterSequence.hh:
* include/fastjet/ClusterSequenceWrapper.hh:
added ClusterSequenceInfo as an intermediate layer between the
ClusterSequenceWrapper and the classes that use it
(i.e. ClusterSequence and PseudoJet).
By default, a single ClusterSequenceInfo object is shared
between all the objects associated with the same
ClusterSequence. This can thus be thought as a wrapper of
ClusterSequenceWrapper.
The underlying idea behind this apparently redundant structure
is that if one wants to add info to a PseudoJet (e.g. jet
substructure or filtering info), one can derive a class from
ClusterSequenceInfo, add the extra information to it and
associate it to the analysed jet. That way, each jet could carry
its own extra information about its own substructure while
keeping a shared ClusterSequenceWrapper.
=========================================================================
MERGING the devel-clusterinfo branch
Here stops the ChangeLog for the modifications in the branch
=========================================================================
2011-02-08 Gregory Soyez <soyez@lpthe.jussieu.fr>
* src/ClusterSequence_CP2DChan.cc (_CP2DChan_limited_cluster):
for R>pi, some particles were mirrored outside the [-pi:3pi]
range causing an assertion to be failed in ClosestPair2D.
We fixed this by limiting the "mirroring distance" to pi
i.e. practically copying all the particles: adding 2pi to the
particles with phi<pi and subtracting 2pi to those with phi>pi
(note that the particles at phi==pi are not mirrored). For
additional security, we extended the range [-pi:3pi] to
[-3.15:9.45].
2011-02-05 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc (ClusterSequence::_initialise_and_run):
fixed issue created by reordering of tests for Best strategy.
2011-02-03 Gregory Soyez <soyez@lpthe.jussieu.fr>
* tools/fastjet/tools/Selector.hh:
added a Selector::nullify_non_selected() that sets to 0 the
jets that do not pass the selection (equivalent to
SelectorWorker::terminator())
* src/ClusterSequence.cc (_initialise_and_run):
. for the Best strategy, moved the small N test first;
. similarily, inverted the series of tests redirecting to the
processing method for the various strategies
* include/fastjet/Error.hh (Error):
. added a 'set_backtrace(bool)' to control whether the backtrace
is printed together with the error message or not
. added a bunch of Doxygen comments
2011-02-02 Gregory Soyez <soyez@lpthe.jussieu.fr>
* src/Error.cc:
used the correct header (cstdlib) for the access to free()
2011-02-01 Gregory Soyez <soyez@lpthe.jussieu.fr>
* plugins/usage_examples/pxcone_example.cc:
prefixed ENABLE_PLUGIN_PXCONE with FASTJET_
2011-01-31 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* tools/Selector.cc (SW_NHardest):
first check if the size of the vector is larger than the cut.
2011-01-31 Gregory Soyez <soyez@lpthe.jussieu.fr>
* src/Error.cc (Error):
* configure.ac:
checked for the presence of execinfo.h
added a corresponding #ifdef in Error.cc
* src/Error.cc (Error):
prefixed the index in the stack with a hash
* include/fastjet/ClusterSequence.hh (ClusterSequence):
added a method to extract the associated CSW (rename?)
* m4/ax_prefix_config_h.m4: *** ADDED ***
apparently this is missing on some installations of autoconf
just adding it to our own m4 dir seems to solve the problem
* configure.ac:
made sure AC_CONFIG_HEADER outputs its (intermediate) header in
include/fastjet in order to have the correct -I compilation flags
* Makefile.am:
extended the target distclean to remove leftovers from
AX_PERFIX_CONFIG_H
2011-01-28 Gregory Soyez <soyez@lpthe.jussieu.fr>
* include/fastjet/Error.hh (Error):
* src/Error.cc (Error):
when throwing a fastjet::Error, include a backtrace of the stack
in the message
* example/01-basic.cc:
* example/02-jetdef.cc:
* example/03-plugin.cc:
* example/04-constituents.cc:
* example/05-eplus_eminus.cc:
* example/06-area.cc:
* example/07-subtraction.cc:
* example/08-selector.cc:
* example/09-extra_info.cc:
* example/10-subjets.cc:
* example/11-boosted_higgs.cc:
changed "Source file" into "Source code" to avoid empty links
created by Doxygen
* include/fastjet/ClusterSequenceWrapper.hh:
remove the non_const_cs() method (it provided a way to cast
constness away)
* include/fastjet/config_win.h:
* src/genconfig.sh:
reflected the change below to the other affected scripts
and headers
* configure.ac:
* include/fastjet/version.hh:
* example/03-plugin.cc:
* example/fastjet_timing_plugins.cc:
* plugins/usage_examples/many_algs_example.cc:
* plugins/usage_examples/siscone_example.cc:
* plugins/usage_examples/cdfmidpoint_example.cc:
added FASTJET_ to the macros defined in config(_auto).h
so that one can safely include it without risking
an interference with another package
* Doxyfile (STRIP_CODE_COMMENTS): set to NO
Doxyfile-devel (STRIP_CODE_COMMENTS): set to NO
+ version number set to 3.0alpha2-devel
2011-01-27 Gavin SALAM <salam@ada.lpthe.jussieu.fr>
* configure.ac:
* plugins/SISCone/siscone
back on trunk for SISCone and
work starts on fastjet-3.0alpha2-devel
2011-01-27 Gregory Soyez <soyez@cern.ch> and Gavin
* NEWS
* configure.ac
Release of fastjet-3.0alpha1
2011-01-27 Gregory Soyez <soyez@cern.ch> and Gavin
* CHECKLIST:
reported ongoing progress
* plugins/SISCone/siscone
switched back to 2.0.1
* NEWS:
fixed the text for 3.0alpha1
* doc/fastjet-doc.tex:
added a note on what's new in 3.0alpha1
* include/fastjet/config_win.h:
* configure.ac:
updated version number
* Doxyfile:
* Doxyfile-devel:
updated version numbers; checked included paths
* fastjet-config.in:
* examples/Makefile.am:
reverted the order of the fastjettools and fastjet libs
2011-01-27 Gavin Salam <salam@lpthe.jussieu.fr>
* fortran_wrapper/Makefile.am:
* fortran_wrapper/README:
* fortran_wrapper/fastjetfortran_v2.cc -> fastjetfortran.cc:
* fortran_wrapper/Makefile:
moved what was called fastjetfortran_v2 to fastjetfortran
providing SISCone, constituents, dmerge features from fortran.
* several places:
set the svn:keywords property to Id
2011-01-27 Gregory Soyez <soyez@cern.ch>
* example/Makefile.am:
* example/09-extra_info.cc: *** ADDED ***
added a (dummy) example for extra info
+ modified the doxygen doc for the examples
2011-01-27 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
renamed reset_extra_info(...) to set_extra_info(...)
and renamed argument.
2011-01-27 Gregory Soyez <soyez@cern.ch>
* example/README: *** ADDED ***
* example/01-basic.cc: *** ADDED ***
* example/02-jetdef.cc: *** ADDED ***
* example/03-plugin.cc: *** ADDED ***
* example/04-constituents.cc: *** ADDED ***
* example/05-eplus_eminus.cc: *** ADDED ***
* example/06-area.cc: *** ADDED ***
* example/07-subtraction.cc: *** ADDED ***
* example/08-selector.cc: *** ADDED ***
* example/10-subjets.cc: *** ADDED ***
* example/11-boosted_higgs.cc: *** ADDED ***
* example/Makefile.am:
added a list of examples starting with the simplest one then
illustrating various specific features.
2011-01-26 Gregory Soyez <soyez@cern.ch>
* tools/Selector.cc (SW_Relocatable):
for relocatable objects, make sure thay are initialized when
calling _get_rapidity_extent()
2011-01-26 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/fastjet/tools/Selector.hh:
relocate now returns a const Selector & rather than void, so
that one can write
selector.relocate(jet_on_which_to_centre)(jets_to_select)
2011-01-26 Gregory Soyez <soyez@cern.ch> + Gavin
* src/ClusterSequence.cc (plugin_record_ij_recombination):
when overwriting the recombination result with the specified
resulting PseudoJet, make sure it contains info about the
ClusterSequenceWrapper
* tools/fastjet/tools/Selector.hh:
put the logical operators inside the doc
* configure.ac, example/Makefile.am, tools/Makefile.am:
if --enable-debug is set, add by default -Woverloaded-virtual to
the list of default compilation flags (if the compiler supports it)
* tools/Selector.cc, tools/fastjet/tools/Selector.hh:
- added a SelectorRapPhiRange
(with a corresponding SW_RapPhiRange)
- used half_width instead of radius for the SelectorStrip (cc file)
- the Doughnut range now uses its own worker rather than a
combination of 2 circles (advantages: has a known area + is
really >= radius_in instead of >)
- added a relocatable Rectangle range (given rap and phi half-widths)
- added check rapmin <= rapmax
* Makefile.am:
added the -Woverloaded-virtual flag for a better finding of
possible overloading issues.
* tools/Selector.cc:
fixed a missing const in various get_rapidity_extent
* tools/fastjet/tools/Selector.hh:
slight update of exception messages in SW::copy
2011-01-26 Gavin Salam <salam@lpthe.jussieu.fr>
* tools/Selector.cc:
* tools/fastjet/tools/Selector.hh:
moved some longer bits of code from Selector.hh to Selector.cc;
replaced assertions with exceptions; and tided up some comments
in a few places.
2011-01-26 Gavin Salam <gavin.salam@cern.ch>
* regression-tests/nightly-check.pl:
switched --enable-monolithic check over to --disable-monolithic
2011-01-26 Gregory Soyez <soyez@cern.ch>
* m4/plugin.m4:
check for monolithix uses yes/no instead of true/false
2011-01-25 Gregory Soyez <soyez@cern.ch>
* Doxyfile:
remove alphabetical ordering of detailed descriptions
* include/fastjet/ClusterSequence.hh:
added extra doc on the mainpage (links to enum,...)
* include/fastjet/internal/base.hh:
added a "tool" module for the documentation;
documented the fastjet namespace
2011-01-25 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
added a reset_extra_info(...) so that the user does not need to
be aware of any details of the shared pointer (unless they do
advanced things).
* doc/fastjet-doc.tex:
added documentation of D0 run I algorithm (and adapted the Run
II doc to correspond)
* plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh:
* plugins/D0RunICone/fastjet/D0RunIConePlugin.hh:
* plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh:
* Doxyfile
* Doxyfile-devel
updated comments to give more informative doxygen documentation
and included the D0RunI plugins in the doxygen.
* NEWS
working on making this accurate
2011-01-25 Gregory Soyez <soyez@cern.ch>
* configure.ac:
enables the monolithic build of plugins by default
* Doxyfile, Doxyfile-devel:
fixed a missing \; updated the devel doc
* Doxyfile:
updated the file (v1.7.1)
limited the dot-graph depth to a single inheritance
* include/fastjet/ClusterSequence.hh (ClusterSequence):
reshaped the doxygen main page (restored links, added more links)
* include/fastjet/internal/IsBase.hh:
added the workarounds for MSVC
* m4/CGAL.m4:
in case a CGAL directory is explicitly specified, skip the
makefile test (previously, /usr/share/cgal/cgal.mk was
tested anyway). This is safer in case both an "old" and a new
installation coexist.
* configure.ac:
slightly moved the "tools" section (right after the plugins)
added a summary at the end of the run
* m4/plugin.m4:
added AC_PLUGIN_SUMMARY to show what is enabled/disabled
2011-01-25 Gavin Salam <salam@lpthe.jussieu.fr> & Gregory
* tools/ *** ADDED ***
* tools/fastjet/ *** ADDED ***
* tools/fastjet/tools *** ADDED ***
* tools/**/Makefile.am *** ADDED ***
* tools/Selector.cc
* tools/fastjet/tools/Selector.hh
* Makefile.am
* configure.ac
* fastjet-config.in
* Doxyfile-devel:
* Doxyfile:
Created a tools/ top-level directory, moved the Selector code in
from the experimental area, arranged all the Makefiles so that
it gets placed in libfastjettools and ensured that
fastjet-config adds that library too + Doxygen access.
2010-12-20 Gavin Salam <salam@lpthe.jussieu.fr>
* fortran_wrapper/fastjet_fortran_example.f:
* fortran_wrapper/fastjetfortran_v2.cc:
Added a comment concerning the order of array indices in the
fortran interface noting that it differs from the order in
Pythia 6.
2010-12-20 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/test-all-algs.pl:
replaced a zcat (causing problems on mac) with a gunzip -c
* regression-tests/nightly-check.pl:
re-enabled karnak
2010-12-09 Gavin SALAM <salam@lpthe.jussieu.fr>
* src/PseudoJet.cc (delta_phi_to):
fixed serious bug relating to sign of delta_phi_to (presence of
abs internally, which made the sign of the result unreliable)
2010-11-29 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
and took karnak out...
2010-11-28 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
put karnak back in.
2010-11-21 Gavin Salam <salam@lpthe.jussieu.fr>
* regression-tests/test-all-algs.pl:
allowed -deposit option to create the deposit directoy.
* src/ClusterSequence_CP2DChan.cc:
added in assertions to make sure that we catch recombination
with mirror points (will only occur if the CP2DChan routines
mistakenly get called with R >= 2pi).
2010-11-20 Gavin Salam <salam@lpthe.jussieu.fr>
* regression-tests/test-all-algs.pl:
changed the default data file so as to increase the number of
events that can be used for tests.
switched checksum identifiers over to the new file name.
Allowed both -strat and -strategy arguments, and also allowed
them to take a colon-separated list of multiple strategies.
* include/fastjet/JetDefinition.hh:
clarified possible issues when using the pointer returned by
recombiner().
2010-11-19 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/JetDefinition.hh (enum Strategy):
added comments indicating which strategies are non-functional
for R>=2pi.
* src/JetDefinition.cc:
replaced enforcement of R < pi/2 with R < 1000, now that we
support all R values in ClusterSequence. The reason for
maintaining some limit is that particles with pt=0, m=0 can have
rapidities O(10000) and one doesn't want the clustering to start
including them as if their rapidities were physical.
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence.cc (ClusterSequence::_initialise_and_run):
set up automatic change of strategy when R>=2pi, to ensure that
we run a strategy that will give correct answers.
* src/ClusterSequence_TiledN2.cc (ClusterSequence::_initialise_tiles):
set the minimum number of tiles in the phi direction to be 3, so
that it works even for large values of R
* include/fastjet/internal/Dnn2piCylinder.hh:
just updated comments about periodicity in phi and the kt (etc.)
algorithms
2010-10-27 Gregory Soyez <soyez@cern.ch>
* src/genconfig.sh:
* example/makefile.static:
* plugins/CDFCones/CDFcode/makefile.static:
* plugins/SISCone/makefile.static:
* plugins/makefile.static:
aligned the static build of plugins to the default choices.
+ minor corrections to have the static build actually work!
2010-10-26 Gregory Soyez <soyez@cern.ch>
* m4/plugin.m4,
plugins/Makefile.am:
added comments for the automatic plugin release scripts.
2010-10-26 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/GhostedAreaSpec.hh (class GhostedAreaSpec):
changed comment for add_ghosts
2010-10-25 Gregory Soyez <soyez@cern.ch>
* plugins/D0RunICone/D0RunIBaseConePlugin.cc:
carry info about the recombination from HepEntity to the Fastjet
recombination
* plugins/D0RunICone/: *** ADDED ***
released a plugin for the D0 run I cone algorithms.
(two versions: D0RunIpre96ConePlugin and D0RunIConePlugin
corresponding to the code used before an dafter 1996)
Thanks to Lars Sonnenschein for providing the code
2010-10-13 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
temporary disabling of karnak (given nfs problems)
* include/fastjet/PseudoJet.hh:
small fix (template class name) to get compilation working with gcc-3.4
2010-10-10 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
* src/PseudoJet.cc:
added extra_info_cast<T>() member function to directly get a
cast to the extra information in the form one needs.
Throws a PseudoJet::InexistentExtraInfo error (new internal
class, derived from Error).
* include/fastjet/Error.hh:
added a virtual destructor, so make life easier for when we want
to produce derived classes for errors.
2010-10-04 Gavin Salam <gsalam@lxplus242.cern.ch>
* autogen.sh:
added comments at start as a reminder of how to run this without
getting configured in the process
2010-10-01 Gavin Salam <salam@lpthe.jussieu.fr>
* fortran_wrapper/fastjet_fortran_example.f:
* fortran_wrapper/fastjetfortran_v2.cc:
added fastjetdmerge_(..) and fastjetdmergemax_(..) functions,
requested by Stefano Frixione. Showed use of them in example
program.
2010-09-21 Gregory Soyez <soyez@cern.ch>
* include/fastjet/PseudoJetPlusInfo.hh:
added PseudoJetPlusInfo::extra_info that already does the
dynamic cast amd returns a pointer to TExtraInfo
* include/fastjet/PseudoJet.hh:
added a 'const' version of extra_info_shared()
* include/fastjet/PseudoJetPlusInfo.hh:
- added a copy ctor from a "regular" PseudoJet. The extra
information is copied from the PJ if available and of the
correct format.
- added a 'convert_to_vector<T,U> that copies a vector of type
U to a vector of type T (provided t=u works)
2010-09-20 Gavin Salam <salam@lpthe.jussieu.fr>
* example/fastjet_example.cc:
removed testing line accidentally left in (printing of
unavailable areas) that caused the example program to fail.
2010-09-17 Gavin Salam <salam@lpthe.jussieu.fr>
* example/fastjet_example.cc:
* example/fastjet_areas.cc:
* example/fastjet_subjets.cc:
* example/fastjet_boosted_higgs.cc:
* example/fastjet_timing.cc:
* example/fastjet_timing_plugins.cc:
* example/fastjet_subtraction.cc:
switched these over to new form of access to jet
information.
* src/PseudoJet.cc:
* include/fastjet/PseudoJet.hh:
added the validated_cs() and validated_csab() methods (intended
mainly for internal use), which return pointers to the associated
ClusterSequence (and ClusterSequenceAreaBase) objects if
possible, otherwise throw an error.
All methods that provide information from the cluster sequence
now go through these methods (and so throw errors when they
can't return sensible information).
Also added the exclusive_subjet (etc) series of methods
2010-09-16 Gregory Soyez <soyez@cern.ch>
* include/fastjet/PseudoJet.hh:
removed the access to the shared ptr to the associated csw
* include/fastjet/internal/IsBase.hh:
moved to the internal headers folder
* include/fastjet/internal/DerivedPseudoJetHelper.hh:
renamed PseudoJetPlusInfoHandler into DerivedPseudoJetHelper
plus moved it in the internal headers folder
* include/fastjet/ClusterSequenceWrapper.hh:
placed things in the fastjet namespace
* include/fastjet/PseudoJet.hh (PseudoJet):
simplified the ctor with initialisation from a generic 4-vector
* Doxyfile and most of the headers,
Doxyfile-devel *** ADDED ***
Doxygen documentation cleaning:
- classified the classes into modules (see base.hh for the list)
- added an internal tag (internal_doc) to allow removing
classes from the public page
- removed undocumented classes and private class members from
the public doxygen doc.
- added a Doxygen-devel file that (on top of the public/default
doc) includes internal classes and private member.
2010-09-15 Gregory Soyez <soyez@cern.ch>
* include/fastjet/Makefile.am:
added the new headers to the list of installed files
* include/fastjet/PseudoJetPlusInfo.hh: *** ADDED ***
This is a generic template class that allows to build
PseudoJet carrying extra information. You'd basically
define a
class MyExtraInfo : public PseudoJet::ExtraInfo{};
then use
PseudoJetPlusInfo<MyExtraInfo> instead of PseudoJet
The implementation allows one to copy from PseudoJetPlusInfo to
PseudoJet without any loss of information (e.g. you can copy,
element by element, a vector of PseudoetPlusInfo into a vector
of PseudoJet and pass it to a ClusterSequence without loosing
the original ExtraInfo).
Memory is managed internally so you can easily use the extra
information if you define your own recombiner.
* include/fastjet/PseudoJet.hh:
added support to carry extra info. It is stored as a shared
pointer of a dummy type ExtraInfo. A generic extra information
can be stored by deriving a class from ExtraInfo.
* include/fastjet/PseudoJetPlusInfoHandler.hh: *** ADDED ***
This class is a helper to allow to disantangle in the
template<T> PseudoJet::PseudoJet(T &some_four_vector)
between the situation where T just implements T[0--3] and
the case where T is derived from PseudoJet (and thus may carry
extra information)
* include/fastjet/IsBase.hh: *** ADDED ***
added a class (mostly borrowed from TR1 and boost), that allows
to check whether a given pair of typed are a based class and a
class derived from it.
* include/fastjet/PseudoJet.hh
src/PseudoJet.cc:
added associated_cluster_sequence_shared() that returns a
reference to the shared pointer holding the
ClusterSequenceWrapper
* include/fastjet/ClusterSequenceWrapper.hh: *** ADDED ***
moved the ClusterSequenceWrapper class in its own header
2010-09-06 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* regression-tests/nightly-check.pl:
pointed to a new installaion of CGAL (note: this could be done
through the CGAL_DIR environment var as it was done before)
2010-08-30 Gregory Soyez <soyez@cern.ch>
* INSTALL:
Fixed default description of static/shared-lib build
2010-08-09 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
_reset_indices now also resets the _associated_csw (mainly so
that reset() does the expected thing).
* include/fastjet/SharedPtr.hh:
for testing purposes, added an option (if you define
USETR1SHAREDPTR) in which SharedPtr basically wraps the STL TR1
shared_ptr.
2010-08-08 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequenceAreaBase.cc:
subtracted_jet now transfers information about the csw too
* include/fastjet/PseudoJet.hh:
added associated_csw() to retrieve information about the cs
2010-07-29 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
more organisation of documentation.
2010-07-28 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/ClusterSequence.hh:
added more info in the \mainpage section
* include/fastjet/PseudoJet.hh:
starting to group some of the member functions; but not yet very
successful.
2010-07-18 Gavin Salam <salam@lpthe.jussieu.fr>
* AUTHORS:
realised authors was very out of date, so updated it.
2010-07-14 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* include/fastjet/PseudoJet.hh:
added a virtual destructor; declared the methods that access the
associated CS as virtual too (for inheritance purposes).
Negligible speed impact; ~3-5% cost in memory.
2010-07-12 Gregory Soyez <soyez@cern.ch>
* src/PseudoJet.cc:
used a ctor with initialisation for returning 0 PJs when the CSW
is not available.
* include/fastjet/PseudoJet.hh, src/PseudoJet.cc:
added support to acces the area properties.
* src/ClusterSequence.cc, include/fastjet/ClusterSequence.hh:
added a 'transfer_ownership' flag to CS::transfer_from_sequence
(true by default.) That way, the CS associated to the jets of
the CS is the new one.
* src/PseudoJet.cc, include/fastjet/PseudoJet.hh,
src/ClusterSequence.hh:
. replaced _parent_cs by _associated_csw and likewise changes in
the varisou methods.
. added a PseudoJet::set_associated_csw. That allows to remove
the friendship to CS in PJ.
. moved CSWrapper to PseudoJet (avoids incomplete type warnings)
2010-07-12 Gregory Soyez <soyez@cern.ch>
* src/ClusterSequence.cc (ClusterSequence):
bug fixed: made sure that _wrapper_to_this "exists" before
setting its internal CS pointer to NULL
* src/PseudoJet.cc (has_parent_cluster_sequence):
simplified the test
2010-07-12 Gavin SALAM <salam@lpthe.jussieu.fr>
* ISSUES: *** ADDED ***
some thoughts on structure of CSW use etc.
* include/fastjet/ClusterSequence.hh:
* include/fastjet/PseudoJet.hh:
minor changes to coding style / comments.
* src/ClusterSequence.cc:
changed const properties of CSWrapper
2010-07-12 Gregory Soyez <soyez@cern.ch>
* src/ClusterSequence.cc, src/ClusterSequence_TiledN2.cc,
* plugins/EECambridge/EECambridgePlugin.cc, include/fastjet/NNH.hh,
* include/fastjet/internal/ClusterSequence_N2.icc:
SharedPointer adds an implementation of 'swap' in the fastjet
namespace. For code inside 'namespace fastjet{...}', the
std::swap() thus has to be specified explicitly (Note: if you just
have 'using namespace std; using namespace fastjet;' (i.e. use the
fastjet namespace but don't put your code inside it), then you can
call the swap functions from both std and fastjet without
explicitly specifying the namespace.
* include/fastjet/PseudoJet.hh, src/PseudoJet.cc:
added a list of methods giving access to the info in the parent
ClusterSequence (if any): has_parent_cluster_sequence(),
parent_cluster_sequence(), has_partner(), has_child(),
has_parents(), contains(), is_inside(), constituents()
* include/fastjet/PseudoJet.hh, include/fastjet/ClusterSequence.hh,
* src/ClusterSequence.cc:
added a ClusterSequenceWrapper class that contains a pointer to
a ClusterSequence. Then, added a SharedPointer to such an object
both in ClusterSequence and PseudoJet. All the PseudoJet's created
within a ClusterSequence are thus given access to that parent
ClusterSequence through the shared pointer (_parent_cs in
PseudoJet). When the ClusterSequence goes out of scope, the
pointer in the common wrapper object is set to NULL so all
PseudoJet's can avoid accessing it.
* include/fastjet/SharedPtr.hh:
included cstdlib
2010-03-31 Gavin Salam <salam@lpthe.jussieu.fr>
* example/fastjet_timing_plugins.cc (print_jets):
output constituent index as well.
* fortran_wrapper/fastjetfortran_v2.cc: *** COPIED from fastjetfortran.cc ***
an attempt at version 2 of the fortran wrapper, which
centralises some of the housekeeping calls and adds access to
constituents; tested that jet results are the same as for the
original version of the fortran wrapper
* fortran_wrapper/fastjet_fortran_example.cc:
adapted it to show constituents (v2 feature)
* fortran_wrapper/Makefile.alt:
now uses _v2
* fortran_wrapper/Makefile.am (EXTRA_DIST):
added fastjetfortran_v2.cc
2010-03-24 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/ClusterSequence.hh:
removed the commented (unused) GenBriefJet code.
2010-03-10 Gregory Soyez <soyez@cern.ch>
* include/fastjet/SharedPtr.hh:
removed internal get_pointer() (use get() instead), made
get_container() private (_get_container())
* include/fastjet/SharedPtr.hh:
Apart from a few things like
- the support for deleter/allocator
- the initialisation from a weak_ptr or auto_ptr
- the {static,const,dynamic}_pointer_cast
the implementation seems to match the standard.
Note, *_pointer_casts would require the constructor
template<class Y>
SharedPtr(SharedPtr<Y> & share, T * ptr);
which stores T but shares the counter with 'share'
This would probably require a __SharedCounter detached
from __SharedCounterPtr, so we postpone it for the moment
2010-03-09 Gregory Soyez <soyez@cern.ch>
* include/fastjet/SharedPtr.hh (SharedPtr):
Start getting closer to the boost implementation...
* include/fastjet/SharedPtr.hh (SharedPtr):
replaced the previous smart_ptr with a new SharedPtr:
- more generic implementation rather than sth tuned for a
specific situation
- removed the owner part (to be dealt with in an intermediate
class
- manage the object it's pointing to (i.e. deletes it when
counts==0)
- used standard fastjet coding conventions
2010-03-09 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/smart_ptr.hh:
added an operator*
2010-03-08 Gregory Soyez <soyez@cern.ch>
* include/fastjet/smart_ptr.hh (smart_ptr):
added a template class to handle smart pointer (see description
in the header)
2010-03-08 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* m4/CGAL.m4:
force the use of C++ language for the AC_CHECK_LIB test.
In that case, arguments passed through CXXFLAGS are used
automatically without having to set them again in CFLAGS.
2010-03-08 Gavin SALAM <salam@lpthe.jussieu.fr>
* src/PseudoJet.cc:
* include/fastjet/PseudoJet.hh:
phi and rapidity are now no longer cached on construction of the
PseudoJet. Instead _phi is set to a nonsense value (-100), and
both _phi and _rap are calculated the first time that phi() or
rap() is requested.
*****************************************************
Start of work towards FJ 2.5/3.0
*****************************************************
2010-02-26 Gavin Salam <salam@lpthe.jussieu.fr>
* configure.ac:
* CHECKLIST:
release of 2.4.2 carried out; switched over to 2.5-devel
2010-02-26 Gavin Salam <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
added a test with --enable-monolithic
2010-02-26 Gregory Soyez <soyez@cern.ch>
* Merged changes from the devel-monolithic-2.4.2 branch
(see the log for 2010-02-12 for details)
2010-02-18 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc (ClusterSequence::_print_banner):
added a "flush" to the output (to avoid problems in case the
application is separately writing to /dev/stdout)
2010-02-12 Gregory Soyez <soyez@cern.ch>
* m4/plugin.m4:
* configure.ac:
added a list of macros to handle the plugin configure options
modified the configure script accordingly
* fastjet-config.in:
* configure.ac:
added a --list-plugins option to fastjet-config that lists the
available plugins
* configure.ac
plugins/Makefile.am:
plugins/SISCone/Makefile.am:
plugins/CDFCones/Makefile.am:
plugins/PxCone/Makefile.am:
plugins/D0RunIICone/Makefile.am:
plugins/NestedDefs/Makefile.am:
plugins/TrackJet/Makefile.am:
plugins/ATLASCone/Makefile.am:
plugins/EECambridge/Makefile.am:
plugins/Jade/Makefile.am:
plugins/CMSIterativeCone/Makefile.am:
added the --enable-monolithic option (off by default for the
moment) that allows to build all the plugins in a single lib:
libfastjetplugins.{a,so}
2010-02-12 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/JetDefinition.hh:
* include/fastjet/ClusterSequenceAreaBase.hh:
removed explicit names for arguments in preprocess(jet) and a number
of CSAB default implementations that were not actually using
their arguments. This should resolve an issue of warnings reported
by LHCb (Stefan Roiser <Stefan.Roiser@cern.ch>)
2010-02-02 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
switched to 1000 event tests on tycho (32bit), karnak (mac 64
bit) and on pallas with intel compiler.
* regression-tests/test-all-algs.pl:
Put D0RunIICone back with the default tests.
updated 1000 event d0runiicone checksum again following earlier
wrong cut and paste.
2010-02-01 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/test-all-algs.pl:
updated checksum values for 100 and 1000 events on d0runiicone,
following Gregory's inclusion of -fno-inline as a default
compiler flag (eliminates certain damaging optimisations under
32 bits).
2010-02-01 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* plugins/D0RunIICone/Makefile.am (libD0RunIIConePlugin_la_CXXFLAGS):
* configure.ac:
added the -fno-inline option when building the D0 cone
plugin. This is meant to solve a bug related to the optimisation
of the D0 code on some platforms (apparently gcc4 on 32-bit
systems).
Notes: - if -fno-inline is not supported, disable optimisation
by using -O0
- if the user explicitly specifies CXXFLAGS on the
command line, these will prevail. As a noticeable
example, if the compiler does not support -fno-inline
and the used specifies CXXFLAGS="-g -O2", the -O2 will
prevail over the -O0,
Arranged a series of minor typos to clean the code.
2010-01-20 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* configure.ac:
moved AC_PROG_LIBTOOL to avoid checking for a Fortran compiler
when it is not needed
2010-01-20 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl (build_and_check):
sorted out problems related to the output of fortran compiler
info. Put some tests onto tycho (32 bits).
2010-01-19 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/test-all-algs.pl:
allow for compressed data files. Added commented use of 10k
file. That was generated in same way as the default 1k file, but
does not currently give identical results for 1k events. Needs
further investigation between making it our new default file.
DISABLED testing of D0RunIICone temporarily, given the 64 bit
issues.
* include/fastjet/ClusterSequenceArea.hh (initialize_and_run_cswa):
* src/ClusterSequenceArea.cc:
added warning when using explicit ghosts with repeat!=1.
2009-11-19 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/internal/ClusterSequence_N2.icc:
* include/fastjet/ClusterSequence.hh (ClusterSequence):
commented all bits of code related to GenBriefJet, which is not
used (following reports from Andy Buckley about missing virtual
destructor in that code).
2009-10-22 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequenceActiveArea.cc
(ClusterSequenceActiveArea::_throw_unless_jets_have_same_perp_or_E):
in error message, added reference to FAQ for explanations.
2009-07-08 Gavin SALAM <salam@lpthe.jussieu.fr>
* Doxyfile:
changed image format over to png.
2009-07-03 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
removed zetes from nightly check because it's down and added a
separate check on toth with gcc-3.4.
2009-06-12 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* plugins/D0RunIICone/D0RunIIConePlugin.cc (run_clustering):
explicitly discard empty jets (those sometimes come out of the
D0 code when the min_jet_Et parameter is set to 0. This was
creating a segmentation fault (reported by Andy Buckley).
2009-06-10 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* include/fastjet/ClusterSequence.hh (ClusterSequence):
fixed bug in exclusive_ymerge_max which was calling itself
rather than exclusive_dmerge_max. (Reported by Frank Siegert)
2009-05-29 Gavin SALAM <salam@lpthe.jussieu.fr>
* moved SISCone back to trunk
* switched to version 2.4.2-devel
2009-05-29 Gavin SALAM <salam@lpthe.jussieu.fr>
* configure.ac:
switched to version 2.4.1
* regression-tests/nightly-check.pl:
added -only XX option for running just the test with index XX
* fastjet-config.in:
ensured that --rpath=no removes the RPATH that is there with CGAL.
2009-05-29 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* fastjet-config.in:
fixed the returned compilation flags for
fastjet-config --cxxflags --libs
2009-05-28 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* configure.ac:
if CGAL is explicitly requested and not found (or not functional),
return an error (and exit)
* regression-tests/test-all-algs.pl (setRefResults):
added checksums for PxCone
* src/ClusterSequenceAreaBase.cc (get_median_rho_and_sigma),
include/fastjet/ClusterSequenceAreaBase.hh:
disregarded jets with 0 area in the computation of the median
rho and sigma. Added a warning wheh a 0-area jet is
encountered.
2009-05-28 Gavin SALAM <salam@lpthe.jussieu.fr>
* example/fastjet_timing_plugins.cc:
* regression-tests/test-all-algs.pl:
inexistent algs no longer crash, and real crashes are now reported
by test-all-algs as *** BAD (crash) ***
* autogen.sh:
ensured that recursion for creation of configure files is only
inside the plugin directory (e.g. no $srcdir/tmp-* directories)
* regression-tests/nightly-check.pl:
simplified output of fail messages;
now if update changes the nightly check, then it reruns itself;
it should now also output a summary message about what it has done
2009-05-28 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* configure.ac:
moved the test for Fortran at a more flexible and nice-looking place.
* include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh (ClusterSequenceAreaBase):
commented out ghost_area()
* fastjet-config.in:
--rpath set to the form --rpath[=yes|no] (yes by default).
* configure.ac:
. enabled shared libs by defaut (following a long discussion
regarding static vs. shared libraries, we finally decided to
make a minimal modification compared to the previous release,
i.e. keep shared libraries on).
By default, shared libs will be built and used and a -rpath
will be added. You can switch back to static libs by adding
--shared=no to fastjet-config. The rpath can be removed using
--rpath=no or turned into a runpath using --runpath (ELF
platforms only)
. set a CONFIG_CXXFLAGS variable that allows one to specify the
compilation arguments in fastjet-config independently of the
ones used to compile fastjet.
2009-05-27 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
added facility for running some of the tests on remote hosts,
and included a bunch of remote runs by default. Also set up a
fairly long series of combinations that will be tested...
2009-05-26 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
made it possible to have several set of configure/link/nev
options within a single run (e.g. to test out-of-the box
running, as well as a configure with full set of algs).
Current tests include:
- out-of-the-box
- all cxx plugins + CGAL
- shared enabled, static disabled, wtih --runpath
2009-05-26 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* fastjet-config.in:
fixed a typo with the runpath argument
allows use of --cxxflags and --libs at the same time
2009-05-26 Gavin SALAM <salam@lpthe.jussieu.fr>
* configure.ac:
following Gregory's suggestion, fixed a typo related to
temporary CXXFLAGS (this solves a problem on testing some
algs, which seems to have been related to marginally different
handling of floating point operations).
2009-05-25 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* fastjet-config.in (Usage):
added support for a --rpath and a --runpath option to
fastjet-config
* configure.ac:
. switched back to static libs by default
. check if the compiler/linker supports -Wl,-enable-new-dtags
i.e. add support for the runpath (on supported platforms)
2009-05-25 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/ClusterSequenceArea.hh:
* include/fastjet/ClusterSequenceActiveArea.hh:
* include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh:
* src/ClusterSequenceActiveAreaExplicitGhosts.cc:
* src/ClusterSequenceActiveArea.cc:
renamed area_spec -> ghost_spec, in a few places where they
won't affect users (but this helps readability)
* fortran_wrapper/fastjetfortran.cc:
* fortran_wrapper/fastjet_fortran_example.f:
changed interface so that we have generalised kt
(fastjetppgenkt_) as the main way of accessing the
seq.rec. algorithms.
2009-05-21 Gavin Salam <salam@lpthe.jussieu.fr>
* example/fastjet_timing_plugins.cc (print_jets_and_sub):
expanded output on the -subdcut flag.
* src/ClusterSequence.cc (ClusterSequence::exclusive_subdmerge_max):
added some comments about output (zero) when nsub >= number of constituents
2009-05-20 Gavin SALAM <salam@lpthe.jussieu.fr>
* fortran_wrapper/fastjetsiscone.cc: *** DELETED ***
* fortran_wrapper/fastjetfortran.cc: *** ADDED ***
* fortran_wrapper/fastjet_fortran_example.f: (was siscone_example.f)
extended the wrappers to have some seq.rec. pp algorithms as well
2009-05-10 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* autogen.sh:
fixed a sh script problem (replaced [[ "x"=="y" ]] w [ "x"="y" ])
* src/Makefile.am, example/Makefile.am,
plugins/usage_examples/Makefile.am,
plugins/D0RunIICone/Makefile.am, plugins/SISCone/Makefile.am,
plugins/Jade/Makefile.am, plugins/CDFCones/CDFcode/Makefile.am,
plugins/CDFCones/Makefile.am, plugins/NestedDefs/Makefile.am,
plugins/CMSIterativeCone/Makefile.am,
plugins/TrackJet/Makefile.am, plugins/EECambridge/Makefile.am,
plugins/ATLASCone/Makefile.am, plugins/PxCone/Makefile.am,
include/fastjet/internal/Makefile.am:
replaced a bunch of ${VAR} by $(VAR)
* configure.ac:
- specified the tar-ustar option for automake. This solves a
problem with filenames of length larger than 99 that were not
included in the distribution under Ubuntu.
- moved F77 to FC (and related) so that gfortran is
automatically detected if available.
- added a bunch of comments regarding the recommendation to use
AC_CONFIG_MACRO_DIR([m4]) in the latest libtool
versions. Nothing is done (and justified!)
2009-05-10 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/ATLASCone/fastjet/ATLASConePlugin.hh:
* plugins/ATLASCone/ATLASConePlugin.cc:
added R,seedPt,f to description + removed extraneous headers
* plugins/TrackJet/fastjet/TrackJetPlugin.hh:
* plugins/TrackJet/TrackJetPlugin.cc:
moved some headers out of .hh into .cc
* plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh:
* plugins/CMSIterativeCone/CMSIterativeConePlugin.cc
fixed description so that it includes the radius and seed
threshold + removed extraneous headers.
2009-05-08 Gavin Salam <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
added some comments for how this might evolve in future
2009-05-08 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* example/fastjet_example.cc:
* example/fastjet_subjets.cc:
* example/fastjet_timing.cc:
* include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh:
* plugins/usage_examples/run_jet_finder.cc:
added #include <cstdio> for compatibility with g++-4.4
(pointed out by <peter.elmer@cern.ch>
2009-05-07 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
put back the svn update lines.
2009-05-01 Gavin Salam <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
removed the --enabled-shared option in the configure;
* moved siscone back over to the trunk...
2009-04-29 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh (ClusterSequenceAreaBase):
added a ghost_area() method to get the info about the ghost area
used with this clusterSequence
2009-04-29 Gavin SALAM <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc:
* src/ClusterSequence_N2.cc:
* include/fastjet/ClusterSequence.hh:
replaced void ClusterSequence::_dummy_N2_cluster_instantiation()
(dummy instantiation of template to make it available elsewhere)
with _simple_N2_cluster_BriefJet() and
_simple_N2_cluster_EEBriefJet() (they are to be called and
should directly run the template).
2009-04-27 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* src/ClusterSequence.cc:
restored the warning about dangerous request for exclusive
jets (removed earlier today) with a more reasonnable
list of algorithms for which no warnings are given.
* include/fastjet/JetDefinition.hh:
* plugins/Jade/fastjet/JadePlugin.hh:
* plugins/EECambridge/fastjet/EECambridgePlugin.hh:
added a 'exclusive_seqence_meaningful' member allowing to know
if a plugin gives meaningful exclusive jets (default=false).
Set to true in Jade and EECambrigde.
* configure.ac:
include/fastjet/config_win.h:
DoxyFile:
switched version number to 2.4.1-devel
* test-compare.sh:
discard lines with "WARNING" (occurs in non-predictable
positions due to flushing issues)
* src/ClusterSequence.cc:
removed the WARNING previously given when extracting exclusive
jets for algorithms other than pp and e+e- kt
2009-04-16 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* plugins/SISCone/fastjet/SISConeBasePlugin.hh:
Switched back to an implementation without templates
(we're now using virtual function overloading)
* plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh:
Added a plugin for the CMS iterative cone
(see plugins/CMSIterativeCone/README for details)
2009-04-13 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh (dot_product):
added dot_product binary operator...
2009-04-10 Gavin SALAM <salam@lpthe.jussieu.fr>
* m4/CGAL.m4:
updated comments to make it clearer what goes with 3.3.x v. 3.4.
2009-04-06 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* src/ClusterSequenceAreaBase.cc:
* include/fastjet/ClusterSequenceAreaBase.hh:
changes to comments
* doc/fastjet-doc.tex:
sorted out a few details here and there about local ranges, and
added info on running with hard jets excluded.
* include/fastjet/CircularRange.hh:
added check that a center has been properly defined
2009-03-31 Gavin Salam <salam@lpthe.jussieu.fr>
* example/fastjet_timing_plugins.cc (main):
move root printout in with main jet printout (so you can get
root even for exclusive jets)
2009-03-18 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* src/ClusterSequence.cc (ClusterSequence::add_constituents):
When the jet is made of a single particle, add explicitly that
particled instead of the given 'jet'. This ensures that calling
add_constituents with a subtracted jet containing only one
particle will work.
2009-03-11 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* m4/CGAL.m4
m4/compiler_flags.m4: *** ADDED ***
check if the compiler supports -frounding-math
(for the moment, just discard it if it's not supported)
2009-03-11 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
switched over to using CGAL 3.4.
* plugins/CDFCones/fastjet/CDFJetCluPlugin.hh:
removed default overlap for jetclu...
* set svn:keywords to be "Id" on a bunch of files where this was
missing
2009-03-07 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* plugins/Jade: *** ADDED ***
Added a plugin for the JADE algorithm
It is an e+e- sequential recombination algorithm with
interparticle distance
dij = 2 E_i E_j (1 - cos theta_ij)
or equivalently
yij = dij/E_{visible}^2
This corresponds to the distance measured used in
"Experimental Investigation of the Energy Dependence of the
Strong Coupling Strength." JADE Collaboration (S. Bethke et
al.) Phys.Lett.B213:235,1988
The JADE article carries out particle recombinations in the
E-scheme (4-vector recombination), which is the default
procedure for this plugin.
NOTE: other widely used schemes include E0, P, P0; however they
also involve modifications to the distance measure. Be
sure of what you're doing before running a JADE type
algorithm.
To access the jets with a given ycut value (clustering stops
once all yij > ycut), use
vector<PseudoJet> jets = cluster_sequence.exclusive_jets_ycut(ycut);
and related routines.
2009-03-02 Gavin Salam <salam@lpthe.jussieu.fr>
* regression-tests/test-all-algs.pl:
fixed commented entry for d0runiicone with 10events
2009-03-02 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* configure.ac:
Added options --enable-allplugins and --enable-allcxxplugins
Allow to enable all the (CXX) plugins at a go.
We do actually only change the set of default values, so
combinations like
./configure --enable-allplugins --disable-pxcone
will enable everything but PxCone
On top of that, --disable-all(cxx)plugins is automatically
defined by autoconf Therefore, we implement it so as it does
what it is supposed to do i.e. disable all the plugins. Again,
--disable-allplugins --enable-siscone will work and just enable
the SISCone plugin
2009-02-18 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* m4/CGAL.m4: put the resulting info on CGAL compilation
requirements into CGAL_xyz variables rather than the global
vars.
2009-02-18 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/NNH.hh:
modified this so that one can now also use NNH<BJ,Info> where
Info is an information class. One then uses the constructor
NNH<BJ,Info>(const vector<PseudoJet> & particles, Info * info)
and the briefjets get initialised via the call
BJ->init(const PseudoJet & jet, Info * info)
if you want to make sure that info does get modified, use
NNH<BJ, const Info>.
The original NNH<BJ> continues to work without the Info in the
constructors/initialisation calls.
2009-02-13 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* example/fastjet_timing_plugins.cc (main):
added a -ycut comand-line argument
* plugin/EECambridge: *** ADDED ***
Added a plugin for the e+e- Cambridge algorithm.
Default: enabled.
This plugin takes ycut as a parameter.
* plugins/ATLASCone: *** ADDED ***
Added a plugin for the e+e- Cambridge algorithm.
Default: disabled.
This plugin takes as a parameter a cone radius, a seed
threshold (2.0 GeV by default) and an overlap
threshold (default:0.5). See the header file for a comment on
the default values.
This plugin is derived from the SpartyJet implementation of the
ATLAS cone algorithm.
2009-02-12 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* m4/CGAL.m4: added support for CGAL 3.4 (and cleaned)
A Makefile can still be provided using the
--with-cgalmakefile=... option, so backward compatibility is
not broken. On top of that, a path to an installation of CGAL
can be specified using --with-cgal-directory=PATH in which case
the headers and lib will be searched in PATH/include and
PATH/lib respectively. Finally, if no argument (except
--eanble-cgal) are specified, CGAL is searched in standard
locations.
* makefile.static: added support for CGAL 3.4
this is done in line with CGAL.m4 by allowing the specification
of a CGAL_DIRECTORY instead of the CGAL_MAKEFILE variable.
2009-02-12 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc (ClusterSequence::_initialise_and_run):
arranged for ee algos with an R value to behave sensibly when
R > pi (i.e. last pair of particles gets recombined into one).
* example/fastjet_example_v1_interface.cc -> example/graveyard
* example/Makefile.am:
moved fastjet_example_v1_interface into the graveyard (no
longer
* example/fastjet_timing_plugins.cc:
tried to improve documentation of various options and added
-excly; -ee-print for printing jets in terms of px,py,pz,E;
common output file for a range of jet output options.
* include/fastjet/ClusterSequence.hh:
added exclusive_ymerge, exclusive_ymerge_max,
n_exclusive_jets_ycut, exclusive_jets_ycut so as to provide more
helpful access to things in e+e- Jade and kt algorithms
* moved plugins/Jade/NNH.hh -> fastjet/include/NNH.hh
so as to make it available to other algorithms too
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence.cc (ClusterSequence::_fill_initial_history):
added Q() to return total energy in the event (relevant for e+e-)
2009-02-11 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/internal/ClusterSequence_N2.icc: *** ADDED ***
* include/fastjet/ClusterSequence.hh
* src/ClusterSequence_N2.cc
* include/fastjet/internal/Makefile.am
reorganised things internally so that plugins should now have
access to the templated N2 implementation.
2009-02-10 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh (class PseudoJet):
removed some consts following PAD's report of compilation
warnings un gcc 4.3 (with fastjet-2.3.4).
2009-01-26 Gavin SALAM <salam@lpthe.jussieu.fr>
* Doxyfile:
updated to avoid warnings with doxygen 1.5.7
2009-01-23 Gavin SALAM <salam@lpthe.jussieu.fr>
* experimental/coding-guidelines.txt: *** ADDED ***
following GS's suggestion...
2009-01-21 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* include/fastjet/RangeDefinition.hh and CircularRange.hh
Reinstated set_position(), added is_localizable() to base
class (RangeDefinition) and derived one (CircularRange)
2009-01-16 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* for each plugin, put everything under the namespace
fastjet::<plugin_name>
to avoid any conflict with other codes
* plugins/TrackJet/fastjet/TrackJetPlugin.hh
plugins/TrackJet/TrackJetPlugin.cc
plugins/NestedDefs/fastjet/NestedDefsPlugin.hh
plugins/NestedDefs/NestedDefsPlugin.cc:
aligned with previous naming conventions (i.e. used _var for
private vars)
* test-compare.sh:
extended the check down to pt=0 (instead of only jets with pt>5)
2009-01-16 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* example/fastjet_timing_plugins.cc:
adapted this to use modern forms of constructors
* include/fastjet/JetDefinition.hh:
* src/JetDefinition.cc:
put in a constructor without R (for eekt) and a default
constructor, as well as a check that the jet algorithm has been
constructed with the right number of parameters.
*** BACKWARDS COMPATIBILITY BREAK ***
CALLING USUAL PP JET ALGS WITH NO R NOW
GIVES A RUN-TIME ERROR.
* test-compare.sh:
fixed problem with pxcone mixing f77/c++ output order according
to system, which caused problems in make check
* plugins/D0RunIICone/D0RunIIConePlugin.cc:
Attempt to sort out compilation problem on a mac
2009-01-15 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* include/fastjet/PseudoJet.hh (class PseudoJet):
added Et() and Et2() to compute the transverse energy
2009-01-14 Gavin Salam <salam@lpthe.jussieu.fr>
* doc/fastjet-doc.tex (subsection{SISCone Plugin}):
* plugins/SISCone/SISConePlugin.cc (SISConePlugin::description):
* plugins/SISCone/SISConeSphericalPlugin.cc (SISConeSphericalPlugin::description):
* plugins/SISCone/fastjet/SISConeBasePlugin.hh:
extras now contains a function int pass(jet), which returns the
pass of the jet;
added function to set, query the use of the jet-definition's own
recombiner (which then overrides the presence of the pass in the
jets' user-index).
documented the whole lot.
* example/fastjet_timing_plugins.cc:
-cones also prints out passes of jets, user-index, etc.
2009-01-14 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* test-compare.sh:
added options to specify additional params
added options to specify another event
added genkt, eekt and eegenkt
added multiple values of R
* configure.ac:
even though they're enabled by default, AM_ENABLE_SHARED has to
be called so that ${enable_shared} is set to 'yes' instead of ''
* test-compare.sh:
- dealt with a missing ${srcdir}
- cleaned a bit more the output
2009-01-13 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* configure.ac:
switched shared libs to enabled by default
note that the static libs are also built.
2009-01-13 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* src/ClusterSequence.cc:
* src/ClusterSequenceVoronoiArea.cc:
* src/ClusterSequenceActiveArea.cc:
made modifications to allow zero-particle events to work
fine. Tested various areas, as well as plain runs, including
plugins (or at least SISCone).
* src/ClusterSequence_TiledN2.cc:
added a lower limit on the tile size to avoid huge memory use
with tiny jet radii.
* include/fastjet/RangeDefinition.hh:
removed set_position and associated variables (will go back in
-> 2.5)
2009-01-13 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* test-compare.sh
test-script-output-orig.txt:
used now fastjet_timings_plugin rather than many_algs_examples
to test the output of each installed algorithm/plugin.
2009-01-12 Gavin SALAM <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc (ClusterSequence::_initialise_and_run):
changed the transition N for the anti-kt algorithm to
35000/R^1.15 (based only on R=0.7)
* regression-tests/nightly-check.pl:
added --enable-shared, to test that Gregory's new option works
fine (probably want a manual test anyway...)
2009-01-11 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* include/fastjet/RangeDefinition.hh (class RangeDefinition):
- initialised _phispan in the default constructor
- bound the phi range to twopi in the computation of total_area
2009-01-09 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* include/fastjet/RangeDefinition.hh (class RangeDefinition):
sorted out the issue of periodicity for generic phi ranges.
2009-01-09 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/test-all-algs.pl (setRefResults):
* doc/fastjet-doc.tex
* src/ClusterSequence.cc:
switched R in eegenkt to be in radians, not
sqrt(2(1-\cos\theta))!! Updated docs and regression tests also,
and deposited test results in in usual place,
~salam/work/fastjet/validation-ref-2008-10-30
* example/ktjet_timing.cc:
added -get-all-dij option to print out the full list of dij
* example/fastjet_timing_plugins.cc:
added -get-all-dij option to print out the full list of dij
+ fixed up up output on -excld (removed squared pt)
Ran tests on 1k events
./fastjet_timing_plugins -nev 1000 -eekt -get-all-dij < ../../data/Pythia-PtMin1000-LHC-1000ev.dat | grep '^d for'
./ktjet_timing -nev 1000 -eekt -get-all-dij < ../../data/Pythia-PtMin1000-LHC-1000ev.dat | grep '^d for'
and it passed it fine (modulo some small rounding error issues
here and there.
2009-01-05 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* plugins/TrackJet/TrackJetPlugin.cc:
released the TrackJet plugin.
Adapted many_algs_examples, fastjet_timing_plugins and
all build scripts accordingly
2008-12-18 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/test-all-algs.pl:
added documentation on how to add a new algorithm.
* regression-tests/nightly-check.pl:
adding a little more info to output
2008-11-17 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/RangeDefinition.hh:
added a check that phimax <= twopi in constructor
2008-10-31 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl:
finished a first version of this, with a fairly complete set of
checks.
2008-10-30 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/nightly-check.pl: *** ADDED ***
started work on this script for running a full swathe of regular
checks
* regression-tests/test-all-algs.pl: *** ADDED ***
script to help test correctness of fastjet, by running many algs
and, for each, comparing checksum of numerical part of results
to a previously stored checksum.
* example/fastjet_timing_plugins.cc:
various small changes to ease test-all-algs.pl behaviour
2008-10-30 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* include/fastjet/RangeDefinition.hh:
replaced methods place_at() and place() with set_position()
2008-10-29 Gavin SALAM <salam@lpthe.jussieu.fr> & Matteo
* include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh:
* include/fastjet/ClusterSequenceAreaBase.hh:
* include/fastjet/ClusterSequenceArea.hh:
added a virtual function has_explicit_ghosts(), which returns
true if the clusterSequence has explicit ghosts within the jets.
* src/ClusterSequenceArea.cc:
if has_explicit_ghosts() is true, then don't bother with fancy
estimations of empty_area in
get_median_rho_and_sigma(...). Instead set it to zero, and
assume that the corresponding information is provided by the
pure ghost jets.
NB: the empty_area(range) routine also returns zero if
has_explicit_ghosts(); the empty_area(jets, range) does not, on
the grounds that the user may have deliberately passed some
incomplete set of jets within the range.
2008-10-27 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* src/ClusterSequence.cc:
updated banner link to www.fastjet.fr
2008-10-13 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* include/fastjet/RangeDefinition.hh
Added method place_at(jet) and place_at(rap,phi), to be used by
derived local ranges to place the range at a jet's position,
after having defined the range only once with just its
geometrical parameters. Moved _rapjet and _phijet from
private to protected. Correspondingly modified CircularRange.hh
2008-10-09 Gavin Salam <salam@lpthe.jussieu.fr>
* example/fastjet_boosted_higgs.cc: *** ADDED ***
* example/data/HZ-event-Hmass115.dat: *** ADDED ***
* example/Makefile.am:
* example/data/Makefile.am:
added an example to show how to carry out subjet decomposition
for finding boosted objects
* example/Makefile.am:
* example/fastjet_subjets.cc:
tidied this up a little & arranged for it to be compiled
2008-09-04 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* plugins/CDFCones/CDFJetCluPlugin.cc:
in transfer part of plugin, sorted the constituents of a jet (into
ascending fjindex), to work around the problem that JetClu may
return constiuents in different orders when soft ghost-particles
are added.
Note: JetClu seems to be IR unsafe (at the 10^{-4} level in toy
events) even when the seed threshold is non-zero. The frequence
is higher in real events and means that passive areas, and
active areas with repeat > 1, will throw fastjet::Error(...);
users should catch this if they want to continue running.
tested on 1k events against unmodified jetclu plugin in 2.3.4
-----------------------------------------------
released 2.3.4 on 2008-08-15
it contains jetclu & "exit" bug fixes from below + siscone 1.3.3
-----------------------------------------------
2008-08-15 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/CDFCones/CDFJetCluPlugin.cc:
switched over to the use of PhysicsTower::fjindex for
bookkeeping a jet's contents (rather than a map, which had led
to a bug report by James Monk).
* plugins/CDFCones/CDFcode/PhysicsTower.hh (class PhysicsTower):
add fjindex member variable to this class to allow bookkeeping
needed by the JetClu plugin.
2008-08-11 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/GhostedAreaSpec.hh (class GhostedAreaSpec):
* src/GhostedAreaSpec.cc (GhostedAreaSpec::add_ghosts):
added constructor and implementation for asymmetric ghost range
(different min & max rapidities), following request by Roman
Kogler <roman.kogler@desy.de> (H1 is asym in rap).
* example/fastjet_timing_plugins.cc:
dense coverage switched over to using GhostedAreaSpec (will
change root pictures relative to earlier), used also for testing
the new asymmetric range of ghosts.
2008-08-06 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* example/fastjet_timing_plugins.cc (main):
when appropriate, delete the plugin at the end of the execution.
2008-07-24 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* src/ClusterSequenceAreaBase.cc
Added copy of user_index over to subtracted jet
in subtracted_jet() [previously fogotten]
2008-07-23 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* NEWS:
updated the warnings about IR safety of the spherical
implementation of SISCone
* example/Makefile.am,
plugins/usage_examples/Makefile.am:
adapted the compilation flags to use the new version of the
plugin (requires inclusion of the SISCone headers)
* plugins/SISCone/fastjet/SISConeBasePlugin.hh,
plugins/SISCone/fastjet/SISConePlugin.hh,
plugins/SISCone/fastjet/SISConeSphericalPlugin.hh,
plugins/SISCone/SISConePlugin.cc,
plugins/SISCone/SISConeSphericalPlugin.cc:
Added a template plugin and made the two current plugins
derive from it.
2008-07-18 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* configure.ac:
removed the unnecessary -I../included flag from AM_CXXFLAGS
2008-07-18 Gavin SALAM <salam@lpthe.jussieu.fr>
* example/CmdLine.cc:
* example/CmdLine.hh:
put in a missing "const" & included cstdlib in the .cc (for
access to exit)
2008-07-17 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* include/fastjet/Makefile.am (nodist_fastjetinclude_HEADERS):
config_auto.h removed from the package distribution as it
may conflict with the configure-generated one when building
in a separate directory.
2008-07-16 Gavin Salam <salam@lpthe.jussieu.fr>
* mksnapshot.sh:
included fix for ensuring the windows include file is correct in
the snapshot.
2008-07-14 Gavin Salam <salam@lpthe.jussieu.fr>
* src/PseudoJet.cc:
* include/fastjet/PseudoJet.hh:
added sorted_by_pz() (used for safety tests on new algs)
2008-07-12 Gavin Salam <salam@lpthe.jussieu.fr>
* NEWS:
added mention of spherical siscone
* example/fastjet_timing_plugins.cc:
added -sisconespheri option for running spherical siscone;
changed scale of "dense" additions to separate them better from
normal particles.
* plugins/SISCone/fastjet/SISConeSphericalPlugin.hh:
added comments about differences relative to the cylindrical
algorithm
NB: some other files have changed with minor typographical fixes
2008-07-11 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* include/fastjet/ClusterSequenceAreaBase.hh:
added a comment to notice that putting a negative
value for 'exclude_above' means the cut is discarded
(in parabolic_pt_per_unit_area).
* configure.ac (ENABLE_PLUGIN_SISCONE)
examples/Makefile.am
plugins/usage_examples/Makefile.am:
added libsiscone_spherical to the list of libs to link
against when using the SISCone plugin.
2008-07-11 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* fixed CircularRange.hh (wrong filenme and missing fastjet
namespace)
2008-07-07 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* plugins/SISCone/SISConeSphericalPlugin.cc:
plugins/SISCone/fastjet/SISConeSphericalPlugin.hh:
added a plugin for the spherical version of SISCone.
It is named SISConeSplericalPlugin and included in
the same plugin library as the main plugin
2008-06-28 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* plugins/NestedAlgs/fastjet/NestedAlgsPlugin.hh
plugins/NestedAlgs/NestedAlgsPlugin.cc:
- rename NestedAlgs in NestedDefs
- internally, call 'algorithms' 'definitions', for consistency
- do not put the last alg. recomb at the end but at the moment
they appear.
- keep the dij, diB for the last def; and set all others to
zero? That way people can run sub-jet tools on the last
jet-def without worrying about strange conflicts with the
previous dij's which have a different meaning.
- do some renaming of the internal variables for readability
2008-06-22 Gavin Salam <salam@lpthe.jussieu.fr>
* doc/fastjet-doc.tex:
updated the documentation to contain information about the e+e-
algorithms; added note on accessing version info;
* src/ClusterSequence.cc:
removed warning about exclusive jets for the ee_kt alg.
Added test of ee_kt R value.
Arranged distance-measure normalisations such that dij has 1/R^2
for ee_gen_kt, but not for ee_kt (the former matches on directly
to gen_kt, the latter onto the usual e+e- convention).
* include/fastjet/JetDefinition.hh:
* src/JetDefinition.cc (JetDefinition::JetDefinition):
moved the code for the constructor into the .cc file;
For the ee_kt_algorithm, set the R value explicitly (R=4), to
avoid the user getting something that isn't the original kt
algorithm without realising. Also removed the mention of $R$ in
the description.
NB: functionality of R for this alg can be obtained with
ee_genkt.
2008-06-19 Gavin Salam <salam@lpthe.jussieu.fr>
* TESTING:
ran basic tests on behaviour of eegenkt for a set of simple
events; checked that eegenkt with p=1 gives same as eekt (for
R=2); and rechecked once again against original KtJet.
* include/fastjet/JetDefinition.hh:
removed inappropriate restriction on R for eegenkt.
2008-06-14 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/JetDefinition.hh (enum JetAlgorithm):
* src/JetDefinition.cc (JetDefinition::description):
* src/ClusterSequence.cc (ClusterSequence::_initialise_and_run, inclusive_jets):
* src/ClusterSequence_N2.cc (ClusterSequence::_bj_set_jetinfo<EEBriefJet>):
added support for the ee_genkt_algorithm [should double check
ee_kt (some mods may have affected it, though quick tests done)
and check genkt more extensively [e.g. with spherical plots?]
2008-06-02 Gregory Soyez <gsoyez@quark.phy.bnl.gov>
* plugins/NestedAlgs/NestedAlgsPlugin.cc:
Added a new plugin which does the clustering by applying
successively a set of algorithms.
The usage simply goes as follows
list<JetDefinition> jet_list;
// add here the list of algs you want (the first one
// you want to be applied goes first) to 'jet_list'
JetDefinition jet_def = new NestedAlg(jet_list);
ClusterSequence(particle_list, jet_def);
As for the other plugins, NestedAlgs can be enabled or
disabled at configure-time using --enable-nestedalgs or
--disable-nestedalgs (enabled by default).
2008-05-28 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh:
Following discussions with Christophe Royon and Lars
Sonnenschein, removed the default value for the min_jet_Et in the
D0RunIIConePlugin, since two different values have been used
over the years.
* test-script-output-orig.txt:
* example/fastjet_timing_plugins.cc:
* plugins/usage_examples/many_algs_example.cc:
updated these to use min_jet_Et to 6 GeV (was 8) for the
d0runiicone
2008-05-23 Gavin Salam <salam@lpthe.jussieu.fr>
* src/PseudoJet.cc:
* include/fastjet/PseudoJet.hh:
Added a delta_phi_to(...) member function to calculte phi
distance to another PseudoJet
2008-05-21 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence.cc:
Rather than have an inline virtual destructor, moved it into
the .cc file (no particular reason)
2008-05-17 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequenceAreaBase.cc:
* include/fastjet/ClusterSequenceArea.hh:
* include/fastjet/ClusterSequenceAreaBase.hh:
Added an extra version of get_median_rho_and_sigma which takes
an explicit list of jets and calculates the median from that ---
intended to help easily consider multiple R values within the
C/A algorithm. Also added empty_area_from_jets()
NB: "gmrs" also takes an extra argument to indicate
whether the supplied jets are inclusive or not (affects
assumptions it makes in calculating number of empty jets)
NB2: when playing these games, the estimate of the number of
empty jets is very hard to get in "plain" area classes for
non-inclusive jets. Currently it's done by estimating the
empty_area and dividing this by the mean_area of the non-empty
jets; however there are situations where this procedure becomes
dodgy (still to be understood why)...
* TODO:
updated this to reflect the current status of things
2008-05-16 Gavin SALAM <salam@lpthe.jussieu.fr>
* NEWS:
updated this to reflect main current changes
2008-05-14 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* include/fastjet/CircularRange.hh ADDED
added derived class for circular range
2008-05-12 Gavin Salam <salam@lpthe.jussieu.fr>
* example/root/jet-plots.C:
- changed histograms to doubles so that ghosting gives visible results.
- JetHist::default_etamax and default_nbins can now be set
by user
- showjets now plots labels on axes
- it reads a comment from the file and uses it as a label
if none is supplied
- it returns a pointer to the canvas, for user's subsequent
manipulation
* src/ClusterSequence.cc (ClusterSequence::print_jets_for_root):
* include/fastjet/ClusterSequence.hh:
added alternative interface for print_jets_for_root, which takes
filename and optional comment
* include/fastjet/ClusterSequence.hh:
*** COULD BREAK COMPILED LIBRARIES?? ***
added virtual ~ClusterSequence () {} destructor; necessary in
order to get deletion of pointers to generic ClusterSequence type
objects working correctly (e.g. ClusterSequence *, that points to
a ClusterSequenceArea).
Leaving this out originally was related to the fact that we did
not originally forsee derived classes from ClusterSequence.
-----------------------------------------------
released 2.3.3 on 2008-04-28
it contains bug fixes from below
-----------------------------------------------
2008-04-28 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/internal/SearchTree.hh:
added a missing typename (pointed out by Belyaev).
* include/fastjet/Makefile.am (fastjetinclude_HEADERS):
added config_auto.h which was not being installed.
2008-04-18 Gavin SALAM <salam@lpthe.jussieu.fr>
* mksnapshot.sh:
added this script for creating snapshots, numbered both with
date and revision number
2008-04-04 Gavin SALAM <salam@lpthe.jussieu.fr> later
**** TESTS CARRIED OUT ****
tested 1000 events from ../data/Pythia-PtMin1000-LHC-1000ev.dat
between fastjet_timing_plugins and ktjet_timing with dcut = 10
and dcut = 2000; both give identical results.
Commands used were:
./ktjet_timing -eekt -nev 1000 -excld 2000 < ../../data/Pythia-PtMin1000-LHC-1000ev.dat
./fastjet_timing_plugins -eekt -R 2.0 -nev 1000 -excld 2000 < ....
NB: R > sqrt(2) is mandatory within the current interface
* example/fastjet_timing_plugins.cc:
* example/ktjet_timing.cc:
added e+e- kt run options to these programs
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence_N2.cc:
* src/ClusterSequence.cc:
modifications so that the _simple_N2_cluster() routine becomes a
template, whose action depends on specific type of BriefJet with
which it is called.
Added the EEBriefJet type, together with minimal functions, so
as to get a form of the e+e- algorithm.
* include/fastjet/PseudoJet.hh
added the modp2() member function which returns the squared
modulus of the 3-vector part of the PseudoJet
* include/fastjet/JetDefinition.hh
added the ee_kt_algorithm;
2008-04-04 Gavin SALAM <salam@lpthe.jussieu.fr> earlier
* plugins/CDFCones/fastjet/CDFMidPointPlugin.hh:
* plugins/SISCone/fastjet/SISConePlugin.hh:
removed the default value for the overlap_threshold (was 0.5 and
this caused physics problems in the past; 0.75 is recommended).
2008-04-03 Gavin SALAM <salam@lpthe.jussieu.fr>
* NEWS:
updated NEWS to reflect changes made on the 2.3.2-devel bug-fix
branch
-----------------------------------------------
released 2.3.2 on 2008-04-03
it contains a subset of what is listed below
-----------------------------------------------
2008-04-03 Gavin SALAM <salam@lpthe.jussieu.fr>
* BUGS:
updated this file to reflect current status
2008-04-01 Gregory SOYEZ <soyez@tycho.lpthe.jussieu.fr>
* src/Voronoi.{hh,cc}
BUGS:
declared some variables as volatile.
Those were subject to "==" tests which lead to segmentation
faults when the registers did not have the same precision as a
regular double.
This closes the following bug:
. The Voronoi area evaluation (=Passive for the kt algorithm), is
known to crash on events in which the momenta lie on a exact grid in
rapidity,phi (i.e. a calorimeter). An unsatisfactory workaround is
to slightly displace input momenta away from the exact grid.
Work is in progress to address this issue.
* src/ClusterSequenceVoronoiArea.cc (VAC::VoronoiAreaCalc): added bits of comments
2008-03-28 Gregory Soyez <g.soyez@ulg.ac.be>
* src/ClusterSequenceActiveArea.cc (ClusterSequenceActiveArea::_transfer_areas):
fixed array-size issue when there are unclustered particles.
2008-03-26 Gregory Soyez <g.soyez@ulg.ac.be>
* configure.ac:
fix a bug with AM_CXXFLAGS being overwritten at some point
2008-03-23 Gavin Salam <salam@lpthe.jussieu.fr>
* configure.ac:
fix CXXFLAGS in such a way as to allow the user to set their own
default.
* include/fastjet/ClusterSequenceArea.hh (class ClusterSequenceArea):
added some missing Doxygen comments to this class
2008-03-15 Gavin Salam <salam@lpthe.jussieu.fr>
* src/Voronoi.cc
* plugins/SISCone/siscone
* include/fastjet/ClusterSequence1GhostPassiveArea.hh
* include/fastjet/ClusterSequencePassiveArea.hh
* include/fastjet/ClusterSequenceActiveArea.hh
* include/fastjet/internal/Voronoi.hh
got rid of using namespace std in the headers
2008-03-15 Gavin Salam <salam@lpthe.jussieu.fr>
* did svnmerge.py uninit on the D0ILConePlugin branch
* merged the D0ILConePlugin Branch, which provides the D0 Run II
Cone, the genkt algorithm, and a full set of subjet tools (still
to be tested in part?)
============== MERGE OF D0ILConePlugin Branch =====================
2008-01-12 Gavin SALAM <salam@lpthe.jussieu.fr>
* example/fastjet_timing_plugins.cc:
changed position of a #ifdef ENABLE_PLUGIN_SISCONE so that when
we merge it doesn't logically conflict with a parallel change in
the trunk).
2007-12-29 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/ClusterSequence.hh:
* src/ClusterSequence.cc:
added a full set of subjet functions, in analogy with what's
available for normal exclusive jets. Not yet documented
2007-12-28 Gavin Salam <salam@lpthe.jussieu.fr>
* doc/fastjet-doc.tex
documented genkt and subjet work;
NB: MORE FUNCTIONALITY (SPLIT TO N JETS, ETC.) NEEDED
FOR THE SUBJET WORK.
* include/fastjet/JetDefinition.hh:
* src/JetDefinition.cc:
* src/ClusterSequence.cc:
Got genkt working.
* example/fastjet_timing_plugins.cc:
added option (-subdcut) for carrying out subjet analysis on
every jet; various methods are programmed internally, and the
subjet analysis was checked by making sure that for each method,
./fastjet_timing_plugins -nev 1000 -cam -subdcut 0.25 \
< ~/work/fastjet/data/Pythia-PtMin50-TeV-1000ev.dat
gave identical results (similarly also for kt). This validates
the ClustSequence::exclusive_subjets(...) routine.
Also added -doruniicone option.
* plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh:
added default values for min_jet_Et and split_ratio, such that
the algorithm can be called with just the cone radius and it
will correspond to what is used by D0.
* example/fastjet_subjets.cc:
added some explicit subjet analysis
* src/ClusterSequence.cc:
corrected a couple of bugs in exclusive_subjets
2007-12-21 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc:
* include/fastjet/ClusterSequence.hh:
added the exclusive_subjets(jet,dcut) routine to find out
about the subjets at scale (dcut) inside a given jet
-----------------------------------------------------
* from revision 989 onwards, add subjet analysis
-----------------------------------------------------
2007-12-14 Gavin Salam <salam@lpthe.jussieu.fr>
* example/fastjet_timing_plugins.cc:
fixed compilation bug when siscone is disabled
* plugins/usage_examples/many_algs_example.cc:
* test-script-output-orig.txt:
* test-compare.sh
modified these so that D0 cone is tested as well + fixed bug
in check when siscone is disabled
* [various]/Makefile.am
* configure.ac
added compilation of D0 code & plugins
* plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh: *** ADDED ***
* plugins/D0RunIICone/D0RunIIConePlugin.cc: *** ADDED ***
added these both, modified the D0RunIICone to get easy access to
jet constituents, and tested that it gives correct answers on
sample event sent by Lars Sonnenschein.
* plugins/D0RunIICone/ *** ADDED ***
- put in untarred version of D0RunIIcone/
- copied main pieces into top directory
- made modifications for compilation
- added index entry to HepEntity
2007-12-14 Gavin Salam <salam@lpthe.jussieu.fr>
-----------------------------------------------------
* on branch (from revision 981) for adding D0 cone...
-----------------------------------------------------
============== END OF MERGE OF D0ILConePlugin Branch =====================
2008-03-15 Gavin Salam <salam@lpthe.jussieu.fr>
* initialised svnmerge.py on
svn+ssh://tycho/ada1/lpthe/salam/svn/fastjet/branches/fastjet-release-devel-D0ILConePlugin
2008-03-15 Gavin Salam <salam@lpthe.jussieu.fr>
* doc/fastjet-doc.tex (subsection[$k_t$ jet algorithm]):
added refs separately to inclusive and exclusive when describing
jet-alg (subsequent to mails from Piergiulio Lenzi who was
having trouble understanding what was happening).
2008-03-07 Gavin SALAM <salam@lpthe.jussieu.fr>
* configure.ac:
switched version number over to 2.4-devel
-----------------------------------------------
released 2.3.1 on 2008-03-07
-----------------------------------------------
2008-03-07 Gavin SALAM <salam@lpthe.jussieu.fr>
* configure.ac
* test-compare.sh
* src/genconfig.sh
* src/makefile.static
* include/fastjet/config.h *** ADDED ***
* include/fastjet/config_win.h *** ADDED ***
Moved to a structure of config_auto.h (with autotools and unix
static makefiles), and config_win.h (under windows).
The config.h file now detects the system and includes the
appropriate one
2008-02-28 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* src/ClusterSequenceAreaBase.cc:
Revisited part of the change made on 2008-02-18: subtracted
jets with unphysical momentum now also get a valid index
2008-02-25 Gavin SALAM <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc:
in exclusive_dmerge(njets) and exclusive_dmerge_max(njets),
fixed assert(njets > 0) to njets >= 0;
Bug reported by Piergiulio Lenzi <lenzip@fi.infn.it>.
2008-02-18 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* src/ClusterSequenceAreaBase.cc:
in subtracted_jet(), copied cluster_hist_index from original
jet to sub_jet, so that one can then directly analyse sub_jet
(for instance in terms of its constituents). Feature request
by Juan Rojo
2008-01-28 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/SISCone/fastjet/SISConePlugin.hh:
added note about recommended value for overlap_threshold
different from the default.
* Doxyfile:
updated this to reflect new plugin header locations
* CHECKLIST:
added this to indicate what's needed for a release
2008-01-17 Gavin Salam <salam@lpthe.jussieu.fr>
* src/genconfig.sh (configfile):
can now take a first argument to generate a file of whatever
name user likes.
2008-01-15 Gregory Soyez <g.soyez@ulg.ac.be>
* plugins/PxCone/pxcone.h:
fix name conventions for VC compilation
* plugins/CDFCones/CDFcode/LorentzVector.hh (M_PI):
* plugins/CDFCones/CDFcode/Centroid.hh (M_PI):
* plugins/CDFCones/CDFcode/CalTower.hh (M_PI):
added a definition of M_PI in case not already defined (VC compilation)
* include/fastjet/internal/SearchTree.hh:
added 'typename' where required (VC compilation)
* src/ClusterSequenceVoronoiArea.cc:
- added the limis header (VC compilation)
- replaced M_PI by pi (defined in fastjet/internal/numconsts.hh)
* src/ClusterSequenceActiveArea.cc:
- added the algorithm, cmath and valarray headers (VC compilation)
- fixed a type/operator confusion in
ClusterSequenceActiveArea::_postprocess_AA (VC compilation)
* src/PseudoJet.cc:
* src/ClusterSequence_TiledN2.cc:
* src/ClusterSequenceAreaBase.cc:
* src/ClosestPair2D.cc:
added the algorithm header (VC compilation)
2008-01-15 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/CDFCones/CDFcode/MidPointAlgorithm.cc (MidPointAlgorithm::iterateCone):
fixed speed issue with optimized compilation by making some
local variable volatile (Gregory's proposal). The problem was
that on 32 bit machines a 64 bit stored variable was being
compared to an 80 bit register -- making everything volatile
forces thing to go into memory and solves the problem.
2008-01-14 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/SISCone/siscone
switched this back over to the SISCone trunk, in preparation for
Belyaev's bug fixes.
2008-01-11 Gavin SALAM <salam@lpthe.jussieu.fr>
* TODO:
updated this a little
* test-compare.sh:
fixed typo that caused make check failure when siscone is disabled
* example/fastjet_timing_plugins.cc:
bug-fix in conditional compilation to get things to still work when
siscone is disabled.
* configure.ac:
switched over to 2.3.1-devel
2008-01-04 Gavin Salam <salam@bison>
* BUGS:
added remark about pt=0 and ambiguities in clustering inputs on
a perfect y-phi grid + VC7.1 compilation.
-----------------------------------------------
released 2.3.0 on 2008-01-03
-----------------------------------------------
2008-01-03 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* BUGS *** ADDED ***
* prepared things for the 2.3.0 release
2007-12-24 Gavin Salam <salam@lpthe.jussieu.fr>
* NEWS:
added information summarising 2.1 -> 2.3
2007-12-18 Gavin SALAM <salam@lpthe.jussieu.fr>
* Makefile.am:
added Doxyfile to EXTRA_DIST
2007-12-11 Gavin Salam <salam@lpthe.jussieu.fr>
* example/root/jet-plots.C:
minor fix to get it working with modern (5.16) version of root.
2007-12-04 Gavin Salam <salam@lpthe.jussieu.fr> + Gregory
* include/fastjet/ClusterSequenceArea.hh:
* include/fastjet/ClusterSequenceAreaBase.hh:
made 4-argument get_median_rho_and_sigma virtual, and added a
4-argument overridden version to ClusterSequenceArea; this was
necessary because when you redefine one version with a given
name, then you need to explicitly override all other versions
with the same name.
2007-12-04 Gavin Salam <salam@lpthe.jussieu.fr>
* configure.ac
moved version number over to 2.3-beta1-devel
* NEWS
renamed 2.2-beta1 -> 2.3-beta0
* ClusterSequenceActiveArea.cc|hh
Commented out the parabolic_pt_per_unit_area function, since it
is provided by the AreaBase class. This should also avoid the
compilation warning about the base class function being hidden.
* example/fastjet_areas.cc:
added more explicit comments about some of the alternatives that
are currently commented out.
2007-12-03 Gavin Salam <salam@lpthe.jussieu.fr> + Gregory
* TAGGED the 2.3-beta0 release
2007-11-30 Gregory Soyez <g.soyez@ulg.ac.be>
* include/fastjet/Makefile.am: remove config.h from the list of
headers included in the distribution. It should be generated
from config.h.in at configure time. When included, it also seems
to cause trouble for make distcheck.
* test-compare.sh: add write permissions to the temporary copy of
the original output (read-only by default for make
distcheck). Also, explicitely remove the files generated by make
ckeck in case it succeeds (also required for make distcheck to
work.)
2007-11-29 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* src/ClusterSequenceAreaBase.cc
very minor fix to subtracted_jets() (use of int in loop was
giving a warning, *this was useless, eliminated debugging comments)
* src/ClusterSequence.cc
Updated the banner (PLB + anti-kt)
* configure.ac
Version number moved to 2.3-beta0 (from 2.3-beta0-devel)
* INSTALL
- single line version for compiling and linking external program
- replaced output example vith version 2.3-beta0 (only the banner
changes)
2007-11-26 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* src/ClusterSequenceAreaBase.cc [+.hh] :
* fixed comment of subtracted_jet()
* added the methods subtracted_jets() which
returns a vector of PseudoJet by acting on inclusive_jets()
* added fortran wrapper to TODO list
* typo-fixing in documentation
* include/fastjet/JetDefinition.hh
include/fastjet/ClusterSequence.hh [.cc]
Replaced JetFinder by JetAlgorithm, and (_)jet_finder
by (_)jet_algorithm, in keeping with Les Houches convention.
Also replaced accordingly _default_jet_finder and the jet_finder()
method.
Backward compatibility is assured at the user-level by a
typedef and by doubling functions containing the word "jet_finder"
NB. THERE IS ONE EXCEPTION: _default_jet_finder and _jet_finder
were protected variables of ClusterSequence: the replacement
will break derived classes using them. They should be replaced
everywhere by "_default_jet_algorithm" and "_jet_algorithm"
* src/ClusterSequenceAreaBase.cc
src/ClusterSequencePassiveArea.cc
src/JetDefinition.cc
replaced jet_finder() by jet_algorithm()
* example/fastjet_subtraction.cc
median rho is now calculated using ...per_unit_area_4vector
when used in 4-vector subtraction along with area_4vector
* example/fastjet_subtraction.cc
fastjet_areas.cc
fastjet_example.cc
fastjet_timing.cc
fastjet_timing_plugin.cc
replaced "finder" with "algorithm"
2007-11-22 Gavin SALAM <salam@lpthe.jussieu.fr> & Matteo
Tidying up in anticipation of 2.3-beta0 release; in addition to
what's mentioned below, various bits of old commented code
removed.
* include/fastjet/JetDefinition.hh
introduced jet_algorithm() (does same as jet_finder());
* src/ClusterSequenceArea.cc: *** ADDED *** +.hh
* src/ClusterSequenceAreaBase.cc: + .hh
set get_median_rho_and_sigma (and parabolic...) to be virtual,
overloaded it in ClusterSequenceArea so as to check that if
ghosts were used they're over a suitably large rapidity range.
* src/ClusterSequenceAreaBase.cc:
removed explicit code for median_pt_per_unit_something -- it now
just calls get_median_rho_and_sigma and returns the median;
tested that results are identical!
* include/fastjet/RangeDefinition.hh:
modified comment for _numerical_total_area; added
virtual get_rap_limits() to find out what rapidity limits the
range has. Mentioned it in the documentation too.
* src/ClusterSequenceActiveArea.cc (_initialise_AA):
* [and elsewhere]
removed commented lines with old "maxrap" interface for setting
range when finding median etc.
* configure.ac:
switched version number to 2.3-beta0
* plugins/SISCone/
put siscone onto tagged version 1.3.0
2007-11-10 Gavin Salam <salam@lpthe.jussieu.fr>
Summary of places where tests carried out in past few days:
name | system | tarball v autoconf+automake | conf
-------------------------------------------------------------
ramses | OSX 10.3 | t + a 2.61+1.10 (DIY) | ??
tycho | FC 7 | a 2.61+1.10 | cp
bison(me)| Ubun 7.04 | a 2.61+1.9.6 | cps
bison(me)| cygwin | a ??? | p?(s?)
lxplus | SLC4 | t + a 2.59+1.9.2 | ps
zetes | SLC4? | t | ps
lpnui | SLC3 | t | ps
The "conf" column indicates which of cgal, pxcone and shared were enabled,
when I can remember... Lowest libtool: 1.5.6
* plugins/PxCone/Makefile.am:
added missing pxcone.h to EXTRA_DIST
* test-compare.sh:
fixed bug causing it to fail when build takes place in a
separate directory.
* test-static.sh: *** RENAMED FROM *** test-script.sh
modified it so that it uses test-compare.sh for carrying out the
tests.
* src/makefile.static:
adapted it so that it uses install-sh for the installation in
lib/ (works around issue with absent lib/ directory in the
distribution)
* Makefile.am:
included test-script.sh in EXTRA_DIST
* example/Makefile.am:
removed test-*.sh from EXTRA_DIST (since the scripts have been removed)
* plugins/usage_examples/Makefile.am:
removed test-*.sh from EXTRA_DIST (since the scripts have been removed)
added -I../../include so as to get the
../../include/fastjet/config.h when building in a separate directory.
2007-11-09 Gregory Soyez <g.soyez@ulg.ac.be>
* test-compare.sh:
test-script-output-orig.txt:
Allow to test the complete set of installed plugins.
* plugins/usage_examples/many_algs_example.cc (main):
append the anti-kt clustering algorithm
* fastjet-config.in: sort out the -static issue
Now, shared lib is used by default if enabled. You can still
use the static one using the --shared=no flag
2007-11-09 Gavin Salam <salam@lpthe.jussieu.fr>
* include/FjPseudoJet.hh:
* include/FjClusterSequence.hh:
added obscolescence warning
* put version number over to 2.2-beta1-devel (-beta ensures it
comes alphabetically before 2.2.0)
2007-11-08 Gregory Soyez <g.soyez@ulg.ac.be>
* test-compare.sh: all tests will be launched from here
This allows to test examples before plugins examples
* plugins/(PxCone|CDFCones|SISCone)/...Plugin.hh:
added a #warning to tell the user to switch to new version
2007-11-08 Gavin SALAM <salam@lpthe.jussieu.fr>
* plugins/(PxCone|CDFCones|SISCone)/Makefile.am:
* plugins/(PxCone|CDFCones|SISCone)/...Plugin.hh: ***ADDED***
added
* example/root/Makefile.am: * example/Makefile.am: * configure.ac:
put in some stuff missing from the
distribution (example/makefile.static, example/root/...)
2007-11-08 Gavin SALAM <salam@lpthe.jussieu.fr>
* MERGED svn/fastjet/branches/fastjet-release-autoconf (Rev 938)
back into the trunk; assembled the Changelogs to be in date
order across the two groups of chages.
2007-11-08 gavin salam <salam@lpthe.jussieu.fr>
* configure.ac:
removed EXEEXT for fastjet-config (relevant presumably only for
cygwin, where, as a script, it should not have the extension).
* example/Makefile.alt:
removed explicit path to fastjet-config
2007-11-07 Gregory Soyez <g.soyez@ulg.ac.be>
* m4/CGAL.m4: move the local m4 macro defs in the m4 subdir
* Makefile.am (ACLOCAL_AMFLAGS): add info on the local m4 macros
* autogen.sh: search local aclocal m4 macros in the m4 subdir
* INSTALL: add info regarding autoreconf
2007-11-07 Gavin SALAM <salam@lpthe.jussieu.fr>
* autogen.sh:
removed lines replacing libtool->glibtool on MAC, since with
fresh compilation of recent autoconf, automake and libtool, it's
all working fine.
* doc/Makefile.am *** ADDED ***
added doc/ to the tarfile
* fortran_wrapper/siscone_example.f:
* fortran_wrapper/Makefile -> Makefile.alt
* fortran_wrapper/Makefile.am
* Makefile.am
* configure.ac
got the fortran wrapper example working
2007-11-07 Gavin SALAM <salam@lpthe.jussieu.fr>
* configure.ac:
* example/Makefile.am:
* plugins/usage_examples/Makefile.am:
when pxcone is enabled, the following macros get called
AC_PROG_F77
AC_F77_LIBRARY_LDFLAGS
they set up FLIBS, which is then used where relevant
2007-11-07 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
modified reset(...) a little so that we have:
- version with 4 args (px,...,E) and template (vectorial) version
- version that takes a PseudoJet
The first ones reset the indices to default values; the latter
just copies the PseudoJet;
Also coordinated the resetting of indices.
2007-11-06 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
added PseudoJet::reset(...) for modifying the 4-momentum.
2007-11-06 Gavin SALAM <salam@lpthe.jussieu.fr>
* src/ClusterSequence.cc:
promoted Gregory to full author status.
* include/fastjet/version.hh:
* configure.ac:
* src/genconfig.sh: ***ADDED***
arranged things so that we generate include/fastjet/config.h
even with the makefile.static options, and we also use the
version number from config.h in fastjet output...
+ fixed some dependence issues in other makefiles
* example/fastjet_timing_plugins.cc:
* example/fastjet_areas.cc:
* plugins/usage_examples/cdfmidpoint_example.cc
* plugins/usage_examples/siscone_example.cc
* plugins/usage_examples/many_algs_example.cc
* plugins/usage_examples/pxcone_example.cc
adapted them to get rid of PLUGINS_NOT_IN_FASTJET and use
instead config.h
* example/Makefile.alt:
documented a bit better
2007-11-05 Gregory Soyez <g.soyez@ulg.ac.be>
* fastjet-config.in:
configure.ac:
Previous replacement of AM_LIBS by CONFIG_LIBS had
some influence on fastjet-config that was not properly
taken into account. This should be fixed now.
* plugins/SISCone/fastjet
plugins/CDFCones/fastjet
plugins/PxCone/fastjet:
Those 3 directories now contain the header files for the
corresponding plugins
* plugins/SISCone/fastjet/Makefile.am
plugins/CDFCones/fastjet/Makefile.am
plugins/PxCone/fastjet/Makefile.am:
Files added for autotools support
* plugins/SISCone/SISConePlugin.cc
plugins/CDFCones/CDFJetCluPlugin.cc
plugins/CDFCones/CDFMidPointPlugin.cc
plugins/PxCone/PxConePlugin.cc
plugins/usage_examples/Makefile.am
plugins/usage_examples/siscone_example.cc
plugins/usage_examples/cdfmidpoint_example.cc
plugins/usage_examples/pxcone_example.cc
plugins/usage_examples/many_algs_example.cc
examples/Makefile.am
example/fastjet_timing_plugins.cc
example/fastjet_areas.cc:
update to match the new include path structure
2007-11-01 Gregory Soyez <g.soyez@ulg.ac.be>
* INSTALL: add a bit more details
* CGAL.m4 (ACX_CHECK_CGAL):
fix the previous changes. CGAL check starts by looking
for a --with-cgalmakefile option. If this is absent it
looks for a defined CGAL_MAKEFILE variable. Otherwise,
the default location is used.
2007-10-31 Gavin Salam <salam@lpthe.jussieu.fr>
* CGAL.m4 (ACX_CHECK_CGAL):
hopefully fixed problem with it not finding the CGAL makefile
* autogen.sh:
fixed minor incompatibility with plain sh (in Darwin "if")
2007-10-27 Gregory Soyez <g.soyez@ulg.ac.be>
* example/fastjet_timing_plugins.cc:
plugins/usage_examples/many_algs_examples.cc:
use config.h to get the info on the available plugins
For the static build (using makefile.static), we
explicitely define the SISCone and CDFCones flags.
* example/test-areas.sh: *** ADDED ***
example/test-example.sh: *** ADDED ***
test-compare.sh: *** ADDED ***
test-script-output-orig.txt
example/Makefile.am:
add tests accessible through "make check".
Note that the comparison results file has been reorganised
to follow the order in which tests are run now (the latter
being a consequence of the build/Makefile order).
* plugins/usage_examples/Makefile.am:
build many_algs_example and the enabled plugins tests
* example/Makefile.am:
- build different executables:
fastjet_example fastjet_example_v1_interface
fastjet_areas fastjet_subtraction
fastjet_timing fastjet_timing_plugin
* autogen.sh: Add test to use glibtool(ize) under Darwin (Mac)
2007-10-24 Gregory Soyez <g.soyez@ulg.ac.be>
* series of small fixes to have a working make distcheck:
- correctly set the include dirs in case one builds into a
directory which is not the one containing the sources
- fix issues with the conditional build of plugins to make sure
that distribution-related make goals include all directories
2007-10-24 Gavin Salam <salam@lpthe.jussieu.fr>
* example/fastjet_areas.cc:
* example/fastjet_timing_plugins.cc:
Arranged for these to work both with new compilations and old
(with ifdefs at beginning to decide where to search for
plugins), using the PLUGINS_NOT_IN_FASTJET define for the old case
* makefile.static:
added
CXXFLAGS += -DPLUGINS_NOT_IN_FASTJET
to signal to example programs what is going on -- maybe sort
this out more elegantly later?
* test-script.sh:
arranged for it to use makefile.static (for now)
* example/makefile.static
put this in (things had got lost)
* example/Makefile.alt
this one should provide an example of how to get things to work
with the new build/install procedure
2007-10-24 Gregory Soyez <g.soyez@ulg.ac.be>
* plugins/PxCone/Makefile.am *** ADDED ***
plugins/Makefile.am
configure.ac:
Add autotools support for the PxCone plugin
* configure.ac:
- add options to enable plugins:
--enable-siscone (default=yes)
--enable-cdfcones (default=yes)
--enable-pxcone (default=no)
- add recursion into the SISCone autotools build
- the --enable-shared cmd-line option is already handled by
libtool. We just need to add AM_DISABLE_SHARED to disable the
shared lib by default (can still be changed by using
--enable-shared)
* fastjet-config.in: added a '--prefix' option which returns the
installation dir
2007-10-24 Gavin Salam <salam@lpthe.jussieu.fr>
* configure.ac:
included mention of the new Makefiles
* Makefile.am, example/Makefile.am, example/data/Makefile.am
Added the latter two and hopefully the example should now be
included in the tarball (but testing seems to be awkard)
* fastjet-config.in:
fixed bug left in from previous mod
2007-10-23 Gregory Soyez <g.soyez@ulg.ac.be>
* Makefile.am: the script is installed ad bin_SCRIPT!!!!
2007-10-23 Gavin Salam <salam@lpthe.jussieu.fr>
* fastjet-config.in:
removed -static ouput in case where things only built with
static option (but not tested)
changed some a+="b" to a=$a"b" for compatibility with mac
2007-10-22 Gavin SALAM <salam@tycho.lpthe.jussieu.fr>
* example/Makefile.alt *** ADDED ***
illustration of how to compile things with the new structure.
2007-10-20 salam <salam@BISON>
* INSTALL:
started adding some instructions
* configure.ac:
sorted out order of libraries for siscone plugin in fastjet-config
2007-10-19 Gregory Soyez <g.soyez@ulg.ac.be>
* configure.ac:
plugins/SISCone/Makefile_main_SISCone.am *** ADDED ***
We add an additional Makefile.am to avoid the '/' in the SUBDIRS
in plugins/SISCone/Makefile.am which does not seem supported by
older vesions of automake
We also replace each occurence of VAR+="value" by
VAR=${VAR}"value" which is more portable and apparently
supported by older versions of autoconf
2007-10-19 Gavin Salam <salam@lpthe.jussieu.fr>
* configure.ac:
changed version number by hand here to reflect what we have in
the code (this needs to be dealt with properly at some point),
so that tarballs can't get confused with those already released.
2007-10-18 Gregory Soyez <g.soyez@ulg.ac.be>
* configure.ac:
fastjet-config.in
include/Makefile.am *** ADDED ***
include/fastjet/Makefile.am *** ADDED ***
include/fastjet/internal/Makefile.am *** ADDED ***
plugins/CDFCones/Mkefile.am *** ADDED ***
plugins/CDFCones/CDFcode/Makefile.am *** ADDED ***
A set of updates:
- added installation of fastjet headers
- added build of the CDFCones plugin
- and fixed issues with the SISCone plugin
- fixed bug in fastjet-config wrt plugins
2007-10-17 Gregory Soyez <g.soyez@ulg.ac.be>
* plugins/Makefile.am *** ADDED ***
plugins/SISCone/Makefile.am *** ADDED ***
These two files, together with modification of the main
configure.ac and Makefile.am allow for the SISCone plugin to be
installed
* modify the main Makefile.am so the fastjet-config program is
installed
* autogen.sh *** ADDED ***
configure.ac *** ADDED ***
config.h.in *** ADDED ***
fastjet-config.in *** ADDED ***
CGAL.m4 *** ADDED ***
Makefile.am *** ADDED ***
src/Makefile.am *** ADDED ***
This is the base files for an automake/autoconf-generated build
of fastjet. With those files, building of the main lib can be
done by issuing ./autogen.sh <configure-options>; make; make
install
There are configure options to configure the type of lib (shared
or static) and the CGAL support.
* Change the external reference to the SISCone svn so that
it points to the development trunk. This allows to use
the makefile.static and autoconf things already implemented
there.
* rename "ReleaseNotes' into "NEWS" and added "AUTHORS"
This is done to satisfy GNU standards
* move all Makefile to makefile.static
In doing that, we have updated the makefile contents so
that the recursive behaviour is not broken
2007-10-17 Gregory Soyez <g.soyez@ulg.ac.be>
* BRANCHED (REVISION 889) -> svn/fastjet/branches/fastjet-release-autoconf
for autoconf related work
?
2007-10-16 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/CDFCones/CDFcode/MidPointAlgorithm.cc:
added protection in midpoint code for cases when no stable cones are
found (e.g. because all particles are below seed threshold).
2007-09-30 Gavin Salam <salam@lpthe.jussieu.fr>
* AutoConfSpecs: *** ADDED ***
added this outline of what we might like from autoconf.
2007-08-24 Gavin SALAM <salam@lpthe.jussieu.fr>
* bug-examples/: *** ADDED ***
* bug-examples/voronoi-square-problem.* *** ADDED ***
added this directory as a common place for putting code that
highlights bugs that need solving, together with a specific
example bug.
* include/fastjet/PseudoJet.hh:
* src/PseudoJet.cc:
added a PtYPhiM(...) function for creating a pseudojet
from pt, y, phi, m (alternative would be a constructor from some
new type that just held pt,y,phi,m?)
2007-08-01 Matteo & Gavin SALAM <salam@lpthe.jussieu.fr>
* fortran_wrapper/ *** ADDED ***
wrote a wrapper to show how to use parts of fastjet from
Fortran.
2007-07-30 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* src/Makefile:
removed the pedantic option because CGAL 3.3 fails with it.
* example/fastjet_timing_plugins.cc
added output of fastjet version
2007-07-26 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/GhostedAreaSpec.hh:
added GhostedAreaSpec::generator_at_own_risk() for access to the
internal generator object.
2007-07-18 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* include/fastjet/ClusterSequence.hh|cc:
added version of has_child which returns a pointer to the
child (more efficient) and also introduced object_in_jet
Corrected bugs in has_child and has_partner, related to the
treatment of cases near beam jets;
introduced a new protected member function
_potentially_valid(jet), for checking the use of a jet won't
lead to crash-causing nonsense (it may still lead to meaningless
answers).
NB: now adding [RETHINK-IF-CHANGE-NUMBERING: ...] in
neighoburhood of things that may be affected if we ever decide
to give inclusive jets their own separate identify.
2007-07-12 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/SISCone/SISConePlugin.cc:
added output of SISCone version number within the plugin
description.
* include/fastjet/JetDefinition.hh:
* src/ClusterSequence.cc:
added fastjet_version_string() function which returns a string
along the lines of "FastJet version 2.2beta1-devel"
2007-06-28 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* added subtracted_jet and subtracted_pt methods
to ClusterSequenceAreaBase
2007-06-28 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/GhostedAreaSpec.hh:
added deprecated access to intenal random number generator (for
internal development purposes) -- not guaranteed to stay.
* include/fastjet/ClusterSequenceAreaBase.hh:
* include/fastjet/ClusterSequenceArea.hh:
Added is_pure_ghost as a virtual function in the area base
class (implemented -- gives false by default) and added a proper
version to ClusterSequenceArea.
* test-script.sh + test-script-output-orig.txt:
sorted out some little hiccups in test script output
-----------------------------------------------
released 2.2beta0 on 2007-06-28
-----------------------------------------------
2007-06-27 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/version.hh
updated version number to 2.2beta0
* test-script-output-orig.txt
adapted this to current version
* example/fastjet_subtraction.cc
sorted out some poor naming
2007-06-25 Gavin SALAM <salam@lpthe.jussieu.fr>
* moved SISConePlugin/siscone over to 1.2.0 tag of siscone
2007-06-22 Gavin SALAM <salam@lpthe.jussieu.fr>
* regression-tests/regression-test.pl: *** ADDED ***
regression-tests*.res *** ADDED ***
added this directory for carrying out regressions tests and
output files, so as to (help) ensure that each new version of
fastjet is giving consistent results.
* ChangeLog (this file!):
moved contents of INTERNAL_CHANGELOG (deleted) into here.
* include/fastjet/JetDefinition.hh:
updated comments relating to optimal strategy for a given N
* README: adapted this to reflect current situation with plugins
and anti-kt
2007-06-17 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/JetDefinition.hh:
introduced typedef so that JetAlgorithm == JetFinder
* src/PseudoJet.cc:
added pseudorapidity() method.
* plugins/CDFCones/CDFJetCluPlugin.hh:
added control of ratcheting to quick constructor for
CDFJetCluPlugin.
2007-06-16 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* ClusterSequence--various-area-classes.cc|hh
adapted all the derived classes so that they take the
RangeDefinition rather than maxrap -- this is subsequent to
changes made below
* plugins/Makefile
plugins/CDFCones/Makefile
fixed error on Macs (case-insensitive file system)
2007-06-16 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* RangeDefinition.hh
Added. Allows one to define the range in which to average
pt/area points in terms of rapmin,rapmax,phimin,phimax
* ClusterSequenceAreaBase.cc|hh
added parabolic_pt_per_unit_area, essentially copied from
ClusterSequenceActiveArea except for the raprange, which has
now no default and must be specified.
2007-06-14 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* ClusterSequence.cc|hh:
added has_parents(...), has_child(...) and has_partner(...)
methods for acccessing the branching structure.
2007-06-06 Gavin SALAM <salam@lpthe.jussieu.fr>
* src/ClusterSequenceActiveAreaExplicitGhosts.cc:
amplified warning message.
* src/ClusterSequenceActiveArea.cc:
added extra checking when matching different sequences (bounds,
making sure we match dij with dij and not dij with diB).
* include/fastjet/JetDefinition.hh:
added enum entry for the genkt_algorithm
2007-06-05 Gavin SALAM <salam@lpthe.jussieu.fr>
* test-script-output-orig.txt
updated this so that it corresponds to current results (concerns
areas and banners)
2007-06-04 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/internal/LimitedWarning.hh: *** ADDED ***
added this for dealing with warnings that should appear a
limited number of times
* src/ClusterSequenceActiveAreaExplicitGhosts.cc|hh:
fixed bug (a missing "!") in determination of
has_dangerous_particles, and switched warnings over to the
LimitedWarning class.
* src/ClusterSequenceAreaBase.cc:
added warnings about jet alg used in median determination (if
not kt, cam)
2007-06-03 Gavin Salam <salam@lpthe.jussieu.fr>
* src/ClusterSequenceActiveArea.cc:
made error for unmatched sequences more explicit and provided a
explanation of origin (based on has_dangerous_particles()
below), when the suspected cause is particles with low pt.
Also added (but did not test) has_dangerous_particles().
* src/ClusterSequenceActiveAreaExplicitGhosts.cc|hh:
added max_ghost_perp2() and has_dangerous_particles() member
functions, as well as an explicit warning (first few times) in
cases which are dangerous (particle pt2 < ghost pt);
2007-05-28 Gavin Salam <salam@lpthe.jussieu.fr>
* TODO: *** ADDED ***
it was about time we had this in here, even if it's not yet
complete.
2007-05-16 Gregory Soyez <g.soyez@ulg.ac.be>
* src/ClusterSequenceVoronoiArea.cc:
Clearing parts of the code
2007-05-14 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/ClusterSequenceWithArea.hh: *** ADDED ***
* include/fastjet/ClusterSequenceActiveArea.hh:
* include/fastjet/ClusterSequenceArea.hh:
switched to naming and backwards compatibility options decided
on 2007-05-11.
2007-05-11 Gavin SALAM <salam@lpthe.jussieu.fr> (later)
* include/fastjet/ClusterSequenceWithArea.hh
-> include/fastjet/ClusterSequenceArea.hh
+ corresponding renaming in various places -- designed to ensure
we really can get full backwards compatibility.
2007-05-11 Gavin SALAM <salam@lpthe.jussieu.fr>
* include/fastjet/ClusterSequenceActiveArea.hh:
* include/fastjet/ClusterSequenceWithArea.hh:
partially fixed the problem of backwards compatibility with v2.1
by #defining ClusterSequenceWithArea as ClusterSequenceAreaBase,
UNLESS ClusterSequenceWithArea is explicitly included anywhere.
2007-05-10 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* include/fastjet/AreaDefinition.hh: (later)
changed the enum values and order for AreaType (to make them
more logical)
* include/fastjet/ActiveAreaSpec.hh: *** ADDED ***
new version of this file, which just defines ActiveAreaSpec =
GhostedAreaSpec, for backwards compatibility
* ActiveAreaSpec -> GhostedAreaSpec:
changed the name to reflect use of this class for passive &
active;
* AreaDefinition.hh|cc
moved AreaType enum out of class. Sorted out the descriptions.
* ClusterSequenceActiveAreaExplicitGhosts.cc|hh:
sorted out empty_area for this case too.
* plugins/SISCone/SISConePlugin.hh:
fixed missing component in a constructor
2007-05-09 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo [later]
* JetDefinition.cc|hh:
* plugins/SISCone/SISConePlugin.hh|cc:
added mechanism for supporting ghosted passive areas in plugins
* include/fastjet/ClusterSequencePassiveArea.hh *** ADDED ***
* src/ClusterSequencePassiveArea.cc *** ADDED ***
put in support for this passive area class that redirects one to
the supposedly optimal passive-area determination for each each
algorithm.
* include/fastjet/AreaDefinition.hh:
* include/fastjet/ClusterSequence1GhostPassiveArea.hh:
* include/fastjet/ClusterSequencePassiveArea.hh:
* include/fastjet/ClusterSequenceActiveArea.hh:
* include/fastjet/ClusterSequenceWithArea.hh:
various changes related to the above, including selection of the
PassiveArea from the WithArea class.
2007-05-09 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* ClusterSequencePassiveArea -> ClusterSequence1GhostPassiveArea
* JetDefinition.cc|hh:
* ClusterSequence.cc|hh:
introduced cambridge_for_passive_algorithm (for internal use
only), and moved the jet_scale_for_algorithm routine into the
.cc file.
2007-05-09 Gavin Salam <salam@lpthe.jussieu.fr>
* src/JetDefinition.cc:
* src/ClusterSequence.cc:
updated banner to reflect current status
* example/Makefile (depend):
* src/Makefile:
removed CXXFLAGS from make depend (it caused it to get all CGAL
files).
* many places:
set the svn:keywords property to "Id" on many files where it was
missing. Sorted out some copyright statements (e.g. Voronoi.cc
we should not be claiming copyright!)
2007-05-09 Gregory Soyez <g.soyez@ulg.ac.be>
* include/fastjet/ClusterSequenceWithArea.hh:
redirect to the ClusterSequencePAssiveArea class when area type
is set to passive_area
* include/fastjet/AreaDefinition.hh:
- added passive_area to the list of allowed area types.
- added a new ctor specifying an ActiveAreaSpec together with
an AreaType. This allow definition of active,
active_with_explicit_ghosts and passive areas.
2007-05-08 Gavin SALAM <salam@lpthe.jussieu.fr> & matteo
* include/fastjet/ClusterSequencePassiveArea.hh: ***ADDED***
* src/ClusterSequencePassiveArea.cc: ***ADDED***
added a passive class that scans a single ghost over the event,
repeating the clustering once for each ghost position -- the
name may well evolve in the coming days.
* ClusterSequenceActiveArea.hh|cc:
changed some private/protected statuses to allow the PassiveArea
to access whatever it needs to access, and split some of the
functions into pieces so that they can be used piecemeal from
derived class.
2007-05-08 Gregory Soyez <g.soyez@ulg.ac.be>
* src/ClusterSequenceVoronoiArea.cc:
Fix problem with particles at phi=0
2007-05-08 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* ActiveAreaSpec.hh|cc:
added get_random_statu(), set_random_status(),
checkpoint_random(), restore_checkpoint_random(), to facilitate
the user's life when then need correlated random numbers for the
areas.
* include/fastjet/internal/BasicRandom.hh:
added set_status and get_status routines in the <int> and
<double> versions.
2007-05-08 Gavin, Matteo & Gregory
* example/fastjet_areas.cc:
adapted example to new form of ClusterSequenceWithAreas
* include/fastjet/AreaDefinition.hh:
added default constructor for VoronoiAreaSpec
* ActiveAreaSpec.cc|hh
changed default grid_scatter (1e-4 -> 1.0) [gives better
systematics at large ghost areas, and runs faster on cone], and
redefined scatter (kt and y,phi) to be around central values
(rather than an asymmetric shift as before).
* ClusterSequenceWithArea.hh
added constructors that take ActiveAreaSpec and VoronoiAreaSpec
directly.
2007-05-07 Gavin SALAM <salam@lpthe.jussieu.fr>
* ClusterSequenceVoronoiArea.hh|cc:
added area_4vector to class, based on sum of cell centers rather
than the 4vector for each cell.
2007-05-07 Gregory Soyez <g.soyez@ulg.ac.be>
* include/fastjet/ClusterSequenceWithArea.hh|cc: Append Voronoi
area computation.
* src/ClusterSequenceVoronoiArea.hh|cc: Add a class to compute the
Voronoi area.
* src/Voronoi.hh|cc: Add O'Sullivan C++ adaptation of Fortune's
code to compute Voronoi diagrams.
2007-05-07 Gavin SALAM <salam@lpthe.jussieu.fr> & Matteo
* ClusterSequence.hh|cc:
added the transfer_from_sequence(...) member, which copies the
information from another sequence into this one.
* include/fastjet/ClusterSequenceWithArea.hh: *** ADDED ***
class to access a generic type of area, as specified through an
AreaDefinition.
* AreaDefinition.hh|cc *** ADDED ***
start of work towards an area definition, to be used as an input
to the future ClusterSequenceWithArea.hh|cc
* RENAMED ClusterSequenceWithArea.hh|cc
-> ClusterSequenceAreaBase.hh|cc
carried out this renaming in view of reusing the original name
not as a base class, but rather as a class that provides easy
access to all different types of areas.
NB: numerous associated changes, for things to carry on
working...
2007-05-06 Gavin SALAM <salam@lpthe.jussieu.fr>
* ClusterSequenceWithArea.hh|cc:
added get_median_rho_and_error(...) to allow one to extract
the median together with the size of fluctuations around the
median (and the mean error, of use in doing converting
fluctuations to errors on individual jets).
2007-05-05 Gavin Salam <salam@lpthe.jussieu.fr>
* areas/jet_def_from_cmdline.cc|hh:
added this so as to provide easy (and common) access to a jet
finder from the command-line
2007-05-02 Gavin SALAM <salam@lpthe.jussieu.fr> & Matteo
* include/fastjet/ClusterSequenceWithArea.hh|cc:
added empty_area(...), n_empty_jets(...),
median_pt_per_unit_area(...),
median_pt_per_unit_area_4vector(...), and the one that does the
work, median_pt_per_unit_something, as virtual functions, so
that these facilities can be accessed with any of the area
classes.
* include/fastjet/ClusterSequenceActiveArea.hh|cc:
added versions of empty_area(...), n_empty_jets(...), that make
use of all the information that's available from the ghosts.
* include/fastjet/JetDefinition.hh:
* plugins/*/*Plugin.hh:
added the double R() const abstract virtual member function to
the JetDefinition::Plugin class, and updated all the plugins, so
that one can get a sensible value of R out of any algorithm.
2007-04-24 Gavin SALAM <salam@lpthe.jussieu.fr>
* plugins/SISCone/SISConePlugin.hh|cc:
added the split_merge_on_transverse_mass in the constructor (+
other ways of accessing it), which interfaces with SISCone's
SM_var2_hardest_cut_off variable.
2007-04-19 Gavin SALAM <salam@lpthe.jussieu.fr> & Matteo
* src/ClusterSequenceActiveArea.cc|hh:
moved the check on equivalence of ghosted jets into a common
member function for ij and iB recombination -- now they both use
pt == ptref || E == Eref. At some point this check should be
made more robust (move away from momentum and towards tags or
something similar).
2007-04-18 Gavin SALAM <salam@lpthe.jussieu.fr> & Matteo
* include/fastjet/JetDefinition.hh:
* include/fastjet/ClusterSequence.hh:
* src/JetDefinition.cc:
* src/ClusterSequence.cc:
introduced the "antikt" algorithm.
* example/fastjet_timing_plugins.cc
got it working with antikt
2007-04-13 Gavin SALAM <salam@lpthe.jussieu.fr>
* example/root/jet-plots.C: *** ADDED ***
root script for plotting output from print_jets_for_root(...);
see instructions at beginning for usage.
* include/fastjet/ClusterSequence.hh|cc:
added print_jets_for_root, which takes jets and outputs them in
a form suitable for the root script...
* example/fastjet_timing_plugins.cc:
fixed a bug that prevented compilation and added some extra
cone-related options.
-----------------------------------------------
released 2.1.0 on 2007-04-02
-----------------------------------------------
2007-04-02 Gavin SALAM <salam@lpthe.jussieu.fr> + MC
* plugins/usage_examples/many_algs_example.cc:
removed PxCone by default (compile with -DUSEPXCONE get it back
and adapt Makefile too).
* test-script.sh
corrected bug related to G77LIBDIR; removed fortran related
stuff (pxcone now out by default)
2007-03-16 Gavin SALAM <salam@lpthe.jussieu.fr>
* example/data/cone-midpoint-problem-ev1.dat
* example/data/cone-midpoint-problem-ev2.dat
added these to illustrate the IR problem with midpoint
2007-03-14 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/SISCone/SISConePlugin.hh:
changed the default number of passes to 0
* plugins/SISCone/SISConePlugin.cc:
fixed bug in choice of split-merge scale when recomputing jets
from a cached siscone run.
2007-03-12 Gavin SALAM <salam@lpthe.jussieu.fr>
* src/PseudoJet.cc|hh:
added boost(...) and unboost(...) methods.
* example/data/cone-darktower.dat:
* example/data/cone-sm-pt-problem-ev(1|2).dat:
added two simple example events to illustrate the split-merge problem
with pt ordering, as well as the dark-tower problem in
single-pass algs.
2007-03-10 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/ActiveAreaSpec.hh:
changed default repeat value to 1 (was 5);
* plugins/CDFCones/CDFcode/ClusterComparisons.hh:
* plugins/CDFCones/CDFcode/Cluster.hh:
* plugins/CDFCones/CDFcode/MidPointAlgorithm.cc|hh:
added support for the pt_tilde scale in the split-merge
procedure; note that the way this is done adds a small (1-3%)
speed penalty for all choices.
* plugins/CDFCones/CDFMidPointPlugin.cc|hh:
added the corresponding pt_tilde entry to the SplitMergeScale
enum.
* plugins/SISCone/SISConePlugin.hh:
changed default split_merge_scale to SM_pttilde; in legacy
interface, bool split_merge_on_transverse_mass now decides
between SM_mt and SM_pttilde;
2007-03-09 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/SISCone/SISConePlugin.cc|hh:
introduced the SISConePlugin::SplitMergeScale enum (like the one
for the CDF plugin) and implemented the interface between this
and siscone's corresponding enum (NB: they must be ordered the
same way, otherwise you will get surprises...).
2007-03-06 Gavin SALAM <salam@lpthe.jussieu.fr> & Matteo
* include/fastjet/version.hh:
updated internal version number (to avoid confusion)
* include/fastjet/ActiveAreaSpec.hh|cc:
added description() member function
* moved siscone external back onto siscone trunk
2007-03-04 Gavin Salam <salam@lpthe.jussieu.fr>
* doc/fastjet-doc.tex:
Wrote the SISCone section; moved the example program forward,
since it uses only features from section 2, not all the
subsequence stuff. Updated intro.
* plugins/SISCone/SISConePlugin.hh:
added the stable_cones() method to SISConeExtras, which is
identical to protocones() (but stable_cones is a more consistent
name).
2007-03-03 Gavin Salam <salam@lpthe.jussieu.fr>
* switched the plugins/SISCone svn:externals property to point to
svn+ssh://login.hepforge.org/hepforge/svn/siscone/tags/siscone-1.1.0
rather than
svn+ssh://login.hepforge.org/hepforge/svn/siscone/trunk
2007-03-01 (later) Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
added transverse mass functions.
* plugins/SISCone/SISConePlugin.cc|hh:
added a new member function
SISConeExtras::most_ambiguous_split(), which returns the degree
of ambiguity of the most ambiguous decision about attributing a
particle to one or other jet during a split step. Useful for
testing purposes.
* example/fastjet_timing_plugins.cc:
started adding minimal access to cone information with the
"-cones" option.
2007-03-01 MC
* doc/fastjet-doc.tex
Updated the documentation to describe the new options
of pt_per_unit_area and parabolic_pt_per_unit_area
concerning the use of area_4vector
2007-03-01 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
fixed bug in phi_std() pointed out by Oscar Stal,
<oscar.stal@tsl.uu.se>
* test-script-output-orig.txt
updated this so that it corresponds to current output.
* include/fastjet/ClusterSequence.hh:
added the ClusterSequence::Extras class, as well as
ClusterSequence::extras() function which returns a (possibly
null) pointer to any extras.
* plugins/SISCone/SISConePlugin.hh|cc:
updated them to reflect a change in naming in siscone;
added SISConeExtras class (derives from
ClusterSequence::Extras), whose contents are set up from within
the plugin and which allows a user to access the protocones.
* ReleaseNotes:
updated to reflect recent additions
2007-02-28 Gavin Salam <salam@lpthe.jussieu.fr> + MC
* src/ClusterSequenceActiveArea.cc:
switched over to use of the current recombination scheme when
averaging 4vector areas over multiple repeats with different
ghosts.
* include/fastjet/JetDefinition.hh:
added Recombiner::plus_equal(A,B) to help simplify code in
various places
* src/ClusterSequenceActiveArea.cc|hh
Added median_4vector option to mean_pt_strategies for
pt_per_unit_area
Added use_area_4vector to parabolic_pt_per_unit_area
NB. Neither is the default.
* src/JetDefinition.cc
Corrected bug in massless recombination schemes for when
the pt of both particles is zero
* src/ClusterSequenceActiveAreaExplicitGhosts.cc
The area_4vector is now calculated with the same
recombination scheme as the jets
2007-02-25 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/PxCone/pxcone.f:
fixed some bugs in the way momenta are recombined relating to
2pi periodicity of phi; identified origin of a remaining problem
of jets depending on the order of input particles -- related to
the way the n-way midpoints are determined.
2007-02-24 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/PseudoJet.hh:
arranged for template constructor also to set default user and
cluster-history indices
2007-02-21 Gavin SALAM <salam@lpthe.jussieu.fr>
* plugins/CDFCones/CDFMidPointPlugin.hh|cc:
added the option of specifying the scale to be used in the
split-merge step (pt is default, but we also have Et and mt), to
take advantage of the modification made to the CDF code below.
* plugins/CDFCones/CDFcode/MidPointAlgorithm.hh|cc:
added the option of specifying the scale to be used in the
split-merge step (pt is default, but we also have Et and mt)
NB: this means that the CDF code we release is now actually a
modified version of the original.
2007-02-20 Gavin Salam <salam@lpthe.jussieu.fr>
* example/CmdLine.*
updated these to recent versions
* example/fastjet_timing_plugins.cc (main):
added the -nomt option for choosing the ordering in siscone
split merge.
* plugins/SISCone/SISConePlugin.cc|h:
added the "bool split_merge_on_transverse_mass" parameter to
constructor, put in a corresponding member variable and used it
when calling siscone.
2007-02-18 Gavin Salam <salam@lpthe.jussieu.fr>
* plugins/SISCone/Makefile (libSISConePlugin.a): fixed some
dependencies wrt to the siscone distribution directory.
2007-02-12 Gavin Salam <salam@lpthe.jussieu.fr>
* updated test-script.sh to accept -j2 option for faster compilation
* ADDED include/fastjet/version.hh which sets the version number;
this is used throughout, also in tarit.sh and in svntagit.sh
* ADDED svntagit.sh which will one day deal with all the tagging...
* updated the test script ref. output to reflect the new version
numbers
2007-02-09 Gavin Salam <salam@lpthe.jussieu.fr>
* switched external reference to siscone over to new repository,
svn+ssh://login.hepforge.org/hepforge/svn/siscone/trunk
2007-02-08 Gavin Salam <salam@lpthe.jussieu.fr>
* modified tarit.sh so that it indicates which svn commands to
use to tag the release
2007-01-24 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* tweaked test-script.sh some more
* added fastjet-release/test-script-output-orig.txt
* modified tarit.sh accordingly
2007-01-23 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* removed more (all?) extraneous semi-colons
* added fastjet-release/test-script.sh
* added protojet_ptmin argument to SISConePlugin constructor (etc.)
2007-01-19+20 Gavin Salam <salam@lpthe.jussieu.fr>
* removed some extraneous semi-colons after functions in many
places, and checked that library now compiles with the "-pedantic
-Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses"
options. NB PxConePlugin needs some more work on it before it
will compile (variable length arrays).
2007-01-12 Gavin Salam <salam@lpthe.jussieu.fr> + matteo
* areas/SubtractionDefinition.hh
definition class for a future subtraction class
* areas/ClusterSequenceWithSubtraction.hh
class for subtraction
* areas/subtraction-HIeff-native.cc
main program which will eventually use the new
subtraction class
* areas/subtraction-HIeff-iter.cc
Added before. Slightly modified version of
subtraction-HIeff-tests.cc.
Performs a multi-pass subtraction,
the same which will eventually be performed by the
"-native" file above.
2007-01-08 Gavin Salam <salam@lpthe.jussieu.fr>
* areas/area-plots/2point-areas-3alg.gp
Passive area for 3 algs
* areas/areas-1gluon-for-root.cc
areas/root-games/ghosted_plots.C
root-related stuff for when there's a single hard parton
(illustrate active areas)
2007-01-02 Gavin Salam <salam@lpthe.jussieu.fr>
* added the areas/hydjet_eff directory to repository
2006-12-28 Gavin Salam <salam@lpthe.jussieu.fr>
* Added a "caching" option to the SISCone plugin to allow runs
with multiple overlap_threshold values (and everything else
identical) to reuse the set of stable cones.
* in PseudoJet introduced the "have_same_momentum(jeta, jetb)"
function (used in SISCone plugin).
2006-12-26 Gavin Salam <salam@lpthe.jussieu.fr>
* Added SISCone to the list of plugins made automatically
* SISCone plugin now sets the jet "user_index" to be equal to the
pass at which the jet was found; documentation added to the
beginning of the class...
* adapated areas/areas-hist.cc to use midpoint and siscone plugins
as well...
* dealt with renaming from scones -> siscone;
* added the siscone repository as an "external" repository to
fastjet, inside plugins/SISCone (so that it is updated
automatically each time fastjet is updated -- but note: commits
do not recurse automatically down...)
* also updated the usage_examples (many_algs_example now also runs
siscone).
* made this version 2.1.0b1 (changed tarit, but did not "tag" it)
2006-12-21 Gavin Salam <salam@lpthe.jussieu.fr> + Gregory Soyez
* Modified SCones plugin so that it provides information also on
the use of "wrong" split-merge procedure.
2006-12-18 Gavin Salam <salam@lpthe.jussieu.fr> + Gregory Soyez
* Added output of description of the algorithm in the
fastjet_timing_plugins routine routines (and got the .pl script
to read it), so that one knows what it is one's been doing.
2006-12-14 Gavin Salam <salam@lpthe.jussieu.fr> + Gregory Soyez
* Added static function set_print_errors(bool) to Error.hh class
so that user can request "quiet" exceptions. NOT YET TESTED...
2006-12-12 Gavin Salam <salam@lpthe.jussieu.fr> + Gregory Soyez
* Added plugin for SCones (Gregory's seedless cones code);
ran some basic tests; note the seedless cone code is not yet
included here, and the Makefile is accordingly a bit rough...
* added example/fastjet_timing_plugins for running the timing
tests with the various plugin algorithms.
2006-12-07 Gavin Salam <salam@lpthe.jussieu.fr>
* Changed tar script so that it works by first creating a tar
file, unpacking it in /tmp, renaming the corresponding directory
and then recreating the tar file (all of this to get the proper
directory name while maintaining symbolic links)
* added ClusterSequence::unclustered_particles(), which returns a
vector of unclustered particles.
* added warning (printed up to 5 times) when extracting exclusive
jets with an algorithm other than kt.
* in main Makefile, changed default inclusion of fortran libraries
to avoid also getting multiple libstdc++ (when g77 uses a
different version of gcc than g++).
2006-11-30 Gavin Salam <salam@lpthe.jussieu.fr>
* Renamed the plugin directories (to have capitalisation
corresponding to library names), added the CDF cone code
together with Makefiles etc.
* added plugins/usage_examples to illustrate how to use the
plugins, and how to use multiple jet algorithms together; added
some documentation to the pxcone and midpoint plugins (jetclu
users are on their own for the time being...)
* adapted Doxyfile to include the plugins directory; made it
non-recurisve so that it doesn't get the CDF code and as a
result had to add various directories by hand
* added mention of plugins/ directory in documentation.
* Updated the banner to include mention of plugins; compactified
the rest a little.
* Updated ReleaseNotes to reflect the current status
2006-11-29 Gavin Salam <salam@lpthe.jussieu.fr>
* Added the Et and Et2 schemes, as well as boost invariant BIpt
and BIpt2 schemes.
2006-11-28 Gavin Salam <salam@lpthe.jussieu.fr>
* fixed problems with alternative orderings of arguments in
JetDefinition constructor; added constructor with external
recombination scheme; added "preprocess" virtual function to
recombination scheme so that it carries out necessary
modification of momenta before running the clustering (as in
ktjet), and checked that pt and pt2 schemes give results
identical to those in ktjet (albeit boost-dependent...)
2006-11-27 Gavin Salam <salam@lpthe.jussieu.fr>
* added recombination scheme functionality, both via a plugin (not
currently tested much) and (for standard use) with a
RecombinationScheme enum; take a look at ReleaseNotes for things
that still need to be done/tested...
Modified example program so that it makes recombination scheme
freedom explicitly visible.
2006-11-23 Gavin Salam <salam@lpthe.jussieu.fr>
* added areas/area-hist-plots/ which contains results of area
histograms for "idealized" soft clustering and clustering with a
single hard parton.
2006-11-13 Gavin Salam <salam@lpthe.jussieu.fr>
* Added more stuff related to plots & sorted out some svn:ignore
properties
2006-11-11 Gavin Salam <salam@lpthe.jussieu.fr>
* added a whole bunch of plots and related material in the
area-plots directory that previously weren't in version control
* added a QM2006/ directory which includes some material
(jet-finding on individual events) for illustrative plots.
* in areas/ put a recent version of the CmdLine.* utility class.
* added areas/README to help navigate that directory, which is
rapidly becoming too complex!
2006-11-06 Gavin Salam <salam@lpthe.jussieu.fr>
* added squared_distance(...) to PseudoJet (does the same as
plain_distance, but the name is more logical).
* added areas/subtraction-tests-HIeff.cc for carrying out
efficiency and purity studies.
* areas/SimpleHist.hh got modified to provide more extensive
histogramming facilities (notably an overflow bin)
* areas/run-mass-test.pl was modified to as to enable combined
hydjet+subtraction-tests-HIeff running. (Had previously also
been modified to have run_hydjet as the executable rather than
test2_hydjet).
2006-10-25 Gavin Salam <salam@lpthe.jussieu.fr>
* added m() method to PseudoJet (like CLHEP, for negative m2() it
returns -sqrt(-m2())).
* to PseudoJet, added cluster_sequence_history_index() and
set_cluster_sequence_history_index(...) as alternative names for
cluster_hist_index() and set_cluster_hist_index(...), in the
hope that these new names might be more meaningful.
* added a function particle_jet_indices(...) to ClusterSequence so
as to allow the user to easily identify which particles fall into
which jet (or no jet at all). [NOT YET DOCUMENTED]
2006-10-19 Gavin Salam <salam@lpthe.jussieu.fr>
* replaced eta -> y (or rap) in documentation (was potentially
unclear before) and in ActiveAreaSpec class...
2006-10-16 Gavin Salam <salam@lpthe.jussieu.fr>
Introduced plugin functionality (CCN28-76)
* added description() member function to JetDefinition class
(involved adding src/JetDefinition.cc which returns a default
value).
* added a JetDefinition::Plugin abstract base class, which serves
as a model for user-supplied plugins; added an JetDefinition
constructor that takes a pointer to a plugin.
* added checks in ClusterSequence to see whether we're dealing
with a plugin -- if we are then the plugin clustering routine is
called instead of ours;
modified the inclusive_jets() routine so that it behaves
sensibly regardless of the diB values and ordering of the
clustering returned by the plugin.
added "plugin_record_ij_recombination", etc., member functions
to allow the plugin to make a record of what it's done in the
cluster sequence.
2006-10-12 Gavin Salam <salam@lpthe.jussieu.fr>
* in include/fastjet/ClusterSequence.hh added a slightly more
user-friendly message for the doxygen main page.
2006-10-09 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
--- release of fastjet-2.0.0 ---
* added a wider range of arithmetic operations on PseudoJets;
added phi_std() and phi_02pi() which return values respectively
in the -pi..pi range and 0..2pi range; in the clustering code,
switched from use of phi() to phi_02pi() to allow for future
changes to action of phi().
* switched fastjet_subtraction.cc over to new arithmetic
operations.
* programmed improved formulae for automatic choice of best
strategy, including the choice also for the Cambridge algorithm.
* switched a number of member function of PseudoJet over from
const double & to simply double.
* various small changes made to the documentation.
2006-09-25 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* added areas/areas-hist.cc for getting the distribution of areas
for pure noise (+ option of anchor).
* moved the SimpleHist.hh file into this directory from ../../chan
2006-08-24 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo
* Renamed old_median -> non_ghost_median
* parabolic_pt_per_unit_area made const
2006-08-23 Gavin Salam <salam@lpthe.jussieu.fr>
* Renamed NlnNCam2piMultD -> NlnNCam (for simplicity).
2006-08-22 Matteo Cacciari <cacciari@lpthe.jussieu.fr>
* example/fastjet_subtraction.cc
Added the subtraction using area_4vector. The results
are compared in output to the "standard" subtraction.
Added some comments.
2006-08-19 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/Error.hh
error message output now states that this is a fastjet::Error
error.
* include/fastjet/ClusterSequence.hh
* src/ClusterSequence.cc
Put some of the bookkeeping code into specific member functions
(_transfer_input_jets, _decant_options), so that this
housekeeping can be more easily (reliably) carried out also by
derived classes.
These new functions, as well as _do_iB_recombination_step,
_do_ij_recombination_step have been made protected (as opposed
to private), again for access from derived classes.
* src/ClusterSequenceActiveAreaExplicitGhosts.cc
* include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
Arranged for _is_pure_ghost(int history_index) to return false
for any negative value of history_index (so that e.g. BeamJet is
not considered a ghost).
* include/fastjet/ClusterSequenceActiveArea.hh
* src/ClusterSequenceActiveArea.cc
Rather than first running the clustering on the unghosted event
and then providing area info from runs on ghosted events, this
class now deduces the unghosted clustering sequence from a
ghosted event, so as to reduce the number of runs. This is
relevant for heavy-ions. If the requested number of repetitions
is zero, it reverts to the plain unghosted-clustering
2006-08-19 Gavin Salam <salam@lpthe.jussieu.fr>
* include/fastjet/internal/BasicRandom.hh *** ADDED ***
* src/BasicRandom.hh *** ADDED ***
Added these files, which are basically copies of the (GPL)
random-number generator from Zoltan Nagy's nlojet++ program.
* include/fastjet/ActiveAreaSpec.hh
* ActiveAreaSpec.cc
Added _our_rand() to return a random double between 0.0 and 1.0,
checked that it gave identical results to before and then
switched over to using the BasicRandom<double> class.
NOTE: currently the random number generator object for
ActiveAreaSpec is static (ie. there is a single sequence shared
among all instances of ActiveAreaSpec). One consequence of this
is that in areas-2point.cc, previously we restarted the sequence
from the beginning for each separation Delta eta (giving some
correlation between successive values of eta), whereas, now,
successive values of eta are completely uncorrelated.
* include/fastjet/ClusterSequenceActiveArea.hh
Commented the lines that reset the global C random seed and
wrote a warning about this.
2006-08-17 Gavin Salam <salam@lpthe.jussieu.fr> & Matteo
* Reworked naming scheme, so that all includes are now in
include/fastjet/ and those not destined for the user are in
include/fastjet/internal; we've introduced a namespace (fastjet)
and a fastjet/internal/base.hh file where we define begin and
end macros for it; we've put everything into the namespace...
The "Fj" prefix has been systematically removed...
added private/fastjet-rename-v1-to-v2.pl, to help in much of the
renaming of internals.
* Introduced include/FjPseudoJet.hh and
include/FjClusterSequence.hh files that provide access to
everything needed by programs based on the v1 legacy interface
* Removed the CP2DCHAN compile definition -- now the Chan code is
always included.
* Added areas code to main release: created a base class
ClusterSequenceWithArea, as well as derived classes:
ClusterSequenceActiveArea // was WithMeanArea
ClusterSequenceActiveAreaExplicitGhosts // was WithArea
and also included the class
ActiveAreaSpec
* Placed an explicit limit (via assertion) on R <= pi/2 (larger
than this can cause crashes in many places...)
* Removed extraneous code in areas/, adapted remaining code to new
interface.
2006-08-15 Gavin Salam <salam@lpthe.jussieu.fr> & Matteo
* Copied Chan method across from its development directory
* Added a data/ directory with some sample input files
* moved release number up to 1.9, in preparation for forthcoming
release 2
* updated examples to use new interface for specifying jet finder
2006-08-11 Gavin Salam <salam@lpthe.jussieu.fr>
* modified FjPseudoJet's rapidity calculation so that it gives
answers that are not completely crazy for momenta where rounding
error causes the difference between E and pz to be zero.
* played around with passive areas (including a plot or two) --
they seem to work OK.
* fixed a bug (when reaching last pair of objects to cluster) in
the CP2DChan strategies.
* in the main Makefile (and Triangulations.h) added option for
using a simpler CGAL kernel -- this can give about 20% speed
gain but it's not clear how robust it is.
2006-08-10 Gavin Salam <salam@lpthe.jussieu.fr>
* incorporated a first passive areas class,
FjClusterSequenceWithPassiveArea. It is quite slow, and
currently seen only very limited testing, but seems to work in
the 2-particle case...
next steps: add gnuplot visulation, look at more complex events
* modified order of includes in some other class definitions to
place private things after public ones.
2006-08-04 Gavin Salam <salam@lpthe.jussieu.fr>
* switched remaining jet-finding strategies over to use of
"_do_XY_recombination_step".
* updated thresholds for "Best" to take into account the
N2MinHeapTiled version (though perhaps this should wait until
we've incorporated MinHeap into our "standard" suite...
Have not updated things to deal with the Cambridge algorithm --
not sure what the best option would be here, given that Chan's
approach is so cache dependent...
2006-08-04 Gavin Salam <salam@lpthe.jussieu.fr>
* added routines for clustering the Cambridge algorithm based on
Chan's closest pairs (CP) method. The new strategies are:
NlnNCam4pi // all points duplicated
NlnNCam2pi2R // points within R of 0,2pi duplicated
NlnNCam2piMultD // two steps of clustering to reduce duplctn.
[fastest]
For 10^4 particles, on a dual core P4D with 2MB cache,
NlnNCam2piMultD seems to be about 2.5 times faster than NlnN
(and 1.7 times faster than N2MinHeapTiled described below).
As N grows larger, the advantages of the NlnNCam routines seem
to disappear, presumably because we end up outside limits of
cache. (And on machines with a small cache, e.g. anubis with
512KB, the advantage of the Cambridge-specific routines seem to
disappear.
* added a version of the tiled N2 algorithm that makes use of the
MinHeap developed for the CP work:
N2MinHeapTiled
On a dual-core P4D with 2MB cache, it seems to be the fastest
general option for 400 \lesssim N \lesssim 16000.
* the above options currently all require the CP2DChan library
which is in cvs in ../chan/ -- compilation there uses scons:
scons libCP2DChan.a
(was testing out scons as an alternative to make...). At some
point, we should probably merge that codebase into ours.
* added FjClusterSequence::_do_ij_recombination_step and
_do_iB_recombination_step so as to avoid rampant duplication of
the associated code. Not all clusterings have switched over to
this yet...
2006-07-17 Gavin Salam <salam@lpthe.jussieu.fr>
* added area-plots/midpoint-zmass-profile-N1947.eps to see what
cone timings are like...
2006-07-17 Gavin Salam <salam@lpthe.jussieu.fr>
* In FjJetDefinition.hh renamed _R -> _Rparam (single letter
with underscore caused problems under g++3.3)
* Added results and associated files for the ttbar analysis.
2006-07-15 Gavin Salam <salam@lpthe.jussieu.fr>
* FjPseudoJet: added operator+=,-=,*=,/=, which leave the
user and cluster_hist indices unchanged. It is natural (in a
sense) insofar as these operators act naturally just on the
momentum -- in practice it is also useful because a user may
want to correct a jet in some way while still have the jet
associated with its "history").
* subtraction-tests-ttbar: now gives a full panoply of results in
histograms so that one can get a semi-sensible analysis of
ttbar events.
* run-mass-test.pl: adapted it so that it deals nicely with the
ttbar cases too...
2006-07-14 Gavin Salam <salam@lpthe.jussieu.fr>
* *** ADDED include/FjJetDefinition.hh ***
in which we now define:
enum FjStrategy // unchanged
enum FjJetFinder // was part of FjClusterSequence
class FjJetDefinition // new
The class is designed to hold all info that specifies a jet
algorithm (currently, just R, jet-finder ID and strategy)
In FjClusterSequence.* new interfaces have been introduced in
which the FjJetDefinition is used to specify the jet algorithm;
these interfaces are present both for the public constructor and
for the protected _initialise_and_run(...) routines...
In areas/, some minor changes have been made to account for these
changes...
Also got the limit on the inclusive pt for the Cambridge jets
working (introduced separate code inside the inclusive_jets
routine).
Started work on the ttbar project...
* In areas/FjClusterSequenceWith[Mean]Area.*
Introduced the class FjActiveAreaSpec, which contains the
specification of how one defines the active area. It is intended
to provide a somewhat cleaner way of passing the information
around, and should hopefully provide an easier way of dealing
with the random number issue for this class (at least it's now
a well separated).
Introduced new interfaces for the various area routines so that
one can refer to them in both the new way (with an
FjActiveAreaSpec object) and the old way (for backwards
compatibility).
For now the FjActiveAreaSpec is inside the
FjClusterSequenceWithArea.* files -- but perhaps at some point
it should be moved?
2006-07-13 Gavin Salam <salam@lpthe.jussieu.fr>
* Added areas/subtraction-tests-ttbar.cc
areas/FlavourHolder.hh
areas/FlavourHolder.cc
as part of work towards an analysis of semi-leptonic ttbar
events.
2006-07-10 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo Cacciari
* Added option in FjClusterSequenceWithMeanArea of excluding
particles with pt/area greater than some threshold
2006-07-05 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo Cacciari
* Minor bug-fixed to FjClusterSequenceWithMeanArea
+ some files added related to heavy-ion studies
2006-07-03 Gavin Salam <salam@lpthe.jussieu.fr> + Matteo Cacciari
* Added areas/subtraction-tests-inclpt.cc for looking at inclusive
pt distributions (designed for use with hydjet events, at least
initially).
* To FjClusterSequenceWithMeanArea.* added
parabolic_pt_per_unit_area for carrying out a parabolic
(a+b*y^2) fit to the pt/area.
* areas/run-mass-test.pl adapted to deal with the hydjet case too
* areas/area-plots -- all plots updated (for Florence talk and
Matteo's US visit [done some time ago...])
2006-06-18 Gavin Salam <salam@lpthe.jussieu.fr>
* to areas/FjClusterSequenceWithArea.* placed upper limit on
number of seed warnings messages; on subtraction-tests-mass,
also placed upper limit on output of info (to avoid eccessively
large mails when running jobs)
2006-06-18 Gavin Salam <salam@lpthe.jussieu.fr>
* to areas/FjClusterSequenceWithArea.* placed upper limit on
number of seed warnings messages; on subtraction-tests-mass,
also placed upper limit on output of info (to avoid eccessively
large mails when running jobs)
2006-06-18 Gavin Salam <salam@lpthe.jussieu.fr>
* to FjClusterSequenceWith[Mean]Area.* added
FjPseudoJet extended_area(const FjPseudoJet & jet) const;
member function which returns a four vector corresponding to
E-scheme addition and averaging of the ghost vectors (with
appropriate normalisation for each).
* adapated areas/subtraction-tests-mass.cc to use the new extended
area (i.e. four-vector subtraction) for an alternative
subtraction scheme ("hecr" "fecr" go into two extra columns at
end, so as not to mess up original file format).
2006-06-13 Gavin Salam <salam@lpthe.jussieu.fr>
* Found bug in reading of hydjet format (didn't skip particles
with istat/=1), but in practice they ended up having
non-sensical rapidities so got thrown out anyway (i.e. results
don't change);
THIS BUG SHOULD BE FIXED EVERYWHERE ELSE TOO...
2006-06-06 Gavin Salam <salam@lpthe.jussieu.fr>
* Added vector<int> FjClusterSequence::unique_history_order(),
which returns a order in which to read the history such
branchings are then independent of irrelevant degeneracies in
the d_ij. This is basically a corrected version of the
_extract_tree function added yesterday to
FjClusterSequenceWithMeanArea (now removed from that class).
* Arranged for FjClusterSequenceWithMeanArea to use the new
unique_history_order to map jets between the plain clustering
and that with the active area measurement. First tests suggests
that it's behaving properly (i.e. giving same results as before
for the kt algorithm, and sensible looking results for the
cambridge algorithm).
2006-06-05 Gavin Salam <salam@lpthe.jussieu.fr>
* Added the _extract_tree private member function to
FjClusterSequenceWithMeanArea, which extracts a tree that should
have a unique ordering independently of degeneracies in the
labelling of the clustering. It comes along with some
helpers... Maybe it should be transferred into the main class?
2006-06-04 Gavin Salam <salam@lpthe.jussieu.fr>
* Added the jets(), history() and n_particles() member functions
to FjClusterSequence so that the user can access this raw
information if they want to (this was a solution to the problem
of accessing things when transferring info between area classes
-- somehow protected information of an object of a related class
is not available to "this"). These functions provide a const ref
(so hopefully the user can't do anything dangerous).
* reworked transfer of information from the ...WithArea ->
...WithMeanArea classes, so that now all jets should have a mean
area associated with them, and it might even work for the
Cambridge algorithm [though one has to watch out for possible
degeneracies there at the stage of jets -> inclusive jets].
2006-06-02 Gavin Salam <salam@lpthe.jussieu.fr>
* FjClusterSequenceWithMeanArea.* -- split this into .cc and .hh
files to make things a bit cleaner in future.
* FjClusterSequenceWithArea.* added is_pure_ghost() function and
modified calculation of areas so that it occurs in a
post-processing stage; got areas-native to print out whether a
jet is a true one or a ghost one...
* FjClusterSequence.cc: made _fill_initial_history reserve space
in _jets and _history.
2006-06-01 Gavin Salam <salam@lpthe.jussieu.fr>
* FjClusterSequence.cc: caused it to throw an error if the event
is empty. (Should think about what happens if the event contains
only one parton?)
2006-05-31 Gavin Salam <salam@lpthe.jussieu.fr>
* added -cone075 options for areas/subtraction-tests-mass.cc
(overlap fraction of 0.75 with standard midpoint cone)
2006-05-29 Gavin Salam <salam@lpthe.jussieu.fr>
* added a few more options for areas/subtraction-tests-mass.cc
(one of them allowing one to eliminate the temporary
intermediate file in run-mass-tests.sh)
2006-05-27 Gavin Salam <salam@lpthe.jussieu.fr>
* added enum FjClusterSequence::FjJetFinder, which defines the
kt_algorithm and the cambridge_algorithm; implemented
FjClusterSequence::set_jet_finder which determines which of the
two algorithms to use in the clustering. Added -cam option to
fastjet_timing and subtraction-tests-mass. Note that the
Cambridge impleemntation is extremely crude , that many
functionalities are still missing, and that we will almost
certain want to rethink the interface to it at some later
point...
* added areas/merge-hist.pl for merging histograms and added a
-freq option to subtractes-tests-mass so as to allow output of
intermediate results.
2006-05-26 Gavin Salam <salam@lpthe.jussieu.fr>
* in areas/subtraction-tests-mass.cc: changed outnormalisation of
histograms so as to make it easy to compare histograms made with
different bin widths and different numbers of events.
* in areas/subtraction-tests-mass.cc introduced -cone and
-searchcone options for running with the plain midpoint cone and
CDF's IR nearly unsafe midpoint searchcone algo.
* added areas/run-mass-test.pl which runs pythia and pipes its
output into subtraction-tests-mass (via a named pipe, splitting
up the options appropriately between the two programs).
* copied areas/subtraction-tests.cc -> subtraction-tests-mass.cc and
started organizing it a bit better, removing extraneous material
etc.; added new option -bin (sets the bin width).
* introduced -in and -out options for subtraction-tests.cc (naming
the files makes it easier to figure out what's going on when we
look at an output file later).
2006-05-25 Gavin SALAM <salam@lpthe.jussieu.fr> & Matteo for conception
* added examples/test-correctness.sh for testing that all the
different algorithms are giving consistent results
* in FjClusterSequence.hh, introduced jet_scale_for_algorithm,
which given a jet returns the scale to be used in the
clustering. Currently it is kt^2, but by replacing it with the
1, one gets the Cambridge/Aachen algorithm. Made modifications
elsewhere so that everything should now be using the new form;
still need to check that with the scale set to 1 it gives the
same as the Cambridge algorithm code [and maybe want to examine
timings?].
2006-05-24 Gavin SALAM <salam@lpthe.jussieu.fr>
* In areas/, added basic histogramming class (CSHisto), and used
it to look at mass distribution of a reconstructed Z (decayed to
two jets).
* In FjPseudoJet.* added m2() member function and one instance of
a multiplication operator.
* In DynamicNearestNeighbours.hh and DnnPlane.cc, renamed
DNN_Error -> DnnError, and added a constructor for DnnError that
prints out an error message.
* Added the file include/FjError.hh which defines a class FjError
that is used for throwing all exceptions (except those related
to DnnError -- maybe need to catch things there?)
2006-05-23 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo (part)
* Added FjClusterSequenceWithMeanArea::play option when calling
FjClusterSequenceWithMeanAreapt_per_unit_area, for printing
out all sorts of bits and pieces; median was renamed old_median,
and now median gives a median which takes into account also the
average number of non-jets when calculating the median position.
It is this new median that is now used also when determining
cuts for averages.
Mean pt/area ratios and overal pt/area ratios now also take into
account the non-jet number and area (respectively).
2006-05-22 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* modified (areas|examples)/CmdLine.* so as to have the facility
to find out if there are any unused/invalid options.
* Added areas/subtraction-tests.cc for examining how subtraction
of underlying events etc works
* Added internal support for getting "non-jet" areas inside
areas/FjClusterSequenceWithMeanArea.hh (but no external handles
for time being).
* modified a couple of comments in FjPseudoJet.hh to better
reflect return values of plain_distance().
2006-05-15 Gavin SALAM <salam@lpthe.jussieu.fr> + Matteo
* Added areas/areas-test-mean-class and
areas/FjClusterSequenceWithMeanArea.hh to help automate the study
of areas and relevant subtractions. Played with it a bit...
* in FjClusterSequence.hh -> included cmath and switched abs ->
std::abs (following compiler complaints with g++ 4.1.0, where we
would have got int abs(int) rather than the double version).
* in FjClusterSequence.hh: made the clustering history protected
rather than private.
2006-05-12 Gavin SALAM + Matteo Cacciari <salam@lpthe.jussieu.fr>
* in areas/areas-histogramming.cc (not part of release) discovered
that CGAL (probably) is playing with random numbers messing up our
sequence for area studies via creation of ghosts; so currently
set explicit new seed at each turn of loop.
Also fixed Makefile dependencies in areas/.
Also, writeout_combinations with FlClusterSequence_witharea now
prints out the full list of particles (including ghosts) before
clustering.
* discovered problem with gcc-3.2.3 and certain events,
specifically:
./fastjet_timing -combine 10 -incl 0.0 -strategy 2 < ../../Pythia-1PtMin50+nMinBias-mansorted.dat
The problem manifests itself when erasing things from the tree,
but hasn't been identified beyond that; running it with valgrind
it miraculously works (and gives no valgrind errors). It works
also with gcc-3.3 (Mac) and gcc-3.4.3 (zetes). Some commented code
is in FjClusterSequence_Delaunay to try to uncover what's
happening, but no conclusion has been reached yet. Non-Delaunay
variants work fine (3pi,4pi variants have problems for different
event sets, e.g. -combine 12).
2006-04-04 Gavin SALAM + Matteo Cacciari <salam@lpthe.jussieu.fr>
* src/FjClusterSequence_Delaunay.cc: in _add_ktdistance_to_map,
changed if (kt2i < _jets[jj].kt2()) to
if (kt2i <= _jets[jj].kt2())
so as catch the case when the two are equal.
2006-03-?? Gavin SALAM + Matteo Cacciari <salam@lpthe.jussieu.fr>
* some bug fixes to sanitization routines (appeared with different
compiler version).
2006-02-28 Gavin SALAM <salam@lpthe.jussieu.fr>
* Replaced typedef std::pair<double,double> EtaPhi with a class
that allows one to conveniently sanitize phi into the correct range.
* From FjClusterSequence::_delaunay_cluster, called the
sanitization routine when inserting a new point... Should make
thing a bit more robust in cases where arithmetic rounding tricks
cause confusion bewteen 0 and 2pi.
2006-02-26 Gavin Salam <salam@lpthe.jussieu.fr>
* adapted timing scripts so as to get reasonable behaviour for
very high N (including subtraction of read time and limiting
nstat).
2006-02-17 Gavin SALAM <salam@lpthe.jussieu.fr> & Matteo Cacciari
This is release v1.0.0b3
* fixed huge memory leak in the N ln N CGAL-based strategies.
* changes to internal structure of FjClusterSequence class to
simplify future developments.
2006-02-13 Gavin Salam <salam@lpthe.jussieu.fr>
This is release v1.0.0b2
* added "#include <cassert>" in places where it's needed (thanks
to Thomas Kluge for pointing out the need for this).
* Improved error message in case of request for N ln N strategy
when CGAL has not been compiled in.
* when creating package, main Makefile is automatically modified
to have USE_CGAL=no (the original is put back after creating the
tarfile).
2006-02-13 v1.0.0b1
* arranged for harmonisation of behaviour of the various example
programs...
2006-02-04 v1.0.0b0
* added minimal standard files (ChangeLog, LICENSE) and headers
for GNU dist and included cvs ID string in all code files.
----------------------------------------------------------------------
2006/02/04 GPS
--------------
FjClusterSequence.hh
FjClusterSequence_TiledN2.cc
fixed bug in tiling for R/=1 (assumptions about indices for
wrapping in phi that were hard-coded for R=1).
example/ktjet_timing.cc *** ADDED ***
Makefile adapted too...
----------------------------------------------------------------------
2006/02/03 GPS
--------------
Various things done since copying across from previous directory in
preparation for release:
Name changes: Fj prefix added to public types
FjStrategy: turned into enum and renamed from "clever"
directory structure: src/, example/, lib/, include/ rather single dir
documentation: added doc/fastjet-doc.tex as a manual
|