{"diffoscope-json-version": 1, "source1": "/srv/reproducible-results/rbuild-debian/r-b-build.PJ3vv1Od/b1/siscone_3.0.5-2_armhf.changes", "source2": "/srv/reproducible-results/rbuild-debian/r-b-build.PJ3vv1Od/b2/siscone_3.0.5-2_armhf.changes", "unified_diff": null, "details": [{"source1": "Files", "source2": "Files", "unified_diff": "@@ -2,9 +2,9 @@\n 53778456c070332e66c16526b37a68c1 79112 libdevel optional libsiscone-dev_3.0.5-2_armhf.deb\n b0cfad68d1b6f853e904c9cb6fb1d1be 70760 libdevel optional libsiscone-spherical-dev_3.0.5-2_armhf.deb\n 823ff6f9c2341bf3a6b9d839e5861b08 416192 debug optional libsiscone-spherical0v5-dbgsym_3.0.5-2_armhf.deb\n f7f8e90018f87b59a85185a51a6b4bf3 52888 libs optional libsiscone-spherical0v5_3.0.5-2_armhf.deb\n 9a3a55f423e4fbdc0360725c1d5147e4 489168 debug optional libsiscone0v5-dbgsym_3.0.5-2_armhf.deb\n 99bd89d6bd474ff9af30f3ed644583b0 58192 libs optional libsiscone0v5_3.0.5-2_armhf.deb\n 59a250410c9d2ecd52fc5a9f5ac3e048 1054600 doc optional siscone-doc-html_3.0.5-2_all.deb\n- 96efb1ac72f6e2380df8558416701794 1465328 doc optional siscone-doc-pdf_3.0.5-2_all.deb\n+ 38f050ebce99180d82dd6e4bcf7435ab 1464260 doc optional siscone-doc-pdf_3.0.5-2_all.deb\n ee8a36e6ed6ae32143424e71fcc9dc11 34968 devel optional siscone-examples_3.0.5-2_all.deb\n"}, {"source1": "siscone-doc-pdf_3.0.5-2_all.deb", "source2": "siscone-doc-pdf_3.0.5-2_all.deb", "unified_diff": null, "details": [{"source1": "file list", "source2": "file list", "unified_diff": "@@ -1,3 +1,3 @@\n -rw-r--r-- 0 0 0 4 2023-01-10 17:32:40.000000 debian-binary\n -rw-r--r-- 0 0 0 808 2023-01-10 17:32:40.000000 control.tar.xz\n--rw-r--r-- 0 0 0 1464328 2023-01-10 17:32:40.000000 data.tar.xz\n+-rw-r--r-- 0 0 0 1463260 2023-01-10 17:32:40.000000 data.tar.xz\n"}, {"source1": "control.tar.xz", "source2": "control.tar.xz", "unified_diff": null, "details": [{"source1": "control.tar", "source2": "control.tar", "unified_diff": null, "details": [{"source1": "./control", "source2": "./control", "unified_diff": "@@ -1,13 +1,13 @@\n Package: siscone-doc-pdf\n Source: siscone\n Version: 3.0.5-2\n Architecture: all\n Maintainer: Debian Science Maintainers \n-Installed-Size: 1446\n+Installed-Size: 1445\n Section: doc\n Priority: optional\n Multi-Arch: foreign\n Homepage: http://projects.hepforge.org/siscone/\n Description: Developer's reference manual of SISCone (PDF)\n SISCone implements a Seedless Infrared (IR) Safe Cone jet algorithm, it takes\n N^2*ln(N) time to find jets among N particles, comparing to N*2^N time of\n"}, {"source1": "./md5sums", "source2": "./md5sums", "unified_diff": null, "details": [{"source1": "./md5sums", "source2": "./md5sums", "comments": ["Files differ"], "unified_diff": null}]}]}]}, {"source1": "data.tar.xz", "source2": "data.tar.xz", "unified_diff": null, "details": [{"source1": "data.tar", "source2": "data.tar", "unified_diff": null, "details": [{"source1": "file list", "source2": "file list", "unified_diff": "@@ -3,10 +3,10 @@\n drwxr-xr-x 0 root (0) root (0) 0 2023-01-10 17:32:40.000000 ./usr/share/\n drwxr-xr-x 0 root (0) root (0) 0 2023-01-10 17:32:40.000000 ./usr/share/doc/\n drwxr-xr-x 0 root (0) root (0) 0 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/\n -rw-r--r-- 0 root (0) root (0) 1125 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/changelog.Debian.gz\n -rw-r--r-- 0 root (0) root (0) 16688 2020-04-24 08:56:01.000000 ./usr/share/doc/siscone-doc-pdf/changelog.gz\n -rw-r--r-- 0 root (0) root (0) 1151 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/copyright\n drwxr-xr-x 0 root (0) root (0) 0 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/pdf/\n--rw-r--r-- 0 root (0) root (0) 1449164 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/pdf/refman.pdf.gz\n+-rw-r--r-- 0 root (0) root (0) 1448729 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/pdf/refman.pdf.gz\n drwxr-xr-x 0 root (0) root (0) 0 2023-01-10 17:32:40.000000 ./usr/share/doc-base/\n -rw-r--r-- 0 root (0) root (0) 240 2023-01-10 17:32:40.000000 ./usr/share/doc-base/siscone-doc-pdf.siscone-pdf\n"}, {"source1": "./usr/share/doc/siscone-doc-pdf/pdf/refman.pdf.gz", "source2": "./usr/share/doc/siscone-doc-pdf/pdf/refman.pdf.gz", "unified_diff": null, "details": [{"source1": "refman.pdf", "source2": "refman.pdf", "unified_diff": null, "details": [{"source1": "pdftotext {} -", "source2": "pdftotext {} -", "unified_diff": "@@ -1749,67 +1749,67 @@\n . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 197\n \n 5.14.2 Variable Documentation . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 198\n 5.14.2.1 twopi . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 198\n 5.15 defines.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 198\n 5.16 geom_2d.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 199\n 5.17 geom_2d.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 201\n-5.18 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 203\n-5.19 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 204\n-5.20 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 205\n-5.21 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 214\n-5.22 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 224\n-5.23 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 226\n-5.24 quadtree.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 228\n-5.25 quadtree.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 232\n-5.26 ranlux.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 232\n-5.27 siscone/ranlux.h File Reference . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 235\n-5.27.1 Function Documentation . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 235\n-5.27.1.1 ranlux_get() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 235\n-5.27.1.2 ranlux_init() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 235\n-5.27.1.3 ranlux_print_state() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 235\n-5.28 ranlux.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 236\n-5.29 reference.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 236\n-5.30 reference.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 238\n-5.31 siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 239\n-5.32 siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 242\n-5.33 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 246\n-5.34 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 247\n-5.35 siscone_error.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 248\n-5.36 siscone_error.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 248\n-5.37 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 249\n-5.38 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 251\n-5.39 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 252\n-5.40 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 254\n-5.41 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 257\n-5.42 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 259\n+5.18 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 203\n+5.19 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 204\n+5.20 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 205\n+5.21 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 208\n+5.22 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 211\n+5.23 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 212\n+5.24 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 216\n+5.25 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 217\n+5.26 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 220\n+5.27 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 229\n+5.28 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 239\n+5.29 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 241\n+5.30 quadtree.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n+5.31 quadtree.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 246\n+5.32 ranlux.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 247\n+5.33 siscone/ranlux.h File Reference . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 249\n+5.33.1 Function Documentation . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 250\n+5.33.1.1 ranlux_get() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 250\n+5.33.1.2 ranlux_init() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 250\n+5.33.1.3 ranlux_print_state() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 250\n+5.34 ranlux.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 251\n+5.35 reference.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 251\n+5.36 reference.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 253\n+5.37 siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 254\n+5.38 siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 257\n+5.39 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 261\n+5.40 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 262\n+5.41 siscone_error.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 263\n+5.42 siscone_error.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 263\n \n Generated by Doxygen\n \n \fxvi\n \n-5.43 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 262\n-5.44 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 264\n-5.45 vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 266\n-5.46 vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 270\n+5.43 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 264\n+5.44 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 265\n+5.45 vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 266\n+5.46 vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 267\n 5.47 split_merge.cpp\n \n-. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 273\n+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 269\n \n 5.48 split_merge.cpp\n \n-. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 287\n+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 283\n \n-5.49 split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 300\n-5.50 split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 303\n-5.51 vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 306\n-5.52 vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 307\n+5.49 split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 296\n+5.50 split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 299\n+5.51 vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 301\n+5.52 vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 305\n Index\n \n-311\n+309\n \n Generated by Doxygen\n \n \fChapter 1\n \n Hierarchical Index\n \n@@ -2079,34 +2079,34 @@\n 176\n 191\n 192\n 193\n 194\n 196\n 199\n-249\n-252\n 203\n-257\n-262\n 205\n-224\n-228\n-232\n-232\n-235\n-236\n-238\n+264\n+211\n+216\n+220\n 239\n+243\n 246\n-248\n-248\n-287\n-303\n-270\n+247\n+249\n+251\n+253\n+254\n+261\n+263\n+263\n+283\n+299\n+305\n \n \f6\n \n File Index\n \n siscone/vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/spherical/geom_2d.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n@@ -2120,29 +2120,29 @@\n siscone/spherical/siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/spherical/siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/spherical/split_merge.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/spherical/split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/spherical/vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/spherical/vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n \n-307\n+267\n 201\n-251\n-254\n 204\n-259\n-264\n-214\n-226\n-242\n-247\n-273\n-300\n+208\n+265\n+212\n+217\n+229\n+241\n+257\n+262\n+269\n+296\n+301\n 266\n-306\n \n Generated by Doxygen\n \n \fChapter 4\n \n Class Documentation\n \n@@ -13918,15 +13918,15 @@\n 00149\n 00150 // test overlap\n 00151 // - r1 first range\n 00152 // - r2 second range\n \n Generated by Doxygen\n \n-\f5.18 hash.h\n+\f5.18 geom_2d.h\n \n 203\n \n 00153 // return true if overlap, false otherwise.\n 00154 //-----------------------------------------00155 bool is_range_overlap(const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2){\n 00156\n // check overlap in eta AND phi\n@@ -13955,18 +13955,18 @@\n 00174\n 00175\n return tmp;\n 00176 }\n 00177\n 00178 }\n \n-5.18 hash.h\n-00001 // -*- C++ -*00003 // File: hash.h\n+5.18 geom_2d.h\n+00001 // -*- C++ -*00003 // File: geom_2d.h\n //\n-00004 // Description: header file for classes hash_element and hash_cones\n+00004 // Description: header file for two-dimensional geometry tools\n //\n 00005 // This file is part of the SISCone project.\n //\n 00006 // For more details, see http://projects.hepforge.org/siscone\n //\n 00007 //\n //\n@@ -13997,109 +13997,1905 @@\n 00020 // You should have received a copy of the GNU General Public License\n //\n 00021 // along with this program; if not, write to the Free Software\n //\n 00022 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n 00023 //\n //\n-00024 // $Revision:: 224\n+00024 // $Revision:: 422\n $//\n-00025 // $Date:: 2008-05-16 19:58:30 +0200 (Fri, 16 May 2008)\n+00025 // $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)\n $//\n 00027\n-00028 #ifndef __HASH_H__\n-00029 #define __HASH_H__\n+00028 #ifndef __GEOM_2D_H__\n+00029 #define __GEOM_2D_H__\n 00030\n-00031 #include \"momentum.h\"\n-00032 #include \"reference.h\"\n+00031 #include \n+00032 #include \n+00033 #include \"defines.h\"\n+00034\n+00035 #ifndef M_PI\n+00036 #define M_PI 3.141592653589793238462643383279502884197\n+00037 #endif\n+00038\n+00039 namespace siscone{\n+00040\n+00043 inline double phi_in_range(double phi) {\n+if\n+(phi <= -M_PI) phi += twopi;\n+00044\n+00045\n+else if (phi >\n+M_PI) phi -= twopi;\n+00046\n+return phi;\n+00047 }\n+00048\n+00052 inline double dphi(double phi1, double phi2) {\n+00053\n+return phi_in_range(phi1-phi2);\n+00054 }\n+00055\n+00056\n+00060 inline double abs_dphi(double phi1, double phi2) {\n+double delta = fabs(phi1-phi2);\n+00061\n+\n+Generated by Doxygen\n+\n+\f204\n+\n+File Documentation\n+\n+00062\n+return delta > M_PI ? twopi-delta : delta;\n+00063 }\n+00064\n+00066 inline double pow2(double x) {return x*x;}\n+00067\n+00068\n+00073 class Ctwovect {\n+00074 public:\n+00076\n+Ctwovect() : x(0.0), y(0.0) {}\n+00077\n+00081\n+Ctwovect(double _x, double _y) : x(_x), y(_y) {}\n+00082\n+double x, y;\n+00084\n+00085\n+inline double mod2()const {return pow2(x)+pow2(y);}\n+00087\n+00088\n+inline double modulus()const {return sqrt(mod2());}\n+00090\n+00091 };\n+00092\n+00093\n+00098 inline double dot_product(const Ctwovect & a, const Ctwovect & b) {\n+00099\n+return a.x*b.x + a.y*b.y;\n+00100 }\n+00101\n+00102\n+00107 inline double cross_product(const Ctwovect & a, const Ctwovect & b) {\n+00108\n+return a.x*b.y - a.y*b.x;\n+00109 }\n+00110\n+00111\n+00120 class Ceta_phi_range{\n+00121 public:\n+00123\n+Ceta_phi_range();\n+00124\n+00130\n+Ceta_phi_range(double c_eta, double c_phi, double R);\n+00131\n+00134\n+Ceta_phi_range& operator = (const Ceta_phi_range &r);\n+00135\n+int add_particle(const double eta, const double phi);\n+00140\n+00141\n+unsigned int eta_range;\n+00143\n+00144\n+unsigned int phi_range;\n+00146\n+00147\n+// extremal value for eta\n+00148\n+00149\n+static double eta_min;\n+static double eta_max;\n+00150\n+00151\n+00152 private:\n+inline unsigned int get_eta_cell(double eta){\n+00154\n+00155\n+return (unsigned int) (1u \u00ab ((int) (32*((eta-eta_min)/(eta_max-eta_min)))));\n+00156\n+}\n+00157\n+inline unsigned int get_phi_cell(double phi){\n+00159\n+00160\n+return (unsigned int) (1u \u00ab ((int) (32*phi/twopi+16)%32));\n+00161\n+}\n+00162 };\n+00163\n+00168 bool is_range_overlap(const Ceta_phi_range &r1, const Ceta_phi_range &r2);\n+00169\n+00175 const Ceta_phi_range range_union(const Ceta_phi_range &r1, const Ceta_phi_range &r2);\n+00176\n+00177 }\n+00178\n+00179 #endif\n+\n+5.19 geom_2d.h\n+00001 // -*- C++ -*00003 // File: geom_2d.h\n+00004 // Description: header file for two-dimensional geometry tools\n+00005 // This file is part of the SISCone project.\n+//\n+00006 // WARNING: this is not the main SISCone trunk but\n+00007 //\n+an adaptation to spherical coordinates\n+00008 // For more details, see http://projects.hepforge.org/siscone\n+00009 //\n+00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n+00011 //\n+00012 // This program is free software; you can redistribute it and/or modify\n+00013 // it under the terms of the GNU General Public License as published by\n+00014 // the Free Software Foundation; either version 2 of the License, or\n+00015 // (at your option) any later version.\n+//\n+\n+//\n+//\n+\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+\n+Generated by Doxygen\n+\n+\f5.20 hash.cpp\n+\n+205\n+\n+00016 //\n+//\n+00017 // This program is distributed in the hope that it will be useful,\n+//\n+00018 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+//\n+00019 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+//\n+00020 // GNU General Public License for more details.\n+//\n+00021 //\n+//\n+00022 // You should have received a copy of the GNU General Public License\n+//\n+00023 // along with this program; if not, write to the Free Software\n+//\n+00024 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n+00025 //\n+//\n+00026 // $Revision:: 422\n+$//\n+00027 // $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)\n+$//\n+00029\n+00030 #ifndef __SPH_GEOM_2D_H__\n+00031 #define __SPH_GEOM_2D_H__\n+00032\n+00033 #include \n+00034 #include \n+00035 #include \n+00036 #include \n+00037\n+00038 #ifndef M_PI\n+00039 #define M_PI 3.141592653589793238462643383279502884197\n+00040 #endif\n+00041\n+00042 namespace siscone_spherical{\n+00043\n+00052 class CSphtheta_phi_range{\n+00053 public:\n+00055\n+CSphtheta_phi_range();\n+00056\n+00062\n+CSphtheta_phi_range(double c_theta, double c_phi, double R);\n+00063\n+00066\n+CSphtheta_phi_range& operator = (const CSphtheta_phi_range &r);\n+00067\n+int add_particle(const double theta, const double phi);\n+00072\n+00073\n+unsigned int theta_range;\n+00075\n+00076\n+unsigned int phi_range;\n+00078\n+00079\n+static double theta_min;\n+00081\n+00082\n+static double theta_max;\n+00083\n+00084 private:\n+inline unsigned int get_theta_cell(double theta){\n+00086\n+00087\n+if (theta>=theta_max) return 1u\u00ab31;\n+00088\n+return (unsigned int) (1u \u00ab ((int) (32*((theta-theta_min)/(theta_max-theta_min)))));\n+00089\n+}\n+00090\n+inline unsigned int get_phi_cell(double phi){\n+00092\n+00093\n+return (unsigned int) (1u \u00ab ((int) (32*phi/twopi+16)%32));\n+00094\n+}\n+00095 };\n+00096\n+00101 bool is_range_overlap(const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2);\n+00102\n+00108 const CSphtheta_phi_range range_union(const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2);\n+00109\n+00110 }\n+00111\n+00112 #endif\n+\n+5.20 hash.cpp\n+00001\n+00002 // File: hash.cpp\n+00003 // Description: source file for classes hash_element and hash_cones\n+00004 // This file is part of the SISCone project.\n+//\n+00005 // For more details, see http://projects.hepforge.org/siscone\n+00006 //\n+00007 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n+00008 //\n+00009 // This program is free software; you can redistribute it and/or modify\n+00010 // it under the terms of the GNU General Public License as published by\n+00011 // the Free Software Foundation; either version 2 of the License, or\n+00012 // (at your option) any later version.\n+//\n+00013 //\n+00014 // This program is distributed in the hope that it will be useful,\n+00015 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+\n+Generated by Doxygen\n+\n+//\n+//\n+\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+\n+//\n+//\n+//\n+\n+\f206\n+\n+File Documentation\n+\n+00016 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+//\n+00017 // GNU General Public License for more details.\n+//\n+00018 //\n+//\n+00019 // You should have received a copy of the GNU General Public License\n+//\n+00020 // along with this program; if not, write to the Free Software\n+//\n+00021 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n+00022 //\n+//\n+00023 // $Revision:: 225\n+$//\n+00024 // $Date:: 2008-05-20 16:59:47 +0200 (Tue, 20 May 2008)\n+$//\n+00026\n+00027 #include \n+00028 #include \n+00029 #include \"hash.h\"\n+00030 #include \n+00031\n+00032 namespace siscone{\n 00033\n-00034 namespace siscone{\n+00034 using namespace std;\n 00035\n-00045 class hash_element{\n-00046 public:\n-00047\n-Creference ref;\n+00036 /**************************************************************\n+00037 * implementation of hash_cones\n+*\n+00038 * list of cones candidates.\n+*\n+00039 * We store in this class all the hash_elements and give\n+*\n+00040 * functions to manipulate them.\n+*\n+00041 **************************************************************/\n+00042\n+00043 // constructor with initialisation\n+00044 // - _Np number of particles\n+00045 // - _R2 cone radius (squared)\n+00046 //----------------------------------00047 hash_cones::hash_cones(int _Np, double _R2){\n+int i;\n 00048\n-double eta;\n-double phi;\n 00049\n 00050\n-bool is_stable;\n-00051\n+n_cones = 0;\n+00051 #ifdef DEBUG_STABLE_CONES\n 00052\n-hash_element *next;\n-00053 };\n+n_occupied_cells = 0;\n+00053 #endif\n 00054\n-00062 class hash_cones{\n-00063 public:\n+// determine hash size\n+00055\n+00056\n+// for a ymax=5 and R=0.7, we observed an occupancy around 1/8 N^2 ~ N2 R2/4\n+00057\n+//mask = 1 \u00ab (int) (2*log(double(_Np))/log(2.0));\n+00058\n+//if (mask<=1) mask=2;\n+00059\n+int nbits = (int) (log(_Np*_R2*_Np/4.0)/log(2.0));\n+if (nbits<1) nbits=1;\n+00060\n+00061\n+mask = 1 \u00ab nbits;\n+00062\n+00063\n+// create hash\n+00064\n+hash_array = new hash_element*[mask];\n+00065\n+mask--;\n+00066\n+// set the array to 0\n 00067\n-hash_cones(int _Np, double _R2);\n 00068\n+//? needed ?\n+00069\n+for (i=0;inext;\n+00085\n+delete elm;\n+00086\n+}\n+00087\n+}\n+00088\n+delete[] hash_array;\n+00089\n+00090 }\n+00091\n+00092\n+00093 /*\n+00094 * insert a new candidate into the hash.\n+00095 * - v\n+4-momentum of the cone to add\n+00096 * - parent parent particle defining the cone\n+child particle defining the cone\n+00097 * - child\n+00098 * - p_io\n+whether the parent has to belong to the cone or not\n+whether the child has to belong to the cone or not\n+00099 * - c_io\n+00100 * return 0 on success, 1 on error\n+00101 ***********************************************************************/\n+00102 int hash_cones::insert(Cmomentum *v, Cmomentum *parent, Cmomentum *child, bool p_io, bool c_io){\n \n Generated by Doxygen\n \n-\f204\n+\f5.20 hash.cpp\n+\n+00103\n+hash_element *elm;\n+int index = (v->ref.ref[0]) & mask;\n+00104\n+00105\n+00106\n+// check the array cell corresponding to our reference\n+00107\n+elm = hash_array[index];\n+00108\n+00109 #ifdef DEBUG_STABLE_CONES\n+00110\n+if (elm==NULL)\n+00111\n+n_occupied_cells++;\n+00112 #endif\n+00113\n+do{\n+00114\n+00115\n+// if it is not present, add it\n+00116\n+if (elm==NULL){\n+00117\n+// create element\n+00118\n+elm = new hash_element;\n+00119\n+// set its varibles\n+00120\n+00121\n+// Note: at this level, eta and phi have already been computed\n+00122\n+//\n+through Cmomentum::build_etaphi.\n+00123\n+elm->ref = v->ref;\n+00124\n+00125\n+//compute vectors centre\n+00126\n+v->build_etaphi();\n+00127\n+elm->eta = v->eta;\n+00128\n+elm->phi = v->phi;\n+00129\n+// if at least one of the two is_inside tests gives a result != from the expected,\n+00130\n+// the || will be true hence !(...) false as wanted\n+00131\n+elm->is_stable = !((is_inside(v, parent)^p_io)||(is_inside(v, child)^c_io));\n+00132\n+//cout \u00ab \"-- new status of \" \u00ab v->ref[0] \u00ab \":\" \u00ab elm->is_stable \u00ab endl;\n+00133\n+00134\n+// update hash\n+00135\n+elm->next = hash_array[index];\n+00136\n+hash_array[index] = elm;\n+00137\n+00138\n+n_cones++;\n+00139\n+return 0;\n+00140\n+}\n+00141\n+// if the cone is already there, simply update stability status\n+00142\n+00143\n+if (v->ref == elm->ref){\n+00144\n+// there is only an update to perform to see if the cone is still stable\n+00145\n+if (elm->is_stable){\n+00146\n+v->build_etaphi();\n+00147\n+elm->is_stable = !((is_inside(v, parent)^p_io)||(is_inside(v, child)^c_io));\n+00148\n+//cout \u00ab \" parent/child: \"\n+00149\n+//\n+\u00ab parent->ref[0] \u00ab \":\" \u00ab is_inside(v, parent) \u00ab \":\" \u00ab p_io \u00ab \" \"\n+00150\n+//\n+\u00ab child->ref[0] \u00ab \":\" \u00ab is_inside(v, child) \u00ab \":\" \u00ab c_io \u00ab endl;\n+00151\n+//cout \u00ab \"-- rep status of \" \u00ab v->ref[0] \u00ab \":\" \u00ab elm->is_stable \u00ab endl;\n+00152\n+//cout \u00ab v->eta \u00ab \" \" \u00ab v->phi \u00ab endl;\n+00153\n+//cout \u00ab (child->eta) \u00ab \" \" \u00ab child->phi \u00ab endl;\n+00154\n+}\n+00155\n+return 0;\n+00156\n+}\n+00157\n+00158\n+elm = elm->next;\n+00159\n+} while (1);\n+00160\n+return 1;\n+00161\n+00162 }\n+00163\n+00164 /*\n+00165 * insert a new candidate into the hash.\n+00166 * - v\n+4-momentum of te cone to add\n+00167 * Note, in this case, we assume stability. We also assume\n+00168 * that eta and phi are computed for v\n+00169 * return 0 on success, 1 on error\n+00170 ***********************************************************************/\n+00171 int hash_cones::insert(Cmomentum *v){\n+00172\n+hash_element *elm;\n+int index = (v->ref.ref[0]) & mask;\n+00173\n+00174\n+//cout \u00ab \"-- stable candidate: \" \u00ab v->ref[0] \u00ab \":\" \u00ab endl;\n+00175\n+00176\n+// check the array cell corresponding to our reference\n+00177\n+elm = hash_array[index];\n+do{\n+00178\n+00179\n+// if it is not present, add it\n+00180\n+if (elm==NULL){\n+00181\n+// create element\n+00182\n+elm = new hash_element;\n+00183\n+00184\n+// set its varibles\n+00185\n+// Note: at this level, eta and phi have already been computed\n+00186\n+//\n+through Cmomentum::build_etaphi.\n+00187\n+elm->ref = v->ref;\n+00188\n+elm->eta = v->eta;\n+00189\n+elm->phi = v->phi;\n+\n+Generated by Doxygen\n+\n+207\n+\n+\f208\n \n File Documentation\n \n+00190\n+elm->is_stable = true;\n+00191\n+// update hash\n+00192\n+00193\n+elm->next = hash_array[index];\n+00194\n+hash_array[index] = elm;\n+00195\n+00196\n+n_cones++;\n+return 0;\n+00197\n+00198\n+}\n+00199\n+00200\n+// if the cone is already there, we have nothing to do\n+00201\n+if (v->ref == elm->ref){\n+00202\n+return 0;\n+00203\n+}\n+00204\n+00205\n+elm = elm->next;\n+00206\n+} while (1);\n+00207\n+return 1;\n+00208\n+00209 }\n+00210\n+00211 /*\n+00212 * test if a particle is inside a cone of given centre.\n+00213 * check if the particle of coordinates \u2019v\u2019 is inside the circle of radius R\n+00214 * centered at \u2019centre\u2019.\n+00215 * - centre\n+centre of the circle\n+particle to test\n+00216 * - v\n+00217 * return true if inside, false if outside\n+00218 ******************************************************************************/\n+00219 inline bool hash_cones::is_inside(Cmomentum *centre, Cmomentum *v){\n+double dx, dy;\n+00220\n+00221\n+00222\n+dx = centre->eta - v->eta;\n+00223\n+dy = fabs(centre->phi - v->phi);\n+00224\n+if (dy>M_PI)\n+00225\n+dy -= 2.0*M_PI;\n+00226\n+return dx*dx+dy*dy\n+00030 #include \n+00031 #include \"hash.h\"\n+00032 #include \n+00033\n+00034 namespace siscone_spherical{\n+00035\n+00036 using namespace std;\n+00037\n+\n+//\n+\n+Generated by Doxygen\n+\n+\f5.21 hash.cpp\n+\n+209\n+\n+00038 /**************************************************************\n+00039 * implementation of sph_hash_cones\n+*\n+00040 * list of cones candidates.\n+*\n+00041 * We store in this class all the sph_hash_element and give\n+*\n+00042 * functions to manipulate them.\n+*\n+00043 **************************************************************/\n+00044\n+00045 // constructor with initialisation\n+00046 // - _Np\n+number of particles\n+00047 // - _radius cone radius\n+00048 //----------------------------------00049 sph_hash_cones::sph_hash_cones(int _Np, double _radius){\n+00050\n+int i;\n+00051\n+00052\n+n_cones = 0;\n+00053 #ifdef DEBUG_STABLE_CONES\n+00054\n+n_occupied_cells = 0;\n+00055 #endif\n+00056\n+00057\n+// determine hash size\n+00058\n+// for a ymax=5 and R=0.7, we observed an occupancy around 1/8 N^2 ~ N2 R2/4\n+00059\n+//mask = 1 \u00ab (int) (2*log(double(_Np))/log(2.0));\n+00060\n+//if (mask<=1) mask=2;\n+00061\n+int nbits = (int) (log(_Np*_radius*_radius*_Np/4.0)/log(2.0));\n+00062\n+if (nbits<1) nbits=1;\n+00063\n+mask = 1 \u00ab nbits;\n+00064\n+// create hash\n+00065\n+00066\n+hash_array = new sph_hash_element*[mask];\n+00067\n+mask--;\n+00068\n+// set the array to 0\n+00069\n+00070\n+//? needed ?\n+00071\n+for (i=0;inext;\n+00088\n+delete elm;\n+00089\n+}\n 00090\n-int insert(Cmomentum *v);\n+}\n 00091\n-00093\n-hash_element **hash_array;\n+delete[] hash_array;\n+00092\n+00093 }\n 00094\n-00096\n-int n_cones;\n+00095\n+00096 /*\n+00097 * insert a new candidate into the hash.\n+4-momentum of the cone to add\n+00098 * - v\n+00099 * - parent parent particle defining the cone\n+child particle defining the cone\n+00100 * - child\n+00101 * - p_io\n+whether the parent has to belong to the cone or not\n+whether the child has to belong to the cone or not\n+00102 * - c_io\n+00103 * return 0 on success, 1 on error\n+00104 ***********************************************************************/\n+00105 int sph_hash_cones::insert(CSphmomentum *v, CSphmomentum *parent, CSphmomentum *child, bool p_io, bool\n+c_io){\n+00106\n+sph_hash_element *elm;\n+int index = (v->ref.ref[0]) & mask;\n+00107\n+00108\n+// check the array cell corresponding to our reference\n+00109\n+00110\n+elm = hash_array[index];\n+00111\n+00112 #ifdef DEBUG_STABLE_CONES\n+00113\n+if (elm==NULL)\n+00114\n+n_occupied_cells++;\n+00115 #endif\n+00116\n+00117\n+do{\n+00118\n+// if it is not present, add it\n+00119\n+if (elm==NULL){\n+00120\n+// create element\n+00121\n+elm = new sph_hash_element;\n+00122\n+00123\n+// set its varibles\n+\n+Generated by Doxygen\n+\n+\f210\n+\n+File Documentation\n+\n+00124\n+// Note: at this level, eta and phi have already been computed\n+00125\n+//\n+through CSphmomentum::build_thetaphi.\n+00126\n+elm->centre = *v;\n+00127\n+// if at least one of the two is_closer tests gives a result != from the expected,\n+00128\n+00129\n+// the || will be true hence !(...) false as wanted\n+00130\n+elm->is_stable = !((is_closer(v, parent, tan2R)^p_io)||(is_closer(v, child, tan2R)^c_io));\n+00131\n+//cout \u00ab \"-- new status of \" \u00ab v->ref[0] \u00ab \":\" \u00ab elm->is_stable \u00ab endl;\n+00132\n+00133\n+// update hash\n+00134\n+elm->next = hash_array[index];\n+00135\n+hash_array[index] = elm;\n+00136\n+00137\n+n_cones++;\n+return 0;\n+00138\n+00139\n+}\n+00140\n+// if the cone is already there, simply update stability status\n+00141\n+00142\n+if (v->ref == elm->centre.ref){\n+00143\n+// there is only an update to perform to see if the cone is still stable\n+00144\n+if (elm->is_stable){\n+00145\n+elm->is_stable = !((is_closer(v, parent, tan2R)^p_io)||(is_closer(v, child, tan2R)^c_io));\n+00146\n+//cout \u00ab \" parent/child: \"\n+00147\n+//\n+\u00ab parent->ref[0] \u00ab \":\" \u00ab is_closer(v, parent) \u00ab \":\" \u00ab p_io \u00ab \" \"\n+00148\n+//\n+\u00ab child->ref[0] \u00ab \":\" \u00ab is_closer(v, child) \u00ab \":\" \u00ab c_io \u00ab endl;\n+00149\n+//cout \u00ab \"-- rep status of \" \u00ab v->ref[0] \u00ab \":\" \u00ab elm->is_stable \u00ab endl;\n+00150\n+//cout \u00ab v->eta \u00ab \" \" \u00ab v->phi \u00ab endl;\n+00151\n+//cout \u00ab (child->eta) \u00ab \" \" \u00ab child->phi \u00ab endl;\n+00152\n+}\n+00153\n+return 0;\n+00154\n+}\n+00155\n+00156\n+elm = elm->next;\n+00157\n+} while (1);\n+00158\n+return 1;\n+00159\n+00160 }\n+00161\n+00162 /*\n+00163 * insert a new candidate into the hash.\n+00164 * - v\n+4-momentum of te cone to add\n+00165 * Note, in this case, we assume stability. We also assume\n+00166 * that eta and phi are computed for v\n+00167 * return 0 on success, 1 on error\n+00168 ***********************************************************************/\n+00169 int sph_hash_cones::insert(CSphmomentum *v){\n+00170\n+sph_hash_element *elm;\n+int index = (v->ref.ref[0]) & mask;\n+00171\n+00172\n+//cout \u00ab \"-- stable candidate: \" \u00ab v->ref[0] \u00ab \":\" \u00ab endl;\n+00173\n+00174\n+// check the array cell corresponding to our reference\n+00175\n+elm = hash_array[index];\n+00176\n+do{\n+// if it is not present, add it\n+00177\n+00178\n+if (elm==NULL){\n+00179\n+// create element\n+00180\n+elm = new sph_hash_element;\n+00181\n+// set its varibles\n+00182\n+00183\n+// Note: at this level, eta and phi have already been computed\n+00184\n+//\n+through CSphmomentum::build_thetaphi.\n+00185\n+elm->centre = *v;\n+00186\n+elm->is_stable = true;\n+00187\n+// update hash\n+00188\n+00189\n+elm->next = hash_array[index];\n+00190\n+hash_array[index] = elm;\n+00191\n+00192\n+n_cones++;\n+00193\n+return 0;\n+00194\n+}\n+00195\n+// if the cone is already there, we have nothing to do\n+00196\n+00197\n+if (v->ref == elm->centre.ref){\n+00198\n+return 0;\n+00199\n+}\n+00200\n+00201\n+elm = elm->next;\n+00202\n+} while (1);\n+00203\n+return 1;\n+00204\n+00205 }\n+00206\n+00207 }\n+\n+Generated by Doxygen\n+\n+\f5.22 momentum.cpp\n+\n+5.22 momentum.cpp\n+00001\n+//\n+00002 // File: momentum.cpp\n+00003 // Description: source file for 4-momentum class Cmomentum\n+//\n+00004 // This file is part of the SISCone project.\n+//\n+00005 // For more details, see http://projects.hepforge.org/siscone\n+//\n+00006 //\n+//\n+00007 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n+//\n+00008 //\n+//\n+00009 // This program is free software; you can redistribute it and/or modify\n+//\n+00010 // it under the terms of the GNU General Public License as published by\n+//\n+00011 // the Free Software Foundation; either version 2 of the License, or\n+//\n+00012 // (at your option) any later version.\n+//\n+00013 //\n+//\n+00014 // This program is distributed in the hope that it will be useful,\n+//\n+00015 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+//\n+00016 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+//\n+00017 // GNU General Public License for more details.\n+//\n+00018 //\n+//\n+00019 // You should have received a copy of the GNU General Public License\n+//\n+00020 // along with this program; if not, write to the Free Software\n+//\n+00021 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n+00022 //\n+//\n+00023 // $Revision:: 123\n+$//\n+00024 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n+$//\n+00026\n+00027 #include \"momentum.h\"\n+00028 #include \n+00029 #include \n+00030\n+00031 namespace siscone{\n+00032\n+00033 /*************************************************************************\n+00034 * class Cmomentum\n+*\n+00035 * This class contains the information for particle or group of\n+*\n+00036 * particles management.\n+*\n+00037 * It includes all Lorentz properties as well as tools for summing them. *\n+00038 *************************************************************************/\n+00039\n+00040 // default ctor\n+00041 //-------------00042 Cmomentum::Cmomentum(){\n+00043\n+eta = 0.0;\n+00044\n+phi = 0.0;\n+00045\n+px = py = pz = E = 0.0;\n+00046\n+ref = Creference();\n+00047\n+index = -1;\n+00048 }\n+00049\n+00050 // ctor with initialisation\n+00051 //-------------------------00052 Cmomentum::Cmomentum(double _px, double _py, double _pz, double _E){\n+00053\n+px = _px;\n+00054\n+py = _py;\n+00055\n+pz = _pz;\n+00056\n+E = _E;\n+00057\n+// compute eta and phi\n+00058\n+00059\n+build_etaphi();\n+00060\n+ref = Creference();\n+00061 }\n+00062\n+00063 // ctor with detailed initialisation\n+00064 //----------------------------------00065 Cmomentum::Cmomentum(double _eta, double _phi, Creference _ref){\n+00066\n+eta = _eta;\n+00067\n+phi = _phi;\n+00068\n+00069\n+ref = _ref;\n+00070 }\n+00071\n+00072 // default dtor\n+00073 //-------------00074 Cmomentum::~Cmomentum(){\n+00075\n+00076 }\n+00077\n+00078 // assignment of vectors\n+00079 //----------------------00080 Cmomentum& Cmomentum::operator = (const Cmomentum &v){\n+00081\n+px = v.px;\n+00082\n+py = v.py;\n+\n+Generated by Doxygen\n+\n+211\n+\n+\f212\n+\n+File Documentation\n+\n+00083\n+pz = v.pz;\n+00084\n+E = v.E;\n+00085\n+00086\n+eta = v.eta;\n+00087\n+phi = v.phi;\n+00088\n+00089\n+ref = v.ref;\n+return *this;\n+00090\n+00091 }\n+00092\n+00093 // addition of vectors\n+00094 // !!! WARNING !!! no updating of eta and phi !!!\n+00095 //-----------------------------------------------00096 const Cmomentum Cmomentum::operator + (const Cmomentum &v){\n 00097\n-00099 #ifdef DEBUG_STABLE_CONES\n+Cmomentum tmp = *this;\n+00098\n+return tmp+=v;\n+00099 }\n 00100\n-int n_occupied_cells;\n-00101 #endif\n+00101 // incrementation of vectors\n+00102 // !!! WARNING !!! no updating of eta and phi !!!\n+00103 //-----------------------------------------------00104 Cmomentum& Cmomentum::operator += (const Cmomentum &v){\n+00105\n+px+=v.px;\n+00106\n+py+=v.py;\n+00107\n+pz+=v.pz;\n+00108\n+E +=v.E;\n+00109\n+00110\n+ref+=v.ref;\n+00111\n+return *this;\n+00112\n+00113 }\n+00114\n+00115 // incrementation of vectors\n+00116 // !!! WARNING !!! no updating of eta and phi !!!\n+00117 //-----------------------------------------------00118 Cmomentum& Cmomentum::operator -= (const Cmomentum &v){\n+00119\n+px-=v.px;\n+00120\n+py-=v.py;\n+00121\n+pz-=v.pz;\n+00122\n+E -=v.E;\n+00123\n+00124\n+ref-=v.ref;\n+return *this;\n+00125\n+00126 }\n+00127\n+00128 // build eta-phi from 4-momentum info\n+00129 // !!!\n+WARNING\n+!!!\n+00130 // !!! computing eta and phi is time-consuming !!!\n+00131 // !!! use this whenever you need eta or phi\n+!!!\n+00132 // !!! automatically called for single-particle !!!\n+00133 //-------------------------------------------------00134 void Cmomentum::build_etaphi(){\n+00135\n+// note: the factor n (ref.nb) cancels in all expressions !!\n+00136\n+eta = 0.5*log((E+pz)/(E-pz));\n+00137\n+phi = atan2(py,px);\n+00138 }\n+00139\n+00140\n+00141 // ordering of two vectors\n+00142 // the default ordering is w.r.t. their references\n+00143 //------------------------------------------------00144 bool operator < (const Cmomentum &v1, const Cmomentum &v2){\n+00145\n+return v1.ref < v2.ref;\n+00146 }\n+00147\n+00148 // ordering of vectors in eta (e.g. used in collinear tests)\n+00149 //----------------------------------------------------------00150 bool momentum_eta_less(const Cmomentum &v1, const Cmomentum &v2){\n+return v1.eta < v2.eta;\n+00151\n+00152 }\n+00153\n+00154 // ordering of vectors in pt\n+00155 //--------------------------00156 bool momentum_pt_less(const Cmomentum &v1, const Cmomentum &v2){\n+00157\n+return v1.perp2() < v2.perp2();\n+00158 }\n+00159\n+00160 }\n+00161\n+\n+5.23 momentum.cpp\n+00001\n+\n+Generated by Doxygen\n+\n+\f5.23 momentum.cpp\n+\n+00002 // File: momentum.cpp\n+//\n+00003 // Description: source file for 4-momentum class Cmomentum\n+//\n+00004 // This file is part of the SISCone project.\n+//\n+00005 // WARNING: this is not the main SISCone trunk but\n+//\n+00006 //\n+an adaptation to spherical coordinates\n+//\n+00007 // For more details, see http://projects.hepforge.org/siscone\n+//\n+00008 //\n+//\n+00009 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n+00010 //\n+//\n+00011 // This program is free software; you can redistribute it and/or modify\n+//\n+00012 // it under the terms of the GNU General Public License as published by\n+//\n+00013 // the Free Software Foundation; either version 2 of the License, or\n+//\n+00014 // (at your option) any later version.\n+//\n+00015 //\n+//\n+00016 // This program is distributed in the hope that it will be useful,\n+//\n+00017 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+//\n+00018 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+//\n+00019 // GNU General Public License for more details.\n+//\n+00020 //\n+//\n+00021 // You should have received a copy of the GNU General Public License\n+//\n+00022 // along with this program; if not, write to the Free Software\n+//\n+00023 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n+00024 //\n+//\n+00025 // $Revision:: 255\n+$//\n+00026 // $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008)\n+$//\n+00028\n+00029 #include \"momentum.h\"\n+00030 #include \n+00031 #include \n+00032\n+00033 namespace siscone_spherical{\n+00034\n+00035 /*************************************************************************\n+00036 * class CSph3vector\n+*\n+00037 * This class contains the information for particle or group of\n+*\n+00038 * particles management.\n+*\n+00039 *************************************************************************/\n+00040\n+00041 // default ctor\n+00042 //-------------00043 CSph3vector::CSph3vector(){\n+00044\n+_theta = _phi = _norm = 0.0;\n+00045\n+px = py = pz = 0.0;\n+00046\n+ref = siscone::Creference();\n+00047 }\n+00048\n+00049 // ctor with initialisation\n+00050 //-------------------------00051 CSph3vector::CSph3vector(double _px, double _py, double _pz){\n+00052\n+px = _px;\n+00053\n+py = _py;\n+00054\n+pz = _pz;\n+00055\n+00056\n+// compute the norm\n+00057\n+build_norm();\n+00058\n+00059\n+ref = siscone::Creference();\n+00060 }\n+00061\n+00062 // default dtor\n+00063 //-------------00064 CSph3vector::~CSph3vector(){\n+00065\n+00066 }\n+00067\n+00068\n+00069 // assignment of vectors\n+00070 //----------------------00071 CSph3vector& CSph3vector::operator = (const CSph3vector &v){\n+00072\n+px = v.px;\n+00073\n+py = v.py;\n+00074\n+pz = v.pz;\n+00075\n+00076\n+_norm = v._norm;\n+00077\n+_theta = v._theta;\n+00078\n+_phi\n+= v._phi;\n+00079\n+00080\n+ref = v.ref;\n+00081\n+return *this;\n+00082 }\n+00083\n+00084 // addition of vectors\n+00085 //------------------------------------------------\n+\n+Generated by Doxygen\n+\n+213\n+\n+//\n+\n+\f214\n+\n+File Documentation\n+\n+00086 const CSph3vector CSph3vector::operator + (const CSph3vector &v){\n+00087\n+CSph3vector tmp = *this;\n+00088\n+return tmp+=v;\n+00089 }\n+00090\n+00091 // subtraction of vectors\n+00092 //-----------------------------------------------00093 const CSph3vector CSph3vector::operator - (const CSph3vector &v){\n+00094\n+CSph3vector tmp = *this;\n+00095\n+return tmp-=v;\n+00096 }\n+00097\n+00098 // division by constant\n+00099 //-----------------------------------------------00100 const CSph3vector CSph3vector::operator / (const double &r){\n+00101\n+CSph3vector tmp = *this;\n 00102\n+return tmp/=r;\n+00103 }\n 00104\n-int mask;\n-00105\n-double R2;\n+00105 // incrementation\n+00106 //-----------------------------------------------00107 CSph3vector& CSph3vector::operator += (const CSph3vector &v){\n 00108\n+px+=v.px;\n 00109\n-inline bool is_inside(Cmomentum *centre, Cmomentum *v);\n+py+=v.py;\n+00110\n+pz+=v.pz;\n+00111\n+return *this;\n+00112\n+00113 }\n+00114\n+00115 // decrementation\n+00116 //-----------------------------------------------00117 CSph3vector& CSph3vector::operator -= (const CSph3vector &v){\n 00118\n-00119 };\n+px-=v.px;\n+00119\n+py-=v.py;\n 00120\n-00121 }\n-00122 #endif\n+pz-=v.pz;\n+00121\n+00122\n+return *this;\n+00123 }\n+00124\n+00125 // multiplication by a constant\n+00126 //-----------------------------------------------00127 CSph3vector& CSph3vector::operator *= (const double &r){\n+00128\n+px*=r;\n+00129\n+py*=r;\n+00130\n+pz*=r;\n+00131\n+return *this;\n+00132\n+00133 }\n+00134\n+00135 // division by a constant\n+00136 //-----------------------------------------------00137 CSph3vector& CSph3vector::operator /= (const double &r){\n+00138\n+px/=r;\n+00139\n+py/=r;\n+00140\n+pz/=r;\n+00141\n+00142\n+_norm/=r;\n+00143\n+return *this;\n+00144\n+00145 }\n+00146\n+00147 // build norm from 3-momentum info\n+00148 void CSph3vector::build_norm(){\n+00149\n+_norm = norm();\n+00150 }\n+00151\n+00152 // build norm from 3-momentum info\n+00153 void CSph3vector::build_thetaphi(){\n+00154\n+_theta = theta();\n+00155\n+_phi = phi();\n+00156 }\n+00157\n+00158\n+00159 // for this direction, compute the two reference directions\n+00160 // used to measure angles\n+00161 void CSph3vector::get_angular_directions(CSph3vector &angular_dir1, CSph3vector &angular_dir2){\n+00162\n+if (px < py){\n+if (pz < px){\n+00163\n+00164\n+// z smallest\n+00165\n+angular_dir1 = CSph3vector(-py, px, 0.0);\n+00166\n+} else {\n+00167\n+// x smallest\n+00168\n+angular_dir1 = CSph3vector(0.0, -pz, py);\n+00169\n+}\n+00170\n+} else {\n+if (pz < py){\n+00171\n+00172\n+// z smallest\n \n-5.19 hash.h\n-00001 // -*- C++ -*00003 // File: hash.h\n+Generated by Doxygen\n+\n+\f5.23 momentum.cpp\n+\n+00173\n+angular_dir1 = CSph3vector(-py, px, 0.0);\n+00174\n+} else {\n+00175\n+// y smallest\n+00176\n+angular_dir1 = CSph3vector(-pz, 0.0, px);\n+00177\n+}\n+00178\n+}\n+00179\n+angular_dir2 = cross_product3(*this, angular_dir1);\n+00180\n+// We\u2019ll simply take x & y so the reflection symmetry is not broken\n+00181\n+//angular_dir1 = CSph3vector(0.0, -pz, py);\n+00182\n+//angular_dir2 = CSph3vector(-pz, 0.0, -px);\n+00183 }\n+00184\n+00185 /*************************************************************************\n+00186 * class CSphmomentum\n+*\n+00187 * This class contains the information for particle or group of\n+*\n+00188 * particles management.\n+*\n+00189 * It includes all Lorentz properties as well as tools for summing them. *\n+00190 *************************************************************************/\n+00191\n+00192 // default ctor\n+00193 //-------------00194 CSphmomentum::CSphmomentum(){\n+00195\n+E=0.0;\n+00196\n+index = -1;\n+00197 }\n+00198\n+00199 // ctor with initialisation\n+00200 //-------------------------00201 CSphmomentum::CSphmomentum(double _px, double _py, double _pz, double _E)\n+00202\n+: CSph3vector(_px, _py, _pz) {\n+00203\n+E = _E;\n+00204\n+// compute the angles\n+00205\n+00206\n+build_thetaphi();\n+00207 }\n+00208\n+00209 // ctor with initialisation\n+00210 //-------------------------00211 CSphmomentum::CSphmomentum(CSph3vector &_v, double _E)\n+00212\n+: CSph3vector(_v.px, _v.py, _v.pz) {\n+00213\n+E = _E;\n+00214 }\n+00215\n+00216 // default dtor\n+00217 //-------------00218 CSphmomentum::~CSphmomentum(){\n+00219\n+00220 }\n+00221\n+00222 // assignment of vectors\n+00223 //----------------------00224 CSphmomentum& CSphmomentum::operator = (const CSphmomentum &v){\n+00225\n+px = v.px;\n+00226\n+py = v.py;\n+00227\n+pz = v.pz;\n+00228\n+E = v.E;\n+00229\n+00230\n+_norm = v._norm;\n+00231\n+_theta = v._theta;\n+00232\n+_phi\n+= v._phi;\n+00233\n+00234\n+ref = v.ref;\n+00235\n+return *this;\n+00236 }\n+00237\n+00238 // addition of vectors\n+00239 // !!! WARNING !!! no updating of eta and phi !!!\n+00240 //-----------------------------------------------00241 const CSphmomentum CSphmomentum::operator + (const CSphmomentum &v){\n+00242\n+CSphmomentum tmp = *this;\n+00243\n+return tmp+=v;\n+00244 }\n+00245\n+00246 // incrementation of vectors\n+00247 // !!! WARNING !!! no updating of eta and phi !!!\n+00248 //-----------------------------------------------00249 CSphmomentum& CSphmomentum::operator += (const CSphmomentum &v){\n+00250\n+px+=v.px;\n+00251\n+py+=v.py;\n+00252\n+pz+=v.pz;\n+00253\n+E +=v.E;\n+00254\n+00255\n+ref+=v.ref;\n+00256\n+00257\n+return *this;\n+00258 }\n+\n+Generated by Doxygen\n+\n+215\n+\n+\f216\n+\n+File Documentation\n+\n+00259\n+00260 // decrementation of vectors\n+00261 // !!! WARNING !!! no updating of eta and phi !!!\n+00262 //-----------------------------------------------00263 CSphmomentum& CSphmomentum::operator -= (const CSphmomentum &v){\n+00264\n+px-=v.px;\n+00265\n+py-=v.py;\n+00266\n+pz-=v.pz;\n+00267\n+E -=v.E;\n+00268\n+00269\n+ref-=v.ref;\n+00270\n+return *this;\n+00271 }\n+00272\n+00273\n+00274 // ordering of two vectors\n+00275 // the default ordering is w.r.t. their references\n+00276 //------------------------------------------------00277 bool operator < (const CSphmomentum &v1, const CSphmomentum &v2){\n+00278\n+return v1.ref < v2.ref;\n+00279 }\n+00280\n+00281 // ordering of vectors in eta (e.g. used in collinear tests)\n+00282 //----------------------------------------------------------00283 bool momentum_theta_less(const CSphmomentum &v1, const CSphmomentum &v2){\n+return v1._theta < v2._theta;\n+00284\n+00285 }\n+00286\n+00287 // ordering of vectors in pt\n+00288 //--------------------------00289 bool momentum_pt_less(const CSphmomentum &v1, const CSphmomentum &v2){\n+00290\n+return v1.perp2() < v2.perp2();\n+00291 }\n+00292\n+00293 }\n+00294\n+\n+5.24 momentum.h\n+00001 // -*- C++ -*00003 // File: momentum.h\n //\n-00004 // Description: header file for classes hash_element and hash_cones\n+00004 // Description: header file for 4-momentum class Cmomentum\n //\n 00005 // This file is part of the SISCone project.\n //\n-00006 // WARNING: this is not the main SISCone trunk but\n+00006 // For more details, see http://projects.hepforge.org/siscone\n //\n 00007 //\n-an adaptation to spherical coordinates\n //\n-00008 // For more details, see http://projects.hepforge.org/siscone\n+00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n //\n 00009 //\n //\n-00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n+00010 // This program is free software; you can redistribute it and/or modify\n //\n-00011 //\n+00011 // it under the terms of the GNU General Public License as published by\n+//\n+00012 // the Free Software Foundation; either version 2 of the License, or\n+//\n+00013 // (at your option) any later version.\n+//\n+00014 //\n+//\n+00015 // This program is distributed in the hope that it will be useful,\n+//\n+00016 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+//\n+00017 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+//\n+00018 // GNU General Public License for more details.\n+//\n+00019 //\n+//\n+00020 // You should have received a copy of the GNU General Public License\n+//\n+00021 // along with this program; if not, write to the Free Software\n+//\n+00022 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n+00023 //\n+//\n+00024 // $Revision:: 163\n+$//\n+00025 // $Date:: 2007-04-26 22:31:02 +0200 (Thu, 26 Apr 2007)\n+$//\n+00027\n+00028 #ifndef __VECTOR_H__\n+00029 #define __VECTOR_H__\n+00030\n+00031 #include \n+00032 #include \n+00033 #include \"reference.h\"\n+00034 #include \"geom_2d.h\"\n+00035 #include \"defines.h\"\n+00036\n+00037 namespace siscone{\n+00038\n+00049 class Cmomentum{\n+00050 public:\n+00052\n+Cmomentum();\n+00053\n+00055\n+Cmomentum(double _px, double _py, double _pz, double _E);\n+\n+Generated by Doxygen\n+\n+\f5.25 momentum.h\n+\n+217\n+\n+00056\n+00058\n+Cmomentum(double _eta, double _phi, Creference _ref);\n+00059\n+00061\n+~Cmomentum();\n+00062\n+00064\n+inline double perp()const {return sqrt(perp2());}\n+00065\n+inline double perp2()const {return px*px+py*py;}\n+00067\n+00068\n+inline double mass()const {return sqrt(mass2());}\n+00070\n+00071\n+inline double mass2()const {return perpmass2()-perp2();}\n+00073\n+00074\n+inline double perpmass()const {return sqrt((E-pz)*(E+pz));}\n+00076\n+00077\n+00079\n+inline double perpmass2()const {return (E-pz)*(E+pz);}\n+00080\n+inline double Et()const {return E/sqrt(1.0+pz*pz/perp2());}\n+00082\n+00083\n+inline double Et2()const {return E*E/(1.0+pz*pz/perp2());}\n+00085\n+00086\n+00088\n+Cmomentum& operator = (const Cmomentum &v);\n+00089\n+const Cmomentum operator + (const Cmomentum &v);\n+00092\n+00093\n+00096\n+Cmomentum& operator += (const Cmomentum &v);\n+00097\n+00100\n+Cmomentum& operator -= (const Cmomentum &v);\n+00101\n+00107\n+void build_etaphi();\n+00108\n+double px;\n+00109\n+double py;\n+00110\n+00111\n+double pz;\n+00112\n+double E;\n+00113\n+double eta;\n+00114\n+double phi;\n+00115\n+00116\n+int parent_index;\n+int index;\n+00117\n+00118\n+00120\n+// the following part is used for checksums //\n+00122\n+Creference ref;\n+00123 };\n+00124\n+00127 bool operator < (const Cmomentum &v1, const Cmomentum &v2);\n+00128\n+00130 bool momentum_eta_less(const Cmomentum &v1, const Cmomentum &v2);\n+00131\n+00133 bool momentum_pt_less(const Cmomentum &v1, const Cmomentum &v2);\n+00134\n+00135\n+00137 // some handy utilities //\n+00139\n+00144 inline double get_distance(double eta, double phi, Cmomentum *v){\n+00145\n+double dx, dy;\n+00146\n+00147\n+dx = eta - v->eta;\n+00148\n+dy = fabs(phi - v->phi);\n+if (dy>M_PI)\n+00149\n+00150\n+dy -= twopi;\n+00151\n+00152\n+return dx*dx+dy*dy;\n+00153 }\n+00154\n+00155 }\n+00156\n+00157 #endif\n+\n+5.25 momentum.h\n+00001 // -*- C++ -*00003 // File: momentum.h\n+00004 // Description: header file for 4-momentum class Cmomentum\n+00005 // This file is part of the SISCone project.\n //\n+00006 // WARNING: this is not the main SISCone trunk but\n+00007 //\n+an adaptation to spherical coordinates\n+00008 // For more details, see http://projects.hepforge.org/siscone\n+00009 //\n+00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n+00011 //\n 00012 // This program is free software; you can redistribute it and/or modify\n+\n+Generated by Doxygen\n+\n+//\n+//\n+\n+//\n+//\n+//\n //\n+//\n+//\n+//\n+\n+\f218\n+\n+File Documentation\n+\n 00013 // it under the terms of the GNU General Public License as published by\n //\n 00014 // the Free Software Foundation; either version 2 of the License, or\n //\n 00015 // (at your option) any later version.\n //\n 00016 //\n@@ -14117,83 +15913,275 @@\n 00022 // You should have received a copy of the GNU General Public License\n //\n 00023 // along with this program; if not, write to the Free Software\n //\n 00024 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n 00025 //\n //\n-00026 // $Revision:: 294\n+00026 // $Revision:: 256\n $//\n-00027 // $Date:: 2009-05-01 17:15:04 +0200 (Fri, 01 May 2009)\n+00027 // $Date:: 2008-07-14 13:52:16 +0200 (Mon, 14 Jul 2008)\n $//\n 00029\n-00030 #ifndef __SPH_HASH_H__\n-00031 #define __SPH_HASH_H__\n+00030 #ifndef __SPH_VECTOR_H__\n+00031 #define __SPH_VECTOR_H__\n 00032\n-00033 #include \"momentum.h\"\n-00034\n-00035 namespace siscone_spherical{\n-00036\n-00046 class sph_hash_element{\n-00047 public:\n-00048\n-CSph3vector centre;\n-bool is_stable;\n-00049\n-00050\n-00051\n-sph_hash_element *next;\n-00052 };\n-00053\n-00061 class sph_hash_cones{\n-00062 public:\n-00065\n-sph_hash_cones(int _Np, double _radius);\n+00033 #include \n+00034 #include \n+00035 #include \n+00036 #include \"geom_2d.h\"\n+00037 #include \n+00038\n+00039 namespace siscone_spherical{\n+00040\n+00054 class CSph3vector{\n+00055 public:\n+00057\n+CSph3vector();\n+00058\n+00060\n+CSph3vector(double _px, double _py, double _pz);\n+00061\n+00063\n+~CSph3vector();\n+00064\n 00066\n-00068\n-~sph_hash_cones();\n-00069\n+CSph3vector& operator = (const CSph3vector &v);\n+00067\n+const CSph3vector operator + (const CSph3vector &v);\n+00070\n+00071\n+00074\n+const CSph3vector operator - (const CSph3vector &v);\n+00075\n+const CSph3vector operator / (const double &r);\n+00078\n 00079\n-int insert(CSphmomentum *v, CSphmomentum *parent, CSphmomentum *child, bool p_io, bool c_io);\n-00080\n-int insert(CSphmomentum *v);\n-00088\n-00089\n+00082\n+CSph3vector& operator += (const CSph3vector &v);\n+00083\n+00086\n+CSph3vector& operator -= (const CSph3vector &v);\n+00087\n+00090\n+CSph3vector& operator *= (const double &r);\n 00091\n-sph_hash_element **hash_array;\n-00092\n-int n_cones;\n 00094\n+CSph3vector& operator /= (const double &r);\n 00095\n-00097 #ifdef DEBUG_STABLE_CONES\n+inline double perp()const {return sqrt(perp2());}\n+00097\n 00098\n-int n_occupied_cells;\n-\n-Generated by Doxygen\n-\n-\f5.20 protocones.cpp\n-\n-205\n-\n-00099 #endif\n 00100\n-00102\n-int mask;\n+inline double perp2()const {return px*px+py*py;}\n+00101\n+inline double norm()const {return sqrt(px*px+py*py+pz*pz);}\n 00103\n-double R2;\n+00104\n+inline double norm2()const {return px*px+py*py+pz*pz;}\n 00106\n 00107\n-double tan2R;\n+inline double phi()const {return atan2(py, px);}\n 00109\n-00110 };\n-00111\n-00112 }\n-00113 #endif\n+00110\n+inline double theta()const {return atan2(perp(),pz);}\n+00112\n+00113\n+void build_norm();\n+00120\n+00121\n+00125\n+void build_thetaphi();\n+00126\n+void get_angular_directions(CSph3vector &angular_dir1, CSph3vector &angular_dir2);\n+00129\n+00130\n+double px;\n+00131\n+double py;\n+00132\n+00133\n+double pz;\n+00134\n+double _norm;\n+00135\n+00136\n+double _theta;\n+double _phi;\n+00137\n+00138\n+// the following part is used for checksums //\n+00140\n+00142\n+siscone::Creference ref;\n+00143 };\n+00144\n+00158 class CSphmomentum : public CSph3vector{\n+00159 public:\n+00161\n+CSphmomentum();\n+00162\n+\n+Generated by Doxygen\n+\n+\f5.25 momentum.h\n+\n+219\n+\n+00164\n+CSphmomentum(CSph3vector &init, double E=0.0);\n+00165\n+00167\n+CSphmomentum(double _px, double _py, double _pz, double _E);\n+00168\n+//CSphmomentum(double _eta, double _phi, siscone::Creference _ref);\n+00170\n+00171\n+00173\n+~CSphmomentum();\n+00174\n+00176\n+inline double mass()const {return sqrt(mass2());}\n+00177\n+00179\n+inline double mass2()const {return perpmass2()-perp2();}\n+00180\n+inline double perpmass()const {return sqrt((E-pz)*(E+pz));}\n+00182\n+00183\n+inline double perpmass2()const {return (E-pz)*(E+pz);}\n+00185\n+00186\n+inline double Et()const {return E/sqrt(1.0+pz*pz/perp2());}\n+00188\n+00189\n+inline double Et2()const {return E*E/(1.0+pz*pz/perp2());}\n+00191\n+00192\n+00194\n+CSphmomentum& operator = (const CSphmomentum &v);\n+00195\n+00198\n+const CSphmomentum operator + (const CSphmomentum &v);\n+00199\n+00202\n+CSphmomentum& operator += (const CSphmomentum &v);\n+00203\n+00206\n+CSphmomentum& operator -= (const CSphmomentum &v);\n+00207\n+double E;\n+00208\n+00209\n+int parent_index;\n+00210\n+00211\n+int index;\n+00212 };\n+00213\n+00216 bool operator < (const CSphmomentum &v1, const CSphmomentum &v2);\n+00217\n+00219 bool momentum_theta_less(const CSphmomentum &v1, const CSphmomentum &v2);\n+00220\n+00222 bool momentum_pt_less(const CSphmomentum &v1, const CSphmomentum &v2);\n+00223\n+00224\n+00226 // some handy utilities //\n+00228\n+00230 inline double sqr(double x){return x*x;}\n+00231\n+00235 inline double dot_product3(const CSph3vector &v1, const CSph3vector &v2){\n+//double tmp = v1.px*v2.px + v1.py*v2.py + v1.pz*v2.pz;\n+00236\n+00237\n+//if (!isfinite(tmp)){\n+00238\n+// std::cout \u00ab \"dot_product inf: \" \u00ab std::endl;\n+00239\n+// std::cout \u00ab \" angles: \" \u00ab v1._theta \u00ab \" \" \u00ab v1._phi \u00ab \" and \" \u00ab v2._theta \u00ab \" \" \u00ab v2._phi \u00ab\n+std::endl;\n+00240\n+// std::cout \u00ab \" moms : \" \u00ab v1.px \u00ab \" \" \u00ab v1.py \u00ab \" \" \u00ab v1.pz\n+00241\n+//\n+\u00ab \" and \"\n+\u00ab v2.px \u00ab \" \" \u00ab v2.py \u00ab \" \" \u00ab v2.pz \u00ab std::endl;\n+00242\n+//}\n+00243\n+return v1.px*v2.px + v1.py*v2.py + v1.pz*v2.pz;\n+00244 }\n+00245\n+00249 inline CSph3vector cross_product3(const CSph3vector &v1, const CSph3vector &v2){\n+//CSph3vector tmp;\n+00250\n+00251\n+//tmp.px = v1.py*v2.pz-v1.pz*v2.py;\n+00252\n+//tmp.py = v1.pz*v2.px-v1.px*v2.pz;\n+00253\n+//tmp.pz = v1.px*v2.py-v1.py*v2.px;\n+00254\n+//return tmp;\n+00255\n+return CSph3vector(v1.py*v2.pz-v1.pz*v2.py,\n+00256\n+v1.pz*v2.px-v1.px*v2.pz,\n+00257\n+v1.px*v2.py-v1.py*v2.px);\n+00258 }\n+00259\n+00263 inline double norm2_cross_product3(const CSph3vector &v1, const CSph3vector &v2){\n+00264\n+return sqr(v1.py*v2.pz-v1.pz*v2.py) + sqr(v1.pz*v2.px-v1.px*v2.pz) + sqr(v1.px*v2.py-v1.py*v2.px);\n+00265 }\n+00266\n+00270 inline double get_tan2_distance(const CSphmomentum &v1, const CSphmomentum &v2){\n+00271\n+return norm2_cross_product3(v1,v2)/sqr(dot_product3(v1,v2));\n+00272 }\n+00273\n+00277 inline double get_distance(const CSph3vector *v1, const CSph3vector *v2){\n+return atan2(sqrt(norm2_cross_product3(*v1,*v2)), dot_product3(*v1,*v2));\n+00278\n+00279 }\n+00280\n+00289 inline bool is_closer(const CSph3vector *v1, const CSph3vector *v2, const double tan2R){\n+00290\n+double dot = dot_product3(*v1,*v2);\n+return (dot>=0) && (norm2_cross_product3(*v1,*v2)<=tan2R*dot*dot);\n+00291\n+00292 }\n+00293\n+00299 inline bool is_closer_safer(const CSph3vector *v1, const CSph3vector *v2, const double cosR){\n+00300\n+return dot_product3(*v1,*v2)>=cosR*sqrt(v1->norm2()*v2->norm2());\n+\n+Generated by Doxygen\n+\n+\f220\n+\n+File Documentation\n+\n+00301\n+//double dot = dot_product3(*v1,*v2);\n+00302\n+//return (dot>=0) && (norm2_cross_product3(*v1,*v2)\n 00063 #include \n 00064 #include \"circulator.h\"\n 00065 #include \n 00066\n 00067 namespace siscone{\n-\n-Generated by Doxygen\n+00068\n \n *\n \n-\f206\n+Generated by Doxygen\n+\n+\f5.26 protocones.cpp\n \n-00068\n 00069 using namespace std;\n 00070\n 00071 /**********************************************************************\n 00072 * Cstable_cones implementation\n *\n 00073 * Computes the list of stable comes from a particle list.\n 00074 * This class does the first fundamental task of te cone algorithm:\n *\n 00075 * it is used to compute the list of stable cones given a list\n *\n 00076 * of particles.\n *\n 00077 **********************************************************************/\n 00078\n-00080 // INITIALISATION FUNCTIONS\n //\n+00080 // INITIALISATION FUNCTIONS\n 00081 // - ctor()\n //\n 00082 // - ctor(particle_list)\n //\n 00083 // - dtor()\n //\n 00084 // - init(particle_list)\n@@ -14355,107 +16343,109 @@\n nb_tot = 0;\n 00100\n hc = NULL;\n 00101 }\n 00102\n 00103 // default dtor\n 00104 //-------------00105 Cstable_cones::~Cstable_cones(){\n-if (hc!=NULL) delete hc;\n 00106\n+if (hc!=NULL) delete hc;\n 00107 }\n 00108\n 00109 /*\n 00110 * initialisation\n 00111 * - _particle_list list of particles\n-number of particles\n 00112 * - _n\n+number of particles\n 00113 *********************************************************************/\n 00114 void Cstable_cones::init(vector &_particle_list){\n-// check already allocated mem\n 00115\n+// check already allocated mem\n 00116\n if (hc!=NULL){\n 00117\n delete hc;\n 00118\n }\n if (protocones.size()!=0)\n 00119\n 00120\n protocones.clear();\n 00121\n 00122\n multiple_centre_done.clear();\n 00123\n-00124\n // initialisation\n+00124\n 00125\n set_particle_list(_particle_list);\n 00126 }\n 00127\n 00128\n-00130 // ALGORITHM MAIN ENTRY\n //\n+00130 // ALGORITHM MAIN ENTRY\n 00131 // - get_stable_cone(radius)\n //\n 00133\n 00134 /*\n 00135 * compute stable cones.\n 00136 * This function really does the job i.e. computes\n 00137 * the list of stable cones (in a seedless way)\n-radius of the cones\n 00138 * - _radius:\n+radius of the cones\n 00139 * The number of stable cones found is returned\n 00140 *********************************************************************/\n 00141 int Cstable_cones::get_stable_cones(double _radius){\n-00142\n int p_idx;\n+00142\n 00143\n // check if everything is correctly initialised\n 00144\n 00145\n if (n_part==0){\n-return 0;\n 00146\n+return 0;\n 00147\n }\n 00148\n 00149\n R = _radius;\n 00150\n R2 = R*R;\n 00151\n // allow hash for cones candidates\n 00152\n 00153\n hc = new hash_cones(n_part, R2);\n 00154\n-00155\n // browse all particles\n+00155\n 00156\n for (p_idx=0;p_idxv;\n 00216\n centre_idx = first_cone;\n 00217\n-// build the initial cone (nodist: avoids calculating distances -00218\n-00219\n+00218\n+// build the initial cone (nodist: avoids calculating distances -00219\n // just deduces contents by circulating around all in/out operations)\n 00220\n // this function also sets the list of included particles\n 00221\n compute_cone_contents();\n 00222\n return 0;\n@@ -14575,57 +16565,53 @@\n 00239\n // all 4 possible cases (parent or child in or out the cone)\n 00240\n // are tested when taking the pair of particle parent+child\n 00241\n // and child+parent.\n 00242\n-00243\n // here are the tests entering the first series:\n+00243\n 00244\n // 1. check if the cone is already inserted\n 00245\n // 2. check cone stability for the parent and child particles\n 00246\n+00247\n+if (centre->side){\n \n Generated by Doxygen\n \n-207\n-\n-\f208\n-\n-File Documentation\n+\f5.26 protocones.cpp\n \n-00247\n-if (centre->side){\n-// test when both particles are not in the cone\n 00248\n+// test when both particles are not in the cone\n 00249\n // or when both are in.\n 00250\n // Note: for the totally exclusive case, test emptyness before\n 00251\n cone_candidate = cone;\n-00252\n if (cone.ref.not_empty()){\n+00252\n 00253\n hc->insert(&cone_candidate, parent, child, false, false);\n 00254\n }\n 00255\n 00256\n cone_candidate = cone;\n 00257\n cone_candidate+= *parent + *child;\n 00258\n hc->insert(&cone_candidate, parent, child, true, true);\n 00259\n } else {\n-// test when 1! of the particles is in the cone\n 00260\n+// test when 1! of the particles is in the cone\n 00261\n cone_candidate = cone + *parent;\n 00262\n hc->insert(&cone_candidate, parent, child, true, false);\n 00263\n 00264\n cone_candidate = cone + *child;\n@@ -14644,44 +16630,44 @@\n 00273\n 00274 /*\n 00275 * update the cone\n 00276 * go to the next child for that parent and update \u2019cone\u2019 appropriately\n 00277 * return 0 if update candidate found, 1 otherwise\n 00278 ***********************************************************************/\n 00279 int Cstable_cones::update_cone(){\n-00280\n // get the next child and centre\n+00280\n 00281\n centre_idx++;\n-if (centre_idx==vicinity_size)\n 00282\n+if (centre_idx==vicinity_size)\n 00283\n centre_idx=0;\n if (centre_idx==first_cone)\n 00284\n-00285\n return 1;\n+00285\n 00286\n // update the cone w.r.t. the old child\n 00287\n 00288\n // only required if the old child is entering inside in which\n 00289\n // case we need to add it. We also know that the child is\n 00290\n // inside iff its side is -.\n 00291\n if (!centre->side){\n-00292\n // update cone\n+00292\n 00293\n cone += (*child);\n 00294\n-00295\n // update info on particles inside\n+00295\n 00296\n centre->is_inside->cone = true;\n 00297\n // update stability check quantities\n 00298\n 00299\n dpt += fabs(child->px)+fabs(child->py);\n@@ -14691,42 +16677,42 @@\n 00302\n // update centre and child to correspond to the new position\n 00303\n centre = vicinity[centre_idx];\n 00304\n child = centre->v;\n 00305\n-00306\n // check cocircularity\n+00306\n 00307\n // note that if cocirculaity is detected (i.e. if we receive 1\n 00308\n // in the next test), we need to recall \u2019update_cone\u2019 directly\n 00309\n // since tests and remaining part of te update has been performed\n 00310\n //if (cocircular_check())\n 00311\n if (cocircular_check())\n-return update_cone();\n 00312\n+return update_cone();\n 00313\n 00314\n 00315\n // update the cone w.r.t. the new child\n 00316\n // only required if the new child was already inside in which\n 00317\n // case we need to remove it. We also know that the child is\n 00318\n // inside iff its side is +.\n 00319\n if ((centre->side) && (cone.ref.not_empty())){\n-00320\n // update cone\n+00320\n 00321\n cone -= (*child);\n 00322\n // update info on particles inside\n 00323\n 00324\n centre->is_inside->cone = false;\n@@ -14734,29 +16720,33 @@\n // update stability check quantities\n 00326\n 00327\n dpt += fabs(child->px)+fabs(child->py); //child->perp2();\n 00328\n }\n 00329\n-// check that the addition and subtraction of vectors does\n 00330\n+// check that the addition and subtraction of vectors does\n 00331\n // not lead to too much rounding error\n 00332\n // for that, we compute the sum of pt modifications and of |pt|\n 00333\n // since last recomputation and once the ratio overpasses a threshold\n+00334\n+// we recompute vicinity.\n \n Generated by Doxygen\n \n-\f5.20 protocones.cpp\n+223\n+\n+\f224\n+\n+File Documentation\n \n-00334\n-// we recompute vicinity.\n 00335\n if ((dpt>PT_TSHOLD*(fabs(cone.px)+fabs(cone.py))) && (cone.ref.not_empty())){\n 00336\n recompute_cone_contents();\n 00337\n }\n 00338\n@@ -14775,38 +16765,38 @@\n 00346\n 00347 /*\n 00348 * compute stability of all enumerated candidates.\n 00349 * For all candidate cones which are stable w.r.t. their border particles,\n 00350 * pass the last test: stability with quadtree intersection\n 00351 ************************************************************************/\n 00352 int Cstable_cones::proceed_with_stability(){\n-00353\n int i; // ,n;\n+00353\n 00354\n hash_element *elm;\n 00355\n-00356\n //n=0;\n+00356\n 00357\n for (i=0;i<=hc->mask;i++){\n-00358\n // test ith cell of the hash array\n+00358\n 00359\n elm = hc->hash_array[i];\n 00360\n // browse elements therein\n 00361\n 00362\n while (elm!=NULL){\n 00363\n // test stability\n 00364\n if (elm->is_stable){\n-00365\n // stability is not ensured by all pairs of \"edges\" already browsed\n+00365\n 00366 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00367\n // => testing stability with quadtree intersection\n 00368\n if (quadtree->circle_intersect(elm->eta, elm->phi, R2)==elm->ref){\n 00369 #else\n 00370\n@@ -14828,16 +16818,16 @@\n 00378\n protocones.push_back(Cmomentum(elm->eta, elm->phi, elm->ref));\n 00379\n }\n 00380\n }\n 00381\n-00382\n // jump to the next one\n+00382\n 00383\n elm = elm->next;\n 00384\n }\n 00385\n }\n 00386\n@@ -14850,21 +16840,21 @@\n 00390 #ifdef DEBUG_STABLE_CONES\n 00391\n nb_hash_cones = hc->n_cones;\n 00392\n nb_hash_occupied = hc->n_occupied_cells;\n 00393 #endif\n 00394\n-delete hc;\n 00395\n+delete hc;\n 00396\n hc=NULL;\n 00397\n-00398\n return protocones.size();\n+00398\n 00399 }\n 00400\n 00401\n 00403 // ALGORITHM MAIN STEPS FOR COCIRCULAR SITUATIONS\n //\n 00404 // - cocircular_pt_less(v1, v2)\n //\n@@ -14874,36 +16864,32 @@\n //\n 00407 // - test_stability(candidate, border_vect)\n //\n 00408 // - updat_cone_cocircular()\n //\n 00410\n 00412 bool cocircular_pt_less(Cmomentum *v1, Cmomentum *v2){\n-00413\n return v1->perp2() < v2->perp2();\n+00413\n 00414 }\n 00415\n 00416 /*\n 00417 * run through the vicinity of the current parent and for each child\n 00418 * establish which other members are cocircular... Note that the list\n 00419 * associated with each child contains references to vicinity\n 00420 * elements: thus two vicinity elements each associated with one given\n 00421 * particle may appear in a list -- this needs to be watched out for\n 00422 * later on...\n 00423 **********************************************************************/\n+00424 void Cstable_cones::prepare_cocircular_lists() {\n \n Generated by Doxygen\n \n-209\n-\n-\f210\n-\n-File Documentation\n+\f5.26 protocones.cpp\n \n-00424 void Cstable_cones::prepare_cocircular_lists() {\n 00425\n circulator::iterator > here(vicinity.begin(),\n 00426\n vicinity.begin(),\n 00427\n vicinity.end());\n 00428\n@@ -14913,59 +16899,59 @@\n do {\n 00431\n 00432\n Cvicinity_elm* here_pntr = *here();\n 00433\n search.set_position(here);\n 00434\n-// search forwards for things that should have \"here\" included in\n 00435\n+// search forwards for things that should have \"here\" included in\n 00436\n // their cocircularity list\n 00437\n while (true) {\n 00438\n ++search;\n-00439\n if ( abs_dphi((*search())->angle, here_pntr->angle) <\n+00439\n 00440\n here_pntr->cocircular_range\n 00441\n && search() != here()) {\n 00442\n (*search())->cocircular.push_back(here_pntr);\n 00443\n } else {\n-break;\n 00444\n+break;\n 00445\n }\n 00446\n }\n 00447\n // search backwards\n 00448\n 00449\n search.set_position(here);\n-00450\n while (true) {\n+00450\n 00451\n --search;\n if ( abs_dphi((*search())->angle, here_pntr->angle) <\n 00452\n 00453\n here_pntr->cocircular_range\n 00454\n && search() != here()) {\n 00455\n (*search())->cocircular.push_back(here_pntr);\n 00456\n } else {\n-00457\n break;\n+00457\n 00458\n }\n 00459\n }\n 00460\n 00461\n ++here;\n@@ -14985,84 +16971,86 @@\n 00474\n list & border_list) {\n 00475\n vector border_vect;\n 00476\n 00477\n border_vect.reserve(border_list.size());\n-00478\n for (list::iterator it = border_list.begin();\n+00478\n 00479\n it != border_list.end(); it++) {\n 00480\n border_vect.push_back(Cborder_store(*it, centre->eta, centre->phi));\n 00481\n }\n 00482\n 00483\n // get them into order of angle\n 00484\n sort(border_vect.begin(), border_vect.end());\n 00485\n-// set up some circulators, since these will help us go around the\n 00486\n+// set up some circulators, since these will help us go around the\n 00487\n // circle easily\n 00488\n circulator::iterator >\n 00489\n start(border_vect.begin(), border_vect.begin(),border_vect.end());\n 00490\n circulator::iterator > mid(start), end(start);\n 00491\n-// test the borderless cone\n 00492\n+// test the borderless cone\n 00493\n Cmomentum candidate = borderless_cone;\n 00494\n candidate.build_etaphi();\n if (candidate.ref.not_empty())\n 00495\n 00496\n test_stability(candidate, border_vect);\n 00497\n 00498\n do {\n-// reset status wrt inclusion in the cone\n 00499\n+// reset status wrt inclusion in the cone\n 00500\n mid = start;\n-do {\n 00501\n+do {\n 00502\n mid()->is_in = false;\n 00503\n } while (++mid != start);\n 00504\n-00505\n // now run over all inclusion possibilities with this starting point\n+00505\n 00506\n candidate = borderless_cone;\n-00507\n while (++mid != start) {\n-// will begin with start+1 and go up to start-1\n+00507\n 00508\n+// will begin with start+1 and go up to start-1\n 00509\n mid()->is_in = true;\n 00510\n candidate += *(mid()->mom);\n+00511\n+test_stability(candidate, border_vect);\n \n Generated by Doxygen\n \n-\f5.20 protocones.cpp\n+225\n \n-211\n+\f226\n+\n+File Documentation\n \n-00511\n-test_stability(candidate, border_vect);\n 00512\n }\n 00513\n 00514\n } while (++start != end);\n 00515\n // mid corresponds to momentum that we need to include to get the\n@@ -15076,61 +17064,61 @@\n 00520\n test_stability(candidate, border_vect);\n 00521 }\n 00522\n 00523\n 00530 void Cstable_cones::test_stability(Cmomentum & candidate, const vector & border_vect) {\n 00531\n-00532\n // this almost certainly has not been done...\n+00532\n 00533\n candidate.build_etaphi();\n 00534\n bool stable = true;\n 00535\n-00536\n for (unsigned i = 0; i < border_vect.size(); i++) {\n-if (is_inside(&candidate, border_vect[i].mom) ^ (border_vect[i].is_in)) {\n+00536\n 00537\n+if (is_inside(&candidate, border_vect[i].mom) ^ (border_vect[i].is_in)) {\n 00538\n stable = false;\n 00539\n break; // it\u2019s unstable so there\u2019s no point continuing\n 00540\n }\n 00541\n }\n 00542\n-00543\n if (stable) hc->insert(&candidate);\n+00543\n 00544 }\n 00545\n 00546 /*\n 00547 * check if we are in a situation of cocircularity.\n 00548 * if it is the case, update and test in the corresponding way\n 00549 * return \u2019false\u2019 if no cocircularity detected, \u2019true\u2019 otherwise\n 00550 * Note that if cocircularity is detected, we need to\n 00551 * recall \u2019update\u2019 from \u2019update\u2019 !!!\n 00552 ***************************************************************/\n 00553 bool Cstable_cones::cocircular_check(){\n-// check if many configurations have the same centre.\n 00554\n+// check if many configurations have the same centre.\n 00555\n // if this is the case, branch on the algorithm for this\n 00556\n // special case.\n 00557\n // Note that those situation, being considered separately in\n 00558\n // test_cone_multiple, must only be considered here if all\n 00559\n // angles are on the same side (this avoid multiple counting)\n 00560\n-if (centre->cocircular.empty()) return false;\n 00561\n+if (centre->cocircular.empty()) return false;\n 00562\n // first get cone into status required at end...\n 00563\n 00564\n if ((centre->side) && (cone.ref.not_empty())){\n 00565\n // update cone\n@@ -15146,16 +17134,16 @@\n 00571\n 00572\n dpt += fabs(child->px)+fabs(child->py); //child->perp2();\n 00573\n }\n 00574\n 00575\n-00576\n // now establish the list of unique children in the list\n+00576\n 00577\n // first make sure parent and child are in!\n 00578\n 00579\n list removed_from_cone;\n 00580\n list put_in_border;\n@@ -15179,41 +17167,39 @@\n 00591\n // region and of the cocircular region itself\n 00592\n for(list::iterator it = centre->cocircular.begin();\n 00593\n it != centre->cocircular.end(); it++) {\n 00594\n-00595\n if ((*it)->is_inside->cone) {\n+00595\n 00596\n cone_removal\n += *((*it)->v);\n 00597\n (*it)->is_inside->cone = false;\n 00598\n removed_from_cone.push_back((*it)->is_inside);\n 00599\n }\n 00600\n-// if a point appears twice (i.e. with + and - sign) in the list of\n 00601\n+// if a point appears twice (i.e. with + and - sign) in the list of\n 00602\n // points on the border, we take care not to include it twice.\n 00603\n // Note that this situation may appear when a point is at a distance\n+00604\n+// close to 2R from the parent\n \n Generated by Doxygen\n \n-\f212\n-\n-File Documentation\n+\f5.26 protocones.cpp\n \n-00604\n-// close to 2R from the parent\n 00605\n if (!(*it)->is_inside->cocirc) {\n 00606\n border += *((*it)->v);\n 00607\n (*it)->is_inside->cocirc = true;\n 00608\n@@ -15230,49 +17216,49 @@\n // figure out whether this pairing has been observed before\n 00615\n Cmomentum borderless_cone = cone;\n 00616\n borderless_cone -= cone_removal;\n bool consider = true;\n 00617\n-00618\n for (unsigned int i=0;i(borderless_cone.ref,\n 00628\n border.ref));\n 00629\n-00630\n // first figure out whether our cone momentum is good\n+00630\n 00631\n double local_dpt = fabs(cone_removal.px) + fabs(cone_removal.py);\n-00632\n double total_dpt = dpt + local_dpt;\n+00632\n 00633\n 00634\n recompute_cone_contents_if_needed(borderless_cone, total_dpt);\n 00635\n if (total_dpt == 0) {\n-// a recomputation has taken place -- so take advantage of this\n 00636\n+// a recomputation has taken place -- so take advantage of this\n 00637\n // and update the member cone momentum\n 00638\n cone = borderless_cone + cone_removal;\n 00639\n dpt = local_dpt;\n 00640\n@@ -15280,16 +17266,16 @@\n 00641\n 00642\n test_cone_cocircular(borderless_cone, border_list);\n 00643\n }\n 00644\n 00645\n-// relabel things that were in the cone but got removed\n 00646\n+// relabel things that were in the cone but got removed\n 00647\n for(list::iterator is_in = removed_from_cone.begin();\n 00648\n is_in != removed_from_cone.end(); is_in++) {\n 00649\n (*is_in)->cone = true;\n 00650\n@@ -15302,25 +17288,25 @@\n 00654\n is_in != put_in_border.end(); is_in++) {\n 00655\n (*is_in)->cocirc = false;\n 00656\n }\n 00657\n-00658\n // we\u2019re done with everything -- return true to signal to user that we\u2019ve\n+00658\n 00659\n // been through the co-circularity rigmarole\n 00660\n return true;\n 00661 }\n 00662\n 00663\n-00665 // RECOMPUTATION OF CONE CONTENTS\n //\n+00665 // RECOMPUTATION OF CONE CONTENTS\n 00666 // - compute_cone_contents()\n //\n 00667 // - recompute_cone_contents()\n //\n 00668 // - recompute_cone_contents_if_needed()\n //\n 00670\n@@ -15329,83 +17315,87 @@\n circulator::iterator >\n 00681\n start(vicinity.begin()+first_cone, vicinity.begin(), vicinity.end());\n 00682\n 00683\n circulator::iterator > here(start);\n 00684\n-00685\n // note that in the following algorithm, the cone contents never includes\n+00685\n 00686\n // the child. Indeed, if it has positive sign, then it will be set as\n 00687\n // outside at the last step in the loop. If it has negative sign, then the\n 00688\n // loop will at some point go to the corresponding situation with positive\n 00689\n // sign and set the inclusion status to 0.\n 00690\n-do {\n 00691\n-00692\n+do {\n // as we leave this position a particle enters if its side is\n+00692\n 00693\n // negative (i.e. the centre is the one at -ve angle wrt to the\n 00694\n // parent-child line\n 00695\n if (!(*here())->side) ((*here())->is_inside->cone) = 1;\n 00696\n // move on to the next position\n 00697\n 00698\n ++here;\n 00699\n-00700\n // as we arrive at this position a particle leaves if its side is positive\n+00700\n+00701\n+if ((*here())->side) ((*here())->is_inside->cone) = 0;\n \n Generated by Doxygen\n \n-\f5.20 protocones.cpp\n+227\n+\n+\f228\n+\n+File Documentation\n \n-00701\n-if ((*here())->side) ((*here())->is_inside->cone) = 0;\n 00702\n } while (here != start);\n 00703\n-00704\n // once we\u2019ve reached the start the \u2019is_inside\u2019 information should be\n+00704\n 00705\n // 100% complete, so we can use it to calculate the cone contents\n 00706\n // and then exit\n 00707\n recompute_cone_contents();\n-00708\n return;\n+00708\n 00709\n 00710 }\n 00711\n 00712\n 00713 /*\n 00714 * compute the cone momentum from particle list.\n 00715 * in this version, we use the \u2019pincluded\u2019 information\n 00716 * from the Cvicinity class\n 00717 */\n 00718 void Cstable_cones::recompute_cone_contents(){\n-unsigned int i;\n 00719\n+unsigned int i;\n 00720\n // set momentum to 0\n 00721\n 00722\n cone = Cmomentum();\n 00723\n-// Important note: we can browse only the particles\n 00724\n+// Important note: we can browse only the particles\n 00725\n // in vicinity since all particles in the cone are\n 00726\n // withing a distance 2R w.r.t. parent hence in vicinity.\n 00727\n // Among those, we only add the particles for which \u2019is_inside\u2019 is true !\n 00728\n@@ -15417,59 +17407,59 @@\n 00731\n if ((vicinity[i]->side) && (vicinity[i]->is_inside->cone))\n 00732\n cone += *vicinity[i]->v;\n 00733\n }\n 00734\n-00735\n // set check variables back to 0\n+00735\n 00736\n dpt = 0.0;\n 00737 }\n 00738\n 00739\n 00740 /*\n 00741 * if we have gone beyond the acceptable threshold of change, compute\n-in this version, we use the\n 00742 * the cone momentum from particle list.\n+in this version, we use the\n 00743 * \u2019pincluded\u2019 information from the Cvicinity class, but we don\u2019t\n 00744 * change the member cone, only the locally supplied one\n 00745 */\n 00746 void Cstable_cones::recompute_cone_contents_if_needed(Cmomentum & this_cone,\n-double & this_dpt){\n 00747\n+double & this_dpt){\n 00748\n-00749\n if (this_dpt > PT_TSHOLD*(fabs(this_cone.px)+fabs(this_cone.py))) {\n-if (cone.ref.is_empty()) {\n+00749\n 00750\n+if (cone.ref.is_empty()) {\n 00751\n this_cone = Cmomentum();\n 00752\n } else {\n-00753\n // set momentum to 0\n+00753\n 00754\n this_cone = Cmomentum();\n 00755\n-00756\n // Important note: we can browse only the particles\n+00756\n 00757\n // in vicinity since all particles in the this_cone are\n 00758\n // withing a distance 2R w.r.t. parent hence in vicinity.\n 00759\n // Among those, we only add the particles for which \u2019is_inside\u2019 is true !\n 00760\n // This methos rather than a direct comparison avoids rounding errors\n 00761\n for (unsigned int i=0;iside) && (vicinity[i]->is_inside->cone))\n 00764\n this_cone += *vicinity[i]->v;\n 00765\n }\n 00766\n@@ -15481,55 +17471,53 @@\n this_dpt = 0.0;\n 00770\n }\n 00771\n 00772 }\n 00773\n 00774\n-00776 // VARIOUS TOOLS\n //\n+00776 // VARIOUS TOOLS\n 00777 // - circle_intersect()\n //\n 00778 // - is_inside()\n //\n 00779 // - abs_dangle()\n //\n 00781\n 00782\n 00783 /*\n 00784 * circle intersection.\n 00785 * computes the intersection with a circle of given centre and radius.\n 00786 * The output takes the form of a checkxor of the intersection\u2019s particles\n circle centre x coordinate\n 00787 * - cx\n-00788 * - cy\n circle centre y coordinate\n+00788 * - cy\n 00789 * return the checkxor for the intersection\n+00790 ******************************************************************/\n \n Generated by Doxygen\n \n-213\n-\n-\f214\n+\f5.27 protocones.cpp\n \n-File Documentation\n+229\n \n-00790 ******************************************************************/\n 00791 Creference Cstable_cones::circle_intersect(double cx, double cy){\n 00792\n Creference intersection;\n-00793\n int i;\n-double dx, dy;\n+00793\n 00794\n+double dx, dy;\n 00795\n for (i=0;ieta - v->eta;\n 00825\n dy = fabs(centre_in->phi - v->phi);\n-00826\n if (dy>M_PI)\n+00826\n 00827\n dy -= twopi;\n 00828\n return dx*dx+dy*dyM_PI)\n 00843\n 00844\n dphi = dphi-twopi;\n 00845\n 00846\n return dphi;\n 00847 }\n 00848\n 00849 }\n \n-5.21 protocones.cpp\n+5.27 protocones.cpp\n 00001\n 00002 // File: protocones.cpp\n 00003 // Description: source file for stable cones determination (Cstable_cones)\n 00004 // This file is part of the SISCone project.\n //\n 00005 // WARNING: this is not the main SISCone trunk but\n 00006 //\n@@ -15622,14 +17610,18 @@\n 00013 // the Free Software Foundation; either version 2 of the License, or\n 00014 // (at your option) any later version.\n //\n 00015 //\n 00016 // This program is distributed in the hope that it will be useful,\n 00017 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n 00018 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+00019 // GNU General Public License for more details.\n+//\n+\n+Generated by Doxygen\n \n //\n //\n \n //\n //\n //\n@@ -15641,20 +17633,16 @@\n //\n \n //\n //\n //\n //\n \n-Generated by Doxygen\n-\n-\f5.21 protocones.cpp\n+\f230\n \n-00019 // GNU General Public License for more details.\n-//\n 00020 //\n //\n 00021 // You should have received a copy of the GNU General Public License\n //\n 00022 // along with this program; if not, write to the Free Software\n //\n 00023 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n@@ -15776,40 +17764,37 @@\n 00101\n nb_tot = 0;\n 00102\n hc = NULL;\n 00103 }\n 00104\n 00105 // default dtor\n-00106 //--------------\n-\n-Generated by Doxygen\n+00106 //-------------00107 CSphstable_cones::~CSphstable_cones(){\n+00108\n+if (hc!=NULL) delete hc;\n \n-215\n+File Documentation\n \n *\n \n-\f216\n+Generated by Doxygen\n \n-File Documentation\n+\f5.27 protocones.cpp\n \n-00107 CSphstable_cones::~CSphstable_cones(){\n-if (hc!=NULL) delete hc;\n-00108\n 00109 }\n 00110\n 00111 /*\n 00112 * initialisation\n 00113 * - _particle_list list of particles\n number of particles\n 00114 * - _n\n 00115 *********************************************************************/\n 00116 void CSphstable_cones::init(vector &_particle_list){\n-00117\n // check already allocated mem\n+00117\n 00118\n if (hc!=NULL){\n 00119\n delete hc;\n 00120\n }\n if (protocones.size()!=0)\n@@ -15823,30 +17808,30 @@\n // initialisation\n 00126\n 00127\n set_particle_list(_particle_list);\n 00128 }\n 00129\n 00130\n-//\n 00132 // ALGORITHM MAIN ENTRY\n+//\n 00133 // - get_stable_cone(radius)\n //\n 00135\n 00136 /*\n 00137 * compute stable cones.\n 00138 * This function really does the job i.e. computes\n 00139 * the list of stable cones (in a seedless way)\n radius of the cones\n 00140 * - _radius:\n 00141 * The number of stable cones found is returned\n 00142 *********************************************************************/\n 00143 int CSphstable_cones::get_stable_cones(double _radius){\n-int p_idx;\n 00144\n+int p_idx;\n 00145\n // check if everything is correctly initialised\n 00146\n 00147\n if (n_part==0){\n return 0;\n 00148\n@@ -15863,16 +17848,16 @@\n tan2R *= tan2R;\n 00155\n 00156\n // allow hash for cones candidates\n 00157\n hc = new sph_hash_cones(n_part, R);\n 00158\n-// browse all particles\n 00159\n+// browse all particles\n 00160\n for (p_idx=0;p_idxside){\n@@ -16085,37 +18074,33 @@\n 00276\n //UPDATED(see below): }\n 00277\n //UPDATED(see below):\n 00278\n //UPDATED(see below): nb_tot+=2;\n 00279\n-// instead of testing 2 inclusion/exclusion states for every pair, we test the 4 of them\n 00280\n+// instead of testing 2 inclusion/exclusion states for every pair, we test the 4 of them\n 00281\n // when the parent has an energy bigger than the child\n 00282\n if (parent->E >= child->E){\n-// test when both particles are not in the cone\n 00283\n+// test when both particles are not in the cone\n 00284\n // Note: for the totally exclusive case, test emptiness before\n+00285\n+cone_candidate = cone;\n+00286\n+if (cone.ref.not_empty()){\n \n Generated by Doxygen\n \n-217\n-\n-\f218\n-\n-File Documentation\n+\f5.27 protocones.cpp\n \n-00285\n-cone_candidate = cone;\n-if (cone.ref.not_empty()){\n-00286\n 00287\n hc->insert(&cone_candidate, parent, child, false, false);\n 00288\n }\n 00289\n 00290\n // test when 1! of the particles is in the cone\n@@ -16168,18 +18153,18 @@\n 00322\n 00323\n centre_idx++;\n if (centre_idx==vicinity_size)\n 00324\n 00325\n centre_idx=0;\n-00326\n if (centre_idx==first_cone)\n-return 1;\n+00326\n 00327\n+return 1;\n 00328\n // update the cone w.r.t. the old child\n 00329\n 00330\n // only required if the old child is entering inside in which\n 00331\n // case we need to add it. We also know that the child is\n@@ -16192,16 +18177,16 @@\n cout \u00ab \" old_enter\";\n 00336 #endif\n 00337\n // update cone\n 00338\n cone += (*child);\n 00339\n-00340\n // update info on particles inside\n+00340\n 00341\n centre->is_inside->cone = true;\n 00342\n // update stability check quantities\n 00343\n 00344\n dpt += fabs(child->px)+fabs(child->py)+fabs(child->pz);\n@@ -16247,26 +18232,30 @@\n 00367\n if ((centre->side) && (cone.ref.not_empty())){\n 00368 #ifdef DEBUG_STABLE_CONES\n 00369\n cout \u00ab \" new exit\";\n 00370 #endif\n 00371\n+// update cone\n+00372\n+00373\n+cone -= (*child);\n \n Generated by Doxygen\n \n-\f5.21 protocones.cpp\n+233\n+\n+\f234\n+\n+File Documentation\n \n-00372\n-// update cone\n-00373\n-cone -= (*child);\n 00374\n-00375\n // update info on particles inside\n+00375\n 00376\n centre->is_inside->cone = false;\n 00377\n // update stability check quantities\n 00378\n 00379\n dpt += fabs(child->px)+fabs(child->py)+fabs(child->pz); //child->perp2();\n@@ -16285,16 +18274,16 @@\n // we recompute vicinity.\n 00387\n if ((dpt>PT_TSHOLD*(fabs(cone.px)+fabs(cone.py)+fabs(cone.pz))) && (cone.ref.not_empty())){\n 00388\n recompute_cone_contents();\n 00389\n }\n-if (cone.ref.is_empty()){\n 00390\n+if (cone.ref.is_empty()){\n 00391\n cone = CSphmomentum();\n 00392\n dpt=0.0;\n 00393\n }\n 00394\n@@ -16317,29 +18306,29 @@\n int i;\n 00409\n 00410\n sph_hash_element *elm;\n 00411\n 00412\n for (i=0;i<=hc->mask;i++){\n-00413\n // test ith cell of the hash array\n+00413\n 00414\n elm = hc->hash_array[i];\n 00415\n // browse elements therein\n 00416\n 00417\n while (elm!=NULL){\n // test stability\n 00418\n 00419\n if (elm->is_stable){\n-00420\n // stability is not ensured by all pairs of \"edges\" already browsed\n+00420\n 00421 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00422\n // => testing stability with quadtree intersection\n 00423\n if (quadtree->circle_intersect(elm->eta, elm->phi, R2)==elm->ref)\n 00424 #else\n 00425\n@@ -16357,16 +18346,16 @@\n 00432\n elm = elm->next;\n 00433\n }\n 00434\n }\n 00435\n-// free hash\n 00436\n+// free hash\n 00437\n // we do that at this level because hash eats rather a lot of memory\n 00438\n // we want to free it before running the split/merge algorithm\n 00439 #ifdef DEBUG_STABLE_CONES\n 00440\n nb_hash_cones = hc->n_cones;\n@@ -16394,25 +18383,21 @@\n //\n 00456 // - test_stability(candidate, border_vect)\n //\n 00457 // - updat_cone_cocircular()\n //\n 00459\n 00461 //NEVER USED\n+00462 //bool cocircular_pt_less(CSphmomentum *v1, CSphmomentum *v2){\n+00463 // return v1->perp2() < v2->perp2();\n \n Generated by Doxygen\n \n-219\n-\n-\f220\n-\n-File Documentation\n+\f5.27 protocones.cpp\n \n-00462 //bool cocircular_pt_less(CSphmomentum *v1, CSphmomentum *v2){\n-00463 // return v1->perp2() < v2->perp2();\n 00464 //}\n 00465\n 00466 /*\n 00467 * run through the vicinity of the current parent and for each child\n 00468 * establish which other members are cocircular... Note that the list\n 00469 * associated with each child contains references to vicinity\n 00470 * elements: thus two vicinity elements each associated with one given\n@@ -16499,16 +18484,16 @@\n 00518 * on the border --- note that this is till probably overkill, since\n 00519 * in principle we only have to test situations where up to a\n 00520 * half-circle is filled (but going to a full circle is simpler)\n 00521 ******************************************************************/\n 00522 void CSphstable_cones::test_cone_cocircular(CSphmomentum & borderless_cone,\n 00523\n list & border_list) {\n-// in spherical coordinates, we don\u2019t have a universal x-y axis system\n 00524\n+// in spherical coordinates, we don\u2019t have a universal x-y axis system\n 00525\n // to measure the angles. So we first determine one minimising\n 00526\n // the uncertainties\n 00527\n CSph3vector angl_dir1, angl_dir2;\n 00528\n@@ -16534,43 +18519,47 @@\n }\n 00539\n 00540\n // get them into order of angle\n 00541\n sort(border_vect.begin(), border_vect.end());\n 00542\n-00543\n // set up some circulators, since these will help us go around the\n+00543\n 00544\n // circle easily\n 00545\n siscone::circulator::iterator >\n 00546\n start(border_vect.begin(), border_vect.begin(),border_vect.end());\n 00547\n siscone::circulator::iterator > mid(start), end(start);\n 00548\n+// test the borderless cone\n+00549\n+00550\n+CSphmomentum candidate = borderless_cone;\n \n Generated by Doxygen\n \n-\f5.21 protocones.cpp\n+235\n+\n+\f236\n+\n+File Documentation\n \n-00549\n-// test the borderless cone\n-00550\n-CSphmomentum candidate = borderless_cone;\n 00551\n //candidate.build_etaphi();\n 00552\n if (candidate.ref.not_empty())\n 00553\n test_stability(candidate, border_vect);\n 00554\n-do {\n 00555\n+do {\n 00556\n // reset status wrt inclusion in the cone\n 00557\n mid = start;\n 00558\n do {\n 00559\n@@ -16578,32 +18567,32 @@\n 00560\n } while (++mid != start);\n 00561\n // now run over all inclusion possibilities with this starting point\n 00562\n 00563\n candidate = borderless_cone;\n-00564\n while (++mid != start) {\n-// will begin with start+1 and go up to start-1\n+00564\n 00565\n+// will begin with start+1 and go up to start-1\n 00566\n mid()->is_in = true;\n 00567\n candidate += *(mid()->mom);\n 00568\n test_stability(candidate, border_vect);\n 00569\n }\n 00570\n 00571\n } while (++start != end);\n 00572\n-// mid corresponds to momentum that we need to include to get the\n 00573\n+// mid corresponds to momentum that we need to include to get the\n 00574\n // full cone\n 00575\n mid()->is_in = true;\n 00576\n candidate += *(mid()->mom);\n 00577\n@@ -16623,16 +18612,16 @@\n bool stable = true;\n for (unsigned i = 0; i < border_vect.size(); i++) {\n 00593\n 00594\n if (is_closer(&candidate, border_vect[i].mom,tan2R) ^ (border_vect[i].is_in)) {\n 00595\n stable = false;\n-break; // it\u2019s unstable so there\u2019s no point continuing\n 00596\n+break; // it\u2019s unstable so there\u2019s no point continuing\n 00597\n }\n 00598\n }\n 00599\n if (stable) hc->insert(&candidate);\n 00600\n@@ -16662,26 +18651,26 @@\n 00618\n if (centre->cocircular.empty()) return false;\n 00619\n // first get cone into status required at end...\n 00620\n 00621\n if ((centre->side) && (cone.ref.not_empty())){\n-// update cone\n 00622\n+// update cone\n 00623\n cone -= (*child);\n 00624\n // update info on particles inside\n 00625\n 00626\n centre->is_inside->cone = false;\n 00627\n-00628\n // update stability check quantities\n+00628\n 00629\n dpt += fabs(child->px)+fabs(child->py)+fabs(child->pz); //child->perp2();\n 00630\n }\n 00631\n 00632\n // now establish the list of unique children in the list\n@@ -16694,23 +18683,23 @@\n 00637\n list put_in_border;\n 00638\n list border_list;\n 00639\n 00640\n CSphmomentum cone_removal;\n+00641\n+CSphmomentum border = *parent;\n+00642\n+border_list.push_back(parent);\n \n Generated by Doxygen\n \n-221\n-\n-\f222\n+\f5.27 protocones.cpp\n \n-00641\n-00642\n 00643\n 00644\n 00645\n 00646\n 00647\n 00648\n 00649\n@@ -16729,18 +18718,16 @@\n 00662\n 00663\n 00664\n 00665\n 00666\n 00667\n \n-File Documentation\n+237\n \n-CSphmomentum border = *parent;\n-border_list.push_back(parent);\n // make sure child appears in the border region\n centre->cocircular.push_back(centre);\n // now establish the full contents of the cone minus the cocircular\n // region and of the cocircular region itself\n for(list::iterator it = centre->cocircular.begin();\n it != centre->cocircular.end(); it++) {\n if ((*it)->is_inside->cone) {\n@@ -16793,16 +18780,16 @@\n // record the fact that we\u2019ve now seen this combination\n 00684\n 00685\n multiple_centre_done.push_back(pair(borderless_cone.ref,\n 00686\n border.ref));\n 00687\n-00688\n // first figure out whether our cone momentum is good\n+00688\n 00689\n double local_dpt = fabs(cone_removal.px) + fabs(cone_removal.py);\n 00690\n double total_dpt = dpt + local_dpt;\n 00691\n 00692\n recompute_cone_contents_if_needed(borderless_cone, total_dpt);\n@@ -16821,27 +18808,27 @@\n 00699\n 00700\n test_cone_cocircular(borderless_cone, border_list);\n 00701\n }\n 00702\n 00703\n-00704\n // relabel things that were in the cone but got removed\n+00704\n 00705\n for(list::iterator is_in = removed_from_cone.begin();\n 00706\n is_in != removed_from_cone.end(); is_in++) {\n 00707\n (*is_in)->cone = true;\n 00708\n }\n 00709\n-// relabel things that got put into the border\n 00710\n+// relabel things that got put into the border\n 00711\n for(list::iterator is_in = put_in_border.begin();\n 00712\n is_in != put_in_border.end(); is_in++) {\n 00713\n (*is_in)->cocirc = false;\n 00714\n@@ -16852,39 +18839,41 @@\n 00717\n // been through the co-circularity rigmarole\n 00718\n return true;\n 00719 }\n 00720\n 00721\n-00723 // RECOMPUTATION OF CONE CONTENTS\n //\n+00723 // RECOMPUTATION OF CONE CONTENTS\n 00724 // - compute_cone_contents()\n //\n 00725 // - recompute_cone_contents()\n //\n 00726 // - recompute_cone_contents_if_needed()\n //\n 00728\n+00737 void CSphstable_cones::compute_cone_contents() {\n+00738\n+siscone::circulator::iterator >\n \n Generated by Doxygen\n \n-\f5.21 protocones.cpp\n+\f238\n+\n+File Documentation\n \n-00737 void CSphstable_cones::compute_cone_contents() {\n-00738\n-siscone::circulator::iterator >\n 00739\n start(vicinity.begin()+first_cone, vicinity.begin(), vicinity.end());\n 00740\n 00741\n siscone::circulator::iterator > here(start);\n 00742\n-// note that in the following algorithm, the cone contents never includes\n 00743\n+// note that in the following algorithm, the cone contents never includes\n 00744\n // the child. Indeed, if it has positive sign, then it will be set as\n 00745\n // outside at the last step in the loop. If it has negative sign, then the\n 00746\n // loop will at some point go to the corresponding situation with positive\n 00747\n@@ -16917,16 +18906,16 @@\n 00762\n 00763\n // 100% complete, so we can use it to calculate the cone contents\n 00764\n // and then exit\n 00765\n recompute_cone_contents();\n-00766\n return;\n+00766\n 00767\n 00768 }\n 00769\n 00770\n 00771 /*\n 00772 * compute the cone momentum from particle list.\n 00773 * in this version, we use the \u2019pincluded\u2019 information\n@@ -16973,32 +18962,32 @@\n 00799 * if we have gone beyond the acceptable threshold of change, compute\n 00800 * the cone momentum from particle list.\n in this version, we use the\n 00801 * \u2019pincluded\u2019 information from the CSphvicinity class, but we don\u2019t\n 00802 * change the member cone, only the locally supplied one\n 00803 */\n 00804 void CSphstable_cones::recompute_cone_contents_if_needed(CSphmomentum & this_cone,\n-double & this_dpt){\n 00805\n+double & this_dpt){\n 00806\n if (this_dpt > PT_TSHOLD*(fabs(this_cone.px)+fabs(this_cone.py))) {\n 00807\n 00808\n if (cone.ref.is_empty()) {\n 00809\n this_cone = CSphmomentum();\n 00810\n } else {\n-00811\n // set momentum to 0\n+00811\n 00812\n this_cone = CSphmomentum();\n 00813\n-// Important note: we can browse only the particles\n 00814\n+// Important note: we can browse only the particles\n 00815\n // in vicinity since all particles in the this_cone are\n 00816\n // withing a distance 2R w.r.t. parent hence in vicinity.\n 00817\n // Among those, we only add the particles for which \u2019is_inside\u2019 is true !\n 00818\n@@ -17009,28 +18998,24 @@\n // to avoid double-counting, only use particles with + angle\n 00821\n if ((vicinity[i]->side) && (vicinity[i]->is_inside->cone))\n 00822\n this_cone += *vicinity[i]->v;\n 00823\n }\n+00824\n+00825\n+}\n \n Generated by Doxygen\n \n-223\n-\n-\f224\n-\n-File Documentation\n+\f5.28 protocones.h\n \n-00824\n-00825\n-}\n-// set check variables back to 0\n 00826\n+// set check variables back to 0\n 00827\n this_dpt = 0.0;\n 00828\n }\n 00829\n 00830 }\n 00831\n@@ -17074,15 +19059,15 @@\n 00858\n return intersection;\n 00859\n 00860 }\n 00861\n 00862 }\n \n-5.22 protocones.h\n+5.28 protocones.h\n 00001 // -*- C++ -*00003 // File: protocones.h\n //\n 00004 // Description: header file for stable cones determination (Cstable_cones)\n //\n 00005 // This file is part of the SISCone project.\n //\n 00006 // For more details, see http://projects.hepforge.org/siscone\n@@ -17136,33 +19121,37 @@\n 00036 #include \"hash.h\"\n 00037\n 00038 #include \"defines.h\"\n 00039\n 00040 namespace siscone{\n 00041\n 00053 class Cborder_store{\n+00054 public:\n+00056\n+Cborder_store(Cmomentum * momentum, double centre_eta, double centre_phi) :\n \n Generated by Doxygen\n \n-\f5.22 protocones.h\n+239\n+\n+\f240\n+\n+File Documentation\n \n-00054 public:\n-00056\n-Cborder_store(Cmomentum * momentum, double centre_eta, double centre_phi) :\n 00057\n mom(momentum), is_in(false) {\n 00058\n angle = atan2(mom->phi - centre_phi, mom->eta - centre_eta);\n 00059\n }\n 00060\n 00061\n Cmomentum * mom;\n-00062\n double angle;\n+00062\n bool\n is_in;\n 00063\n 00064 };\n 00065\n 00066\n 00069 inline bool operator<(const Cborder_store & a, const Cborder_store & b) {\n@@ -17178,39 +19167,39 @@\n 00086\n 00088\n Cstable_cones(std::vector &_particle_list);\n 00089\n 00091\n ~Cstable_cones();\n 00092\n-00097\n void init(std::vector &_particle_list);\n+00097\n 00098\n int get_stable_cones(double _radius);\n 00106\n 00107\n 00109\n std::vector protocones;\n 00110\n 00112\n hash_cones *hc;\n 00113\n-int nb_tot;\n 00115\n+int nb_tot;\n 00116 #ifdef DEBUG_STABLE_CONES\n 00117\n int nb_hash_cones, nb_hash_occupied;\n 00118 #endif\n 00119\n 00120 protected:\n double R;\n 00122\n 00123\n-00125\n double R2;\n+00125\n 00126\n 00127 private:\n 00130\n Cmomentum cone;\n 00131\n 00133\n Cmomentum *child;\n@@ -17229,16 +19218,16 @@\n 00150\n int test_cone();\n 00157\n 00158\n int update_cone();\n 00164\n 00165\n-00166\n /*\n+00166\n 00167 * run through the vicinity of the current parent and for each child\n 00168 * indicate which members are cocircular...\n 00169 */\n 00170\n void prepare_cocircular_lists();\n 00171\n bool cocircular_check();\n@@ -17250,45 +19239,43 @@\n std::list & border_list);\n 00187\n 00194\n void test_stability(Cmomentum & candidate,\n const std::vector & border_vect);\n 00195\n 00196\n-00203\n void compute_cone_contents();\n+00203\n 00204\n-void recompute_cone_contents();\n 00210\n+void recompute_cone_contents();\n 00211\n /*\n 00212\n 00213 * if we have gone beyond the acceptable threshold of change, compute\n-00214 * the cone momentum from particle list.\n in this version, we use the\n+00214 * the cone momentum from particle list.\n 00215 * \u2019pincluded\u2019 information from the Cvicinity class, but we don\u2019t\n 00216 * change the member cone, only the locally supplied one\n 00217 */\n 00218\n void recompute_cone_contents_if_needed(Cmomentum & this_cone, double & this_dpt);\n 00219\n 00225\n int proceed_with_stability();\n+00226\n+00227\n+/*\n \n Generated by Doxygen\n \n-225\n-\n-\f226\n+\f5.29 protocones.h\n \n-File Documentation\n+241\n \n-00226\n-/*\n-00227\n 00228 * circle intersection.\n 00229 * computes the intersection with a circle of given centre and radius.\n 00230 * The output takes the form of a checkxor of the intersection\u2019s particles\n circle centre x coordinate\n 00231 * - cx\n 00232 * - cy\n circle centre y coordinate\n@@ -17325,15 +19312,15 @@\n 00266 * \\return the absolute value of the difference between the angles\n 00267 *****************************************************************/\n 00268 inline double abs_dangle(double &angle1, double &angle2);\n 00269\n 00270 }\n 00271 #endif\n \n-5.23 protocones.h\n+5.29 protocones.h\n 00001 // -*- C++ -*00003 // File: protocones.h\n //\n 00004 // Description: header file for stable cones determination (Cstable_cones)\n //\n 00005 // This file is part of the SISCone project.\n //\n 00006 // WARNING: this is not the main SISCone trunk but\n@@ -17342,14 +19329,15 @@\n an adaptation to spherical coordinates\n //\n 00008 // For more details, see http://projects.hepforge.org/siscone\n //\n 00009 //\n //\n 00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n+//\n 00011 //\n //\n 00012 // This program is free software; you can redistribute it and/or modify\n //\n 00013 // it under the terms of the GNU General Public License as published by\n //\n 00014 // the Free Software Foundation; either version 2 of the License, or\n@@ -17392,27 +19380,24 @@\n 00039\n 00040 #include \n 00041\n 00042 namespace siscone_spherical{\n 00043\n 00055 class CSphborder_store{\n 00056 public:\n-\n-//\n+00058\n+CSphborder_store(CSphmomentum * momentum, CSph3vector ¢re, CSph3vector &angl_dir1, CSph3vector\n+&angl_dir2) :\n \n Generated by Doxygen\n \n-\f5.23 protocones.h\n-\n-00058\n+\f242\n \n-227\n+File Documentation\n \n-CSphborder_store(CSphmomentum * momentum, CSph3vector ¢re, CSph3vector &angl_dir1, CSph3vector\n-&angl_dir2) :\n 00059\n mom(momentum), is_in(false) {\n 00060\n CSph3vector diff = (*momentum) - centre;\n 00061\n angle = atan2(dot_product3(diff, angl_dir2), dot_product3(diff, angl_dir1));\n 00062 #ifdef DEBUG_STABLE_CONES\n@@ -17473,16 +19458,16 @@\n 00127 protected:\n double R;\n 00129\n 00130\n double R2;\n 00132\n 00133\n-00135\n double tan2R;\n+00135\n 00136\n 00137 private:\n 00140\n CSphmomentum cone;\n 00141\n 00143\n CSphmomentum *child;\n@@ -17501,16 +19486,16 @@\n 00160\n int test_cone();\n 00167\n 00168\n int update_cone();\n 00174\n 00175\n-00176\n /*\n+00176\n 00177 * run through the vicinity of the current parent and for each child\n 00178 * indicate which members are cocircular...\n 00179 */\n 00180\n void prepare_cocircular_lists();\n 00181\n bool cocircular_check();\n@@ -17522,33 +19507,33 @@\n std::list & border_list);\n 00197\n 00204\n void test_stability(CSphmomentum & candidate,\n const std::vector & border_vect);\n 00205\n 00206\n-00213\n void compute_cone_contents();\n+00213\n 00214\n-void recompute_cone_contents();\n 00220\n+void recompute_cone_contents();\n 00221\n /*\n 00222\n 00223 * if we have gone beyond the acceptable threshold of change, compute\n+00224 * the cone momentum from particle list.\n+in this version, we use the\n+00225 * \u2019pincluded\u2019 information from the CSphvicinity class, but we don\u2019t\n \n Generated by Doxygen\n \n-\f228\n+\f5.30 quadtree.cpp\n \n-File Documentation\n+243\n \n-in this version, we use the\n-00224 * the cone momentum from particle list.\n-00225 * \u2019pincluded\u2019 information from the CSphvicinity class, but we don\u2019t\n 00226 * change the member cone, only the locally supplied one\n 00227 */\n 00228\n void recompute_cone_contents_if_needed(CSphmomentum & this_cone, double & this_dpt);\n 00229\n int proceed_with_stability();\n 00235\n@@ -17581,15 +19566,15 @@\n 00258\n double dpt;\n 00259 };\n 00260\n 00261 }\n 00262 #endif\n \n-5.24 quadtree.cpp\n+5.30 quadtree.cpp\n 00001\n //\n 00002 // File: quadtree.cpp\n 00003 // Description: source file for quadtree management (Cquadtree class)\n //\n 00004 // This file is part of the SISCone project.\n //\n@@ -17654,24 +19639,26 @@\n 00043 // default ctor\n 00044 //-------------00045 Cquadtree::Cquadtree(){\n 00046\n v = NULL;\n 00047\n 00048\n children[0][0] = children[0][1] = children[1][0] = children[1][1] = NULL;\n+00049\n+has_child = false;\n+00050 }\n+\n+Generated by Doxygen\n \n *\n \n-Generated by Doxygen\n+\f244\n \n-\f5.24 quadtree.cpp\n+File Documentation\n \n-00049\n-has_child = false;\n-00050 }\n 00051\n 00052\n 00053 // ctor with initialisation (see init for details)\n 00054 //-------------------------00055 Cquadtree::Cquadtree(double _x, double _y, double _half_size_x, double _half_size_y){\n 00056\n v = NULL;\n 00057\n@@ -17687,18 +19674,18 @@\n 00064\n 00065 // default destructor\n 00066 // at destruction, everything is destroyed except\n 00067 // physical values at the leaves\n 00068 //-----------------------------------------------00069 Cquadtree::~Cquadtree(){\n 00070\n if (has_child){\n-00071\n if (v!=NULL) delete v;\n-delete children[0][0];\n+00071\n 00072\n+delete children[0][0];\n 00073\n delete children[0][1];\n delete children[1][0];\n 00074\n 00075\n delete children[1][1];\n 00076\n@@ -17706,23 +19693,23 @@\n 00077 }\n 00078\n 00079\n 00080 /*\n 00081 * init the tree.\n 00082 * By initializing the tree, we mean setting the cell parameters\n 00083 * and preparing the object to act as a seed for a new tree.\n-00084 * - _x\n x-position of the center\n+00084 * - _x\n y-position of the center\n 00085 * - _y\n 00086 * - half_size_x half x-size of the cell\n 00087 * - half_size_y half y-size of the cell\n 00088 * return 0 on success, 1 on error. Note that if the cell\n-00089 *\n is already filled, we return an error.\n+00089 *\n 00090 ******************************************************************/\n 00091 int Cquadtree::init(double _x, double _y, double _half_size_x, double _half_size_y){\n 00092\n if (v!=NULL)\n return 1;\n 00093\n 00094\n@@ -17740,16 +19727,16 @@\n 00101 }\n 00102\n 00103\n 00104 /*\n 00105 * adding a particle to the tree.\n 00106 * This method adds one vector to the quadtree structure which\n 00107 * is updated consequently.\n-00108 * - v\n vector to add\n+00108 * - v\n 00109 * return 0 on success 1 on error\n 00110 ******************************************************************/\n 00111 int Cquadtree::add(Cmomentum *v_add){\n // Description of the method:\n 00112\n 00113\n // -------------------------00114\n@@ -17792,31 +19779,27 @@\n 00131\n // step 2: additional work if 1! particle already present\n 00132\n //\n we use the fact that only 1-particle systems have no child\n 00133\n if (!has_child){\n-double new_half_size_x = 0.5*half_size_x;\n 00134\n-00135\n+double new_half_size_x = 0.5*half_size_x;\n double new_half_size_y = 0.5*half_size_y;\n+00135\n+// create children\n+00136\n+00137\n+children[0][0] = new Cquadtree(centre_x-new_half_size_x, centre_y-new_half_size_y,\n \n Generated by Doxygen\n \n-229\n-\n-\f230\n-\n-File Documentation\n+\f5.30 quadtree.cpp\n \n-00136\n-// create children\n-00137\n-children[0][0] = new Cquadtree(centre_x-new_half_size_x, centre_y-new_half_size_y,\n 00138\n new_half_size_x, new_half_size_y);\n 00139\n children[0][1] = new Cquadtree(centre_x-new_half_size_x, centre_y+new_half_size_y,\n 00140\n new_half_size_x, new_half_size_y);\n 00141\n@@ -17827,25 +19810,25 @@\n children[1][1] = new Cquadtree(centre_x+new_half_size_x, centre_y+new_half_size_y,\n 00144\n new_half_size_x, new_half_size_y);\n 00145\n 00146\n has_child = true;\n 00147\n-// forward to child\n 00148\n+// forward to child\n 00149\n //? The following line assumes \u2019true\u2019==1 and \u2019false\u2019==0\n 00150\n // Note: v being a single particle, eta and phi are correct\n 00151\n children[v->eta>centre_x][v->phi>centre_y]->add(v);\n 00152\n-// copy physical params\n 00153\n+// copy physical params\n 00154\n v = new Cmomentum(*v);\n 00155\n }\n 00156\n 00157\n // step 3: add new particle\n@@ -17862,25 +19845,25 @@\n 00164\n 00165\n 00166 /*\n 00167 * circle intersection.\n 00168 * computes the intersection with a circle of given centre and radius.\n 00169 * The output takes the form of a quadtree with all squares included\n 00170 * in the circle.\n-00171 * - cx\n circle centre x coordinate\n+00171 * - cx\n circle centre y coordinate\n 00172 * - cy\n 00173 * - cR2\n circle radius SQUARED\n 00174 * return the checksum for the intersection\n 00175 ******************************************************************/\n 00176 Creference Cquadtree::circle_intersect(double cx, double cy, double cR2){\n-00177\n // Description of the method:\n+00177\n 00178\n // -------------------------00179\n // 1. check if cell is empty => no intersection\n 00180\n // 2. if cell has 1! particle, check if it is inside the circle.\n 00181\n //\n@@ -17898,39 +19881,39 @@\n // step 1: if there is no particle inside te square, no reason to go further\n 00187\n 00188\n if (v==NULL)\n return Creference();\n 00189\n 00190\n-00191\n double dx, dy;\n+00191\n 00192\n-// step 2: if there is only one particle inside the square, test if it is in\n 00193\n+// step 2: if there is only one particle inside the square, test if it is in\n 00194\n //\n the circle, in which case return associated reference\n 00195\n if (!has_child){\n-00196\n // compute the distance\n+00196\n 00197\n // Note: v has only one particle => eta and phi are defined\n 00198\n dx = cx - v->eta;\n 00199\n dy = fabs(cy - v->phi);\n if (dy>M_PI)\n 00200\n 00201\n dy -= 2.0*M_PI;\n 00202\n-00203\n // test distance\n+00203\n 00204\n if (dx*dx+dy*dyref;\n 00206\n }\n 00207\n@@ -17948,49 +19931,53 @@\n 00214\n // store distance with the centre of the square\n 00215\n 00216\n dx_c = fabs(cx-centre_x);\n 00217\n dy_c = fabs(cy-centre_y);\n-00218\n if (dy_c>M_PI) dy_c = 2.0*M_PI-dy_c;\n+00218\n 00219\n-00220\n // compute (minimal) the distance (pay attention to the periodicity in phi).\n+00220\n 00221\n dx = dx_c-half_size_x;\n-00222\n if (dx<0) dx=0;\n+00222\n+00223\n+dy = dy_c-half_size_y;\n+00224\n+if (dy<0) dy=0;\n \n Generated by Doxygen\n \n-\f5.24 quadtree.cpp\n+245\n+\n+\f246\n+\n+File Documentation\n \n-00223\n-dy = dy_c-half_size_y;\n-if (dy<0) dy=0;\n-00224\n 00225\n-00226\n // check the distance\n+00226\n 00227\n if (dx*dx+dy*dy>=cR2){\n 00228\n // no intersection\n 00229\n return Creference();\n 00230\n }\n 00231\n 00232\n // step 4: check if included\n 00233\n-// compute the (maximal) distance\n 00234\n+// compute the (maximal) distance\n 00235\n dx = dx_c+half_size_x;\n 00236\n dy = dy_c+half_size_y;\n if (dy>M_PI) dy = M_PI;\n 00237\n 00238\n@@ -18025,19 +20012,19 @@\n 00258 * - flux opened stream to write to\n 00259 * return 0 on success, 1 on error\n 00260 ******************************************************************/\n 00261 int Cquadtree::save(FILE *flux){\n 00262\n if (flux==NULL)\n 00263\n-00264\n return 1;\n+00264\n 00265\n-if (has_child){\n 00266\n+if (has_child){\n 00267\n fprintf(flux, \"%e\\t%e\\t%e\\t%e\\n\", centre_x, centre_y, half_size_x, half_size_y);\n 00268\n children[0][0]->save(flux);\n 00269\n children[0][1]->save(flux);\n 00270\n@@ -18061,19 +20048,19 @@\n 00284 * - flux opened stream to write to\n 00285 * return 0 on success, 1 on error\n 00286 ******************************************************************/\n 00287 int Cquadtree::save_leaves(FILE *flux){\n 00288\n if (flux==NULL)\n 00289\n-00290\n return 1;\n+00290\n 00291\n-if (has_child){\n 00292\n+if (has_child){\n if (children[0][0]!=NULL) children[0][0]->save_leaves(flux);\n 00293\n 00294\n if (children[0][1]!=NULL) children[0][1]->save_leaves(flux);\n if (children[1][0]!=NULL) children[1][0]->save_leaves(flux);\n 00295\n 00296\n@@ -18087,24 +20074,22 @@\n 00300\n 00301\n return 0;\n 00302 }\n 00303\n 00304 }\n \n-Generated by Doxygen\n-\n-231\n+5.31 quadtree.h\n+00001 // -*- C++ -*-\n \n-\f232\n+Generated by Doxygen\n \n-File Documentation\n+\f5.32 ranlux.cpp\n \n-5.25 quadtree.h\n-00001 // -*- C++ -*00003 // File: quadtree.h\n+00003 // File: quadtree.h\n //\n 00004 // Description: header file for quadtree management (Cquadtree class)\n //\n 00005 // This file is part of the SISCone project.\n //\n 00006 // For more details, see http://projects.hepforge.org/siscone\n //\n@@ -18161,70 +20146,74 @@\n 00047\n 00049\n Cquadtree(double _x, double _y, double _half_size_x, double _half_size_y);\n 00050\n 00054\n ~Cquadtree();\n 00055\n-int init(double _x, double _y, double _half_size_x, double _half_size_y);\n 00067\n+int init(double _x, double _y, double _half_size_x, double _half_size_y);\n 00068\n int add(Cmomentum *v_add);\n 00076\n 00077\n 00088\n Creference circle_intersect(double cx, double cy, double cR2);\n 00089\n int save(FILE *flux);\n 00099\n 00100\n-00110\n int save_leaves(FILE *flux);\n+00110\n 00111\n double centre_x;\n 00112\n-double centre_y;\n 00113\n+double centre_y;\n 00114\n double half_size_x;\n double half_size_y;\n 00115\n 00116\n 00117\n Cmomentum *v;\n 00118\n 00119\n Cquadtree* children[2][2];\n-00120\n bool has_child;\n+00120\n 00121 };\n 00122\n 00123 }\n 00124 #endif\n \n-5.26 ranlux.cpp\n+5.32 ranlux.cpp\n 00001 // file: ranlux.xpp\n 00002 #include \"ranlux.h\"\n 00003 #include \n 00004 #include \n 00005\n 00006 /* This is a lagged fibonacci generator with skipping developed by Luescher.\n 00007 The sequence is a series of 24-bit integers, x_n,\n 00008\n 00009 x_n = d_n + b_n\n 00010\n 00011 where d_n = x_{n-10} - x_{n-24} - c_{n-1}, b_n = 0 if d_n >= 0 and\n+00012 b_n = 2^24 if d_n < 0, c_n = 0 if d_n >= 0 and c_n = 1 if d_n < 0,\n+00013 where after 24 samples a group of p integers are \"skipped\", to\n+00014 reduce correlations. By default p = 199, but can be increased to\n \n Generated by Doxygen\n \n-\f5.26 ranlux.cpp\n+247\n+\n+\f248\n+\n+File Documentation\n \n-00012 b_n = 2^24 if d_n < 0, c_n = 0 if d_n >= 0 and c_n = 1 if d_n < 0,\n-00013 where after 24 samples a group of p integers are \"skipped\", to\n-00014 reduce correlations. By default p = 199, but can be increased to\n 00015 365.\n 00016\n 00017 The period of the generator is around 10^171.\n 00018\n 00019 From: M. Luescher, \"A portable high-quality random number generator\n 00020 for lattice field theory calculations\", Computer Physics\n 00021 Communications, 79 (1994) 100-110.\n@@ -18253,37 +20242,37 @@\n 00043\n 00044 // internal generator structure\n 00045 //-----------------------------00046 typedef struct {\n unsigned int i;\n 00047\n 00048\n unsigned int j;\n-unsigned int n;\n 00049\n-00050\n+unsigned int n;\n unsigned int skip;\n-unsigned int carry;\n+00050\n 00051\n-00052\n+unsigned int carry;\n unsigned long int u[24];\n+00052\n 00053 } ranlux_state_t;\n 00054\n 00055\n 00056 // internal generator state\n 00057 //-------------------------00058 ranlux_state_t local_ranlux_state;\n 00059\n 00060\n 00061 // incrementation of the generator state\n 00062 //--------------------------------------00063 static inline unsigned long int increment_state(){\n-00064\n unsigned int i = local_ranlux_state.i;\n-unsigned int j = local_ranlux_state.j;\n+00064\n 00065\n-00066\n+unsigned int j = local_ranlux_state.j;\n long int delta = local_ranlux_state.u[j] - local_ranlux_state.u[i]\n+00066\n 00067\n - local_ranlux_state.carry;\n 00068\n 00069\n if (delta & mask_hi){\n 00070\n local_ranlux_state.carry = 1;\n@@ -18295,59 +20284,57 @@\n local_ranlux_state.carry = 0;\n 00074\n }\n 00075\n 00076\n local_ranlux_state.u[i] = delta;\n 00077\n-if (i==0)\n 00078\n+if (i==0)\n 00079\n i = 23;\n else\n 00080\n 00081\n i--;\n 00082\n 00083\n local_ranlux_state.i = i;\n 00084\n-if (j == 0)\n 00085\n+if (j == 0)\n 00086\n j = 23;\n else\n 00087\n 00088\n j--;\n 00089\n 00090\n local_ranlux_state.j = j;\n 00091\n-return delta;\n 00092\n+return delta;\n 00093 }\n 00094\n 00095\n 00096 // set generator state\n 00097 //--------------------00098 static void ranlux_set(unsigned long int s){\n+int i;\n+00099\n+long int seed;\n+00100\n+00101\n \n Generated by Doxygen\n \n-233\n-\n-\f234\n+\f5.33 siscone/ranlux.h File Reference\n \n-File Documentation\n+249\n \n-00099\n-int i;\n-long int seed;\n-00100\n-00101\n 00102\n if (s==0)\n /* default seed is 314159265 */\n 00103\n s = 314159265;\n 00104\n 00105\n@@ -18379,16 +20366,16 @@\n 00120\n local_ranlux_state.j = 9;\n 00121\n local_ranlux_state.n = 0;\n 00122\n local_ranlux_state.skip = 389-24; // 389 => best decorrelation\n 00123\n-if (local_ranlux_state.u[23]&mask_hi){\n 00124\n+if (local_ranlux_state.u[23]&mask_hi){\n 00125\n local_ranlux_state.carry = 1;\n 00126\n } else {\n 00127\n local_ranlux_state.carry = 0;\n 00128\n@@ -18403,18 +20390,18 @@\n 00136\n ranlux_set(0);\n 00137 }\n 00138\n 00139\n 00140 // get random number\n 00141 //------------------00142 unsigned long int ranlux_get(){\n-const unsigned int skip = local_ranlux_state.skip;\n 00143\n-00144\n+const unsigned int skip = local_ranlux_state.skip;\n unsigned long int r = increment_state();\n+00144\n 00145\n 00146\n local_ranlux_state.n++;\n 00147\n if (local_ranlux_state.n == 24){\n 00148\n 00149\n@@ -18432,85 +20419,87 @@\n 00155\n 00156 }\n 00157\n 00158 // print generator state\n 00159 //----------------------00160 void ranlux_print_state(){\n 00161\n size_t i;\n-unsigned char *p = (unsigned char *) (&local_ranlux_state);\n 00162\n-const size_t n = sizeof (ranlux_state_t);\n+unsigned char *p = (unsigned char *) (&local_ranlux_state);\n 00163\n+const size_t n = sizeof (ranlux_state_t);\n 00164\n for (i=0;i\n 00030\n 00031 namespace siscone{\n 00032\n 00033 /*******************************************************\n@@ -18718,34 +20709,32 @@\n 00113\n ref[0] ^= r.ref[0];\n 00114\n ref[1] ^= r.ref[1];\n 00115\n ref[2] ^= r.ref[2];\n \n-Generated by Doxygen\n-\n-237\n+File Documentation\n \n *\n \n *\n \n-\f238\n+Generated by Doxygen\n \n-File Documentation\n+\f5.36 reference.h\n \n 00116\n return *this;\n 00117 }\n 00118\n 00119 }\n 00120\n \n-5.30 reference.h\n+5.36 reference.h\n 00001 // -*- C++ -*00003 // File: reference.h\n //\n 00004 // Description: header file for checkxor management (Creference class)\n //\n 00005 // This file is part of the SISCone project.\n //\n 00006 // For more details, see http://projects.hepforge.org/siscone\n@@ -18844,17 +20833,19 @@\n 00094 }\n 00095\n 00096 // difference test for two references\n 00097 //----------------------------------\n \n Generated by Doxygen\n \n-\f5.31 siscone.cpp\n+253\n \n-239\n+\f254\n+\n+File Documentation\n \n 00098 inline bool operator != (const Creference &r1, const Creference &r2){\n return (r1.ref[0]!=r2.ref[0]) || (r1.ref[1]!=r2.ref[1]) || (r1.ref[2]!=r2.ref[2]);\n 00099\n 00100 }\n 00101\n 00102 // difference test for two references\n@@ -18867,15 +20858,15 @@\n 00107\n ));\n 00108 }\n 00109\n 00110 }\n 00111 #endif\n \n-5.31 siscone.cpp\n+5.37 siscone.cpp\n 00001\n //\n 00002 // File: siscone.cpp\n 00003 // Description: source file for the main SISCone class\n //\n 00004 // This file is part of the SISCone project.\n //\n@@ -18957,21 +20948,19 @@\n rerun_allowed = false;\n 00059 }\n 00060\n 00061 bool Csiscone::init_done=false;\n 00062 std::ostream* Csiscone::_banner_ostr = &cout;\n 00063\n \n-Generated by Doxygen\n-\n *\n \n-\f240\n+Generated by Doxygen\n \n-File Documentation\n+\f5.37 siscone.cpp\n \n 00064 /*\n 00065 * compute the jets from a given particle set doing multiple passes\n 00066 * such pass N looks for jets among all particles not put into jets\n 00067 * during previous passes.\n 00068 * - _particles\n list of particles\n@@ -19109,15 +21098,19 @@\n 00148 * - _particles\n 00149 * - _radius\n cone radius\n 00150 * - _n_pass_max maximum number of runs\n \n Generated by Doxygen\n \n-\f5.31 siscone.cpp\n+255\n+\n+\f256\n+\n+File Documentation\n \n minimum pT of the protojets\n 00151 * - _ptmin\n 00152 * - _ordering_scale\n the ordering scale to decide which stable\n 00153 *\n cone is removed\n@@ -19258,17 +21251,15 @@\n 00234 }\n 00235\n 00236 // ensure things are initialised\n 00237 void Csiscone::_initialise_if_needed(){\n \n Generated by Doxygen\n \n-241\n-\n-\f242\n+\f5.38 siscone.cpp\n \n 00238\n 00239\n 00240\n 00241\n 00242\n 00243\n@@ -19278,15 +21269,15 @@\n 00247\n 00248\n 00249\n 00250\n 00251\n 00252\n \n-File Documentation\n+257\n \n // initialise random number generator\n if (init_done) return;\n // initialise random number generator\n ranlux_init();\n // do not do this again\n init_done=true;\n@@ -19363,15 +21354,15 @@\n 00290 string siscone_version(){\n return SISCONE_VERSION;\n 00291\n 00292 }\n 00293\n 00294 }\n \n-5.32 siscone.cpp\n+5.38 siscone.cpp\n 00001\n 00002 // File: siscone.cpp\n 00003 // Description: source file for the main SISCone class\n 00004 // This file is part of the SISCone project.\n //\n 00005 // WARNING: this is not the main SISCone trunk but\n 00006 //\n@@ -19386,14 +21377,16 @@\n 00014 // (at your option) any later version.\n //\n 00015 //\n 00016 // This program is distributed in the hope that it will be useful,\n 00017 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n 00018 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n \n+Generated by Doxygen\n+\n //\n //\n \n //\n //\n //\n //\n@@ -19404,17 +21397,17 @@\n //\n \n //\n //\n //\n //\n \n-Generated by Doxygen\n+\f258\n \n-\f5.32 siscone.cpp\n+File Documentation\n \n 00019 // GNU General Public License for more details.\n //\n 00020 //\n //\n 00021 // You should have received a copy of the GNU General Public License\n //\n@@ -19534,19 +21527,17 @@\n 00103\n bool finished = false;\n 00104\n 00105\n \n Generated by Doxygen\n \n-243\n-\n-\f244\n+\f5.38 siscone.cpp\n \n-File Documentation\n+259\n \n 00106\n rerun_allowed = false;\n 00107\n protocones_list.clear();\n 00108\n 00109 #ifdef DEBUG_STABLE_CONES\n@@ -19690,17 +21681,17 @@\n CSphstable_cones::init(p_uncol_hard);\n 00191\n 00192\n // get stable cones (stored in \u2019protocones\u2019)\n \n Generated by Doxygen\n \n-\f5.32 siscone.cpp\n+\f260\n \n-245\n+File Documentation\n \n 00193\n unclustered_left = get_stable_cones(_radius);\n 00194\n // add the hardest stable cone to the list of jets\n 00195\n 00196\n@@ -19853,17 +21844,15 @@\n 00272\n 00273 // finally, a bunch of functions to access to\n 00274 // basic information (package name, version)\n 00275 //---------------------------------------------\n \n Generated by Doxygen\n \n-\f246\n-\n-File Documentation\n+\f5.39 siscone.h\n \n 00276\n 00277 /*\n 00278 * return SISCone package name.\n 00279 * This is nothing but \"SISCone\", it is a replacement to the\n 00280 * SISCONE_PACKAGE_NAME string defined in config.h and which is not\n 00281 * guaranteed to be public.\n@@ -19883,15 +21872,15 @@\n 00293 string siscone_version(){\n return SISCONE_VERSION;\n 00294\n 00295 }\n 00296\n 00297 }\n \n-5.33 siscone.h\n+5.39 siscone.h\n 00001 // -*- C++ -*00003 // File: siscone.h\n //\n 00004 // Description: header file for the main SISCone class\n //\n 00005 // This file is part of the SISCone project.\n //\n 00006 // For more details, see http://projects.hepforge.org/siscone\n@@ -19976,15 +21965,19 @@\n 00119\n 00120\n static bool init_done;\n 00121\n \n Generated by Doxygen\n \n-\f5.34 siscone.h\n+261\n+\n+\f262\n+\n+File Documentation\n \n 00122 #ifdef DEBUG_STABLE_CONES\n 00123\n int nb_hash_cones_total, nb_hash_occupied_total;\n 00124 #endif\n 00125\n static void set_banner_stream(std::ostream * ostr) {_banner_ostr = ostr;}\n@@ -20011,15 +22004,15 @@\n 00166 std::string siscone_package_name();\n 00167\n 00173 std::string siscone_version();\n 00174\n 00175 }\n 00176 #endif\n \n-5.34 siscone.h\n+5.40 siscone.h\n 00001 // -*- C++ -*00003 // File: siscone.h\n //\n 00004 // Description: header file for the main SISCone class\n //\n 00005 // This file is part of the SISCone project.\n //\n 00006 // WARNING: this is not the main SISCone trunk but\n@@ -20098,19 +22091,17 @@\n Esplit_merge_scale _ordering_scale=SM_Etilde);\n 00097\n int recompute_jets(double _f, double _Emin = 0.0,\n 00110\n \n Generated by Doxygen\n \n-247\n-\n-\f248\n+\f5.41 siscone_error.cpp\n \n-File Documentation\n+263\n \n 00111\n Esplit_merge_scale _split_merge_scale=SM_Etilde);\n 00112\n 00114\n std::vector > protocones_list;\n 00115\n@@ -20148,15 +22139,15 @@\n 00163 std::string siscone_package_name();\n 00164\n 00170 std::string siscone_version();\n 00171\n 00172 }\n 00173 #endif\n \n-5.35 siscone_error.cpp\n+5.41 siscone_error.cpp\n 00001\n //\n 00002 // File: siscone_error.cpp\n 00003 // Description: source file for SISCone error messages (Csiscone_error)\n //\n 00004 // This file is part of the SISCone project.\n //\n@@ -20204,24 +22195,26 @@\n 00028\n 00029 namespace siscone{\n 00030\n 00031 bool Csiscone_error::m_print_errors = true;\n 00032\n 00033 }\n \n-5.36 siscone_error.h\n+5.42 siscone_error.h\n 00001 // -*- C++ -*00003 // File: siscone_error.h\n 00004 // Description: header file for SISCone error messages (Csiscone_error)\n \n+Generated by Doxygen\n+\n //\n //\n \n-Generated by Doxygen\n+\f264\n \n-\f5.37 geom_2d.h\n+File Documentation\n \n 00005 // This file is part of the SISCone project.\n //\n 00006 // For more details, see http://projects.hepforge.org/siscone\n //\n 00007 //\n //\n@@ -20297,18 +22290,18 @@\n static bool m_print_errors;\n 00060\n 00061 };\n 00062\n 00063 }\n 00064 #endif\n \n-5.37 geom_2d.h\n-00001 // -*- C++ -*00003 // File: geom_2d.h\n+5.43 hash.h\n+00001 // -*- C++ -*00003 // File: hash.h\n //\n-00004 // Description: header file for two-dimensional geometry tools\n+00004 // Description: header file for classes hash_element and hash_cones\n //\n 00005 // This file is part of the SISCone project.\n //\n 00006 // For more details, see http://projects.hepforge.org/siscone\n //\n 00007 //\n //\n@@ -20339,173 +22332,220 @@\n 00020 // You should have received a copy of the GNU General Public License\n //\n 00021 // along with this program; if not, write to the Free Software\n //\n 00022 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n 00023 //\n //\n-00024 // $Revision:: 422\n+00024 // $Revision:: 224\n $//\n \n Generated by Doxygen\n \n-249\n-\n-\f250\n+\f5.44 hash.h\n \n-File Documentation\n+265\n \n-00025 // $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)\n+00025 // $Date:: 2008-05-16 19:58:30 +0200 (Fri, 16 May 2008)\n $//\n 00027\n-00028 #ifndef __GEOM_2D_H__\n-00029 #define __GEOM_2D_H__\n+00028 #ifndef __HASH_H__\n+00029 #define __HASH_H__\n 00030\n-00031 #include \n-00032 #include \n-00033 #include \"defines.h\"\n-00034\n-00035 #ifndef M_PI\n-00036 #define M_PI 3.141592653589793238462643383279502884197\n-00037 #endif\n-00038\n-00039 namespace siscone{\n-00040\n-00043 inline double phi_in_range(double phi) {\n-if\n-(phi <= -M_PI) phi += twopi;\n-00044\n-00045\n-else if (phi >\n-M_PI) phi -= twopi;\n-return phi;\n-00046\n-00047 }\n+00031 #include \"momentum.h\"\n+00032 #include \"reference.h\"\n+00033\n+00034 namespace siscone{\n+00035\n+00045 class hash_element{\n+00046 public:\n+00047\n+Creference ref;\n+double eta;\n 00048\n-00052 inline double dphi(double phi1, double phi2) {\n-00053\n-return phi_in_range(phi1-phi2);\n-00054 }\n-00055\n-00056\n-00060 inline double abs_dphi(double phi1, double phi2) {\n-double delta = fabs(phi1-phi2);\n-00061\n-00062\n-return delta > M_PI ? twopi-delta : delta;\n-00063 }\n-00064\n-00066 inline double pow2(double x) {return x*x;}\n+00049\n+double phi;\n+00050\n+bool is_stable;\n+00051\n+00052\n+hash_element *next;\n+00053 };\n+00054\n+00062 class hash_cones{\n+00063 public:\n 00067\n+hash_cones(int _Np, double _R2);\n 00068\n-00073 class Ctwovect {\n-00074 public:\n-00076\n-Ctwovect() : x(0.0), y(0.0) {}\n-00077\n+00070\n+~hash_cones();\n+00071\n+int insert(Cmomentum *v, Cmomentum *parent, Cmomentum *child, bool p_io, bool c_io);\n 00081\n-Ctwovect(double _x, double _y) : x(_x), y(_y) {}\n 00082\n-double x, y;\n-00084\n-00085\n-inline double mod2()const {return pow2(x)+pow2(y);}\n-00087\n-00088\n-inline double modulus()const {return sqrt(mod2());}\n+int insert(Cmomentum *v);\n 00090\n-00091 };\n-00092\n+00091\n 00093\n-00098 inline double dot_product(const Ctwovect & a, const Ctwovect & b) {\n-return a.x*b.x + a.y*b.y;\n-00099\n-00100 }\n-00101\n+hash_element **hash_array;\n+00094\n+int n_cones;\n+00096\n+00097\n+00099 #ifdef DEBUG_STABLE_CONES\n+00100\n+int n_occupied_cells;\n+00101 #endif\n 00102\n-00107 inline double cross_product(const Ctwovect & a, const Ctwovect & b) {\n+00104\n+int mask;\n+00105\n+double R2;\n 00108\n-return a.x*b.y - a.y*b.x;\n-00109 }\n-00110\n-00111\n-00120 class Ceta_phi_range{\n-00121 public:\n-00123\n-Ceta_phi_range();\n-00124\n-00130\n-Ceta_phi_range(double c_eta, double c_phi, double R);\n-00131\n-00134\n-Ceta_phi_range& operator = (const Ceta_phi_range &r);\n-00135\n-int add_particle(const double eta, const double phi);\n-00140\n-00141\n-unsigned int eta_range;\n-00143\n-00144\n-unsigned int phi_range;\n-00146\n-00147\n-// extremal value for eta\n-00148\n-00149\n-static double eta_min;\n-00150\n-static double eta_max;\n-00151\n-00152 private:\n-inline unsigned int get_eta_cell(double eta){\n-00154\n-00155\n-return (unsigned int) (1u \u00ab ((int) (32*((eta-eta_min)/(eta_max-eta_min)))));\n-00156\n-}\n-00157\n-00159\n-inline unsigned int get_phi_cell(double phi){\n-return (unsigned int) (1u \u00ab ((int) (32*phi/twopi+16)%32));\n-00160\n-00161\n-}\n-00162 };\n-00163\n-00168 bool is_range_overlap(const Ceta_phi_range &r1, const Ceta_phi_range &r2);\n+00109\n+inline bool is_inside(Cmomentum *centre, Cmomentum *v);\n+00118\n+00119 };\n+00120\n+00121 }\n+00122 #endif\n+\n+5.44 hash.h\n+00001 // -*- C++ -*00003 // File: hash.h\n+//\n+00004 // Description: header file for classes hash_element and hash_cones\n+//\n+00005 // This file is part of the SISCone project.\n+//\n+00006 // WARNING: this is not the main SISCone trunk but\n+//\n+00007 //\n+an adaptation to spherical coordinates\n+//\n+00008 // For more details, see http://projects.hepforge.org/siscone\n+//\n+00009 //\n+//\n+00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n+00011 //\n+//\n+00012 // This program is free software; you can redistribute it and/or modify\n+//\n+00013 // it under the terms of the GNU General Public License as published by\n+//\n+00014 // the Free Software Foundation; either version 2 of the License, or\n+//\n+00015 // (at your option) any later version.\n+//\n+00016 //\n+//\n+00017 // This program is distributed in the hope that it will be useful,\n+//\n+00018 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+//\n+00019 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+//\n+00020 // GNU General Public License for more details.\n+//\n+00021 //\n+//\n+00022 // You should have received a copy of the GNU General Public License\n+//\n+00023 // along with this program; if not, write to the Free Software\n+//\n+00024 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n+00025 //\n+//\n+00026 // $Revision:: 294\n+$//\n+00027 // $Date:: 2009-05-01 17:15:04 +0200 (Fri, 01 May 2009)\n+$//\n+00029\n+00030 #ifndef __SPH_HASH_H__\n+00031 #define __SPH_HASH_H__\n+00032\n \n Generated by Doxygen\n \n-\f5.38 geom_2d.h\n+//\n+\n+\f266\n \n-00169\n-00175 const Ceta_phi_range range_union(const Ceta_phi_range &r1, const Ceta_phi_range &r2);\n-00176\n-00177 }\n-00178\n-00179 #endif\n+File Documentation\n \n-5.38 geom_2d.h\n-00001 // -*- C++ -*00003 // File: geom_2d.h\n+00033 #include \"momentum.h\"\n+00034\n+00035 namespace siscone_spherical{\n+00036\n+00046 class sph_hash_element{\n+00047 public:\n+00048\n+CSph3vector centre;\n+bool is_stable;\n+00049\n+00050\n+00051\n+sph_hash_element *next;\n+00052 };\n+00053\n+00061 class sph_hash_cones{\n+00062 public:\n+00065\n+sph_hash_cones(int _Np, double _radius);\n+00066\n+00068\n+~sph_hash_cones();\n+00069\n+int insert(CSphmomentum *v, CSphmomentum *parent, CSphmomentum *child, bool p_io, bool c_io);\n+00079\n+00080\n+int insert(CSphmomentum *v);\n+00088\n+00089\n+00091\n+sph_hash_element **hash_array;\n+00092\n+00094\n+int n_cones;\n+00095\n+00097 #ifdef DEBUG_STABLE_CONES\n+00098\n+int n_occupied_cells;\n+00099 #endif\n+00100\n+int mask;\n+00102\n+00103\n+double R2;\n+00106\n+00107\n+00109\n+double tan2R;\n+00110 };\n+00111\n+00112 }\n+00113 #endif\n+\n+5.45 vicinity.h\n+00001 // -*- C++ -*00003 // File: vicinity.h\n //\n-00004 // Description: header file for two-dimensional geometry tools\n+00004 // Description: header file for particle vicinity (Cvicinity class)\n //\n 00005 // This file is part of the SISCone project.\n //\n 00006 // WARNING: this is not the main SISCone trunk but\n //\n 00007 //\n an adaptation to spherical coordinates\n //\n 00008 // For more details, see http://projects.hepforge.org/siscone\n //\n 00009 //\n //\n 00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n-//\n 00011 //\n //\n 00012 // This program is free software; you can redistribute it and/or modify\n //\n 00013 // it under the terms of the GNU General Public License as published by\n //\n 00014 // the Free Software Foundation; either version 2 of the License, or\n@@ -20527,509 +22567,355 @@\n 00022 // You should have received a copy of the GNU General Public License\n //\n 00023 // along with this program; if not, write to the Free Software\n //\n 00024 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n 00025 //\n //\n-00026 // $Revision:: 422\n+00026 // $Revision:: 255\n $//\n-00027 // $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)\n+00027 // $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008)\n $//\n 00029\n-00030 #ifndef __SPH_GEOM_2D_H__\n-00031 #define __SPH_GEOM_2D_H__\n+00030 #ifndef __SPH_VICINITY_H__\n+00031 #define __SPH_VICINITY_H__\n 00032\n-00033 #include \n-00034 #include \n-00035 #include \n-00036 #include \n-00037\n-00038 #ifndef M_PI\n-00039 #define M_PI 3.141592653589793238462643383279502884197\n+00033 #include \n+00034 #include \n+00035 #include \n+00036 #include \"momentum.h\"\n+00037 #include \n+00038 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00039 #include \n 00040 #endif\n+\n+//\n+\n+Generated by Doxygen\n+\n+\f5.46 vicinity.h\n+\n+267\n+\n 00041\n 00042 namespace siscone_spherical{\n 00043\n-00052 class CSphtheta_phi_range{\n+00044\n+00052 class CSphvicinity_elm{\n 00053 public:\n 00055\n-CSphtheta_phi_range();\n+CSphmomentum *v;\n 00056\n+00058\n+siscone::Cvicinity_inclusion *is_inside;\n+00059\n+// centre variables\n+00060\n+00061\n+CSph3vector centre;\n 00062\n-CSphtheta_phi_range(double c_theta, double c_phi, double R);\n+double angle;\n+bool side;\n 00063\n+00064\n+double cocircular_range;\n 00066\n-CSphtheta_phi_range& operator = (const CSphtheta_phi_range &r);\n-00067\n-00072\n-int add_particle(const double theta, const double phi);\n-00073\n-unsigned int theta_range;\n+00069\n+std::list cocircular;\n+00070 };\n+00071\n+00073 bool ve_less(CSphvicinity_elm *ve1, CSphvicinity_elm *ve2);\n+00074\n 00075\n-00076\n-unsigned int phi_range;\n-00078\n-00079\n-static double theta_min;\n-00081\n-00082\n-static double theta_max;\n-00083\n-00084 private:\n-inline unsigned int get_theta_cell(double theta){\n+00083 class CSphvicinity{\n+00084 public:\n 00086\n+CSphvicinity();\n 00087\n-if (theta>=theta_max) return 1u\u00ab31;\n-00088\n-return (unsigned int) (1u \u00ab ((int) (32*((theta-theta_min)/(theta_max-theta_min)))));\n 00089\n-}\n+CSphvicinity(std::vector &_particle_list);\n 00090\n-inline unsigned int get_phi_cell(double phi){\n 00092\n+~CSphvicinity();\n 00093\n-return (unsigned int) (1u \u00ab ((int) (32*phi/twopi+16)%32));\n-00094\n-}\n-00095 };\n-00096\n-00101 bool is_range_overlap(const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2);\n-00102\n-\n-Generated by Doxygen\n-\n-251\n-\n-\f252\n-\n-File Documentation\n-\n-00108 const CSphtheta_phi_range range_union(const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2);\n+void set_particle_list(std::vector &_particle_list);\n+00098\n+00099\n+void build(CSphmomentum *_parent, double _VR);\n+00105\n+00106\n+00107\n+// cone kinematical information\n+00108\n+CSphmomentum *parent;\n 00109\n-00110 }\n+double VR;\n+double VR2;\n+00110\n 00111\n-00112 #endif\n+double cosVR;\n+double R;\n+00112\n+00113\n+double R2;\n+00114\n+double tan2R;\n+double D2_R;\n+00115\n+00116\n+double inv_R_EPS_COCIRC;\n+double inv_R_2EPS_COCIRC;\n+00117\n+00118\n+// particle list information\n+00119\n+00120\n+int n_part;\n+00121\n+std::vector plist;\n+00123\n+std::vector pincluded;\n+00124\n+CSphvicinity_elm *ve_list;\n+00125 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00126\n+siscone::Cquadtree *quadtree;\n+00127 #endif\n+00128\n+00129\n+// vicinity information\n+00130\n+std::vector vicinity;\n+00131\n+unsigned int vicinity_size;\n+00132\n+00133 protected:\n+00139\n+void append_to_vicinity(CSphmomentum *v);\n+00140\n+// internal variables\n+00141\n+00142\n+CSph3vector parent_centre;\n+00143\n+CSph3vector angular_dir1;\n+00144\n+CSph3vector angular_dir2;\n+00145 };\n+00146\n+00147 }\n+00148\n+00149 #endif\n \n-5.39 hash.cpp\n-00001\n-00002 // File: hash.cpp\n+5.46 vicinity.h\n+00001 // -*- C++ -*00003 // File: vicinity.h\n+00004 // Description: header file for particle vicinity (Cvicinity class)\n+00005 // This file is part of the SISCone project.\n //\n-00003 // Description: source file for classes hash_element and hash_cones\n+00006 // For more details, see http://projects.hepforge.org/siscone\n+00007 //\n+00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n+00009 //\n+\n+Generated by Doxygen\n+\n //\n-00004 // This file is part of the SISCone project.\n //\n-00005 // For more details, see http://projects.hepforge.org/siscone\n+\n //\n-00006 //\n //\n-00007 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n //\n-00008 //\n //\n-00009 // This program is free software; you can redistribute it and/or modify\n+\n+\f268\n+\n+File Documentation\n+\n+00010 // This program is free software; you can redistribute it and/or modify\n //\n-00010 // it under the terms of the GNU General Public License as published by\n+00011 // it under the terms of the GNU General Public License as published by\n //\n-00011 // the Free Software Foundation; either version 2 of the License, or\n+00012 // the Free Software Foundation; either version 2 of the License, or\n //\n-00012 // (at your option) any later version.\n+00013 // (at your option) any later version.\n //\n-00013 //\n+00014 //\n //\n-00014 // This program is distributed in the hope that it will be useful,\n+00015 // This program is distributed in the hope that it will be useful,\n //\n-00015 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+00016 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n //\n-00016 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+00017 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n //\n-00017 // GNU General Public License for more details.\n+00018 // GNU General Public License for more details.\n //\n-00018 //\n+00019 //\n //\n-00019 // You should have received a copy of the GNU General Public License\n+00020 // You should have received a copy of the GNU General Public License\n //\n-00020 // along with this program; if not, write to the Free Software\n+00021 // along with this program; if not, write to the Free Software\n //\n-00021 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n-00022 //\n+00022 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n+00023 //\n //\n-00023 // $Revision:: 225\n+00024 // $Revision:: 123\n $//\n-00024 // $Date:: 2008-05-20 16:59:47 +0200 (Tue, 20 May 2008)\n+00025 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n $//\n-00026\n-00027 #include \n-00028 #include \n-00029 #include \"hash.h\"\n-00030 #include \n-00031\n-00032 namespace siscone{\n-00033\n-00034 using namespace std;\n-00035\n-00036 /**************************************************************\n-00037 * implementation of hash_cones\n-*\n-00038 * list of cones candidates.\n-00039 * We store in this class all the hash_elements and give\n-*\n-00040 * functions to manipulate them.\n-00041 **************************************************************/\n-00042\n-00043 // constructor with initialisation\n-00044 // - _Np number of particles\n-00045 // - _R2 cone radius (squared)\n-00046 //----------------------------------00047 hash_cones::hash_cones(int _Np, double _R2){\n-int i;\n-00048\n+00027\n+00028 #ifndef __VICINITY_H__\n+00029 #define __VICINITY_H__\n+00030\n+00031 #include \n+00032 #include \n+00033 #include \"momentum.h\"\n+00034 #include \"defines.h\"\n+00035 #include \"quadtree.h\"\n+00036\n+00037 namespace siscone{\n+00038\n+00039\n+00040\n+00046 class Cvicinity_inclusion {\n+00047 public:\n 00049\n+Cvicinity_inclusion() : cone(false), cocirc(false) {}\n 00050\n-n_cones = 0;\n-00051 #ifdef DEBUG_STABLE_CONES\n+00051\n+bool cone;\n+bool cocirc;\n 00052\n-n_occupied_cells = 0;\n-00053 #endif\n+00053 };\n 00054\n-// determine hash size\n 00055\n-00056\n-// for a ymax=5 and R=0.7, we observed an occupancy around 1/8 N^2 ~ N2 R2/4\n-00057\n-//mask = 1 \u00ab (int) (2*log(double(_Np))/log(2.0));\n-00058\n-//if (mask<=1) mask=2;\n-00059\n-int nbits = (int) (log(_Np*_R2*_Np/4.0)/log(2.0));\n-if (nbits<1) nbits=1;\n-00060\n-00061\n-mask = 1 \u00ab nbits;\n-00062\n-00063\n-// create hash\n-00064\n-hash_array = new hash_element*[mask];\n-00065\n-mask--;\n+00063 class Cvicinity_elm{\n+00064 public:\n 00066\n-// set the array to 0\n+Cmomentum *v;\n 00067\n-00068\n-//? needed ?\n 00069\n-for (i=0;i cocircular;\n+00082 };\n 00083\n-elm = hash_array[i];\n-00084\n-hash_array[i] = hash_array[i]->next;\n-00085\n-delete elm;\n+00085 bool ve_less(Cvicinity_elm *ve1, Cvicinity_elm *ve2);\n 00086\n-}\n 00087\n-}\n-00088\n-00089\n-delete[] hash_array;\n-00090 }\n-00091\n-00092\n-00093 /*\n-00094 * insert a new candidate into the hash.\n-00095 * - v\n-4-momentum of the cone to add\n-00096 * - parent parent particle defining the cone\n-00097 * - child\n-child particle defining the cone\n-whether the parent has to belong to the cone or not\n-00098 * - p_io\n-00099 * - c_io\n-whether the child has to belong to the cone or not\n-00100 * return 0 on success, 1 on error\n-00101 ***********************************************************************/\n-00102 int hash_cones::insert(Cmomentum *v, Cmomentum *parent, Cmomentum *child, bool p_io, bool c_io){\n-00103\n-hash_element *elm;\n-int index = (v->ref.ref[0]) & mask;\n+00095 class Cvicinity{\n+00096 public:\n+00098\n+Cvicinity();\n+00099\n+00101\n+Cvicinity(std::vector &_particle_list);\n+00102\n 00104\n+~Cvicinity();\n 00105\n-// check the array cell corresponding to our reference\n-00106\n-00107\n-elm = hash_array[index];\n-00108\n-00109 #ifdef DEBUG_STABLE_CONES\n 00110\n-if (elm==NULL)\n+void set_particle_list(std::vector &_particle_list);\n 00111\n-n_occupied_cells++;\n-00112 #endif\n-00113\n-00114\n-do{\n-00115\n-// if it is not present, add it\n-00116\n-if (elm==NULL){\n+void build(Cmomentum *_parent, double _VR);\n 00117\n-// create element\n 00118\n-elm = new hash_element;\n+// cone kinematical information\n 00119\n-// set its varibles\n 00120\n+Cmomentum *parent;\n 00121\n-// Note: at this level, eta and phi have already been computed\n+double VR;\n+double VR2;\n 00122\n-//\n-through Cmomentum::build_etaphi.\n 00123\n-elm->ref = v->ref;\n+double R;\n+double R2;\n 00124\n-//compute vectors centre\n 00125\n+double inv_R_EPS_COCIRC;\n+double inv_R_2EPS_COCIRC;\n 00126\n-v->build_etaphi();\n 00127\n-elm->eta = v->eta;\n 00128\n-elm->phi = v->phi;\n+// particle list information\n 00129\n-// if at least one of the two is_inside tests gives a result != from the expected,\n+int n_part;\n 00130\n-// the || will be true hence !(...) false as wanted\n+std::vector plist;\n 00131\n-elm->is_stable = !((is_inside(v, parent)^p_io)||(is_inside(v, child)^c_io));\n-//cout \u00ab \"-- new status of \" \u00ab v->ref[0] \u00ab \":\" \u00ab elm->is_stable \u00ab endl;\n+std::vector pincluded;\n 00132\n-00133\n+Cvicinity_elm *ve_list;\n+00133 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+\n+Generated by Doxygen\n+\n+\f5.47 split_merge.cpp\n+\n+269\n+\n 00134\n-// update hash\n-00135\n-elm->next = hash_array[index];\n+Cquadtree *quadtree;\n+00135 #endif\n 00136\n-hash_array[index] = elm;\n 00137\n+// vicinity information\n 00138\n-n_cones++;\n-return 0;\n+std::vector vicinity;\n 00139\n+unsigned int vicinity_size;\n 00140\n-}\n-00141\n-00142\n-// if the cone is already there, simply update stability status\n-00143\n-if (v->ref == elm->ref){\n-// there is only an update to perform to see if the cone is still stable\n-00144\n-00145\n-if (elm->is_stable){\n-00146\n-v->build_etaphi();\n+00141 protected:\n+void append_to_vicinity(Cmomentum *v);\n 00147\n-elm->is_stable = !((is_inside(v, parent)^p_io)||(is_inside(v, child)^c_io));\n 00148\n-//cout \u00ab \" parent/child: \"\n 00149\n-//\n-\u00ab parent->ref[0] \u00ab \":\" \u00ab is_inside(v, parent) \u00ab \":\" \u00ab p_io \u00ab \" \"\n+// internal variables\n 00150\n-//\n-\u00ab child->ref[0] \u00ab \":\" \u00ab is_inside(v, child) \u00ab \":\" \u00ab c_io \u00ab endl;\n+double pcx;\n 00151\n-//cout \u00ab \"-- rep status of \" \u00ab v->ref[0] \u00ab \":\" \u00ab elm->is_stable \u00ab endl;\n-00152\n-//cout \u00ab v->eta \u00ab \" \" \u00ab v->phi \u00ab endl;\n+double pcy;\n+00152 };\n 00153\n-//cout \u00ab (child->eta) \u00ab \" \" \u00ab child->phi \u00ab endl;\n-00154\n-}\n+00154 }\n 00155\n-return 0;\n-00156\n-}\n-00157\n-00158\n-elm = elm->next;\n-00159\n-} while (1);\n-00160\n-\n-Generated by Doxygen\n-\n-253\n-\n-\f254\n-\n-File Documentation\n-\n-00161\n-return 1;\n-00162 }\n-00163\n-00164 /*\n-00165 * insert a new candidate into the hash.\n-4-momentum of te cone to add\n-00166 * - v\n-00167 * Note, in this case, we assume stability. We also assume\n-00168 * that eta and phi are computed for v\n-00169 * return 0 on success, 1 on error\n-00170 ***********************************************************************/\n-00171 int hash_cones::insert(Cmomentum *v){\n-00172\n-hash_element *elm;\n-int index = (v->ref.ref[0]) & mask;\n-00173\n-//cout \u00ab \"-- stable candidate: \" \u00ab v->ref[0] \u00ab \":\" \u00ab endl;\n-00174\n-00175\n-00176\n-// check the array cell corresponding to our reference\n-00177\n-elm = hash_array[index];\n-00178\n-do{\n-// if it is not present, add it\n-00179\n-00180\n-if (elm==NULL){\n-// create element\n-00181\n-00182\n-elm = new hash_element;\n-00183\n-// set its varibles\n-00184\n-00185\n-// Note: at this level, eta and phi have already been computed\n-00186\n-//\n-through Cmomentum::build_etaphi.\n-00187\n-elm->ref = v->ref;\n-00188\n-elm->eta = v->eta;\n-00189\n-elm->phi = v->phi;\n-00190\n-elm->is_stable = true;\n-00191\n-// update hash\n-00192\n-00193\n-elm->next = hash_array[index];\n-00194\n-hash_array[index] = elm;\n-00195\n-00196\n-n_cones++;\n-00197\n-return 0;\n-00198\n-}\n-00199\n-// if the cone is already there, we have nothing to do\n-00200\n-00201\n-if (v->ref == elm->ref){\n-00202\n-return 0;\n-00203\n-}\n-00204\n-00205\n-elm = elm->next;\n-00206\n-} while (1);\n-00207\n-return 1;\n-00208\n-00209 }\n-00210\n-00211 /*\n-00212 * test if a particle is inside a cone of given centre.\n-00213 * check if the particle of coordinates \u2019v\u2019 is inside the circle of radius R\n-00214 * centered at \u2019centre\u2019.\n-00215 * - centre\n-centre of the circle\n-particle to test\n-00216 * - v\n-00217 * return true if inside, false if outside\n-00218 ******************************************************************************/\n-00219 inline bool hash_cones::is_inside(Cmomentum *centre, Cmomentum *v){\n-00220\n-double dx, dy;\n-00221\n-00222\n-dx = centre->eta - v->eta;\n-00223\n-dy = fabs(centre->phi - v->phi);\n-if (dy>M_PI)\n-00224\n-00225\n-dy -= 2.0*M_PI;\n-00226\n-00227\n-return dx*dx+dy*dy\n-00030 #include \n-00031 #include \"hash.h\"\n-00032 #include \n-00033\n-00034 namespace siscone_spherical{\n-00035\n-00036 using namespace std;\n-00037\n-00038 /**************************************************************\n-00039 * implementation of sph_hash_cones\n+00029 #include \n+00030 #include \"split_merge.h\"\n+00031 #include \"momentum.h\"\n+00032 #include \n+// for max\n+00033 #include \n+00034 #include \n+00035 #include \n+00036 #include \n+00037 #include \n+00038\n+00039 namespace siscone_spherical{\n+00040\n+00041 using namespace std;\n+00042\n+00043 /********************************************************\n+00044 * class CSphjet implementation\n *\n-00040 * list of cones candidates.\n-00041 * We store in this class all the sph_hash_element and give\n+00045 * real Jet information.\n+00046 * This class contains information for one single jet.\n *\n-00042 * functions to manipulate them.\n-00043 **************************************************************/\n-00044\n-00045 // constructor with initialisation\n-00046 // - _Np\n-number of particles\n-00047 // - _radius cone radius\n-00048 //----------------------------------00049 sph_hash_cones::sph_hash_cones(int _Np, double _radius){\n-00050\n-int i;\n-00051\n-00052\n-n_cones = 0;\n-00053 #ifdef DEBUG_STABLE_CONES\n+00047 * That is, first, its momentum carrying information\n+*\n+00048 * about its centre and pT, and second, its particle\n+*\n+00049 * contents\n+*\n+00050 ********************************************************/\n+00051 // default ctor\n+00052 //-------------00053 CSphjet::CSphjet(){\n 00054\n-n_occupied_cells = 0;\n-00055 #endif\n+n = 0;\n+00055\n+v = CSphmomentum();\n 00056\n+E_tilde = 0.0;\n 00057\n-// determine hash size\n+sm_var2 = 0.0;\n 00058\n-// for a ymax=5 and R=0.7, we observed an occupancy around 1/8 N^2 ~ N2 R2/4\n+pass = CJET_INEXISTENT_PASS; // initialised to a value that should\n 00059\n-//mask = 1 \u00ab (int) (2*log(double(_Np))/log(2.0));\n-00060\n-//if (mask<=1) mask=2;\n-00061\n-int nbits = (int) (log(_Np*_radius*_radius*_Np/4.0)/log(2.0));\n-if (nbits<1) nbits=1;\n-00062\n-00063\n-mask = 1 \u00ab nbits;\n-00064\n-00065\n-// create hash\n-00066\n-hash_array = new sph_hash_element*[mask];\n-00067\n-mask--;\n-00068\n-00069\n-// set the array to 0\n-00070\n-//? needed ?\n-00071\n-for (i=0;inext;\n-delete elm;\n-00088\n-00089\n-}\n-00090\n-}\n-00091\n-00092\n-delete[] hash_array;\n-00093 }\n-00094\n-00095\n+// notappear in the end (after clustering)\n+00060 }\n \n Generated by Doxygen\n \n-255\n-\n-*\n *\n \n-\f256\n+\f270\n \n File Documentation\n \n-00096 /*\n-00097 * insert a new candidate into the hash.\n-00098 * - v\n-4-momentum of the cone to add\n-00099 * - parent parent particle defining the cone\n-00100 * - child\n-child particle defining the cone\n-whether the parent has to belong to the cone or not\n-00101 * - p_io\n-00102 * - c_io\n-whether the child has to belong to the cone or not\n-00103 * return 0 on success, 1 on error\n-00104 ***********************************************************************/\n-00105 int sph_hash_cones::insert(CSphmomentum *v, CSphmomentum *parent, CSphmomentum *child, bool p_io, bool\n-c_io){\n+00061\n+00062 // default dtor\n+00063 //-------------00064 CSphjet::~CSphjet(){\n+00065\n+00066 }\n+00067\n+00068 // ordering of jets in E (e.g. used in final jets ordering)\n+00069 //---------------------------------------------------------00070 bool jets_E_less(const CSphjet &j1, const CSphjet &j2){\n+00071\n+return j1.v.E > j2.v.E;\n+00072 }\n+00073\n+00074\n+00075 /********************************************************\n+00076 * CSphsplit_merge_ptcomparison implementation\n+*\n+00077 * This deals with the ordering of the jets candidates *\n+00078 ********************************************************/\n+00079\n+00080 // odering of two jets\n+00081 // The variable of the ordering is pt or mt\n+00082 // depending on \u2019split_merge_scale\u2019 choice\n+00083 //\n+00084 // with EPSILON_SPLITMERGE defined, this attempts to identify\n+00085 // delicate cases where two jets have identical momenta except for\n+00086 // softish particles -- the difference of pt\u2019s may not be correctly\n+00087 // identified normally and so lead to problems for the fate of the\n+00088 // softish particle.\n+00089 //\n+00090 // NB: there is a potential issue in momentum-conserving events,\n+00091 // whereby the harder of two jets becomes ill-defined when a soft\n+00092 // particle is emitted --- this may have a knock-on effect on\n+00093 // subsequent split-merge steps in cases with sufficiently large R\n+00094 // (but we don\u2019t know what the limit is...)\n+00095 //-----------------------------------------------------------------00096 bool CSphsplit_merge_ptcomparison::operator ()(const CSphjet &jet1, const CSphjet &jet2)const{\n+00097\n+double q1, q2;\n+00098\n+// compute the value for comparison for both jets\n+00099\n+00100\n+// This depends on the choice of variable (mt is the default)\n+00101\n+q1 = jet1.sm_var2;\n+00102\n+q2 = jet2.sm_var2;\n+00103\n+00104\n+bool res = q1 > q2;\n+00105\n+// if we enable the refined version of the comparison (see defines.h),\n 00106\n-sph_hash_element *elm;\n-int index = (v->ref.ref[0]) & mask;\n 00107\n+// we compute the difference more precisely when the two jets are very\n 00108\n-// check the array cell corresponding to our reference\n-00109\n+// close in the ordering variable.\n+00109 #ifdef EPSILON_SPLITMERGE\n 00110\n-elm = hash_array[index];\n+if ( (fabs(q1-q2) < EPSILON_SPLITMERGE*max(q1,q2)) &&\n 00111\n-00112 #ifdef DEBUG_STABLE_CONES\n+(jet1.v.ref != jet2.v.ref) ) {\n+00112 #ifdef DEBUG_SPLIT_MERGE\n 00113\n-if (elm==NULL)\n-00114\n-n_occupied_cells++;\n-00115 #endif\n+cout \u00ab \"Using high-precision ordering tests\" \u00ab endl;\n+00114 #endif\n+00115\n+// get the momentum of the difference\n 00116\n-00117\n-do{\n-// if it is not present, add it\n-00118\n-00119\n-if (elm==NULL){\n-// create element\n-00120\n-00121\n-elm = new sph_hash_element;\n-00122\n-// set its varibles\n-00123\n-00124\n-// Note: at this level, eta and phi have already been computed\n-00125\n-//\n-through CSphmomentum::build_thetaphi.\n-00126\n-elm->centre = *v;\n-00127\n-// if at least one of the two is_closer tests gives a result != from the expected,\n-00128\n-00129\n-// the || will be true hence !(...) false as wanted\n-00130\n-elm->is_stable = !((is_closer(v, parent, tan2R)^p_io)||(is_closer(v, child, tan2R)^c_io));\n-00131\n-//cout \u00ab \"-- new status of \" \u00ab v->ref[0] \u00ab \":\" \u00ab elm->is_stable \u00ab endl;\n-00132\n-00133\n-// update hash\n-00134\n-elm->next = hash_array[index];\n-00135\n-hash_array[index] = elm;\n-00136\n-00137\n-n_cones++;\n-00138\n-return 0;\n-00139\n-}\n-00140\n-// if the cone is already there, simply update stability status\n-00141\n-00142\n-if (v->ref == elm->centre.ref){\n-00143\n-// there is only an update to perform to see if the cone is still stable\n-00144\n-if (elm->is_stable){\n-00145\n-elm->is_stable = !((is_closer(v, parent, tan2R)^p_io)||(is_closer(v, child, tan2R)^c_io));\n-//cout \u00ab \" parent/child: \"\n-00146\n-00147\n-//\n-\u00ab parent->ref[0] \u00ab \":\" \u00ab is_closer(v, parent) \u00ab \":\" \u00ab p_io \u00ab \" \"\n-00148\n-//\n-\u00ab child->ref[0] \u00ab \":\" \u00ab is_closer(v, child) \u00ab \":\" \u00ab c_io \u00ab endl;\n-00149\n-//cout \u00ab \"-- rep status of \" \u00ab v->ref[0] \u00ab \":\" \u00ab elm->is_stable \u00ab endl;\n-00150\n-//cout \u00ab v->eta \u00ab \" \" \u00ab v->phi \u00ab endl;\n-00151\n-//cout \u00ab (child->eta) \u00ab \" \" \u00ab child->phi \u00ab endl;\n-00152\n-}\n-return 0;\n-00153\n-00154\n-}\n-00155\n-00156\n-elm = elm->next;\n-00157\n-} while (1);\n-00158\n-return 1;\n-00159\n-00160 }\n-00161\n-00162 /*\n-00163 * insert a new candidate into the hash.\n-4-momentum of te cone to add\n-00164 * - v\n-00165 * Note, in this case, we assume stability. We also assume\n-00166 * that eta and phi are computed for v\n-00167 * return 0 on success, 1 on error\n-00168 ***********************************************************************/\n-00169 int sph_hash_cones::insert(CSphmomentum *v){\n-00170\n-sph_hash_element *elm;\n-int index = (v->ref.ref[0]) & mask;\n-00171\n-//cout \u00ab \"-- stable candidate: \" \u00ab v->ref[0] \u00ab \":\" \u00ab endl;\n-00172\n-00173\n-// check the array cell corresponding to our reference\n-00174\n-00175\n-elm = hash_array[index];\n-00176\n-do{\n-// if it is not present, add it\n-00177\n-00178\n-if (elm==NULL){\n-// create element\n-00179\n-00180\n-elm = new sph_hash_element;\n-00181\n-\n-Generated by Doxygen\n-\n-\f5.41 momentum.cpp\n-\n-00182\n-// set its varibles\n-00183\n-// Note: at this level, eta and phi have already been computed\n-00184\n-//\n-through CSphmomentum::build_thetaphi.\n-00185\n-elm->centre = *v;\n-00186\n-elm->is_stable = true;\n-00187\n-// update hash\n-00188\n-00189\n-elm->next = hash_array[index];\n-00190\n-hash_array[index] = elm;\n-00191\n-00192\n-n_cones++;\n-return 0;\n-00193\n-00194\n-}\n-00195\n-00196\n-// if the cone is already there, we have nothing to do\n-00197\n-if (v->ref == elm->centre.ref){\n-return 0;\n-00198\n-00199\n-}\n-00200\n-00201\n-elm = elm->next;\n-00202\n-} while (1);\n-00203\n-00204\n-return 1;\n-00205 }\n-00206\n-00207 }\n-\n-5.41 momentum.cpp\n-00001\n-//\n-00002 // File: momentum.cpp\n-00003 // Description: source file for 4-momentum class Cmomentum\n-//\n-00004 // This file is part of the SISCone project.\n-//\n-00005 // For more details, see http://projects.hepforge.org/siscone\n-//\n-00006 //\n-//\n-00007 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-//\n-00008 //\n-//\n-00009 // This program is free software; you can redistribute it and/or modify\n-//\n-00010 // it under the terms of the GNU General Public License as published by\n-//\n-00011 // the Free Software Foundation; either version 2 of the License, or\n-//\n-00012 // (at your option) any later version.\n-//\n-00013 //\n-//\n-00014 // This program is distributed in the hope that it will be useful,\n-//\n-00015 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n-//\n-00016 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n-//\n-00017 // GNU General Public License for more details.\n-//\n-00018 //\n-//\n-00019 // You should have received a copy of the GNU General Public License\n-//\n-00020 // along with this program; if not, write to the Free Software\n-//\n-00021 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n-00022 //\n-//\n-00023 // $Revision:: 123\n-$//\n-00024 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n-$//\n-00026\n-00027 #include \"momentum.h\"\n-00028 #include \n-00029 #include \n-00030\n-00031 namespace siscone{\n-00032\n-00033 /*************************************************************************\n-00034 * class Cmomentum\n-*\n-00035 * This class contains the information for particle or group of\n-*\n-00036 * particles management.\n-*\n-00037 * It includes all Lorentz properties as well as tools for summing them. *\n-00038 *************************************************************************/\n-00039\n-00040 // default ctor\n-00041 //-------------00042 Cmomentum::Cmomentum(){\n-00043\n-eta = 0.0;\n-00044\n-phi = 0.0;\n-00045\n-px = py = pz = E = 0.0;\n-00046\n-ref = Creference();\n-00047\n-index = -1;\n-00048 }\n-00049\n-00050 // ctor with initialisation\n-00051 //--------------------------\n-\n-Generated by Doxygen\n-\n-257\n-\n-\f258\n-\n-File Documentation\n-\n-00052 Cmomentum::Cmomentum(double _px, double _py, double _pz, double _E){\n-00053\n-px = _px;\n-00054\n-py = _py;\n-00055\n-pz = _pz;\n-00056\n-E = _E;\n-00057\n-// compute eta and phi\n-00058\n-00059\n-build_etaphi();\n-00060\n-ref = Creference();\n-00061 }\n-00062\n-00063 // ctor with detailed initialisation\n-00064 //----------------------------------00065 Cmomentum::Cmomentum(double _eta, double _phi, Creference _ref){\n-00066\n-eta = _eta;\n-00067\n-phi = _phi;\n-00068\n-00069\n-ref = _ref;\n-00070 }\n-00071\n-00072 // default dtor\n-00073 //-------------00074 Cmomentum::~Cmomentum(){\n-00075\n-00076 }\n-00077\n-00078 // assignment of vectors\n-00079 //----------------------00080 Cmomentum& Cmomentum::operator = (const Cmomentum &v){\n-00081\n-px = v.px;\n-00082\n-py = v.py;\n-00083\n-pz = v.pz;\n-00084\n-E = v.E;\n-00085\n-00086\n-eta = v.eta;\n-00087\n-phi = v.phi;\n-00088\n-00089\n-ref = v.ref;\n-return *this;\n-00090\n-00091 }\n-00092\n-00093 // addition of vectors\n-00094 // !!! WARNING !!! no updating of eta and phi !!!\n-00095 //-----------------------------------------------00096 const Cmomentum Cmomentum::operator + (const Cmomentum &v){\n-00097\n-Cmomentum tmp = *this;\n-00098\n-return tmp+=v;\n-00099 }\n-00100\n-00101 // incrementation of vectors\n-00102 // !!! WARNING !!! no updating of eta and phi !!!\n-00103 //-----------------------------------------------00104 Cmomentum& Cmomentum::operator += (const Cmomentum &v){\n-00105\n-px+=v.px;\n-00106\n-py+=v.py;\n-00107\n-pz+=v.pz;\n-00108\n-E +=v.E;\n-00109\n-00110\n-ref+=v.ref;\n-00111\n-00112\n-return *this;\n-00113 }\n-00114\n-00115 // incrementation of vectors\n-00116 // !!! WARNING !!! no updating of eta and phi !!!\n-00117 //-----------------------------------------------00118 Cmomentum& Cmomentum::operator -= (const Cmomentum &v){\n-00119\n-px-=v.px;\n-00120\n-py-=v.py;\n-00121\n-pz-=v.pz;\n-00122\n-E -=v.E;\n-00123\n-00124\n-ref-=v.ref;\n-return *this;\n-00125\n-00126 }\n-00127\n-00128 // build eta-phi from 4-momentum info\n-00129 // !!!\n-WARNING\n-!!!\n-00130 // !!! computing eta and phi is time-consuming !!!\n-00131 // !!! use this whenever you need eta or phi\n-!!!\n-00132 // !!! automatically called for single-particle !!!\n-00133 //-------------------------------------------------00134 void Cmomentum::build_etaphi(){\n-00135\n-// note: the factor n (ref.nb) cancels in all expressions !!\n-00136\n-eta = 0.5*log((E+pz)/(E-pz));\n-00137\n-phi = atan2(py,px);\n-00138 }\n-\n-Generated by Doxygen\n-\n-\f5.42 momentum.cpp\n-\n-259\n-\n-00139\n-00140\n-00141 // ordering of two vectors\n-00142 // the default ordering is w.r.t. their references\n-00143 //------------------------------------------------00144 bool operator < (const Cmomentum &v1, const Cmomentum &v2){\n-return v1.ref < v2.ref;\n-00145\n-00146 }\n-00147\n-00148 // ordering of vectors in eta (e.g. used in collinear tests)\n-00149 //----------------------------------------------------------00150 bool momentum_eta_less(const Cmomentum &v1, const Cmomentum &v2){\n-00151\n-return v1.eta < v2.eta;\n-00152 }\n-00153\n-00154 // ordering of vectors in pt\n-00155 //--------------------------00156 bool momentum_pt_less(const Cmomentum &v1, const Cmomentum &v2){\n-return v1.perp2() < v2.perp2();\n-00157\n-00158 }\n-00159\n-00160 }\n-00161\n-\n-5.42 momentum.cpp\n-00001\n-00002 // File: momentum.cpp\n-//\n-00003 // Description: source file for 4-momentum class Cmomentum\n-//\n-00004 // This file is part of the SISCone project.\n-//\n-00005 // WARNING: this is not the main SISCone trunk but\n-//\n-00006 //\n-an adaptation to spherical coordinates\n-//\n-00007 // For more details, see http://projects.hepforge.org/siscone\n-//\n-00008 //\n-//\n-00009 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n-00010 //\n-//\n-00011 // This program is free software; you can redistribute it and/or modify\n-//\n-00012 // it under the terms of the GNU General Public License as published by\n-//\n-00013 // the Free Software Foundation; either version 2 of the License, or\n-//\n-00014 // (at your option) any later version.\n-//\n-00015 //\n-//\n-00016 // This program is distributed in the hope that it will be useful,\n-//\n-00017 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n-//\n-00018 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n-//\n-00019 // GNU General Public License for more details.\n-//\n-00020 //\n-//\n-00021 // You should have received a copy of the GNU General Public License\n-//\n-00022 // along with this program; if not, write to the Free Software\n-//\n-00023 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n-00024 //\n-//\n-00025 // $Revision:: 255\n-$//\n-00026 // $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008)\n-$//\n-00028\n-00029 #include \"momentum.h\"\n-00030 #include \n-00031 #include \n-00032\n-00033 namespace siscone_spherical{\n-00034\n-00035 /*************************************************************************\n-00036 * class CSph3vector\n-*\n-00037 * This class contains the information for particle or group of\n-*\n-00038 * particles management.\n-*\n-00039 *************************************************************************/\n-00040\n-00041 // default ctor\n-00042 //-------------00043 CSph3vector::CSph3vector(){\n-00044\n-_theta = _phi = _norm = 0.0;\n-00045\n-px = py = pz = 0.0;\n-00046\n-ref = siscone::Creference();\n-00047 }\n-00048\n-00049 // ctor with initialisation\n-00050 //-------------------------00051 CSph3vector::CSph3vector(double _px, double _py, double _pz){\n-00052\n-px = _px;\n-00053\n-py = _py;\n-00054\n-pz = _pz;\n-\n-Generated by Doxygen\n-\n-//\n-\n-\f260\n-\n-File Documentation\n-\n-00055\n-// compute the norm\n-00056\n-00057\n-build_norm();\n-00058\n-00059\n-ref = siscone::Creference();\n-00060 }\n-00061\n-00062 // default dtor\n-00063 //-------------00064 CSph3vector::~CSph3vector(){\n-00065\n-00066 }\n-00067\n-00068\n-00069 // assignment of vectors\n-00070 //----------------------00071 CSph3vector& CSph3vector::operator = (const CSph3vector &v){\n-00072\n-px = v.px;\n-00073\n-py = v.py;\n-00074\n-pz = v.pz;\n-00075\n-00076\n-_norm = v._norm;\n-00077\n-_theta = v._theta;\n-00078\n-_phi\n-= v._phi;\n-00079\n-00080\n-ref = v.ref;\n-return *this;\n-00081\n-00082 }\n-00083\n-00084 // addition of vectors\n-00085 //-----------------------------------------------00086 const CSph3vector CSph3vector::operator + (const CSph3vector &v){\n-00087\n-CSph3vector tmp = *this;\n-00088\n-return tmp+=v;\n-00089 }\n-00090\n-00091 // subtraction of vectors\n-00092 //-----------------------------------------------00093 const CSph3vector CSph3vector::operator - (const CSph3vector &v){\n-00094\n-CSph3vector tmp = *this;\n-00095\n-return tmp-=v;\n-00096 }\n-00097\n-00098 // division by constant\n-00099 //-----------------------------------------------00100 const CSph3vector CSph3vector::operator / (const double &r){\n-00101\n-CSph3vector tmp = *this;\n-00102\n-return tmp/=r;\n-00103 }\n-00104\n-00105 // incrementation\n-00106 //-----------------------------------------------00107 CSph3vector& CSph3vector::operator += (const CSph3vector &v){\n-00108\n-px+=v.px;\n-00109\n-py+=v.py;\n-00110\n-pz+=v.pz;\n-00111\n-00112\n-return *this;\n-00113 }\n-00114\n-00115 // decrementation\n-00116 //-----------------------------------------------00117 CSph3vector& CSph3vector::operator -= (const CSph3vector &v){\n-00118\n-px-=v.px;\n-00119\n-py-=v.py;\n-00120\n-pz-=v.pz;\n-00121\n-00122\n-return *this;\n-00123 }\n-00124\n-00125 // multiplication by a constant\n-00126 //-----------------------------------------------00127 CSph3vector& CSph3vector::operator *= (const double &r){\n-00128\n-px*=r;\n-00129\n-py*=r;\n-00130\n-pz*=r;\n-00131\n-00132\n-return *this;\n-00133 }\n-00134\n-00135 // division by a constant\n-00136 //-----------------------------------------------00137 CSph3vector& CSph3vector::operator /= (const double &r){\n-00138\n-px/=r;\n-00139\n-py/=r;\n-00140\n-pz/=r;\n-00141\n-\n-Generated by Doxygen\n-\n-\f5.42 momentum.cpp\n-\n-00142\n-_norm/=r;\n-00143\n-return *this;\n-00144\n-00145 }\n-00146\n-00147 // build norm from 3-momentum info\n-00148 void CSph3vector::build_norm(){\n-00149\n-_norm = norm();\n-00150 }\n-00151\n-00152 // build norm from 3-momentum info\n-00153 void CSph3vector::build_thetaphi(){\n-00154\n-_theta = theta();\n-00155\n-_phi = phi();\n-00156 }\n-00157\n-00158\n-00159 // for this direction, compute the two reference directions\n-00160 // used to measure angles\n-00161 void CSph3vector::get_angular_directions(CSph3vector &angular_dir1, CSph3vector &angular_dir2){\n-if (px < py){\n-00162\n-00163\n-if (pz < px){\n-00164\n-// z smallest\n-00165\n-angular_dir1 = CSph3vector(-py, px, 0.0);\n-00166\n-} else {\n-// x smallest\n-00167\n-00168\n-angular_dir1 = CSph3vector(0.0, -pz, py);\n-00169\n-}\n-00170\n-} else {\n-00171\n-if (pz < py){\n-// z smallest\n-00172\n-00173\n-angular_dir1 = CSph3vector(-py, px, 0.0);\n-00174\n-} else {\n-00175\n-// y smallest\n-00176\n-angular_dir1 = CSph3vector(-pz, 0.0, px);\n-00177\n-}\n-00178\n-}\n-00179\n-angular_dir2 = cross_product3(*this, angular_dir1);\n-00180\n-// We\u2019ll simply take x & y so the reflection symmetry is not broken\n-00181\n-//angular_dir1 = CSph3vector(0.0, -pz, py);\n-00182\n-//angular_dir2 = CSph3vector(-pz, 0.0, -px);\n-00183 }\n-00184\n-00185 /*************************************************************************\n-00186 * class CSphmomentum\n-*\n-00187 * This class contains the information for particle or group of\n-*\n-00188 * particles management.\n-*\n-00189 * It includes all Lorentz properties as well as tools for summing them. *\n-00190 *************************************************************************/\n-00191\n-00192 // default ctor\n-00193 //-------------00194 CSphmomentum::CSphmomentum(){\n-00195\n-E=0.0;\n-00196\n-index = -1;\n-00197 }\n-00198\n-00199 // ctor with initialisation\n-00200 //-------------------------00201 CSphmomentum::CSphmomentum(double _px, double _py, double _pz, double _E)\n-00202\n-: CSph3vector(_px, _py, _pz) {\n-00203\n-E = _E;\n-00204\n-// compute the angles\n-00205\n-00206\n-build_thetaphi();\n-00207 }\n-00208\n-00209 // ctor with initialisation\n-00210 //-------------------------00211 CSphmomentum::CSphmomentum(CSph3vector &_v, double _E)\n-00212\n-: CSph3vector(_v.px, _v.py, _v.pz) {\n-00213\n-E = _E;\n-00214 }\n-00215\n-00216 // default dtor\n-00217 //-------------00218 CSphmomentum::~CSphmomentum(){\n-00219\n-00220 }\n-00221\n-00222 // assignment of vectors\n-00223 //----------------------00224 CSphmomentum& CSphmomentum::operator = (const CSphmomentum &v){\n-00225\n-px = v.px;\n-00226\n-py = v.py;\n-00227\n-pz = v.pz;\n-\n-Generated by Doxygen\n-\n-261\n-\n-\f262\n-\n-File Documentation\n-\n-00228\n-E = v.E;\n-00229\n-00230\n-_norm = v._norm;\n-00231\n-_theta = v._theta;\n-00232\n-_phi\n-= v._phi;\n-00233\n-00234\n-ref = v.ref;\n-return *this;\n-00235\n-00236 }\n-00237\n-00238 // addition of vectors\n-00239 // !!! WARNING !!! no updating of eta and phi !!!\n-00240 //-----------------------------------------------00241 const CSphmomentum CSphmomentum::operator + (const CSphmomentum &v){\n-00242\n-CSphmomentum tmp = *this;\n-00243\n-return tmp+=v;\n-00244 }\n-00245\n-00246 // incrementation of vectors\n-00247 // !!! WARNING !!! no updating of eta and phi !!!\n-00248 //-----------------------------------------------00249 CSphmomentum& CSphmomentum::operator += (const CSphmomentum &v){\n-00250\n-px+=v.px;\n-00251\n-py+=v.py;\n-00252\n-pz+=v.pz;\n-00253\n-E +=v.E;\n-00254\n-00255\n-ref+=v.ref;\n-00256\n-return *this;\n-00257\n-00258 }\n-00259\n-00260 // decrementation of vectors\n-00261 // !!! WARNING !!! no updating of eta and phi !!!\n-00262 //-----------------------------------------------00263 CSphmomentum& CSphmomentum::operator -= (const CSphmomentum &v){\n-00264\n-px-=v.px;\n-00265\n-py-=v.py;\n-00266\n-pz-=v.pz;\n-00267\n-E -=v.E;\n-00268\n-00269\n-ref-=v.ref;\n-return *this;\n-00270\n-00271 }\n-00272\n-00273\n-00274 // ordering of two vectors\n-00275 // the default ordering is w.r.t. their references\n-00276 //------------------------------------------------00277 bool operator < (const CSphmomentum &v1, const CSphmomentum &v2){\n-00278\n-return v1.ref < v2.ref;\n-00279 }\n-00280\n-00281 // ordering of vectors in eta (e.g. used in collinear tests)\n-00282 //----------------------------------------------------------00283 bool momentum_theta_less(const CSphmomentum &v1, const CSphmomentum &v2){\n-return v1._theta < v2._theta;\n-00284\n-00285 }\n-00286\n-00287 // ordering of vectors in pt\n-00288 //--------------------------00289 bool momentum_pt_less(const CSphmomentum &v1, const CSphmomentum &v2){\n-00290\n-return v1.perp2() < v2.perp2();\n-00291 }\n-00292\n-00293 }\n-00294\n-\n-5.43 momentum.h\n-00001 // -*- C++ -*00003 // File: momentum.h\n-00004 // Description: header file for 4-momentum class Cmomentum\n-00005 // This file is part of the SISCone project.\n-//\n-00006 // For more details, see http://projects.hepforge.org/siscone\n-00007 //\n-00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-00009 //\n-00010 // This program is free software; you can redistribute it and/or modify\n-00011 // it under the terms of the GNU General Public License as published by\n-00012 // the Free Software Foundation; either version 2 of the License, or\n-00013 // (at your option) any later version.\n-//\n-\n-//\n-//\n-\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-\n-Generated by Doxygen\n-\n-\f5.43 momentum.h\n-\n-00014 //\n-//\n-00015 // This program is distributed in the hope that it will be useful,\n-//\n-00016 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n-//\n-00017 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n-//\n-00018 // GNU General Public License for more details.\n-//\n-00019 //\n-//\n-00020 // You should have received a copy of the GNU General Public License\n-//\n-00021 // along with this program; if not, write to the Free Software\n-//\n-00022 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n-00023 //\n-//\n-00024 // $Revision:: 163\n-$//\n-00025 // $Date:: 2007-04-26 22:31:02 +0200 (Thu, 26 Apr 2007)\n-$//\n-00027\n-00028 #ifndef __VECTOR_H__\n-00029 #define __VECTOR_H__\n-00030\n-00031 #include \n-00032 #include \n-00033 #include \"reference.h\"\n-00034 #include \"geom_2d.h\"\n-00035 #include \"defines.h\"\n-00036\n-00037 namespace siscone{\n-00038\n-00049 class Cmomentum{\n-00050 public:\n-00052\n-Cmomentum();\n-00053\n-00055\n-Cmomentum(double _px, double _py, double _pz, double _E);\n-00056\n-00058\n-Cmomentum(double _eta, double _phi, Creference _ref);\n-00059\n-00061\n-~Cmomentum();\n-00062\n-inline double perp()const {return sqrt(perp2());}\n-00064\n-00065\n-inline double perp2()const {return px*px+py*py;}\n-00067\n-00068\n-inline double mass()const {return sqrt(mass2());}\n-00070\n-00071\n-00073\n-inline double mass2()const {return perpmass2()-perp2();}\n-00074\n-inline double perpmass()const {return sqrt((E-pz)*(E+pz));}\n-00076\n-00077\n-inline double perpmass2()const {return (E-pz)*(E+pz);}\n-00079\n-00080\n-inline double Et()const {return E/sqrt(1.0+pz*pz/perp2());}\n-00082\n-00083\n-inline double Et2()const {return E*E/(1.0+pz*pz/perp2());}\n-00085\n-00086\n-00088\n-Cmomentum& operator = (const Cmomentum &v);\n-00089\n-const Cmomentum operator + (const Cmomentum &v);\n-00092\n-00093\n-00096\n-Cmomentum& operator += (const Cmomentum &v);\n-00097\n-00100\n-Cmomentum& operator -= (const Cmomentum &v);\n-00101\n-void build_etaphi();\n-00107\n-00108\n-double px;\n-00109\n-00110\n-double py;\n-double pz;\n-00111\n-00112\n-double E;\n-00113\n-double eta;\n-00114\n-00115\n-double phi;\n-int parent_index;\n-00116\n-00117\n-int index;\n-00118\n-// the following part is used for checksums //\n-00120\n-00122\n-Creference ref;\n-00123 };\n-00124\n-00127 bool operator < (const Cmomentum &v1, const Cmomentum &v2);\n-00128\n-00130 bool momentum_eta_less(const Cmomentum &v1, const Cmomentum &v2);\n-00131\n-00133 bool momentum_pt_less(const Cmomentum &v1, const Cmomentum &v2);\n-00134\n-00135\n-00137 // some handy utilities //\n-00139\n-00144 inline double get_distance(double eta, double phi, Cmomentum *v){\n-double dx, dy;\n-00145\n-00146\n-\n-Generated by Doxygen\n-\n-263\n-\n-\f264\n-\n-File Documentation\n-\n-00147\n-dx = eta - v->eta;\n-00148\n-dy = fabs(phi - v->phi);\n-if (dy>M_PI)\n-00149\n-00150\n-dy -= twopi;\n-00151\n-00152\n-return dx*dx+dy*dy;\n-00153 }\n-00154\n-00155 }\n-00156\n-00157 #endif\n-\n-5.44 momentum.h\n-00001 // -*- C++ -*00003 // File: momentum.h\n-//\n-00004 // Description: header file for 4-momentum class Cmomentum\n-//\n-00005 // This file is part of the SISCone project.\n-//\n-00006 // WARNING: this is not the main SISCone trunk but\n-//\n-00007 //\n-an adaptation to spherical coordinates\n-//\n-00008 // For more details, see http://projects.hepforge.org/siscone\n-//\n-00009 //\n-//\n-00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n-//\n-00011 //\n-//\n-00012 // This program is free software; you can redistribute it and/or modify\n-//\n-00013 // it under the terms of the GNU General Public License as published by\n-//\n-00014 // the Free Software Foundation; either version 2 of the License, or\n-//\n-00015 // (at your option) any later version.\n-//\n-00016 //\n-//\n-00017 // This program is distributed in the hope that it will be useful,\n-//\n-00018 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n-//\n-00019 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n-//\n-00020 // GNU General Public License for more details.\n-//\n-00021 //\n-//\n-00022 // You should have received a copy of the GNU General Public License\n-//\n-00023 // along with this program; if not, write to the Free Software\n-//\n-00024 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n-00025 //\n-//\n-00026 // $Revision:: 256\n-$//\n-00027 // $Date:: 2008-07-14 13:52:16 +0200 (Mon, 14 Jul 2008)\n-$//\n-00029\n-00030 #ifndef __SPH_VECTOR_H__\n-00031 #define __SPH_VECTOR_H__\n-00032\n-00033 #include \n-00034 #include \n-00035 #include \n-00036 #include \"geom_2d.h\"\n-00037 #include \n-00038\n-00039 namespace siscone_spherical{\n-00040\n-00054 class CSph3vector{\n-00055 public:\n-00057\n-CSph3vector();\n-00058\n-00060\n-CSph3vector(double _px, double _py, double _pz);\n-00061\n-00063\n-~CSph3vector();\n-00064\n-00066\n-CSph3vector& operator = (const CSph3vector &v);\n-00067\n-const CSph3vector operator + (const CSph3vector &v);\n-00070\n-00071\n-const CSph3vector operator - (const CSph3vector &v);\n-00074\n-00075\n-const CSph3vector operator / (const double &r);\n-00078\n-00079\n-00082\n-CSph3vector& operator += (const CSph3vector &v);\n-00083\n-00086\n-CSph3vector& operator -= (const CSph3vector &v);\n-00087\n-00090\n-CSph3vector& operator *= (const double &r);\n-00091\n-00094\n-CSph3vector& operator /= (const double &r);\n-00095\n-inline double perp()const {return sqrt(perp2());}\n-00097\n-00098\n-inline double perp2()const {return px*px+py*py;}\n-00100\n-00101\n-\n-Generated by Doxygen\n-\n-\f5.44 momentum.h\n-\n-265\n-\n-00103\n-inline double norm()const {return sqrt(px*px+py*py+pz*pz);}\n-00104\n-inline double norm2()const {return px*px+py*py+pz*pz;}\n-00106\n-00107\n-inline double phi()const {return atan2(py, px);}\n-00109\n-00110\n-inline double theta()const {return atan2(perp(),pz);}\n-00112\n-00113\n-void build_norm();\n-00120\n-00121\n-00125\n-void build_thetaphi();\n-00126\n-void get_angular_directions(CSph3vector &angular_dir1, CSph3vector &angular_dir2);\n-00129\n-00130\n-double px;\n-00131\n-00132\n-double py;\n-double pz;\n-00133\n-00134\n-double _norm;\n-00135\n-00136\n-double _theta;\n-double _phi;\n-00137\n-00138\n-00140\n-// the following part is used for checksums //\n-00142\n-siscone::Creference ref;\n-00143 };\n-00144\n-00158 class CSphmomentum : public CSph3vector{\n-00159 public:\n-00161\n-CSphmomentum();\n-00162\n-00164\n-CSphmomentum(CSph3vector &init, double E=0.0);\n-00165\n-00167\n-CSphmomentum(double _px, double _py, double _pz, double _E);\n-00168\n-00170\n-//CSphmomentum(double _eta, double _phi, siscone::Creference _ref);\n-00171\n-00173\n-~CSphmomentum();\n-00174\n-inline double mass()const {return sqrt(mass2());}\n-00176\n-00177\n-inline double mass2()const {return perpmass2()-perp2();}\n-00179\n-00180\n-inline double perpmass()const {return sqrt((E-pz)*(E+pz));}\n-00182\n-00183\n-inline double perpmass2()const {return (E-pz)*(E+pz);}\n-00185\n-00186\n-inline double Et()const {return E/sqrt(1.0+pz*pz/perp2());}\n-00188\n-00189\n-00191\n-inline double Et2()const {return E*E/(1.0+pz*pz/perp2());}\n-00192\n-00194\n-CSphmomentum& operator = (const CSphmomentum &v);\n-00195\n-const CSphmomentum operator + (const CSphmomentum &v);\n-00198\n-00199\n-00202\n-CSphmomentum& operator += (const CSphmomentum &v);\n-00203\n-00206\n-CSphmomentum& operator -= (const CSphmomentum &v);\n-00207\n-double E;\n-00208\n-00209\n-00210\n-int parent_index;\n-int index;\n-00211\n-00212 };\n-00213\n-00216 bool operator < (const CSphmomentum &v1, const CSphmomentum &v2);\n-00217\n-00219 bool momentum_theta_less(const CSphmomentum &v1, const CSphmomentum &v2);\n-00220\n-00222 bool momentum_pt_less(const CSphmomentum &v1, const CSphmomentum &v2);\n-00223\n-00224\n-00226 // some handy utilities //\n-00228\n-00230 inline double sqr(double x){return x*x;}\n-00231\n-00235 inline double dot_product3(const CSph3vector &v1, const CSph3vector &v2){\n-00236\n-//double tmp = v1.px*v2.px + v1.py*v2.py + v1.pz*v2.pz;\n-00237\n-//if (!isfinite(tmp)){\n-00238\n-// std::cout \u00ab \"dot_product inf: \" \u00ab std::endl;\n-00239\n-// std::cout \u00ab \" angles: \" \u00ab v1._theta \u00ab \" \" \u00ab v1._phi \u00ab \" and \" \u00ab v2._theta \u00ab \" \" \u00ab v2._phi \u00ab\n-std::endl;\n-00240\n-// std::cout \u00ab \" moms : \" \u00ab v1.px \u00ab \" \" \u00ab v1.py \u00ab \" \" \u00ab v1.pz\n-00241\n-//\n-\u00ab \" and \"\n-\u00ab v2.px \u00ab \" \" \u00ab v2.py \u00ab \" \" \u00ab v2.pz \u00ab std::endl;\n-00242\n-//}\n-00243\n-return v1.px*v2.px + v1.py*v2.py + v1.pz*v2.pz;\n-00244 }\n-00245\n-\n-Generated by Doxygen\n-\n-\f266\n-\n-File Documentation\n-\n-00249 inline CSph3vector cross_product3(const CSph3vector &v1, const CSph3vector &v2){\n-//CSph3vector tmp;\n-00250\n-00251\n-//tmp.px = v1.py*v2.pz-v1.pz*v2.py;\n-00252\n-//tmp.py = v1.pz*v2.px-v1.px*v2.pz;\n-00253\n-//tmp.pz = v1.px*v2.py-v1.py*v2.px;\n-00254\n-//return tmp;\n-00255\n-return CSph3vector(v1.py*v2.pz-v1.pz*v2.py,\n-00256\n-v1.pz*v2.px-v1.px*v2.pz,\n-00257\n-v1.px*v2.py-v1.py*v2.px);\n-00258 }\n-00259\n-00263 inline double norm2_cross_product3(const CSph3vector &v1, const CSph3vector &v2){\n-00264\n-return sqr(v1.py*v2.pz-v1.pz*v2.py) + sqr(v1.pz*v2.px-v1.px*v2.pz) + sqr(v1.px*v2.py-v1.py*v2.px);\n-00265 }\n-00266\n-00270 inline double get_tan2_distance(const CSphmomentum &v1, const CSphmomentum &v2){\n-return norm2_cross_product3(v1,v2)/sqr(dot_product3(v1,v2));\n-00271\n-00272 }\n-00273\n-00277 inline double get_distance(const CSph3vector *v1, const CSph3vector *v2){\n-return atan2(sqrt(norm2_cross_product3(*v1,*v2)), dot_product3(*v1,*v2));\n-00278\n-00279 }\n-00280\n-00289 inline bool is_closer(const CSph3vector *v1, const CSph3vector *v2, const double tan2R){\n-00290\n-double dot = dot_product3(*v1,*v2);\n-return (dot>=0) && (norm2_cross_product3(*v1,*v2)<=tan2R*dot*dot);\n-00291\n-00292 }\n-00293\n-00299 inline bool is_closer_safer(const CSph3vector *v1, const CSph3vector *v2, const double cosR){\n-00300\n-return dot_product3(*v1,*v2)>=cosR*sqrt(v1->norm2()*v2->norm2());\n-//double dot = dot_product3(*v1,*v2);\n-00301\n-00302\n-//return (dot>=0) && (norm2_cross_product3(*v1,*v2)\n-00031 #include \n-00032 #include \n-00033\n-00034 namespace siscone_spherical{\n-00035\n-00036 using namespace std;\n-00037\n-00038 /*************************************************************\n-\n-//\n-\n-Generated by Doxygen\n-\n-\f5.45 vicinity.cpp\n-\n-00039 * CSphvicinity_elm implementation\n-*\n-00040 * element in the vicinity of a parent.\n-00041 * class used to manage one points in the vicinity\n-*\n-00042 * of a parent point.\n-00043 *************************************************************/\n-00044\n-00045 // ordering pointers to CSphvicinity_elm\n-00046 //--------------------------------------00047 bool ve_less(CSphvicinity_elm *ve1, CSphvicinity_elm *ve2){\n-00048\n-return ve1->angle < ve2->angle;\n-00049 }\n-00050\n-00051\n-00052 /*************************************************************\n-00053 * CSphvicinity implementation\n-*\n-00054 * list of element in the vicinity of a parent.\n-*\n-00055 * class used to manage the points which are in the vicinity *\n-00056 * of a parent point. The construction of the list can be\n-*\n-00057 * made from a list of points or from a quadtree.\n-*\n-00058 *************************************************************/\n-00059\n-00060 // default constructor\n-00061 //--------------------00062 CSphvicinity::CSphvicinity(){\n-00063\n-n_part = 0;\n-00064\n-00065\n-ve_list = NULL;\n-00066 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00067\n-quadtree = NULL;\n-00068 #endif\n-00069\n-00070\n-parent = NULL;\n-00071\n-VR2 = VR = 0.0;\n-00072\n-00073 }\n-00074\n-00075 // constructor with initialisation\n-00076 //--------------------------------00077 CSphvicinity::CSphvicinity(vector &_particle_list){\n-00078\n-parent = NULL;\n-00079\n-ve_list = NULL;\n-00080 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00081\n-quadtree = NULL;\n-00082 #endif\n-00083\n-cosVR = VR2 = tan2R = VR = 0.0;\n-00084\n-00085\n-set_particle_list(_particle_list);\n-00086 }\n-00087\n-00088 // default destructor\n-00089 //-------------------00090 CSphvicinity::~CSphvicinity(){\n-00091\n-if (ve_list!=NULL)\n-delete[] ve_list;\n-00092\n-00093\n-00094 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00095\n-if (quadtree!=NULL)\n-00096\n-delete quadtree;\n-00097 #endif\n-00098 }\n-00099\n-00100 /*\n-00101 * set the particle_list\n-00102 * - particle_list\n-list of particles (type CSphmomentum)\n-number of particles in the list\n-00103 * - n\n-00104 ************************************************************/\n-00105 void CSphvicinity::set_particle_list(vector &_particle_list){\n-00106\n-int i,j;\n-00107 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00108\n-double eta_max=0.0;\n-00109 #endif\n-00110\n-// if the particle list is not empty, destroy it !\n-00111\n-00112\n-if (ve_list!=NULL){\n-00113\n-delete[] ve_list;\n-00114\n-}\n-00115\n-vicinity.clear();\n-00116 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00117\n-if (quadtree!=NULL)\n-delete quadtree;\n-00118\n-00119 #endif\n-00120\n-// allocate memory array for particles\n-00121\n-00122\n-// Note: - we compute max for |eta|\n-00123\n-//\n-- we allocate indices to particles\n-00124\n-n_part = 0;\n-00125\n-plist.clear();\n-\n-Generated by Doxygen\n-\n-267\n-\n-*\n-*\n-\n-\f268\n-\n-File Documentation\n-\n-00126\n-pincluded.clear();\n-for (i=0;i<(int) _particle_list.size();i++){\n-00127\n-00128\n-// if a particle is colinear with the beam (infinite rapidity)\n-00129\n-// we do not take it into account\n-00130\n-//if (fabs(_particle_list[i].pz)!=_particle_list[i].E){\n-00131\n-plist.push_back(_particle_list[i]);\n-00132\n-pincluded.push_back(siscone::Cvicinity_inclusion()); // zero inclusion status\n-00133\n-// the parent_index is handled in the split_merge because\n-00134\n-00135\n-// of our multiple-pass procedure.\n-00136\n-// Hence, it is not required here any longer.\n-00137\n-// plist[n_part].parent_index = i;\n-00138\n-plist[n_part].index = n_part;\n-00139\n-// make sure the reference is randomly created\n-00140\n-00141\n-plist[n_part].ref.randomize();\n-00142\n-00143 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00144\n-if (fabs(plist[n_part].eta)>eta_max) eta_max=fabs(plist[n_part].eta);\n-00145 #endif\n-00146\n-n_part++;\n-00147\n-//}\n-00148\n-}\n-00149\n-// allocate quadtree and vicinity_elm list\n-00150\n-00151\n-// note: we set phi in [-pi:pi] as it is the natural range for atan2!\n-00152\n-ve_list = new CSphvicinity_elm[2*n_part];\n-00153 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00154\n-eta_max+=0.1;\n-00155\n-quadtree = new siscone::Cquadtree(0.0, 0.0, eta_max, M_PI);\n-00156 #endif\n-00157\n-// append particle to the vicinity_elm list\n-00158\n-00159\n-j = 0;\n-00160\n-for (i=0;iadd(&plist[i]);\n-00163 #endif\n-00164\n-ve_list[j].v = ve_list[j+1].v = &plist[i];\n-00165\n-ve_list[j].is_inside = ve_list[j+1].is_inside = &(pincluded[i]);\n-00166\n-j+=2;\n-00167\n-}\n-00168\n-00169 }\n-00170\n-00171\n-00172 /*\n-00173 * build the vicinity list from a list of points.\n-reference particle\n-00174 * - _parent\n-00175 * - _VR\n-vicinity radius\n-00176 ************************************************************/\n-00177 void CSphvicinity::build(CSphmomentum *_parent, double _VR){\n-00178\n-int i;\n-00179\n-// set parent and radius\n-00180\n-00181\n-parent = _parent;\n-00182\n-00183\n-VR = _VR;\n-00184\n-VR2 = VR*VR;\n-00185\n-cosVR = cos(VR);\n-00186\n-R2 = 0.25*VR2;\n-00187\n-R\n-= 0.5*VR;\n-double tmp = tan(R);\n-00188\n-00189\n-tan2R = tmp*tmp;\n-00190\n-00191\n-D2_R = 2.0*(1-cos(R));\n-//tmp = sqrt(D2_R);\n-00192\n-00193\n-inv_R_EPS_COCIRC = 1.0 / R / EPSILON_COCIRCULAR;\n-00194\n-inv_R_2EPS_COCIRC = 0.5 / R / EPSILON_COCIRCULAR;\n-00195\n-// clear vicinity\n-00196\n-00197\n-vicinity.clear();\n-00198\n-// init parent variables\n-00199\n-00200\n-// we cpte the direction of the centre and two orthogonal ones\n-00201\n-// to measure the angles. Those are taken orthogonal to the\n-00202\n-// axis of smallest components (of the centre) to increase precision\n-00203\n-parent_centre = (*parent)/parent->_norm;\n-00204\n-parent_centre.get_angular_directions(angular_dir1, angular_dir2);\n-00205\n-angular_dir1 /= angular_dir1._norm;\n-00206\n-angular_dir2 /= angular_dir2._norm;\n-00207\n-00208\n-// really browse the particle list\n-00209\n-for (i=0;i0) ? 0.0 : 2.0;\n-00224\n-double t=c/s;\n-return (s>0) ? 1-t/(1+fabs(t)) : 3-t/(1+fabs(t));\n-00225\n-00226 }\n-00227\n-00228\n-00229 /*\n-00230 * append a particle to the \u2019vicinity\u2019 list after\n-00231 * having computed the angular-ordering quantities\n-00232 * - v\n-vector to test\n-00233 **********************************************************/\n-00234 void CSphvicinity::append_to_vicinity(CSphmomentum *v){\n-00235\n-// skip the particle itself)\n-00236\n-if (v==parent)\n-return;\n-00237\n-00238\n-int i=2*(v->index);\n-00239\n-00240\n-// compute the distance of the i-th particle with the parent\n-00241\n-00242\n-double dot = dot_product3(parent_centre,*v);\n-00243\n-CSph3vector vnormal = *v;\n-00244\n-vnormal/=v->_norm;\n-00245\n-dot/=v->_norm;\n-00246\n-00247\n-// really check if the distance is less than VR\n-00248\n-if (dot>cosVR){\n-00249\n-CSph3vector cross = cross_product3(parent_centre,vnormal);\n-00250\n-// for the centres\n-00251\n-00252\n-CSph3vector median = (parent_centre+vnormal);\n-double amplT = sqrt((tan2R*(1+dot)+(dot-1))*(1+dot));\n-00253\n-00254\n-CSph3vector transverse = amplT*cross/cross._norm;\n-00255\n-00256\n-// first angle (+)\n-00257\n-ve_list[i].centre = median + transverse;\n-00258\n-ve_list[i].centre.build_norm();\n-00259\n-ve_list[i].centre/=ve_list[i].centre._norm;\n-00260\n-CSph3vector diff = ve_list[i].centre - parent_centre;\n-//ve_list[i].angle = atan2(dot_product3(angular_dir2, diff),dot_product3(angular_dir1, diff));\n-00261\n-00262\n-ve_list[i].angle = sort_angle(dot_product3(angular_dir2, diff),dot_product3(angular_dir1, diff));\n-00263\n-ve_list[i].side = true;\n-00264\n-ve_list[i].cocircular.clear();\n-00265\n-vicinity.push_back(&(ve_list[i]));\n-00266\n-// second angle (-)\n-00267\n-00268\n-ve_list[i+1].centre = median - transverse;\n-00269\n-ve_list[i+1].centre.build_norm();\n-00270\n-ve_list[i+1].centre/=ve_list[i+1].centre._norm;\n-00271\n-diff = ve_list[i+1].centre - parent_centre;\n-00272\n-ve_list[i+1].angle = sort_angle(dot_product3(angular_dir2, diff),dot_product3(angular_dir1,\n-diff));\n-00273\n-ve_list[i+1].side = false;\n-00274\n-ve_list[i+1].cocircular.clear();\n-00275\n-vicinity.push_back(&(ve_list[i+1]));\n-00276\n-// now work out the cocircularity range for the two points (range\n-00277\n-00278\n-// of angle within which the points stay within a distance\n-00279\n-// EPSILON_COCIRCULAR of circule\n-00280\n-// P = parent; C = child; O = Origin (center of circle)\n-00281\n-CSph3vector OP = parent_centre - ve_list[i+1].centre;\n-00282\n-CSph3vector OC = vnormal - ve_list[i+1].centre;\n-00283\n-00284\n-// two sources of error are (GPS CCN29-19) epsilon/(R sin theta)\n-00285\n-// and sqrt(2*epsilon/(R (1-cos theta))) and the way things work\n-00286\n-// out, it is the _smaller_ of the two that is relevant [NB have\n-00287\n-// changed definition of theta here relative to that used in\n-00288\n-// CCN29] [NB2: write things so as to avoid zero denominators and\n-00289\n-// to minimize the multiplications, divisions and above all sqrts\n-00290\n-// -- that means that c & s are defined including a factor of VR2]\n-00291\n-double inv_err1 = cross_product3(OP,OC)._norm * inv_R_EPS_COCIRC;\n-double inv_err2_sq = (D2_R-dot_product3(OP,OC)) * inv_R_2EPS_COCIRC;\n-00292\n-00293\n-ve_list[i].cocircular_range = siscone::pow2(inv_err1) > inv_err2_sq ?\n-00294\n-1.0/inv_err1 :\n-00295\n-sqrt(1.0/inv_err2_sq);\n-00296\n-ve_list[i+1].cocircular_range = ve_list[i].cocircular_range;\n-00297\n-}\n-00298 }\n-00299\n-\n-Generated by Doxygen\n-\n-\f270\n-\n-File Documentation\n-\n-00300 }\n-\n-5.46 vicinity.cpp\n-00001\n-//\n-00002 // File: vicinity.cpp\n-00003 // Description: source file for particle vicinity (Cvicinity class)\n-//\n-00004 // This file is part of the SISCone project.\n-//\n-00005 // For more details, see http://projects.hepforge.org/siscone\n-//\n-00006 //\n-//\n-00007 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-//\n-00008 //\n-//\n-00009 // This program is free software; you can redistribute it and/or modify\n-//\n-00010 // it under the terms of the GNU General Public License as published by\n-//\n-00011 // the Free Software Foundation; either version 2 of the License, or\n-//\n-00012 // (at your option) any later version.\n-//\n-00013 //\n-//\n-00014 // This program is distributed in the hope that it will be useful,\n-//\n-00015 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n-//\n-00016 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n-//\n-00017 // GNU General Public License for more details.\n-//\n-00018 //\n-//\n-00019 // You should have received a copy of the GNU General Public License\n-//\n-00020 // along with this program; if not, write to the Free Software\n-//\n-00021 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n-00022 //\n-//\n-00023 // $Revision:: 388\n-$//\n-00024 // $Date:: 2016-03-03 10:42:25 +0100 (Thu, 03 Mar 2016)\n-$//\n-00026\n-00027 #include \"vicinity.h\"\n-00028 #include \n-00029 #include \n-00030 #include \n-00031\n-00032 namespace siscone{\n-00033\n-00034 using namespace std;\n-00035\n-00036 /*************************************************************\n-00037 * Cvicinity_elm implementation\n-*\n-00038 * element in the vicinity of a parent.\n-00039 * class used to manage one points in the vicinity\n-*\n-00040 * of a parent point.\n-00041 *************************************************************/\n-00042\n-00043 // ordering pointers to Cvicinity_elm\n-00044 //-----------------------------------00045 bool ve_less(Cvicinity_elm *ve1, Cvicinity_elm *ve2){\n-00046\n-return ve1->angle < ve2->angle;\n-00047 }\n-00048\n-00049\n-00050 /*************************************************************\n-00051 * Cvicinity implementation\n-*\n-00052 * list of element in the vicinity of a parent.\n-*\n-00053 * class used to manage the points which are in the vicinity *\n-00054 * of a parent point. The construction of the list can be\n-*\n-00055 * made from a list of points or from a quadtree.\n-*\n-00056 *************************************************************/\n-00057\n-00058 // default constructor\n-00059 //--------------------00060 Cvicinity::Cvicinity(){\n-00061\n-n_part = 0;\n-00062\n-00063\n-ve_list = NULL;\n-00064 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00065\n-quadtree = NULL;\n-00066 #endif\n-00067\n-00068\n-parent = NULL;\n-00069\n-VR2 = VR = 0.0;\n-00070\n-00071 }\n-00072\n-00073 // constructor with initialisation\n-00074 //--------------------------------00075 Cvicinity::Cvicinity(vector &_particle_list){\n-00076\n-parent = NULL;\n-00077 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-\n-*\n-*\n-\n-Generated by Doxygen\n-\n-\f5.46 vicinity.cpp\n-\n-00078\n-quadtree = NULL;\n-00079 #endif\n-00080\n-VR2 = VR = 0.0;\n-00081\n-00082\n-ve_list = NULL;\n-00083\n-set_particle_list(_particle_list);\n-00084 }\n-00085\n-00086 // default destructor\n-00087 //-------------------00088 Cvicinity::~Cvicinity(){\n-if (ve_list!=NULL)\n-00089\n-00090\n-delete[] ve_list;\n-00091\n-00092 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00093\n-if (quadtree!=NULL)\n-delete quadtree;\n-00094\n-00095 #endif\n-00096 }\n-00097\n-00098 /*\n-00099 * set the particle_list\n-list of particles (type Cmomentum)\n-00100 * - particle_list\n-00101 * - n\n-number of particles in the list\n-00102 ************************************************************/\n-00103 void Cvicinity::set_particle_list(vector &_particle_list){\n-00104\n-int i,j;\n-00105 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00106\n-double eta_max=0.0;\n-00107 #endif\n-00108\n-00109\n-// if the particle list is not empty, destroy it !\n-00110\n-if (ve_list!=NULL){\n-00111\n-delete[] ve_list;\n-00112\n-}\n-00113\n-vicinity.clear();\n-00114 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00115\n-if (quadtree!=NULL)\n-00116\n-delete quadtree;\n-00117 #endif\n-00118\n-00119\n-// allocate memory array for particles\n-00120\n-// Note: - we compute max for |eta|\n-00121\n-//\n-- we allocate indices to particles\n-00122\n-n_part = 0;\n-00123\n-plist.clear();\n-00124\n-pincluded.clear();\n-00125\n-for (i=0;i<(int) _particle_list.size();i++){\n-00126\n-// if a particle is colinear with the beam (infinite rapidity)\n-00127\n-// we do not take it into account\n-00128\n-if (fabs(_particle_list[i].pz)!=_particle_list[i].E){\n-00129\n-plist.push_back(_particle_list[i]);\n-00130\n-pincluded.push_back(Cvicinity_inclusion()); // zero inclusion status\n-00131\n-00132\n-// the parent_index is handled in the split_merge because\n-00133\n-// of our multiple-pass procedure.\n-00134\n-// Hence, it is not required here any longer.\n-00135\n-// plist[n_part].parent_index = i;\n-00136\n-plist[n_part].index = n_part;\n-00137\n-00138\n-// make sure the reference is randomly created\n-00139\n-plist[n_part].ref.randomize();\n-00140\n-00141 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00142\n-if (fabs(plist[n_part].eta)>eta_max) eta_max=fabs(plist[n_part].eta);\n-00143 #endif\n-00144\n-00145\n-n_part++;\n-00146\n-}\n-00147\n-}\n-00148\n-00149\n-// allocate quadtree and vicinity_elm list\n-00150\n-// note: we set phi in [-pi:pi] as it is the natural range for atan2!\n-00151\n-ve_list = new Cvicinity_elm[2*n_part];\n-00152 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00153\n-eta_max+=0.1;\n-00154\n-quadtree = new Cquadtree(0.0, 0.0, eta_max, M_PI);\n-00155 #endif\n-00156\n-// append particle to the vicinity_elm list\n-00157\n-00158\n-j = 0;\n-00159\n-for (i=0;iadd(&plist[i]);\n-00162 #endif\n-00163\n-ve_list[j].v = ve_list[j+1].v = &plist[i];\n-00164\n-ve_list[j].is_inside = ve_list[j+1].is_inside = &(pincluded[i]);\n-\n-Generated by Doxygen\n-\n-271\n-\n-\f272\n-\n-00165\n-j+=2;\n-00166\n-}\n-00167\n-00168 }\n-00169\n-00170\n-00171 /*\n-00172 * build the vicinity list from a list of points.\n-00173 * - _parent\n-reference particle\n-00174 * - _VR\n-vicinity radius\n-00175 ************************************************************/\n-00176 void Cvicinity::build(Cmomentum *_parent, double _VR){\n-00177\n-int i;\n-00178\n-// set parent and radius\n-00179\n-00180\n-parent = _parent;\n-00181\n-VR = _VR;\n-00182\n-VR2 = VR*VR;\n-00183\n-R2 = 0.25*VR2;\n-00184\n-R\n-= 0.5*VR;\n-00185\n-inv_R_EPS_COCIRC = 1.0 / R / EPSILON_COCIRCULAR;\n-00186\n-inv_R_2EPS_COCIRC = 0.5 / R / EPSILON_COCIRCULAR;\n-00187\n-// clear vicinity\n-00188\n-00189\n-vicinity.clear();\n-00190\n-// init parent variables\n-00191\n-00192\n-pcx = parent->eta;\n-00193\n-pcy = parent->phi;\n-00194\n-00195\n-// really browse the particle list\n-00196\n-for (i=0;i0) ? 0.0 : 2.0;\n-double t=c/s;\n-00210\n-00211\n-return (s>0) ? 1-t/(1+fabs(t)) : 3-t/(1+fabs(t));\n-00212 }\n-00213\n-00214\n-00215 /*\n-00216 * append a particle to the \u2019vicinity\u2019 list after\n-00217 * having computed the angular-ordering quantities\n-vector to test\n-00218 * - v\n-00219 **********************************************************/\n-00220 void Cvicinity::append_to_vicinity(Cmomentum *v){\n-00221\n-double dx, dy, d2;\n-00222\n-// skip the particle itself)\n-00223\n-00224\n-if (v==parent)\n-00225\n-return;\n-00226\n-int i=2*(v->index);\n-00227\n-00228\n-// compute the distance of the i-th particle with the parent\n-00229\n-00230\n-dx = v->eta - pcx;\n-00231\n-dy = v->phi - pcy;\n-00232\n-00233\n-// pay attention to the periodicity in phi !\n-00234\n-if (dy>M_PI)\n-00235\n-dy -= twopi;\n-else if (dy<-M_PI)\n-00236\n-00237\n-dy += twopi;\n-00238\n-00239\n-d2 = dx*dx+dy*dy;\n-00240\n-00241\n-// really check if the distance is less than VR\n-00242\n-if (d2eta - ve_list[i+1].eta,\n-00276\n-phi_in_range(v->phi-ve_list[i+1].phi));\n-00277\n-// two sources of error are (GPS CCN29-19) epsilon/(R sin theta)\n-00278\n-00279\n-// and sqrt(2*epsilon/(R (1-cos theta))) and the way things work\n-00280\n-// out, it is the _smaller_ of the two that is relevant [NB have\n-00281\n-// changed definition of theta here relative to that used in\n-00282\n-// CCN29] [NB2: write things so as to avoid zero denominators and\n-00283\n-// to minimize the multiplications, divisions and above all sqrts\n-00284\n-// -- that means that c & s are defined including a factor of VR2]\n-00285\n-c = dot_product(OP,OC);\n-00286\n-s = fabs(cross_product(OP,OC));\n-00287\n-double inv_err1 = s * inv_R_EPS_COCIRC;\n-double inv_err2_sq = (R2-c) * inv_R_2EPS_COCIRC;\n-00288\n-00289\n-ve_list[i].cocircular_range = pow2(inv_err1) > inv_err2_sq ?\n-00290\n-1.0/inv_err1 :\n-00291\n-sqrt(1.0/inv_err2_sq);\n-00292\n-ve_list[i+1].cocircular_range = ve_list[i].cocircular_range;\n-00293\n-}\n-00294 }\n-00295\n-00296 }\n-\n-5.47 split_merge.cpp\n-00001\n-//\n-00002 // File: split_merge.cpp\n-00003 // Description: source file for splitting/merging (contains the CJet class) //\n-00004 // This file is part of the SISCone project.\n-//\n-00005 // WARNING: this is not the main SISCone trunk but\n-//\n-00006 //\n-an adaptation to spherical coordinates\n-//\n-00007 // For more details, see http://projects.hepforge.org/siscone\n-//\n-00008 //\n-//\n-00009 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n-//\n-00010 //\n-//\n-00011 // This program is free software; you can redistribute it and/or modify\n-//\n-00012 // it under the terms of the GNU General Public License as published by\n-//\n-00013 // the Free Software Foundation; either version 2 of the License, or\n-//\n-00014 // (at your option) any later version.\n-//\n-00015 //\n-//\n-00016 // This program is distributed in the hope that it will be useful,\n-//\n-00017 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n-//\n-00018 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n-//\n-00019 // GNU General Public License for more details.\n-//\n-00020 //\n-//\n-00021 // You should have received a copy of the GNU General Public License\n-//\n-00022 // along with this program; if not, write to the Free Software\n-//\n-00023 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n-00024 //\n-//\n-00025 // $Revision:: 390\n-$//\n-00026 // $Date:: 2016-03-03 11:06:52 +0100 (Thu, 03 Mar 2016)\n-$//\n-00028\n-00029 #include \n-00030 #include \"split_merge.h\"\n-00031 #include \"momentum.h\"\n-00032 #include \n-// for max\n-00033 #include \n-00034 #include \n-\n-Generated by Doxygen\n-\n-273\n-\n-\f274\n-\n-File Documentation\n-\n-00035 #include \n-00036 #include \n-00037 #include \n-00038\n-00039 namespace siscone_spherical{\n-00040\n-00041 using namespace std;\n-00042\n-00043 /********************************************************\n-00044 * class CSphjet implementation\n-*\n-00045 * real Jet information.\n-*\n-00046 * This class contains information for one single jet.\n-*\n-00047 * That is, first, its momentum carrying information\n-*\n-00048 * about its centre and pT, and second, its particle\n-*\n-00049 * contents\n-*\n-00050 ********************************************************/\n-00051 // default ctor\n-00052 //-------------00053 CSphjet::CSphjet(){\n-00054\n-n = 0;\n-00055\n-v = CSphmomentum();\n-00056\n-E_tilde = 0.0;\n-00057\n-sm_var2 = 0.0;\n-00058\n-pass = CJET_INEXISTENT_PASS; // initialised to a value that should\n-00059\n-// notappear in the end (after clustering)\n-00060 }\n-00061\n-00062 // default dtor\n-00063 //-------------00064 CSphjet::~CSphjet(){\n-00065\n-00066 }\n-00067\n-00068 // ordering of jets in E (e.g. used in final jets ordering)\n-00069 //---------------------------------------------------------00070 bool jets_E_less(const CSphjet &j1, const CSphjet &j2){\n-00071\n-return j1.v.E > j2.v.E;\n-00072 }\n-00073\n-00074\n-00075 /********************************************************\n-00076 * CSphsplit_merge_ptcomparison implementation\n-*\n-00077 * This deals with the ordering of the jets candidates *\n-00078 ********************************************************/\n-00079\n-00080 // odering of two jets\n-00081 // The variable of the ordering is pt or mt\n-00082 // depending on \u2019split_merge_scale\u2019 choice\n-00083 //\n-00084 // with EPSILON_SPLITMERGE defined, this attempts to identify\n-00085 // delicate cases where two jets have identical momenta except for\n-00086 // softish particles -- the difference of pt\u2019s may not be correctly\n-00087 // identified normally and so lead to problems for the fate of the\n-00088 // softish particle.\n-00089 //\n-00090 // NB: there is a potential issue in momentum-conserving events,\n-00091 // whereby the harder of two jets becomes ill-defined when a soft\n-00092 // particle is emitted --- this may have a knock-on effect on\n-00093 // subsequent split-merge steps in cases with sufficiently large R\n-00094 // (but we don\u2019t know what the limit is...)\n-00095 //-----------------------------------------------------------------00096 bool CSphsplit_merge_ptcomparison::operator ()(const CSphjet &jet1, const CSphjet &jet2)const{\n-00097\n-double q1, q2;\n-00098\n-// compute the value for comparison for both jets\n-00099\n-00100\n-// This depends on the choice of variable (mt is the default)\n-00101\n-q1 = jet1.sm_var2;\n-00102\n-q2 = jet2.sm_var2;\n-00103\n-00104\n-bool res = q1 > q2;\n-00105\n-// if we enable the refined version of the comparison (see defines.h),\n-00106\n-00107\n-// we compute the difference more precisely when the two jets are very\n-00108\n-// close in the ordering variable.\n-00109 #ifdef EPSILON_SPLITMERGE\n-00110\n-if ( (fabs(q1-q2) < EPSILON_SPLITMERGE*max(q1,q2)) &&\n-00111\n-(jet1.v.ref != jet2.v.ref) ) {\n-00112 #ifdef DEBUG_SPLIT_MERGE\n-00113\n-cout \u00ab \"Using high-precision ordering tests\" \u00ab endl;\n-00114 #endif\n-00115\n-// get the momentum of the difference\n-00116\n-CSphmomentum difference;\n-double E_tilde_difference;\n+CSphmomentum difference;\n+double E_tilde_difference;\n 00117\n 00118\n get_difference(jet1,jet2,&difference,&E_tilde_difference);\n 00119\n 00120\n // use the following relation: pt1^2 - pt2^2 = (pt1+pt2)*(pt1-pt2)\n 00121\n double qdiff;\n-\n-Generated by Doxygen\n-\n-\f5.47 split_merge.cpp\n-\n-275\n-\n 00122\n CSphmomentum sum = jet1.v ;\n 00123\n sum += jet2.v;\n double E_tilde_sum = jet1.E_tilde + jet2.E_tilde;\n 00124\n 00125\n // depending on the choice of ordering variable, set the result\n 00126\n 00127\n switch (split_merge_scale){\n-case SM_Etilde:\n 00128\n+case SM_Etilde:\n 00129\n qdiff = E_tilde_sum*E_tilde_difference;\n break;\n 00130\n-00131\n case SM_E:\n+00131\n 00132\n qdiff = sum.E*difference.E;\n break;\n 00133\n 00134\n default:\n-throw siscone::Csiscone_error(\"Unsupported split-merge scale choice: \"\n 00135\n+throw siscone::Csiscone_error(\"Unsupported split-merge scale choice: \"\n 00136\n + SM_scale_name());\n 00137\n }\n 00138\n res = qdiff > 0;\n 00139\n }\n 00140 #endif // EPSILON_SPLITMERGE\n 00141\n-return res;\n 00142\n+return res;\n 00143 }\n 00144\n 00145\n 00148 std::string split_merge_scale_name(Esplit_merge_scale sms) {\n switch(sms) {\n 00149\n+\n+Generated by Doxygen\n+\n+\f5.47 split_merge.cpp\n+\n+271\n+\n 00150\n case SM_E:\n return \"E (IR unsafe for pairs of identical decayed heavy particles)\";\n 00151\n 00152\n case SM_Etilde:\n 00153\n@@ -23870,27 +23227,20 @@\n 00203\n throw siscone::Csiscone_error(\"get_non_overlap reached part it should never have seen...\");\n 00204\n }\n 00205\n } while ((i1 p_sorted;\n-bool collinear;\n 00406\n-00407\n+bool collinear;\n double dphi;\n+00407\n 00408\n+\n+Generated by Doxygen\n+\n+273\n+\n+\f274\n+\n 00409\n-p_uncol_hard.clear();\n 00410\n-// we first sort the particles according to their theta angle\n 00411\n 00412\n-for (i=0;iM_PI) dphi = twopi-dphi;\n 00433\n 00434\n@@ -24288,16 +23647,16 @@\n 00449\n p_uncol_hard.push_back(p_sorted[i]);\n 00450\n i++;\n 00451\n }\n 00452\n-00453\n return 0;\n+00453\n 00454 }\n 00455\n 00456\n 00457 // add a list of protocones\n 00458 // - protocones list of protocones (initial jet candidates)\n 00459 // - R2\n cone radius (squared)\n@@ -24311,30 +23670,23 @@\n 00465\n CSphmomentum *v;\n double tan2R;\n 00466\n 00467\n CSphjet jet;\n 00468\n-\n-Generated by Doxygen\n-\n-\f5.47 split_merge.cpp\n-\n-279\n-\n 00469\n if (protocones->size()==0)\n-return 1;\n 00470\n+return 1;\n 00471\n 00472\n E_min = Emin;\n-00473\n double R = sqrt(R2);\n+00473\n 00474\n tan2R = tan(R);\n 00475\n tan2R *= tan2R;\n 00476\n 00477 #ifdef DEBUG_SPLIT_MERGE\n 00478\n@@ -24353,25 +23705,32 @@\n 00485\n 00486\n // browse protocones\n 00487\n // for each of them, build the list of particles in them\n 00488\n for (vector::iterator p_it = protocones->begin();p_it != protocones->end();p_it++){\n-// initialise variables\n 00489\n+// initialise variables\n 00490\n c = &(*p_it);\n 00491\n-// browse particles to create cone contents\n 00492\n+// browse particles to create cone contents\n 00493\n // note that jet is always initialised with default values at this level\n 00494\n jet.v = CSphmomentum();\n+\n+Generated by Doxygen\n+\n+\f5.47 split_merge.cpp\n+\n+275\n+\n 00495\n jet.contents.clear();\n for (i=0;i *protocones, double R2,\n double Emin){\n+\n+Generated by Doxygen\n+\n+\f276\n+\n+File Documentation\n+\n 00581\n int i;\n 00582\n 00583\n CSphmomentum *c;\n 00584\n CSphmomentum *v;\n 00585\n double R, tan2R;\n 00586\n CSphjet jet, jet_candidate;\n bool found_jet = false;\n 00587\n 00588\n-00589\n if (protocones->size()==0)\n-return 1;\n+00589\n 00590\n+return 1;\n 00591\n 00592\n E_min = Emin;\n 00593\n R = sqrt(R2);\n 00594\n tan2R = tan(R);\n 00595\n tan2R *= tan2R;\n 00596\n-// browse protocones\n 00597\n+// browse protocones\n 00598\n // for each of them, build the list of particles in them\n 00599\n for (vector::iterator p_it = protocones->begin();p_it != protocones->end();p_it++){\n 00600\n // initialise variables\n 00601\n@@ -24626,19 +23985,14 @@\n jet_candidate.sm_var2 = (*_user_scale)(jet_candidate);\n 00639\n jet_candidate.sm_var2 *= abs(jet_candidate.sm_var2);\n 00640\n } else {\n 00641\n jet_candidate.sm_var2 = get_sm_var2(jet_candidate.v, jet_candidate.E_tilde);\n-\n-Generated by Doxygen\n-\n-\f5.47 split_merge.cpp\n-\n 00642\n }\n 00643\n // now check if it is possibly the hardest\n 00644\n 00645\n if ((! found_jet) ||\n@@ -24674,16 +24028,21 @@\n cout \u00ab \"PR-Jet \" \u00ab jets.size() \u00ab \" [size \" \u00ab jet.contents.size() \u00ab \"]:\";\n 00663 #endif\n 00664\n // update the list of what particles are left\n 00665\n 00666\n int p_remain_index = 0;\n-int contents_index = 0;\n 00667\n+int contents_index = 0;\n+\n+Generated by Doxygen\n+\n+\f5.47 split_merge.cpp\n+\n 00668\n //sort(next_jet.contents.begin(),next_jet.contents.end());\n 00669\n for (int index=0;indexsize()==0)\n+00722\n 00723\n return 0;\n 00724\n if (overlap_tshold>=1.0 || overlap_tshold <= 0) {\n 00725\n 00726\n ostringstream message;\n 00727\n message \u00ab \"Illegal value for overlap_tshold, f = \" \u00ab overlap_tshold;\n 00728\n message \u00ab \" (legal values are 0size()>0){\n-// browse for the first jet\n 00742\n+// browse for the first jet\n 00743\n j1 = candidates->begin();\n 00744\n // if hardest jet does not pass threshold then nothing else will\n 00745\n 00746\n // either so one stops the split merge.\n@@ -24832,14 +24182,23 @@\n 00751\n j2 = j1;\n 00752\n j2++;\n int j2_relindex = 1; // used only in ifdef, but costs little so keep it outside\n 00753\n 00754\n+\n+Generated by Doxygen\n+\n+277\n+\n+\f278\n+\n+File Documentation\n+\n 00755\n while (j2 != candidates->end()){\n 00756 #ifdef DEBUG_SPLIT_MERGE\n 00757\n if (j2_relindex==1) show();\n 00758\n cout \u00ab \"check overlap between cdt 1 and cdt \" \u00ab j2_relindex+1 \u00ab \" with overlap \" \u00ab endl;\n@@ -24941,33 +24300,28 @@\n 00812 #endif\n 00813\n candidates->erase(j1);\n 00814\n }\n 00815\n }\n-\n-Generated by Doxygen\n-\n-\f5.47 split_merge.cpp\n-\n 00816\n } while (candidates->size()>0);\n 00817\n // sort jets by Energy\n 00818\n 00819\n sort(jets.begin(), jets.end(), jets_E_less);\n 00820 #ifdef DEBUG_SPLIT_MERGE\n 00821\n show();\n 00822 #endif\n 00823\n-return jets.size();\n 00824\n+return jets.size();\n 00825 }\n 00826\n 00827\n 00828\n 00829 // save the event on disk\n 00830 // - flux\n stream used to save jet contents\n@@ -24985,14 +24339,19 @@\n fprintf(flux, \"# columns are: px, py, pz, E and number of particles for each jet\\n\");\n for (it_j = jets.begin(), i1=0 ; it_j != jets.end() ; it_j++, i1++){\n 00839\n 00840\n j1 = &(*it_j);\n 00841\n fprintf(flux, \"%e\\t%e\\t%e\\t%e\\t%d\\n\",\n+\n+Generated by Doxygen\n+\n+\f5.47 split_merge.cpp\n+\n 00842\n j1->v.px, j1->v.py, j1->v.pz, j1->v.E, j1->n);\n 00843\n }\n 00844\n 00845\n fprintf(flux, \"# jet contents\\n\");\n@@ -25011,16 +24370,16 @@\n 00852\n particles[j1->contents[i2]].pz, particles[j1->contents[i2]].E,\n 00853\n j1->contents[i2], i1);\n 00854\n }\n 00855\n-return 0;\n 00856\n+return 0;\n 00857 }\n 00858\n 00859\n 00860 // show current jets/candidate status\n 00861 //-----------------------------------00862 int CSphsplit_merge::show(){\n 00863\n jet_iterator it_j;\n@@ -25091,44 +24450,35 @@\n 00899\n fprintf(stdout, \"%d \", c->contents[i2]);\n 00900\n fprintf(stdout, \"\\n\");\n 00901\n }\n 00902\n-\n-Generated by Doxygen\n-\n-283\n-\n-\f284\n-\n-File Documentation\n-\n 00903\n fprintf(stdout, \"\\n\");\n-return 0;\n 00904\n+return 0;\n 00905 }\n 00906\n 00907\n 00908 // get the overlap between 2 jets\n 00909 // - j1\n first jet\n 00910 // - j2\n second jet\n 00911 // - overlap2 returned overlap^2 (determined by the choice of SM variable)\n 00912 // return true if overlapping, false if disjoint\n 00913 //--------------------------------------------------------------------00914 bool CSphsplit_merge::get_overlap(const CSphjet &j1, const CSphjet &j2, double *overlap2){\n-00915\n // check if ranges overlap\n+00915\n 00916\n if (!is_range_overlap(j1.range,j2.range))\n-00917\n return false;\n+00917\n 00918\n int i1,i2;\n 00919\n 00920\n bool is_overlap;\n 00921\n // initialise\n@@ -25136,18 +24486,27 @@\n 00923\n i1=i2=idx_size=0;\n 00924\n is_overlap = false;\n 00925\n CSphmomentum v;\n 00926\n-// compute overlap\n 00927\n+// compute overlap\n 00928\n // at the same time, we store union in indices\n+\n+Generated by Doxygen\n+\n+279\n+\n+\f280\n+\n+File Documentation\n+\n 00929\n do{\n if (j1.contents[i1]\" all over the place\n 00986\n+// shorthand to avoid having \"->\" all over the place\n 00987\n const CSphjet & j1 = * it_j1;\n const CSphjet & j2 = * it_j2;\n 00988\n 00989\n 00990\n i1=i2=0;\n-\n-Generated by Doxygen\n-\n-\f5.47 split_merge.cpp\n-\n 00991\n+jet2.v = jet1.v = CSphmomentum();\n 00992\n 00993\n+// compute centroids\n 00994\n+// When use_E_weighted_splitting is activated, the\n 00995\n+// \"geometrical\" distance is weighted by the inverse\n 00996\n+// of the E of the protojet\n 00997\n+// This is stored in E{1,2}_weight\n 00998\n+E1_weight = (use_E_weighted_splitting) ? 1.0/j1.v.E/j1.v.E : 1.0;\n 00999\n+E2_weight = (use_E_weighted_splitting) ? 1.0/j2.v.E/j2.v.E : 1.0;\n 01000\n 01001\n+// compute jet splitting\n 01002\n+do{\n 01003\n+if (j1.contents[i1]_theta,v->_phi);\n 01011\n+} else if (j1.contents[i1]>j2.contents[i2]){\n+// particle i2 belong only to jet 2\n 01012\n 01013\n+v = &(particles[j2.contents[i2]]);\n 01014\n+jet2.contents.push_back(j2.contents[i2]);\n 01015\n+jet2.v += *v;\n 01016\n+//jet2.pt_tilde += pt[j2.contents[i2]];\n+\n+Generated by Doxygen\n+\n+\f5.47 split_merge.cpp\n+\n 01017\n+i2++;\n 01018\n+jet2.range.add_particle(v->_theta,v->_phi);\n 01019\n+} else { // (j1.contents[i1]==j2.contents[i2])\n 01020\n+// common particle, decide which is the closest centre\n 01021\n+v = &(particles[j1.contents[i1]]);\n 01022\n+//TODO: improve this brutal use of atan2 and sqrt !!!!\n 01023\n 01024\n+//? what when == ?\n 01025\n 01026\n+// When use_E_weighted_splitting is activated, the\n 01027\n+// \"geometrical\" distance is weighted by the inverse\n 01028\n+// of the E of the protojet\n 01029\n+double d1 = get_distance(&(j1.v), v)*E1_weight;\n+double d2 = get_distance(&(j2.v), v)*E2_weight;\n 01030\n 01031\n+// do bookkeeping on most ambiguous split\n 01032\n+if (fabs(d1-d2) < most_ambiguous_split)\n 01033\n+most_ambiguous_split = fabs(d1-d2);\n 01034\n+if (d1_theta,v->_phi);\n 01041\n+} else {\n+// particle i2 belong only to jet 2\n 01042\n 01043\n+jet2.contents.push_back(j2.contents[i2]);\n 01044\n+jet2.v += *v;\n+//jet2.pt_tilde += pt[j2.contents[i2]];\n 01045\n 01046\n+jet2.range.add_particle(v->_theta,v->_phi);\n 01047\n+}\n 01048\n 01049\n+i1++;\n 01050\n+i2++;\n 01051\n+}\n 01052\n+} while ((i1_theta,v->_phi);\n 01061\n+}\n+while (i2_theta,v->_phi);\n 01069\n+}\n 01070\n+// finalise jets\n 01071\n 01072\n+jet1.n = jet1.contents.size();\n 01073\n+jet2.n = jet2.contents.size();\n 01074\n+// now the jet axis is known, we can compute Etilde\n 01075\n 01076\n-01077\n-\n-jet2.v = jet1.v = CSphmomentum();\n-// compute centroids\n-// When use_E_weighted_splitting is activated, the\n-// \"geometrical\" distance is weighted by the inverse\n-// of the E of the protojet\n-// This is stored in E{1,2}_weight\n-E1_weight = (use_E_weighted_splitting) ? 1.0/j1.v.E/j1.v.E : 1.0;\n-E2_weight = (use_E_weighted_splitting) ? 1.0/j2.v.E/j2.v.E : 1.0;\n-// compute jet splitting\n-do{\n-if (j1.contents[i1]_theta,v->_phi);\n-} else if (j1.contents[i1]>j2.contents[i2]){\n-// particle i2 belong only to jet 2\n-v = &(particles[j2.contents[i2]]);\n-jet2.contents.push_back(j2.contents[i2]);\n-jet2.v += *v;\n-//jet2.pt_tilde += pt[j2.contents[i2]];\n-i2++;\n-jet2.range.add_particle(v->_theta,v->_phi);\n-} else { // (j1.contents[i1]==j2.contents[i2])\n-// common particle, decide which is the closest centre\n-v = &(particles[j1.contents[i1]]);\n-//TODO: improve this brutal use of atan2 and sqrt !!!!\n-//? what when == ?\n-// When use_E_weighted_splitting is activated, the\n-// \"geometrical\" distance is weighted by the inverse\n-// of the E of the protojet\n-double d1 = get_distance(&(j1.v), v)*E1_weight;\n-double d2 = get_distance(&(j2.v), v)*E2_weight;\n-// do bookkeeping on most ambiguous split\n-if (fabs(d1-d2) < most_ambiguous_split)\n-most_ambiguous_split = fabs(d1-d2);\n-if (d1_theta,v->_phi);\n-} else {\n-// particle i2 belong only to jet 2\n-jet2.contents.push_back(j2.contents[i2]);\n-jet2.v += *v;\n-//jet2.pt_tilde += pt[j2.contents[i2]];\n-jet2.range.add_particle(v->_theta,v->_phi);\n-}\n-i1++;\n-i2++;\n-}\n-} while ((i1_theta,v->_phi);\n-}\n-while (i2_theta,v->_phi);\n-}\n-// finalise jets\n-jet1.n = jet1.contents.size();\n-jet2.n = jet2.contents.size();\n-// now the jet axis is known, we can compute Etilde\n compute_Etilde(jet1);\n+01077\n compute_Etilde(jet2);\n-\n-Generated by Doxygen\n-\n-285\n-\n-\f286\n-\n-File Documentation\n-\n 01078\n-// remove previous jets\n 01079\n+// remove previous jets\n 01080 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 01081\n cand_refs.erase(j1.v.ref);\n 01082\n cand_refs.erase(j2.v.ref);\n 01083 #endif\n 01084\n candidates->erase(it_j1);\n 01085\n candidates->erase(it_j2);\n 01086\n-01087\n // reinsert new ones\n+01087\n 01088\n insert(jet1);\n 01089\n insert(jet2);\n 01090\n-return true;\n 01091\n+return true;\n 01092 }\n 01093\n 01094 // merge the two given jet.\n 01095 // during this procedure, the jets j1 & j2 are replaced\n 01096 // by 1 single jets containing both of them.\n 01097 // - it_j1 iterator of the first jet in \u2019candidates\u2019\n 01098 // - it_j2 iterator of the second jet in \u2019candidates\u2019\n 01099 // return true on success, false on error\n 01101 bool CSphsplit_merge::merge(cjet_iterator &it_j1, cjet_iterator &it_j2){\n 01102\n CSphjet jet;\n int i;\n 01103\n 01104\n-// build new jet\n+\n+Generated by Doxygen\n+\n+281\n+\n+\f282\n+\n+File Documentation\n+\n 01105\n+// build new jet\n 01106\n // note: particles within j1 & j2 have already been stored in indices\n 01107\n for (i=0;ierase(it_j1);\n 01127\n candidates->erase(it_j2);\n 01128\n-01129\n // reinsert new candidate\n+01129\n 01130\n insert(jet);\n 01131\n return true;\n 01132\n 01133 }\n 01134\n@@ -25566,45 +24924,38 @@\n default:\n throw siscone::Csiscone_error(\"Unsupported split-merge scale choice: \"\n 01174\n 01175\n + ptcomparison.SM_scale_name());\n 01176\n }\n-\n-Generated by Doxygen\n-\n-\f5.48 split_merge.cpp\n-\n-287\n-\n 01177\n-//return 0.0;\n 01178\n+//return 0.0;\n 01179 }\n 01180\n 01181\n 01182\n 01184 void CSphsplit_merge::compute_Etilde(CSphjet &jet){\n 01185\n jet.v.build_norm();\n 01186\n jet.E_tilde=0.0;\n 01187\n CSph3vector jet_axis = jet.v;\n-01188\n //if (jet.v._norm==0){\n+01188\n 01189\n // jet_axis = CSph3vector(0.0,0.0,0.0);\n 01190\n //} else {\n 01191\n jet_axis/=jet.v.E;\n-01192\n //}\n+01192\n 01193\n //cout \u00ab \"~~~ Axis: \" \u00ab jet.v.px \u00ab \" \" \u00ab jet.v.py \u00ab \" \" \u00ab jet.v.pz \u00ab \" \" \u00ab jet.v._norm \u00ab endl;\n 01194\n //cout \u00ab \"~~~ Axis: \" \u00ab jet_axis.px \u00ab \" \" \u00ab jet_axis.py \u00ab \" \" \u00ab jet_axis.pz \u00ab endl;\n 01195\n for (vector::iterator cont_it=jet.contents.begin(); cont_it!=jet.contents.end(); cont_it++){\n const CSphmomentum &p = particles[*cont_it];\n@@ -25613,18 +24964,24 @@\n jet.E_tilde+=p.E*(1.0+norm2_cross_product3(p,jet_axis)/particles_norm2[*cont_it]);\n 01198\n }\n 01199 }\n 01200\n 01201 }\n \n+Generated by Doxygen\n+\n+\f5.48 split_merge.cpp\n+\n+283\n+\n 5.48 split_merge.cpp\n 00001\n-00002 // File: split_merge.cpp\n //\n+00002 // File: split_merge.cpp\n 00003 // Description: source file for splitting/merging (contains the CJet class) //\n 00004 // This file is part of the SISCone project.\n //\n 00005 // For more details, see http://projects.hepforge.org/siscone\n //\n 00006 //\n //\n@@ -25696,23 +25053,14 @@\n 00050 //-------------00051 Cjet::Cjet(){\n 00052\n n = 0;\n 00053\n v = Cmomentum();\n 00054\n pt_tilde = 0.0;\n-\n-Generated by Doxygen\n-\n-*\n-\n-\f288\n-\n-File Documentation\n-\n 00055\n sm_var2 = 0.0;\n 00056\n pass = CJET_INEXISTENT_PASS; // initialised to a value that should\n 00057\n // notappear in the end (after clustering)\n 00058 }\n@@ -25737,52 +25085,61 @@\n 00077\n 00078 // odering of two jets\n 00079 // The variable of the ordering is pt or mt\n 00080 // depending on \u2019split_merge_scale\u2019 choice\n 00081 //\n 00082 // with EPSILON_SPLITMERGE defined, this attempts to identify\n 00083 // delicate cases where two jets have identical momenta except for\n+\n+Generated by Doxygen\n+\n+*\n+\n+\f284\n+\n+File Documentation\n+\n 00084 // softish particles -- the difference of pt\u2019s may not be correctly\n 00085 // identified normally and so lead to problems for the fate of the\n 00086 // softish particle.\n 00087 //\n 00088 // NB: there is a potential issue in momentum-conserving events,\n 00089 // whereby the harder of two jets becomes ill-defined when a soft\n 00090 // particle is emitted --- this may have a knock-on effect on\n 00091 // subsequent split-merge steps in cases with sufficiently large R\n 00092 // (but we don\u2019t know what the limit is...)\n 00093 //-----------------------------------------------------------------00094 bool Csplit_merge_ptcomparison::operator ()(const Cjet &jet1, const Cjet &jet2)const{\n-00095\n double q1, q2;\n+00095\n 00096\n // compute the value for comparison for both jets\n 00097\n 00098\n // This depends on the choice of variable (mt is the default)\n 00099\n q1 = jet1.sm_var2;\n 00100\n q2 = jet2.sm_var2;\n 00101\n-00102\n bool res = q1 > q2;\n+00102\n 00103\n // if we enable the refined version of the comparison (see defines.h),\n 00104\n 00105\n // we compute the difference more precisely when the two jets are very\n 00106\n // close in the ordering variable.\n 00107 #ifdef EPSILON_SPLITMERGE\n 00108\n if ( (fabs(q1-q2) < EPSILON_SPLITMERGE*max(q1,q2)) &&\n 00109\n (jet1.v.ref != jet2.v.ref) ) {\n-00110\n // get the momentum of the difference\n+00110\n 00111\n Cmomentum difference;\n 00112\n double pt_tilde_difference;\n 00113\n get_difference(jet1,jet2,&difference,&pt_tilde_difference);\n 00114\n@@ -25801,32 +25158,32 @@\n 00121\n 00122\n switch (split_merge_scale){\n case SM_mt:\n 00123\n 00124\n qdiff = sum.E*difference.E - sum.pz*difference.pz;\n-break;\n 00125\n-00126\n+break;\n case SM_pt:\n+00126\n 00127\n qdiff = sum.px*difference.px + sum.py*difference.py;\n break;\n 00128\n 00129\n case SM_pttilde:\n 00130\n qdiff = pt_tilde_sum*pt_tilde_difference;\n break;\n 00131\n-case SM_Et:\n 00132\n-00133\n+case SM_Et:\n // diff = E^2 (dpt^2 pz^2- pt^2 dpz^2)\n+00133\n 00134\n //\n + dE^2 (pt^2+pz^2) pt2^2\n 00135\n // where, unless explicitely specified the variables\n 00136\n // refer to the first jet or differences jet1-jet2.\n@@ -25836,100 +25193,100 @@\n ((sum.px*difference.px + sum.py*difference.py)*jet1.v.pz*jet1.v.pz\n 00139\n -jet1.v.perp2()*sum.pz*difference.pz)\n 00140\n +sum.E*difference.E*(jet1.v.perp2()+jet1.v.pz*jet1.v.pz)*jet2.v.perp2();\n 00141\n break;\n-\n-Generated by Doxygen\n-\n-\f5.48 split_merge.cpp\n-\n-289\n-\n-00142\n default:\n-throw Csiscone_error(\"Unsupported split-merge scale choice: \"\n+00142\n 00143\n+throw Csiscone_error(\"Unsupported split-merge scale choice: \"\n 00144\n + SM_scale_name());\n 00145\n }\n 00146\n res = qdiff > 0;\n 00147\n }\n 00148 #endif // EPSILON_SPLITMERGE\n 00149\n-return res;\n 00150\n+return res;\n 00151 }\n 00152\n 00153\n 00156 std::string split_merge_scale_name(Esplit_merge_scale sms) {\n 00157\n switch(sms) {\n-00158\n case SM_pt:\n+00158\n 00159\n return \"pt (IR unsafe)\";\n-case SM_Et:\n 00160\n-00161\n+case SM_Et:\n return \"Et (boost dep.)\";\n-case SM_mt:\n+00161\n 00162\n-00163\n+case SM_mt:\n return \"mt (IR safe except for pairs of identical decayed heavy particles)\";\n-case SM_pttilde:\n+00163\n 00164\n-00165\n+case SM_pttilde:\n return \"pttilde (scalar sum of pt\u2019s)\";\n+00165\n 00166\n default:\n-return \"[SM scale without a name]\";\n 00167\n+return \"[SM scale without a name]\";\n 00168\n }\n 00169 }\n 00170\n 00171\n 00172 // get the difference between 2 jets\n+\n+Generated by Doxygen\n+\n+\f5.48 split_merge.cpp\n+\n+285\n+\n 00173 // - j1\n first jet\n 00174 // - j2\n second jet\n 00175 // - v\n jet1-jet2\n 00176 // - pt_tilde\n jet1-jet2 pt_tilde\n 00177 // return true if overlapping, false if disjoint\n 00178 //----------------------------------------------00179 void Csplit_merge_ptcomparison::get_difference(const Cjet &j1, const Cjet &j2, Cmomentum *v, double\n *pt_tilde)const {\n int i1,i2;\n 00180\n 00181\n-// initialise\n 00182\n+// initialise\n 00183\n i1=i2=0;\n 00184\n *v = Cmomentum();\n 00185\n *pt_tilde = 0.0;\n 00186\n-// compute overlap\n 00187\n+// compute overlap\n 00188\n // at the same time, we store union in indices\n 00189\n do{\n-00190\n if (j1.contents[i1]==j2.contents[i2]) {\n+00190\n 00191\n i1++;\n 00192\n i2++;\n 00193\n } else if (j1.contents[i1](ptcomparison));\n 00240\n@@ -26023,28 +25373,35 @@\n SM_var2_hardest_cut_off = -numeric_limits::max();\n 00243\n // no pt cutoff for the particles to put in p_uncol_hard\n 00244\n 00245\n stable_cone_soft_pt2_cutoff = -1.0;\n 00246\n-// no pt-weighted splitting\n 00247\n+// no pt-weighted splitting\n 00248\n use_pt_weighted_splitting = false;\n 00249 }\n 00250\n 00251\n 00252 // default dtor\n 00253 //-------------00254 Csplit_merge::~Csplit_merge(){\n 00255\n full_clear();\n 00256 }\n 00257\n 00258\n+\n+Generated by Doxygen\n+\n+\f286\n+\n+File Documentation\n+\n 00259 // initialisation function\n 00260 // - _particles list of particles\n 00261 // - protocones list of protocones (initial jet candidates)\n 00262 // - R2\n cone radius (squared)\n 00263 // - ptmin\n minimal pT allowed for jets\n@@ -26070,32 +25427,32 @@\n 00279\n // with infinite rapidity (colinear with the beam)\n 00280\n particles = _particles;\n 00281\n n = particles.size();\n 00282\n-00283\n // build the vector of particles\u2019 pt\n+00283\n 00284\n pt.resize(n);\n for (int i=0;i(ptcomparison));\n 00371\n@@ -26245,99 +25602,99 @@\n 00378\n cand_refs.clear();\n 00379 #endif\n 00380\n 00381\n p_remain.clear();\n 00382\n-00383\n return 0;\n+00383\n 00384 }\n 00385\n 00386\n 00387 // full clearance\n 00388 //---------------00389 int Csplit_merge::full_clear(){\n 00390\n partial_clear();\n 00391\n 00392\n // clear previously allocated memory\n 00393\n if (indices != NULL){\n-00394\n delete[] indices;\n+00394\n 00395\n }\n 00396\n particles.clear();\n 00397\n-00398\n return 0;\n+00398\n 00399 }\n 00400\n 00401\n 00402 // build the list \u2019p_uncol_hard\u2019 from p_remain by clustering collinear particles\n-\n-Generated by Doxygen\n-\n-291\n-\n-\f292\n-\n-File Documentation\n-\n 00403 // note that thins in only used for stable-cone detection\n 00404 // so the parent_index field is unnecessary\n 00405 //------------------------------------------------------------------------00406 int Csplit_merge::merge_collinear_and_remove_soft(){\n-int i,j;\n 00407\n+int i,j;\n 00408\n vector p_sorted;\n bool collinear;\n 00409\n-00410\n double dphi;\n+00410\n 00411\n 00412\n p_uncol_hard.clear();\n 00413\n-// we first sort the particles according to their rapidity\n 00414\n+// we first sort the particles according to their rapidity\n 00415\n for (i=0;i *protocones, double R2, double ptmin){\n-int i;\n 00461\n+int i;\n 00462\n Cmomentum *c;\n 00463\n Cmomentum *v;\n-00464\n double eta, phi;\n+00464\n 00465\n double dx, dy;\n-double R;\n 00466\n+double R;\n 00467\n Cjet jet;\n 00468\n-00469\n if (protocones->size()==0)\n+00469\n 00470\n return 1;\n 00471\n 00472\n pt_min2 = ptmin*ptmin;\n 00473\n R = sqrt(R2);\n 00474\n-// browse protocones\n 00475\n+// browse protocones\n 00476\n // for each of them, build the list of particles in them\n 00477\n for (vector::iterator p_it = protocones->begin();p_it != protocones->end();p_it++){\n // initialise variables\n 00478\n 00479\n@@ -26422,51 +25779,44 @@\n // note: cones have been tested => their (eta,phi) coordinates are computed\n 00481\n 00482\n eta = c->eta;\n 00483\n phi = c->phi;\n 00484\n-00485\n // browse particles to create cone contents\n+00485\n 00486\n // note that jet is always initialised with default values at this level\n 00487\n jet.v = Cmomentum();\n 00488\n jet.pt_tilde=0;\n 00489\n jet.contents.clear();\n-\n-Generated by Doxygen\n-\n-\f5.48 split_merge.cpp\n-\n-293\n-\n-00490\n for (i=0;ipz)!=v->E){\n 00495\n dx = eta - v->eta;\n 00496\n dy = fabs(phi - v->phi);\n if (dy>M_PI)\n 00497\n 00498\n dy -= twopi;\n-if (dx*dx+dy*dyparent_index);\n 00501\n jet.v+= *v;\n 00502\n jet.pt_tilde+= pt[v->parent_index];\n 00503\n@@ -26474,33 +25824,40 @@\n 00504\n }\n 00505\n }\n 00506\n jet.n=jet.contents.size();\n 00507\n-// set the momentum in protocones\n 00508\n+// set the momentum in protocones\n 00509\n // (it was only known through eta and phi up to now)\n 00510\n *c = jet.v;\n 00511\n c->eta = eta; // restore exact original coords\n 00512\n c->phi = phi; // to avoid rounding error inconsistencies\n 00513\n-00514\n // set the jet range\n+00514\n 00515\n jet.range=Ceta_phi_range(eta,phi,R);\n 00516\n 00517 #ifdef DEBUG_SPLIT_MERGE\n 00518\n cout \u00ab \"adding jet: \";\n+\n+Generated by Doxygen\n+\n+\f5.48 split_merge.cpp\n+\n+289\n+\n 00519\n for (int i2=0;i2size()==0)\n 00582\n-00583\n return 1;\n+00583\n 00584\n 00585\n pt_min2 = ptmin*ptmin;\n 00586\n R = sqrt(R2);\n 00587\n 00588\n@@ -26643,14 +25993,21 @@\n // browse particles to create cone contents\n 00602\n jet_candidate.v = Cmomentum();\n 00603\n jet_candidate.pt_tilde=0;\n 00604\n jet_candidate.contents.clear();\n+\n+Generated by Doxygen\n+\n+\f290\n+\n+File Documentation\n+\n 00605\n for (i=0;ieta = eta; // restore exact original coords\n 00627\n c->phi = phi; // to avoid rounding error inconsistencies\n 00628\n-// set the jet range\n 00629\n+// set the jet range\n 00630\n jet_candidate.range=Ceta_phi_range(eta,phi,R);\n 00631\n // check that the protojet has large enough pt\n 00632\n 00633\n if (jet_candidate.v.perp2()is_larger(jet_candidate, jet)\n 00649\n : ptcomparison(jet_candidate, jet))){\n 00650\n@@ -26737,66 +26094,61 @@\n 00651\n found_jet = true;\n 00652\n }\n 00653\n }\n 00654\n-// make sure at least one of the jets has passed the selection\n 00655\n+// make sure at least one of the jets has passed the selection\n 00656\n if (!found_jet) return 1;\n 00657\n // add the jet to the list of jets\n 00658\n 00659\n jets.push_back(jet);\n 00660\n jets[jets.size()-1].v.build_etaphi();\n 00661\n 00662 #ifdef DEBUG_SPLIT_MERGE\n-\n-Generated by Doxygen\n-\n-\f5.48 split_merge.cpp\n-\n 00663\n cout \u00ab \"PR-Jet \" \u00ab jets.size() \u00ab \" [size \" \u00ab jet.contents.size() \u00ab \"]:\";\n 00664 #endif\n 00665\n-00666\n // update the list of what particles are left\n+00666\n 00667\n int p_remain_index = 0;\n-00668\n int contents_index = 0;\n-//sort(next_jet.contents.begin(),next_jet.contents.end());\n+00668\n 00669\n+//sort(next_jet.contents.begin(),next_jet.contents.end());\n 00670\n for (int index=0;indexsize()==0)\n 00723\n+if (candidates->size()==0)\n return 0;\n 00724\n 00725\n-if (overlap_tshold>=1.0 || overlap_tshold <= 0) {\n 00726\n+if (overlap_tshold>=1.0 || overlap_tshold <= 0) {\n 00727\n ostringstream message;\n 00728\n message \u00ab \"Illegal value for overlap_tshold, f = \" \u00ab overlap_tshold;\n 00729\n message \u00ab \" (legal values are 0size()>0){\n 00742\n-00743\n+if (candidates->size()>0){\n // browse for the first jet\n+00743\n 00744\n j1 = candidates->begin();\n 00745\n // if hardest jet does not pass threshold then nothing else will\n 00746\n 00747\n // either so one stops the split merge.\n 00748\n if (j1->sm_var2end()){\n+00755\n 00756 #ifdef DEBUG_SPLIT_MERGE\n 00757\n show();\n 00758 #endif\n 00759\n // check overlapping\n 00760\n if (get_overlap(*j1, *j2, &overlap2)){\n-// check if overlapping energy passes threshold\n 00761\n+// check if overlapping energy passes threshold\n 00762\n // Note that this depends on the ordering variable\n 00763 #ifdef DEBUG_SPLIT_MERGE\n 00764\n cout \u00ab \"overlap between cdt 1 and cdt \" \u00ab j2_relindex+1 \u00ab \" with overlap \"\n 00765\n \u00ab sqrt(overlap2/j2->sm_var2) \u00ab endl\u00abendl;\n 00766 #endif\n 00767\n if (overlap2sm_var2){\n-// split jets\n 00768\n+// split jets\n 00769\n split(j1, j2);\n 00770\n // update iterators\n 00771\n 00772\n j2 = j1 = candidates->begin();\n 00773\n j2_relindex = 0;\n 00774\n } else {\n-// merge jets\n 00775\n+// merge jets\n 00776\n merge(j1, j2);\n 00777\n-// update iterators\n 00778\n+// update iterators\n+\n+Generated by Doxygen\n+\n+291\n+\n+\f292\n+\n+File Documentation\n+\n 00779\n j2 = j1 = candidates->begin();\n 00780\n j2_relindex = 0;\n 00781\n }\n 00782\n@@ -27036,16 +26393,16 @@\n 00816\n sort(jets.begin(), jets.end(), jets_pt_less);\n 00817 #ifdef DEBUG_SPLIT_MERGE\n 00818\n show();\n 00819 #endif\n 00820\n-return jets.size();\n 00821\n+return jets.size();\n 00822 }\n 00823\n 00824\n 00825\n 00826 // save the event on disk\n 00827 // - flux\n stream used to save jet contents\n@@ -27061,38 +26418,33 @@\n fprintf(flux, \"# %d jets found\\n\", (int) jets.size());\n 00835\n fprintf(flux, \"# columns are: eta, phi, pt and number of particles for each jet\\n\");\n for (it_j = jets.begin(), i1=0 ; it_j != jets.end() ; it_j++, i1++){\n 00836\n 00837\n j1 = &(*it_j);\n-\n-Generated by Doxygen\n-\n-\f5.48 split_merge.cpp\n-\n 00838\n j1->v.build_etaphi();\n 00839\n fprintf(flux, \"%f\\t%f\\t%e\\t%d\\n\",\n 00840\n j1->v.eta, j1->v.phi, j1->v.perp(), j1->n);\n 00841\n }\n 00842\n 00843\n fprintf(flux, \"# jet contents\\n\");\n 00844\n fprintf(flux, \"# columns are: eta, phi, pt, particle index and jet number\\n\");\n-00845\n for (it_j = jets.begin(), i1=0 ; it_j != jets.end() ; it_j++, i1++){\n+00845\n 00846\n j1 = &(*it_j);\n-for (i2=0;i2n;i2++)\n 00847\n+for (i2=0;i2n;i2++)\n 00848\n fprintf(flux, \"%f\\t%f\\t%e\\t%d\\t%d\\n\",\n 00849\n particles[j1->contents[i2]].eta, particles[j1->contents[i2]].phi,\n 00850\n particles[j1->contents[i2]].perp(), j1->contents[i2], i1);\n 00851\n@@ -27107,79 +26459,84 @@\n 00858 //-----------------------------------00859 int Csplit_merge::show(){\n 00860\n jet_iterator it_j;\n 00861\n cjet_iterator it_c;\n 00862\n Cjet *j;\n-const Cjet *c;\n 00863\n-00864\n+const Cjet *c;\n int i1, i2;\n+00864\n 00865\n-for (it_j = jets.begin(), i1=0 ; it_j != jets.end() ; it_j++, i1++){\n 00866\n+for (it_j = jets.begin(), i1=0 ; it_j != jets.end() ; it_j++, i1++){\n+\n+Generated by Doxygen\n+\n+\f5.48 split_merge.cpp\n+\n 00867\n j = &(*it_j);\n 00868\n fprintf(stdout, \"jet %2d: %e\\t%e\\t%e\\t%e\\t\", i1+1,\n 00869\n j->v.px, j->v.py, j->v.pz, j->v.E);\n-for (i2=0;i2n;i2++)\n 00870\n+for (i2=0;i2n;i2++)\n 00871\n fprintf(stdout, \"%d \", j->contents[i2]);\n 00872\n fprintf(stdout, \"\\n\");\n 00873\n }\n 00874\n-for (it_c = candidates->begin(), i1=0 ; it_c != candidates->end() ; it_c++, i1++){\n 00875\n+for (it_c = candidates->begin(), i1=0 ; it_c != candidates->end() ; it_c++, i1++){\n 00876\n c = &(*it_c);\n 00877\n fprintf(stdout, \"cdt %2d: %e\\t%e\\t%e\\t%e\\t%e\\t\", i1+1,\n 00878\n c->v.px, c->v.py, c->v.pz, c->v.E, sqrt(c->sm_var2));\n-00879\n for (i2=0;i2n;i2++)\n+00879\n 00880\n fprintf(stdout, \"%d \", c->contents[i2]);\n 00881\n fprintf(stdout, \"\\n\");\n 00882\n }\n 00883\n 00884\n fprintf(stdout, \"\\n\");\n-00885\n return 0;\n+00885\n 00886 }\n 00887\n 00888\n 00889 // get the overlap between 2 jets\n 00890 // - j1\n first jet\n 00891 // - j2\n second jet\n 00892 // - overlap2 returned overlap^2 (determined by the choice of SM variable)\n 00893 // return true if overlapping, false if disjoint\n 00894 //--------------------------------------------------------------------00895 bool Csplit_merge::get_overlap(const Cjet &j1, const Cjet &j2, double *overlap2){\n-00896\n // check if ranges overlap\n+00896\n 00897\n if (!is_range_overlap(j1.range,j2.range))\n 00898\n return false;\n 00899\n int i1,i2;\n 00900\n-bool is_overlap;\n 00901\n+bool is_overlap;\n 00902\n // initialise\n 00903\n 00904\n i1=i2=idx_size=0;\n 00905\n is_overlap = false;\n@@ -27216,38 +26573,29 @@\n indices[idx_size] = j1.contents[i1];\n 00922\n i1++;\n 00923\n i2++;\n 00924\n is_overlap = true;\n-\n-Generated by Doxygen\n-\n-297\n-\n-\f298\n-\n-File Documentation\n-\n 00925\n }\n 00926\n idx_size++;\n 00927\n } while ((i1\" all over the place\n 00970\n 00971\n const Cjet & j1 = * it_j1;\n-const Cjet & j2 = * it_j2;\n 00972\n+const Cjet & j2 = * it_j2;\n 00973\n 00974\n i1=i2=0;\n 00975\n jet2.v = jet1.v = Cmomentum();\n 00976\n jet2.pt_tilde = jet1.pt_tilde = 0.0;\n@@ -27346,20 +26703,20 @@\n phi2 = tmp.phi;\n 00993\n pt2_weight = (use_pt_weighted_splitting) ? 1.0/tmp.perp2() : 1.0;\n 00994\n 00995\n jet1.v = jet2.v = Cmomentum();\n 00996\n-00997\n // compute jet splitting\n+00997\n 00998\n do{\n-00999\n if (j1.contents[i1]eta,v->phi);\n 01015\n } else { // (j1.contents[i1]==j2.contents[i2])\n 01016\n@@ -27400,51 +26752,56 @@\n 01018\n // distance w.r.t. centroid 1\n 01019\n 01020\n dx1 = eta1 - v->eta;\n 01021\n dy1 = fabs(phi1 - v->phi);\n-if (dy1>M_PI)\n 01022\n+if (dy1>M_PI)\n 01023\n dy1 -= twopi;\n 01024\n-01025\n // distance w.r.t. centroid 2\n+01025\n 01026\n dx2 = eta2 - v->eta;\n 01027\n dy2 = fabs(phi2 - v->phi);\n-01028\n if (dy2>M_PI)\n+01028\n 01029\n dy2 -= twopi;\n 01030\n-//? what when == ?\n 01031\n+//? what when == ?\n 01032\n // When use_pt_weighted_splitting is activated, the\n 01033\n // \"geometrical\" distance is weighted by the inverse\n 01034\n // of the pt of the protojet\n 01035\n double d1sq = (dx1*dx1+dy1*dy1)*pt1_weight;\n-double d2sq = (dx2*dx2+dy2*dy2)*pt2_weight;\n 01036\n-01037\n+double d2sq = (dx2*dx2+dy2*dy2)*pt2_weight;\n // do bookkeeping on most ambiguous split\n+01037\n 01038\n if (fabs(d1sq-d2sq) < most_ambiguous_split)\n 01039\n most_ambiguous_split = fabs(d1sq-d2sq);\n 01040\n 01041\n if (d1sqerase(it_j1);\n 01090\n candidates->erase(it_j2);\n 01091\n-// reinsert new ones\n 01092\n+// reinsert new ones\n 01093\n insert(jet1);\n 01094\n insert(jet2);\n 01095\n 01096\n return true;\n 01097 }\n 01098\n 01099 // merge the two given jet.\n-\n-Generated by Doxygen\n-\n-299\n-\n-\f300\n-\n-File Documentation\n-\n 01100 // during this procedure, the jets j1 & j2 are replaced\n 01101 // by 1 single jets containing both of them.\n 01102 // - it_j1 iterator of the first jet in \u2019candidates\u2019\n 01103 // - it_j2 iterator of the second jet in \u2019candidates\u2019\n 01104 // return true on success, false on error\n 01106 bool Csplit_merge::merge(cjet_iterator &it_j1, cjet_iterator &it_j2){\n 01107\n Cjet jet;\n int i;\n 01108\n 01109\n-// build new jet\n 01110\n+// build new jet\n 01111\n // note: particles within j1 & j2 have already been stored in indices\n 01112\n for (i=0;irange, it_j2->range);\n 01121\n // remove old candidates\n 01122\n 01123 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 01124\n@@ -27597,50 +26945,59 @@\n 01126\n cand_refs.erase(it_j2->v.ref);\n 01127\n }\n 01128 #endif\n 01129\n candidates->erase(it_j1);\n+\n+Generated by Doxygen\n+\n+295\n+\n+\f296\n+\n+File Documentation\n+\n 01130\n candidates->erase(it_j2);\n 01131\n // reinsert new candidate\n 01132\n 01133\n insert(jet);\n 01134\n-01135\n return true;\n+01135\n 01136 }\n 01137\n 01143 bool Csplit_merge::insert(Cjet &jet){\n 01144\n-// eventually check that no other candidate are present with the\n 01145\n+// eventually check that no other candidate are present with the\n 01146\n // same cone contents. We recall that this automatic merging of\n 01147\n // identical protocones can lead to infrared-unsafe situations.\n 01148 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 01149\n if ((merge_identical_protocones) && (!cand_refs.insert(jet.v.ref).second))\n-return false;\n 01150\n+return false;\n 01151 #endif\n 01152\n-01153\n // check that the protojet has large enough pt\n+01153\n 01154\n if (jet.v.perp2()insert(jet);\n@@ -27651,24 +27008,24 @@\n 01165\n 01172 double Csplit_merge::get_sm_var2(Cmomentum &v, double &pt_tilde){\n switch(ptcomparison.split_merge_scale) {\n 01173\n 01174\n case SM_pt:\n return v.perp2();\n+01175\n case SM_mt:\n return v.perpmass2();\n-01175\n-01176\n case SM_pttilde: return pt_tilde*pt_tilde;\n+01176\n+01177\n case SM_Et:\n return v.Et2();\n-01177\n-01178\n default:\n+01178\n 01179\n throw Csiscone_error(\"Unsupported split-merge scale choice: \"\n 01180\n + ptcomparison.SM_scale_name());\n 01181\n }\n 01182\n@@ -27676,38 +27033,28 @@\n //return 0.0;\n 01184 }\n 01185\n 01186 }\n \n 5.49 split_merge.h\n 00001 // -*- C++ -*00003 // File: split_merge.h\n-00004 // Description: header file for splitting/merging (contains the CJet class)\n-00005 // This file is part of the SISCone project.\n-//\n-\n //\n+00004 // Description: header file for splitting/merging (contains the CJet class) //\n+00005 // This file is part of the SISCone project.\n //\n-\n-Generated by Doxygen\n-\n-\f5.49 split_merge.h\n-\n-301\n-\n 00006 // WARNING: this is not the main SISCone trunk but\n //\n 00007 //\n an adaptation to spherical coordinates\n //\n 00008 // For more details, see http://projects.hepforge.org/siscone\n //\n 00009 //\n //\n 00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n-//\n 00011 //\n //\n 00012 // This program is free software; you can redistribute it and/or modify\n //\n 00013 // it under the terms of the GNU General Public License as published by\n //\n 00014 // the Free Software Foundation; either version 2 of the License, or\n@@ -27738,14 +27085,23 @@\n 00027 // $Date:: 2016-05-22 12:14:42 +0200 (Sun, 22 May 2016)\n $//\n 00029\n 00030 #ifndef __SPH_SPLIT_MERGE_H__\n 00031 #define __SPH_SPLIT_MERGE_H__\n 00032\n 00033 #include \n+\n+//\n+\n+Generated by Doxygen\n+\n+\f5.49 split_merge.h\n+\n+297\n+\n 00034 #include \n 00035 #include \"geom_2d.h\"\n 00036 #include \"momentum.h\"\n 00037 #include \n 00038 #include \n 00039 #include \n 00040 #include \n@@ -27774,16 +27130,16 @@\n 00068\n double sm_var2;\n 00080\n 00081\n 00083\n CSphtheta_phi_range range;\n 00084\n-00089\n int pass;\n+00089\n 00090 };\n 00091\n 00094\n 00096 bool jets_E_less(const CSphjet &j1, const CSphjet &j2);\n 00097\n 00098\n 00106 enum Esplit_merge_scale {\n@@ -27800,37 +27156,30 @@\n 00122\n CSphsplit_merge_ptcomparison() :\n 00123\n particles(0), split_merge_scale(SM_Etilde){};\n 00124\n 00126\n std::string SM_scale_name()const {\n-return split_merge_scale_name(split_merge_scale);}\n 00127\n+return split_merge_scale_name(split_merge_scale);}\n 00128\n 00129\n std::vector * particles;\n 00130\n std::vector * particles_norm2;\n 00131\n 00133\n bool operator()(const CSphjet &jet1, const CSphjet &jet2) const;\n 00134\n 00146\n void get_difference(const CSphjet &j1, const CSphjet &j2, CSphmomentum *v, double *E_tilde) const;\n 00147\n 00158\n Esplit_merge_scale split_merge_scale;\n-\n-Generated by Doxygen\n-\n-\f302\n-\n-File Documentation\n-\n 00159 };\n 00160\n 00161\n 00162 // iterator types\n 00164 typedef std::multiset::iterator\n cjet_iterator;\n 00165\n@@ -27843,173 +27192,183 @@\n 00178\n CSphsplit_merge();\n 00179\n 00181\n ~CSphsplit_merge();\n 00182\n 00183\n-// initialisation functions //\n 00185\n+// initialisation functions //\n 00187\n-int init(std::vector &_particles, std::vector *protocones, double R2,\n 00196\n+int init(std::vector &_particles, std::vector *protocones, double R2,\n double Emin=0.0);\n 00197\n-int init_particles(std::vector &_particles);\n 00203\n+int init_particles(std::vector &_particles);\n 00204\n int init_pleft();\n 00208\n 00209\n inline int set_E_weighted_splitting(bool _use_E_weighted_splitting){\n 00221\n 00222\n use_E_weighted_splitting = _use_E_weighted_splitting;\n+\n+Generated by Doxygen\n+\n+\f298\n+\n 00223\n-return 0;\n 00224\n-}\n 00225\n-// cleaning functions //\n 00227\n 00229\n 00231\n-int partial_clear();\n 00232\n-int full_clear();\n 00234\n 00235\n-// user-defined stable-cone ordering //\n 00237\n 00239\n 00245\n-class Cuser_scale_base{\n 00246\n-public:\n-virtual ~Cuser_scale_base(){}\n 00248\n 00249\n-virtual double operator()(const CSphjet & jet) const = 0;\n 00254\n 00255\n-virtual bool is_larger(const CSphjet & a, const CSphjet & b)const{\n 00266\n 00267\n-return (a.sm_var2 > b.sm_var2);\n 00268\n-}\n 00269\n-};\n 00270\n-void set_user_scale(const Cuser_scale_base * user_scale_in){\n 00275\n 00276\n-_user_scale = user_scale_in;\n 00277\n-}\n 00278\n 00280\n-const Cuser_scale_base * user_scale()const { return _user_scale; }\n 00281\n 00282\n-// main parts of the algorithm //\n 00284\n 00286\n 00296\n-int merge_collinear_and_remove_soft();\n 00297\n-int add_protocones(std::vector *protocones, double R2, double Emin=0.0);\n 00305\n 00306\n-int add_hardest_protocone_to_jets(std::vector *protocones, double R2, double\n 00317\n-Emin=0.0);\n 00318\n 00328\n-int perform(double overlap_tshold, double Emin=0.0);\n 00329\n 00330\n-// save and debug functions //\n 00332\n 00334\n-int save_contents(FILE *flux);\n 00337\n 00338\n 00340\n-int show();\n 00341\n-// particle information\n 00342\n 00343\n-int n;\n 00344\n-std::vector particles;\n 00345\n-std::vector particles_norm2;\n 00346\n-int n_left;\n 00347\n-std::vector p_remain;\n 00348\n-std::vector p_uncol_hard;\n 00349\n-int n_pass;\n 00350\n-double most_ambiguous_split;\n 00354\n 00355\n-\n-Generated by Doxygen\n-\n-\f5.50 split_merge.h\n-\n 00356\n-// jets information\n 00357\n-std::vector jets;\n 00358\n 00359\n-// working entries\n 00360\n-int *indices;\n-int idx_size;\n 00361\n 00362\n-bool merge_identical_protocones;\n 00371\n 00372\n 00374\n-CSphsplit_merge_ptcomparison ptcomparison;\n 00375\n-double SM_var2_hardest_cut_off;\n 00382\n 00383\n-double stable_cone_soft_E2_cutoff;\n 00391\n 00392\n-00393 private:\n-bool get_overlap(const CSphjet &j1, const CSphjet &j2, double *v);\n+00393\n 00401\n 00402\n 00403\n-bool split(cjet_iterator &it_j1, cjet_iterator &it_j2);\n 00415\n 00416\n-bool merge(cjet_iterator &it_j1, cjet_iterator &it_j2);\n 00425\n 00426\n-bool insert(CSphjet &jet);\n 00433\n 00434\n-double get_sm_var2(CSphmomentum &v, double &E_tilde);\n 00441\n 00442\n-void compute_Etilde(CSphjet &j);\n 00444\n 00445\n+\n+File Documentation\n+\n+return 0;\n+}\n+// cleaning functions //\n+int partial_clear();\n+int full_clear();\n+// user-defined stable-cone ordering //\n+class Cuser_scale_base{\n+public:\n+virtual ~Cuser_scale_base(){}\n+virtual double operator()(const CSphjet & jet) const = 0;\n+virtual bool is_larger(const CSphjet & a, const CSphjet & b)const{\n+return (a.sm_var2 > b.sm_var2);\n+}\n+};\n+void set_user_scale(const Cuser_scale_base * user_scale_in){\n+_user_scale = user_scale_in;\n+}\n+const Cuser_scale_base * user_scale()const { return _user_scale; }\n+// main parts of the algorithm //\n+int merge_collinear_and_remove_soft();\n+int add_protocones(std::vector *protocones, double R2, double Emin=0.0);\n+int add_hardest_protocone_to_jets(std::vector *protocones, double R2, double\n+Emin=0.0);\n+int perform(double overlap_tshold, double Emin=0.0);\n+\n+// save and debug functions //\n+int save_contents(FILE *flux);\n+int show();\n+// particle information\n+int n;\n+std::vector particles;\n+std::vector particles_norm2;\n+int n_left;\n+std::vector p_remain;\n+std::vector p_uncol_hard;\n+int n_pass;\n+double most_ambiguous_split;\n+// jets information\n+std::vector jets;\n+// working entries\n+int *indices;\n+int idx_size;\n+bool merge_identical_protocones;\n+CSphsplit_merge_ptcomparison ptcomparison;\n+double SM_var2_hardest_cut_off;\n+double stable_cone_soft_E2_cutoff;\n+private:\n+bool get_overlap(const CSphjet &j1, const CSphjet &j2, double *v);\n+bool split(cjet_iterator &it_j1, cjet_iterator &it_j2);\n+bool merge(cjet_iterator &it_j1, cjet_iterator &it_j2);\n+bool insert(CSphjet &jet);\n+double get_sm_var2(CSphmomentum &v, double &E_tilde);\n+void compute_Etilde(CSphjet &j);\n+\n+Generated by Doxygen\n+\n+\f5.50 split_merge.h\n+\n 00446\n // jet information\n 00448 #ifdef SISCONE_USES_UNIQUE_PTR_AS_AUTO_PTR\n 00449\n std::unique_ptr > candidates;\n 00450 #else\n 00451\n@@ -28079,23 +27438,14 @@\n //\n 00024 // $Revision:: 405\n $//\n 00025 // $Date:: 2016-05-23 20:15:02 +0200 (Mon, 23 May 2016)\n $//\n 00027\n 00028 #ifndef __SPLIT_MERGE_H__\n-\n-Generated by Doxygen\n-\n-303\n-\n-\f304\n-\n-File Documentation\n-\n 00029 #define __SPLIT_MERGE_H__\n 00030\n 00031 #include \n 00032 #include \"defines.h\"\n 00033 #include \"geom_2d.h\"\n 00034 #include \"momentum.h\"\n 00035 #include \n@@ -28114,24 +27464,33 @@\n Cjet();\n 00058\n 00060\n ~Cjet();\n 00061\n 00062\n Cmomentum v;\n-double pt_tilde;\n 00063\n-00064\n+double pt_tilde;\n int n;\n+00064\n 00065\n std::vector contents;\n 00066\n-double sm_var2;\n 00073\n+double sm_var2;\n 00074\n+\n+Generated by Doxygen\n+\n+299\n+\n+\f300\n+\n+File Documentation\n+\n 00076\n Ceta_phi_range range;\n 00077\n int pass;\n 00082\n 00083 };\n 00084\n@@ -28156,16 +27515,16 @@\n 00119\n Csplit_merge_ptcomparison() :\n 00120\n particles(0), split_merge_scale(SM_pttilde){};\n 00121\n 00123\n std::string SM_scale_name()const {\n-00124\n return split_merge_scale_name(split_merge_scale);}\n+00124\n 00125\n 00126\n std::vector * particles;\n 00127\n std::vector * pt;\n 00128\n 00130\n@@ -28191,196 +27550,186 @@\n 00183\n Csplit_merge();\n 00184\n 00186\n ~Csplit_merge();\n 00187\n 00188\n-// initialisation functions //\n 00190\n+// initialisation functions //\n 00192\n 00201\n int init(std::vector &_particles, std::vector *protocones, double R2, double\n ptmin=0.0);\n 00202\n 00208\n int init_particles(std::vector &_particles);\n 00209\n-00213\n int init_pleft();\n-\n-Generated by Doxygen\n-\n-\f5.50 split_merge.h\n-\n+00213\n 00214\n+inline int set_pt_weighted_splitting(bool _use_pt_weighted_splitting){\n 00226\n 00227\n+use_pt_weighted_splitting = _use_pt_weighted_splitting;\n+return 0;\n 00228\n 00229\n+}\n 00230\n 00232\n+// cleaning functions //\n 00234\n 00236\n+int partial_clear();\n 00237\n+int full_clear();\n 00239\n 00240\n+// user-defined stable-cone ordering //\n 00242\n 00244\n+class Cuser_scale_base{\n 00250\n 00251\n+public:\n 00253\n+virtual ~Cuser_scale_base(){}\n 00254\n+virtual double operator()(const Cjet & jet) const = 0;\n 00259\n 00260\n+virtual bool is_larger(const Cjet & a, const Cjet & b)const{\n 00271\n+return (a.sm_var2 > b.sm_var2);\n 00272\n 00273\n+}\n 00274\n+};\n 00275\n 00280\n+void set_user_scale(const Cuser_scale_base * user_scale_in){\n 00281\n+_user_scale = user_scale_in;\n 00282\n+}\n 00283\n+\n+Generated by Doxygen\n+\n+\f5.51 vicinity.cpp\n+\n+301\n+\n 00285\n+const Cuser_scale_base * user_scale()const { return _user_scale; }\n 00286\n 00287\n 00289\n+// main parts of the algorithm //\n 00291\n 00299\n+int merge_collinear_and_remove_soft();\n 00300\n+int add_protocones(std::vector *protocones, double R2, double ptmin=0.0);\n 00308\n 00309\n+int add_hardest_protocone_to_jets(std::vector *protocones, double R2, double ptmin=0.0);\n 00320\n 00321\n+int perform(double overlap_tshold, double ptmin=0.0);\n 00331\n 00332\n 00333\n 00335\n+// save and debug functions //\n 00337\n+int save_contents(FILE *flux);\n 00340\n 00341\n+int show();\n 00343\n 00344\n+// particle information\n 00345\n 00346\n+int n;\n 00347\n+std::vector particles;\n 00348\n+std::vector pt;\n+int n_left;\n 00349\n 00350\n+std::vector p_remain;\n 00351\n+std::vector p_uncol_hard;\n+int n_pass;\n 00352\n 00353\n 00357\n+double most_ambiguous_split;\n 00358\n+// jets information\n 00359\n 00360\n+std::vector jets;\n 00361\n 00362\n+// working entries\n 00363\n+int *indices;\n+int idx_size;\n 00364\n 00365\n+bool merge_identical_protocones;\n 00374\n 00375\n 00377\n+Csplit_merge_ptcomparison ptcomparison;\n 00378\n+double SM_var2_hardest_cut_off;\n 00385\n 00386\n+double stable_cone_soft_pt2_cutoff;\n 00394\n 00395\n-00396\n+00396 private:\n 00404\n+bool get_overlap(const Cjet &j1, const Cjet &j2, double *v);\n 00405\n 00406\n+bool split(cjet_iterator &it_j1, cjet_iterator &it_j2);\n 00418\n 00419\n+bool merge(cjet_iterator &it_j1, cjet_iterator &it_j2);\n 00428\n 00429\n+bool insert(Cjet &jet);\n 00436\n 00437\n+double get_sm_var2(Cmomentum &v, double &pt_tilde);\n 00444\n 00445\n-\n-305\n-\n-inline int set_pt_weighted_splitting(bool _use_pt_weighted_splitting){\n-use_pt_weighted_splitting = _use_pt_weighted_splitting;\n-return 0;\n-}\n-// cleaning functions //\n-int partial_clear();\n-int full_clear();\n-// user-defined stable-cone ordering //\n-class Cuser_scale_base{\n-public:\n-virtual ~Cuser_scale_base(){}\n-virtual double operator()(const Cjet & jet) const = 0;\n-virtual bool is_larger(const Cjet & a, const Cjet & b)const{\n-return (a.sm_var2 > b.sm_var2);\n-}\n-};\n-void set_user_scale(const Cuser_scale_base * user_scale_in){\n-_user_scale = user_scale_in;\n-}\n-const Cuser_scale_base * user_scale()const { return _user_scale; }\n-// main parts of the algorithm //\n-int merge_collinear_and_remove_soft();\n-int add_protocones(std::vector *protocones, double R2, double ptmin=0.0);\n-int add_hardest_protocone_to_jets(std::vector *protocones, double R2, double ptmin=0.0);\n-int perform(double overlap_tshold, double ptmin=0.0);\n-\n-// save and debug functions //\n-int save_contents(FILE *flux);\n-int show();\n-// particle information\n-int n;\n-std::vector particles;\n-std::vector pt;\n-int n_left;\n-std::vector p_remain;\n-std::vector p_uncol_hard;\n-int n_pass;\n-double most_ambiguous_split;\n-// jets information\n-std::vector jets;\n-// working entries\n-int *indices;\n-int idx_size;\n-bool merge_identical_protocones;\n-Csplit_merge_ptcomparison ptcomparison;\n-double SM_var2_hardest_cut_off;\n-double stable_cone_soft_pt2_cutoff;\n-private:\n-bool get_overlap(const Cjet &j1, const Cjet &j2, double *v);\n-bool split(cjet_iterator &it_j1, cjet_iterator &it_j2);\n-bool merge(cjet_iterator &it_j1, cjet_iterator &it_j2);\n-bool insert(Cjet &jet);\n-double get_sm_var2(Cmomentum &v, double &pt_tilde);\n-\n-Generated by Doxygen\n-\n-\f306\n-\n-File Documentation\n-\n-00446\n // jet information\n+00446\n 00448 #ifdef SISCONE_USES_UNIQUE_PTR_AS_AUTO_PTR\n 00449\n std::unique_ptr > candidates;\n 00450 #else\n 00451\n std::auto_ptr > candidates;\n 00452 #endif\n 00453\n-00455\n double pt_min2;\n+00455\n 00456\n-bool use_pt_weighted_splitting;\n 00462\n+bool use_pt_weighted_splitting;\n 00463\n const Cuser_scale_base *_user_scale;\n 00466\n 00467\n 00468 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 00470\n std::set cand_refs;\n@@ -28388,388 +27737,1035 @@\n 00472 };\n 00473\n 00474 }\n 00475\n 00476\n 00477 #endif\n \n-5.51 vicinity.h\n-00001 // -*- C++ -*00003 // File: vicinity.h\n+5.51 vicinity.cpp\n+00001\n+\n+Generated by Doxygen\n+\n+\f302\n+\n+00002 // File: vicinity.cpp\n //\n-00004 // Description: header file for particle vicinity (Cvicinity class)\n+00003 // Description: source file for particle vicinity (Cvicinity class)\n //\n-00005 // This file is part of the SISCone project.\n+00004 // This file is part of the SISCone project.\n //\n-00006 // WARNING: this is not the main SISCone trunk but\n+00005 // WARNING: this is not the main SISCone trunk but\n //\n-00007 //\n+00006 //\n an adaptation to spherical coordinates\n //\n-00008 // For more details, see http://projects.hepforge.org/siscone\n+00007 // For more details, see http://projects.hepforge.org/siscone\n //\n-00009 //\n+00008 //\n //\n-00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n-00011 //\n+00009 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n+00010 //\n //\n-00012 // This program is free software; you can redistribute it and/or modify\n+00011 // This program is free software; you can redistribute it and/or modify\n //\n-00013 // it under the terms of the GNU General Public License as published by\n+00012 // it under the terms of the GNU General Public License as published by\n //\n-00014 // the Free Software Foundation; either version 2 of the License, or\n+00013 // the Free Software Foundation; either version 2 of the License, or\n //\n-00015 // (at your option) any later version.\n+00014 // (at your option) any later version.\n //\n-00016 //\n+00015 //\n //\n-00017 // This program is distributed in the hope that it will be useful,\n+00016 // This program is distributed in the hope that it will be useful,\n //\n-00018 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+00017 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n //\n-00019 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+00018 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n //\n-00020 // GNU General Public License for more details.\n+00019 // GNU General Public License for more details.\n //\n-00021 //\n+00020 //\n //\n-00022 // You should have received a copy of the GNU General Public License\n+00021 // You should have received a copy of the GNU General Public License\n //\n-00023 // along with this program; if not, write to the Free Software\n+00022 // along with this program; if not, write to the Free Software\n //\n-00024 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n-00025 //\n+00023 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n+00024 //\n //\n-00026 // $Revision:: 255\n+00025 // $Revision:: 255\n $//\n-00027 // $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008)\n+00026 // $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008)\n $//\n-00029\n-00030 #ifndef __SPH_VICINITY_H__\n-00031 #define __SPH_VICINITY_H__\n-00032\n-00033 #include \n-00034 #include \n-00035 #include \n-00036 #include \"momentum.h\"\n-00037 #include \n-00038 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00039 #include \n-00040 #endif\n-00041\n-00042 namespace siscone_spherical{\n-00043\n+00028\n+00029 #include \"vicinity.h\"\n+00030 #include \n+00031 #include \n+00032 #include \n+00033\n+00034 namespace siscone_spherical{\n+00035\n+00036 using namespace std;\n+00037\n+00038 /*************************************************************\n+00039 * CSphvicinity_elm implementation\n+*\n+00040 * element in the vicinity of a parent.\n+00041 * class used to manage one points in the vicinity\n+*\n+00042 * of a parent point.\n+00043 *************************************************************/\n 00044\n-00052 class CSphvicinity_elm{\n-00053 public:\n-00055\n-CSphmomentum *v;\n-00056\n-00058\n-siscone::Cvicinity_inclusion *is_inside;\n+00045 // ordering pointers to CSphvicinity_elm\n+00046 //--------------------------------------00047 bool ve_less(CSphvicinity_elm *ve1, CSphvicinity_elm *ve2){\n+00048\n+return ve1->angle < ve2->angle;\n+00049 }\n+00050\n+00051\n+00052 /*************************************************************\n+00053 * CSphvicinity implementation\n+*\n+00054 * list of element in the vicinity of a parent.\n+*\n+00055 * class used to manage the points which are in the vicinity *\n+00056 * of a parent point. The construction of the list can be\n+*\n+00057 * made from a list of points or from a quadtree.\n+*\n+00058 *************************************************************/\n 00059\n-00060\n-// centre variables\n-00061\n-CSph3vector centre;\n-double angle;\n-00062\n+00060 // default constructor\n+00061 //--------------------00062 CSphvicinity::CSphvicinity(){\n 00063\n-bool side;\n-double cocircular_range;\n+n_part = 0;\n 00064\n-00066\n+00065\n+ve_list = NULL;\n+00066 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00067\n+quadtree = NULL;\n+00068 #endif\n 00069\n-std::list cocircular;\n+00070\n+parent = NULL;\n+00071\n+VR2 = VR = 0.0;\n+00072\n+00073 }\n+00074\n+00075 // constructor with initialisation\n+00076 //--------------------------------00077 CSphvicinity::CSphvicinity(vector &_particle_list){\n+00078\n+parent = NULL;\n+00079\n+ve_list = NULL;\n+00080 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00081\n+quadtree = NULL;\n+00082 #endif\n+00083\n+cosVR = VR2 = tan2R = VR = 0.0;\n+00084\n+00085\n+set_particle_list(_particle_list);\n+00086 }\n+\n+File Documentation\n \n //\n \n+*\n+*\n+\n Generated by Doxygen\n \n-\f5.52 vicinity.h\n+\f5.51 vicinity.cpp\n \n-00070 };\n-00071\n-00073 bool ve_less(CSphvicinity_elm *ve1, CSphvicinity_elm *ve2);\n-00074\n-00075\n-00083 class CSphvicinity{\n-00084 public:\n-00086\n-CSphvicinity();\n 00087\n-00089\n-CSphvicinity(std::vector &_particle_list);\n-00090\n+00088 // default destructor\n+00089 //-------------------00090 CSphvicinity::~CSphvicinity(){\n+if (ve_list!=NULL)\n+00091\n 00092\n-~CSphvicinity();\n+delete[] ve_list;\n 00093\n-00098\n-void set_particle_list(std::vector &_particle_list);\n+00094 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00095\n+if (quadtree!=NULL)\n+00096\n+delete quadtree;\n+00097 #endif\n+00098 }\n 00099\n-00105\n-void build(CSphmomentum *_parent, double _VR);\n+00100 /*\n+00101 * set the particle_list\n+list of particles (type CSphmomentum)\n+00102 * - particle_list\n+00103 * - n\n+number of particles in the list\n+00104 ************************************************************/\n+00105 void CSphvicinity::set_particle_list(vector &_particle_list){\n 00106\n-// cone kinematical information\n-00107\n+int i,j;\n+00107 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00108\n-CSphmomentum *parent;\n-00109\n-double VR;\n-double VR2;\n+double eta_max=0.0;\n+00109 #endif\n 00110\n 00111\n-double cosVR;\n+// if the particle list is not empty, destroy it !\n 00112\n-double R;\n-double R2;\n+if (ve_list!=NULL){\n 00113\n+delete[] ve_list;\n 00114\n-double tan2R;\n-double D2_R;\n+}\n 00115\n-00116\n-double inv_R_EPS_COCIRC;\n-double inv_R_2EPS_COCIRC;\n+vicinity.clear();\n+00116 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00117\n+if (quadtree!=NULL)\n 00118\n-00119\n-// particle list information\n+delete quadtree;\n+00119 #endif\n 00120\n-int n_part;\n 00121\n-std::vector plist;\n+// allocate memory array for particles\n+00122\n+// Note: - we compute max for |eta|\n 00123\n-std::vector pincluded;\n+//\n+- we allocate indices to particles\n 00124\n-CSphvicinity_elm *ve_list;\n-00125 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+n_part = 0;\n+00125\n+plist.clear();\n 00126\n-siscone::Cquadtree *quadtree;\n-00127 #endif\n+pincluded.clear();\n+00127\n+for (i=0;i<(int) _particle_list.size();i++){\n 00128\n+// if a particle is colinear with the beam (infinite rapidity)\n 00129\n-// vicinity information\n+// we do not take it into account\n 00130\n-std::vector vicinity;\n+//if (fabs(_particle_list[i].pz)!=_particle_list[i].E){\n 00131\n-unsigned int vicinity_size;\n+plist.push_back(_particle_list[i]);\n 00132\n-00133 protected:\n+pincluded.push_back(siscone::Cvicinity_inclusion()); // zero inclusion status\n+00133\n+00134\n+// the parent_index is handled in the split_merge because\n+00135\n+// of our multiple-pass procedure.\n+00136\n+// Hence, it is not required here any longer.\n+00137\n+// plist[n_part].parent_index = i;\n+00138\n+plist[n_part].index = n_part;\n 00139\n-void append_to_vicinity(CSphmomentum *v);\n+// make sure the reference is randomly created\n 00140\n-// internal variables\n 00141\n+plist[n_part].ref.randomize();\n 00142\n-CSph3vector parent_centre;\n-00143\n-CSph3vector angular_dir1;\n+00143 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00144\n-CSph3vector angular_dir2;\n-00145 };\n+if (fabs(plist[n_part].eta)>eta_max) eta_max=fabs(plist[n_part].eta);\n+00145 #endif\n 00146\n-00147 }\n+n_part++;\n+00147\n+//}\n 00148\n-00149 #endif\n+}\n+00149\n+// allocate quadtree and vicinity_elm list\n+00150\n+00151\n+// note: we set phi in [-pi:pi] as it is the natural range for atan2!\n+00152\n+ve_list = new CSphvicinity_elm[2*n_part];\n+00153 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00154\n+eta_max+=0.1;\n+00155\n+quadtree = new siscone::Cquadtree(0.0, 0.0, eta_max, M_PI);\n+00156 #endif\n+00157\n+00158\n+// append particle to the vicinity_elm list\n+00159\n+j = 0;\n+00160\n+for (i=0;iadd(&plist[i]);\n+00163 #endif\n+00164\n+ve_list[j].v = ve_list[j+1].v = &plist[i];\n+00165\n+ve_list[j].is_inside = ve_list[j+1].is_inside = &(pincluded[i]);\n+00166\n+j+=2;\n+00167\n+}\n+00168\n+00169 }\n+00170\n+00171\n+00172 /*\n+00173 * build the vicinity list from a list of points.\n \n-5.52 vicinity.h\n-00001 // -*- C++ -*00003 // File: vicinity.h\n+Generated by Doxygen\n+\n+303\n+\n+\f304\n+\n+File Documentation\n+\n+reference particle\n+00174 * - _parent\n+00175 * - _VR\n+vicinity radius\n+00176 ************************************************************/\n+00177 void CSphvicinity::build(CSphmomentum *_parent, double _VR){\n+int i;\n+00178\n+00179\n+// set parent and radius\n+00180\n+00181\n+parent = _parent;\n+00182\n+00183\n+VR = _VR;\n+00184\n+VR2 = VR*VR;\n+00185\n+cosVR = cos(VR);\n+00186\n+R2 = 0.25*VR2;\n+00187\n+R\n+= 0.5*VR;\n+double tmp = tan(R);\n+00188\n+00189\n+tan2R = tmp*tmp;\n+00190\n+00191\n+D2_R = 2.0*(1-cos(R));\n+//tmp = sqrt(D2_R);\n+00192\n+00193\n+inv_R_EPS_COCIRC = 1.0 / R / EPSILON_COCIRCULAR;\n+00194\n+inv_R_2EPS_COCIRC = 0.5 / R / EPSILON_COCIRCULAR;\n+00195\n+00196\n+// clear vicinity\n+00197\n+vicinity.clear();\n+00198\n+// init parent variables\n+00199\n+00200\n+// we cpte the direction of the centre and two orthogonal ones\n+00201\n+// to measure the angles. Those are taken orthogonal to the\n+00202\n+// axis of smallest components (of the centre) to increase precision\n+00203\n+parent_centre = (*parent)/parent->_norm;\n+00204\n+parent_centre.get_angular_directions(angular_dir1, angular_dir2);\n+00205\n+angular_dir1 /= angular_dir1._norm;\n+00206\n+angular_dir2 /= angular_dir2._norm;\n+00207\n+00208\n+// really browse the particle list\n+00209\n+for (i=0;i0) ? 0.0 : 2.0;\n+double t=c/s;\n+00224\n+00225\n+return (s>0) ? 1-t/(1+fabs(t)) : 3-t/(1+fabs(t));\n+00226 }\n+00227\n+00228\n+00229 /*\n+00230 * append a particle to the \u2019vicinity\u2019 list after\n+00231 * having computed the angular-ordering quantities\n+vector to test\n+00232 * - v\n+00233 **********************************************************/\n+00234 void CSphvicinity::append_to_vicinity(CSphmomentum *v){\n+00235\n+// skip the particle itself)\n+00236\n+if (v==parent)\n+00237\n+return;\n+00238\n+int i=2*(v->index);\n+00239\n+00240\n+// compute the distance of the i-th particle with the parent\n+00241\n+00242\n+double dot = dot_product3(parent_centre,*v);\n+00243\n+CSph3vector vnormal = *v;\n+00244\n+vnormal/=v->_norm;\n+00245\n+dot/=v->_norm;\n+00246\n+// really check if the distance is less than VR\n+00247\n+00248\n+if (dot>cosVR){\n+00249\n+CSph3vector cross = cross_product3(parent_centre,vnormal);\n+00250\n+00251\n+// for the centres\n+00252\n+CSph3vector median = (parent_centre+vnormal);\n+00253\n+double amplT = sqrt((tan2R*(1+dot)+(dot-1))*(1+dot));\n+00254\n+CSph3vector transverse = amplT*cross/cross._norm;\n+00255\n+00256\n+// first angle (+)\n+00257\n+ve_list[i].centre = median + transverse;\n+00258\n+ve_list[i].centre.build_norm();\n+00259\n+ve_list[i].centre/=ve_list[i].centre._norm;\n+00260\n+CSph3vector diff = ve_list[i].centre - parent_centre;\n+00261\n+//ve_list[i].angle = atan2(dot_product3(angular_dir2, diff),dot_product3(angular_dir1, diff));\n+\n+Generated by Doxygen\n+\n+\f5.52 vicinity.cpp\n+\n+00262\n+00263\n+00264\n+00265\n+00266\n+00267\n+00268\n+00269\n+00270\n+00271\n+00272\n+\n+305\n+\n+ve_list[i].angle = sort_angle(dot_product3(angular_dir2, diff),dot_product3(angular_dir1, diff));\n+ve_list[i].side = true;\n+ve_list[i].cocircular.clear();\n+vicinity.push_back(&(ve_list[i]));\n+\n+// second angle (-)\n+ve_list[i+1].centre = median - transverse;\n+ve_list[i+1].centre.build_norm();\n+ve_list[i+1].centre/=ve_list[i+1].centre._norm;\n+diff = ve_list[i+1].centre - parent_centre;\n+ve_list[i+1].angle = sort_angle(dot_product3(angular_dir2, diff),dot_product3(angular_dir1,\n+diff));\n+00273\n+ve_list[i+1].side = false;\n+00274\n+ve_list[i+1].cocircular.clear();\n+00275\n+vicinity.push_back(&(ve_list[i+1]));\n+00276\n+// now work out the cocircularity range for the two points (range\n+00277\n+00278\n+// of angle within which the points stay within a distance\n+00279\n+// EPSILON_COCIRCULAR of circule\n+00280\n+// P = parent; C = child; O = Origin (center of circle)\n+00281\n+CSph3vector OP = parent_centre - ve_list[i+1].centre;\n+00282\n+CSph3vector OC = vnormal - ve_list[i+1].centre;\n+00283\n+00284\n+// two sources of error are (GPS CCN29-19) epsilon/(R sin theta)\n+00285\n+// and sqrt(2*epsilon/(R (1-cos theta))) and the way things work\n+00286\n+// out, it is the _smaller_ of the two that is relevant [NB have\n+00287\n+// changed definition of theta here relative to that used in\n+00288\n+// CCN29] [NB2: write things so as to avoid zero denominators and\n+00289\n+// to minimize the multiplications, divisions and above all sqrts\n+00290\n+// -- that means that c & s are defined including a factor of VR2]\n+00291\n+double inv_err1 = cross_product3(OP,OC)._norm * inv_R_EPS_COCIRC;\n+00292\n+double inv_err2_sq = (D2_R-dot_product3(OP,OC)) * inv_R_2EPS_COCIRC;\n+00293\n+ve_list[i].cocircular_range = siscone::pow2(inv_err1) > inv_err2_sq ?\n+00294\n+1.0/inv_err1 :\n+00295\n+sqrt(1.0/inv_err2_sq);\n+00296\n+ve_list[i+1].cocircular_range = ve_list[i].cocircular_range;\n+00297\n+}\n+00298 }\n+00299\n+00300 }\n+\n+5.52 vicinity.cpp\n+00001\n //\n-00004 // Description: header file for particle vicinity (Cvicinity class)\n+00002 // File: vicinity.cpp\n+00003 // Description: source file for particle vicinity (Cvicinity class)\n //\n-00005 // This file is part of the SISCone project.\n+00004 // This file is part of the SISCone project.\n //\n-00006 // For more details, see http://projects.hepforge.org/siscone\n+00005 // For more details, see http://projects.hepforge.org/siscone\n //\n-00007 //\n+00006 //\n //\n-00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n+00007 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n //\n-00009 //\n+00008 //\n //\n-00010 // This program is free software; you can redistribute it and/or modify\n+00009 // This program is free software; you can redistribute it and/or modify\n //\n-00011 // it under the terms of the GNU General Public License as published by\n+00010 // it under the terms of the GNU General Public License as published by\n //\n-00012 // the Free Software Foundation; either version 2 of the License, or\n+00011 // the Free Software Foundation; either version 2 of the License, or\n //\n-00013 // (at your option) any later version.\n+00012 // (at your option) any later version.\n //\n-00014 //\n+00013 //\n //\n-00015 // This program is distributed in the hope that it will be useful,\n+00014 // This program is distributed in the hope that it will be useful,\n //\n-00016 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+00015 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n //\n-00017 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+00016 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n //\n-00018 // GNU General Public License for more details.\n+00017 // GNU General Public License for more details.\n //\n-00019 //\n+00018 //\n //\n-00020 // You should have received a copy of the GNU General Public License\n+00019 // You should have received a copy of the GNU General Public License\n //\n-00021 // along with this program; if not, write to the Free Software\n+00020 // along with this program; if not, write to the Free Software\n //\n-00022 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n-00023 //\n+00021 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n+00022 //\n //\n-00024 // $Revision:: 123\n+00023 // $Revision:: 388\n+$//\n+00024 // $Date:: 2016-03-03 10:42:25 +0100 (Thu, 03 Mar 2016)\n $//\n+00026\n+00027 #include \"vicinity.h\"\n+00028 #include \n+00029 #include \n+00030 #include \n+00031\n+00032 namespace siscone{\n+00033\n+00034 using namespace std;\n+00035\n+00036 /*************************************************************\n+00037 * Cvicinity_elm implementation\n+*\n+00038 * element in the vicinity of a parent.\n \n Generated by Doxygen\n \n-307\n+*\n \n-\f308\n+\f306\n \n-00025 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n-00027\n-00028 #ifndef __VICINITY_H__\n-00029 #define __VICINITY_H__\n-00030\n-00031 #include \n-00032 #include \n-00033 #include \"momentum.h\"\n-00034 #include \"defines.h\"\n-00035 #include \"quadtree.h\"\n-00036\n-00037 namespace siscone{\n-00038\n-00039\n-00040\n-00046 class Cvicinity_inclusion {\n-00047 public:\n+00039 * class used to manage one points in the vicinity\n+*\n+00040 * of a parent point.\n+00041 *************************************************************/\n+00042\n+00043 // ordering pointers to Cvicinity_elm\n+00044 //-----------------------------------00045 bool ve_less(Cvicinity_elm *ve1, Cvicinity_elm *ve2){\n+00046\n+return ve1->angle < ve2->angle;\n+00047 }\n+00048\n 00049\n-Cvicinity_inclusion() : cone(false), cocirc(false) {}\n-00050\n-00051\n-bool cone;\n-bool cocirc;\n-00052\n-00053 };\n-00054\n-00055\n-00063 class Cvicinity_elm{\n-00064 public:\n-00066\n-Cmomentum *v;\n+00050 /*************************************************************\n+00051 * Cvicinity implementation\n+*\n+00052 * list of element in the vicinity of a parent.\n+00053 * class used to manage the points which are in the vicinity *\n+00054 * of a parent point. The construction of the list can be\n+*\n+00055 * made from a list of points or from a quadtree.\n+00056 *************************************************************/\n+00057\n+00058 // default constructor\n+00059 //--------------------00060 Cvicinity::Cvicinity(){\n+00061\n+n_part = 0;\n+00062\n+00063\n+ve_list = NULL;\n+00064 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00065\n+quadtree = NULL;\n+00066 #endif\n 00067\n+00068\n+parent = NULL;\n 00069\n-Cvicinity_inclusion *is_inside;\n+VR2 = VR = 0.0;\n 00070\n-00071\n-// centre variables\n+00071 }\n 00072\n-double eta;\n-double phi;\n-00073\n-00074\n-double angle;\n-00075\n-bool side;\n-double cocircular_range;\n+00073 // constructor with initialisation\n+00074 //--------------------------------00075 Cvicinity::Cvicinity(vector &_particle_list){\n 00076\n+parent = NULL;\n+00077 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00078\n+quadtree = NULL;\n+00079 #endif\n+00080\n+VR2 = VR = 0.0;\n 00081\n-std::list cocircular;\n-00082 };\n+00082\n+ve_list = NULL;\n 00083\n-00085 bool ve_less(Cvicinity_elm *ve1, Cvicinity_elm *ve2);\n-00086\n-00087\n-00095 class Cvicinity{\n-00096 public:\n-00098\n-Cvicinity();\n-00099\n-00101\n-Cvicinity(std::vector &_particle_list);\n-00102\n+set_particle_list(_particle_list);\n+00084 }\n+00085\n+00086 // default destructor\n+00087 //-------------------00088 Cvicinity::~Cvicinity(){\n+00089\n+if (ve_list!=NULL)\n+delete[] ve_list;\n+00090\n+00091\n+00092 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00093\n+if (quadtree!=NULL)\n+00094\n+delete quadtree;\n+00095 #endif\n+00096 }\n+00097\n+00098 /*\n+00099 * set the particle_list\n+00100 * - particle_list\n+list of particles (type Cmomentum)\n+number of particles in the list\n+00101 * - n\n+00102 ************************************************************/\n+00103 void Cvicinity::set_particle_list(vector &_particle_list){\n+int i,j;\n 00104\n-~Cvicinity();\n-00105\n+00105 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00106\n+double eta_max=0.0;\n+00107 #endif\n+00108\n+// if the particle list is not empty, destroy it !\n+00109\n 00110\n-void set_particle_list(std::vector &_particle_list);\n+if (ve_list!=NULL){\n+delete[] ve_list;\n 00111\n-void build(Cmomentum *_parent, double _VR);\n-00117\n+00112\n+}\n+00113\n+vicinity.clear();\n+00114 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00115\n+if (quadtree!=NULL)\n+delete quadtree;\n+00116\n+00117 #endif\n 00118\n 00119\n-// cone kinematical information\n+// allocate memory array for particles\n 00120\n-Cmomentum *parent;\n+// Note: - we compute max for |eta|\n 00121\n-double VR;\n-double VR2;\n+//\n+- we allocate indices to particles\n 00122\n+n_part = 0;\n 00123\n-double R;\n+plist.clear();\n 00124\n-double R2;\n-double inv_R_EPS_COCIRC;\n+pincluded.clear();\n 00125\n+for (i=0;i<(int) _particle_list.size();i++){\n+\n+File Documentation\n+\n+*\n+\n+*\n+\n+*\n+\n+Generated by Doxygen\n+\n+\f5.52 vicinity.cpp\n+\n 00126\n-double inv_R_2EPS_COCIRC;\n+// if a particle is colinear with the beam (infinite rapidity)\n 00127\n-// particle list information\n+// we do not take it into account\n 00128\n+if (fabs(_particle_list[i].pz)!=_particle_list[i].E){\n 00129\n-int n_part;\n+plist.push_back(_particle_list[i]);\n 00130\n-std::vector plist;\n+pincluded.push_back(Cvicinity_inclusion()); // zero inclusion status\n 00131\n-std::vector pincluded;\n+// the parent_index is handled in the split_merge because\n 00132\n-Cvicinity_elm *ve_list;\n-00133 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00133\n+// of our multiple-pass procedure.\n 00134\n-Cquadtree *quadtree;\n-00135 #endif\n+// Hence, it is not required here any longer.\n+00135\n+// plist[n_part].parent_index = i;\n 00136\n+plist[n_part].index = n_part;\n 00137\n-// vicinity information\n+// make sure the reference is randomly created\n 00138\n-std::vector vicinity;\n-unsigned int vicinity_size;\n 00139\n+plist[n_part].ref.randomize();\n 00140\n-00141 protected:\n+00141 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00142\n+if (fabs(plist[n_part].eta)>eta_max) eta_max=fabs(plist[n_part].eta);\n+00143 #endif\n+00144\n+00145\n+n_part++;\n+00146\n+}\n 00147\n-void append_to_vicinity(Cmomentum *v);\n+}\n 00148\n-// internal variables\n 00149\n+// allocate quadtree and vicinity_elm list\n 00150\n-double pcx;\n-double pcy;\n+// note: we set phi in [-pi:pi] as it is the natural range for atan2!\n 00151\n-00152 };\n+ve_list = new Cvicinity_elm[2*n_part];\n+00152 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00153\n-00154 }\n-00155\n-\n-File Documentation\n-\n-$//\n-\n-Generated by Doxygen\n-\n-\f5.52 vicinity.h\n-\n-00156 #endif\n+eta_max+=0.1;\n+00154\n+quadtree = new Cquadtree(0.0, 0.0, eta_max, M_PI);\n+00155 #endif\n+00156\n+00157\n+// append particle to the vicinity_elm list\n+00158\n+j = 0;\n+00159\n+for (i=0;iadd(&plist[i]);\n+00162 #endif\n+00163\n+ve_list[j].v = ve_list[j+1].v = &plist[i];\n+00164\n+ve_list[j].is_inside = ve_list[j+1].is_inside = &(pincluded[i]);\n+00165\n+j+=2;\n+00166\n+}\n+00167\n+00168 }\n+00169\n+00170\n+00171 /*\n+00172 * build the vicinity list from a list of points.\n+00173 * - _parent\n+reference particle\n+vicinity radius\n+00174 * - _VR\n+00175 ************************************************************/\n+00176 void Cvicinity::build(Cmomentum *_parent, double _VR){\n+int i;\n+00177\n+00178\n+// set parent and radius\n+00179\n+00180\n+parent = _parent;\n+00181\n+VR = _VR;\n+00182\n+VR2 = VR*VR;\n+00183\n+R2 = 0.25*VR2;\n+00184\n+R\n+= 0.5*VR;\n+00185\n+inv_R_EPS_COCIRC = 1.0 / R / EPSILON_COCIRCULAR;\n+00186\n+inv_R_2EPS_COCIRC = 0.5 / R / EPSILON_COCIRCULAR;\n+00187\n+// clear vicinity\n+00188\n+00189\n+vicinity.clear();\n+00190\n+// init parent variables\n+00191\n+00192\n+pcx = parent->eta;\n+00193\n+pcy = parent->phi;\n+00194\n+00195\n+// really browse the particle list\n+00196\n+for (i=0;i0) ? 0.0 : 2.0;\n+00209\n+00210\n+double t=c/s;\n+return (s>0) ? 1-t/(1+fabs(t)) : 3-t/(1+fabs(t));\n+00211\n+00212 }\n+00213\n \n Generated by Doxygen\n \n-309\n+307\n \n-\f310\n+\f308\n \n File Documentation\n \n+00214\n+00215 /*\n+00216 * append a particle to the \u2019vicinity\u2019 list after\n+00217 * having computed the angular-ordering quantities\n+00218 * - v\n+vector to test\n+00219 **********************************************************/\n+00220 void Cvicinity::append_to_vicinity(Cmomentum *v){\n+00221\n+double dx, dy, d2;\n+00222\n+// skip the particle itself)\n+00223\n+00224\n+if (v==parent)\n+return;\n+00225\n+00226\n+int i=2*(v->index);\n+00227\n+00228\n+00229\n+// compute the distance of the i-th particle with the parent\n+00230\n+dx = v->eta - pcx;\n+00231\n+dy = v->phi - pcy;\n+00232\n+00233\n+// pay attention to the periodicity in phi !\n+00234\n+if (dy>M_PI)\n+00235\n+dy -= twopi;\n+00236\n+else if (dy<-M_PI)\n+00237\n+dy += twopi;\n+00238\n+00239\n+d2 = dx*dx+dy*dy;\n+00240\n+// really check if the distance is less than VR\n+00241\n+00242\n+if (d2eta - ve_list[i+1].eta,\n+00276\n+phi_in_range(v->phi-ve_list[i+1].phi));\n+00277\n+// two sources of error are (GPS CCN29-19) epsilon/(R sin theta)\n+00278\n+00279\n+// and sqrt(2*epsilon/(R (1-cos theta))) and the way things work\n+00280\n+// out, it is the _smaller_ of the two that is relevant [NB have\n+00281\n+// changed definition of theta here relative to that used in\n+00282\n+// CCN29] [NB2: write things so as to avoid zero denominators and\n+00283\n+// to minimize the multiplications, divisions and above all sqrts\n+00284\n+// -- that means that c & s are defined including a factor of VR2]\n+00285\n+c = dot_product(OP,OC);\n+00286\n+s = fabs(cross_product(OP,OC));\n+double inv_err1 = s * inv_R_EPS_COCIRC;\n+00287\n+00288\n+double inv_err2_sq = (R2-c) * inv_R_2EPS_COCIRC;\n+00289\n+ve_list[i].cocircular_range = pow2(inv_err1) > inv_err2_sq ?\n+00290\n+1.0/inv_err1 :\n+00291\n+sqrt(1.0/inv_err2_sq);\n+00292\n+ve_list[i+1].cocircular_range = ve_list[i].cocircular_range;\n+00293\n+}\n+00294 }\n+00295\n+00296 }\n+\n Generated by Doxygen\n \n \fIndex\n _norm\n siscone::Cjet_area, 28\n siscone_spherical::CSph3vector, 67\n add\n@@ -28867,15 +28863,15 @@\n centre_x\n siscone_spherical::sph_hash_cones, 170\n siscone::Cquadtree, 47\n centre_y\n active_area\n Generated by Doxygen\n \n-\f312\n+\f310\n \n siscone::Cquadtree, 47\n Ceta_phi_range\n siscone::Ceta_phi_range, 16\n children\n siscone::Cquadtree, 48\n circle_intersect\n@@ -29021,15 +29017,15 @@\n examples/options.cpp, 182\n examples/options.h, 185\n examples/sample.cpp, 186\n examples/spherical.cpp, 187\n examples/test.cpp, 188\n examples/times.cpp, 190\n \n-313\n+311\n \n siscone::hash_cones, 164\n siscone_spherical::sph_hash_cones, 172\n hash_cones\n siscone::hash_cones, 162\n hc\n siscone::Cstable_cones, 141\n@@ -29111,15 +29107,15 @@\n siscone_spherical::CSphsplit_merge::Cuser_scale_base,\n siscone::Cquadtree, 48\n 147\n hash_array\n is_stable\n Generated by Doxygen\n \n-\f314\n+\f312\n \n INDEX\n \n siscone::hash_element, 166\n siscone_spherical::sph_hash_element, 174\n j\n siscone::ranlux_state_t, 168\n@@ -29349,38 +29345,38 @@\n siscone::Cmomentum, 34\n siscone_spherical::CSphmomentum, 81\n R2\n siscone::Cstable_cones, 142\n phi\n Generated by Doxygen\n \n-315\n+313\n \n-\f316\n+\f314\n \n siscone::Cvicinity, 155\n siscone::hash_cones, 165\n siscone_spherical::CSphstable_cones, 107\n siscone_spherical::CSphvicinity, 118\n siscone_spherical::sph_hash_cones, 172\n randomize\n siscone::Creference, 52\n range\n siscone::Cjet, 25\n siscone_spherical::CSphjet, 74\n ranlux.h\n-ranlux_get, 235\n-ranlux_init, 235\n-ranlux_print_state, 235\n+ranlux_get, 250\n+ranlux_init, 250\n+ranlux_print_state, 250\n ranlux_get\n-ranlux.h, 235\n+ranlux.h, 250\n ranlux_init\n-ranlux.h, 235\n+ranlux.h, 250\n ranlux_print_state\n-ranlux.h, 235\n+ranlux.h, 250\n recompute_jets\n siscone::Csiscone, 57\n siscone_spherical::CSphsiscone, 86\n ref\n siscone::Cmomentum, 37\n siscone::Creference, 52\n siscone::hash_element, 167\n@@ -29421,49 +29417,49 @@\n siscone/area.cpp, 176\n siscone/area.h, 191\n siscone/circulator.h, 192\n siscone/config.h, 193\n siscone/config_raw.h, 194\n siscone/defines.h, 196, 198\n siscone/geom_2d.cpp, 199\n-siscone/geom_2d.h, 249\n-siscone/hash.cpp, 252\n-siscone/hash.h, 203\n-siscone/momentum.cpp, 257\n-siscone/momentum.h, 262\n-siscone/protocones.cpp, 205\n-siscone/protocones.h, 224\n-siscone/quadtree.cpp, 228\n-siscone/quadtree.h, 232\n-siscone/ranlux.cpp, 232\n-siscone/ranlux.h, 235, 236\n-siscone/reference.cpp, 236\n-siscone/reference.h, 238\n-siscone/siscone.cpp, 239\n-siscone/siscone.h, 246\n-siscone/siscone_error.cpp, 248\n-siscone/siscone_error.h, 248\n+siscone/geom_2d.h, 203\n+siscone/hash.cpp, 205\n+siscone/hash.h, 264\n+siscone/momentum.cpp, 211\n+siscone/momentum.h, 216\n+siscone/protocones.cpp, 220\n+siscone/protocones.h, 239\n+siscone/quadtree.cpp, 243\n+siscone/quadtree.h, 246\n+siscone/ranlux.cpp, 247\n+siscone/ranlux.h, 249, 251\n+siscone/reference.cpp, 251\n+siscone/reference.h, 253\n+siscone/siscone.cpp, 254\n+siscone/siscone.h, 261\n+siscone/siscone_error.cpp, 263\n+siscone/siscone_error.h, 263\n siscone/spherical/geom_2d.cpp, 201\n-siscone/spherical/geom_2d.h, 251\n-siscone/spherical/hash.cpp, 254\n-siscone/spherical/hash.h, 204\n-siscone/spherical/momentum.cpp, 259\n-siscone/spherical/momentum.h, 264\n-siscone/spherical/protocones.cpp, 214\n-siscone/spherical/protocones.h, 226\n-siscone/spherical/siscone.cpp, 242\n-siscone/spherical/siscone.h, 247\n-siscone/spherical/split_merge.cpp, 273\n-siscone/spherical/split_merge.h, 300\n-siscone/spherical/vicinity.cpp, 266\n-siscone/spherical/vicinity.h, 306\n-siscone/split_merge.cpp, 287\n-siscone/split_merge.h, 303\n-siscone/vicinity.cpp, 270\n-siscone/vicinity.h, 307\n+siscone/spherical/geom_2d.h, 204\n+siscone/spherical/hash.cpp, 208\n+siscone/spherical/hash.h, 265\n+siscone/spherical/momentum.cpp, 212\n+siscone/spherical/momentum.h, 217\n+siscone/spherical/protocones.cpp, 229\n+siscone/spherical/protocones.h, 241\n+siscone/spherical/siscone.cpp, 257\n+siscone/spherical/siscone.h, 262\n+siscone/spherical/split_merge.cpp, 269\n+siscone/spherical/split_merge.h, 296\n+siscone/spherical/vicinity.cpp, 301\n+siscone/spherical/vicinity.h, 266\n+siscone/split_merge.cpp, 283\n+siscone/split_merge.h, 299\n+siscone/vicinity.cpp, 305\n+siscone/vicinity.h, 267\n siscone::Carea, 7\n \u223cCarea, 9\n Carea, 9\n compute_active_areas, 9\n compute_areas, 10\n compute_passive_areas, 11\n grid_eta_max, 11\n@@ -29538,15 +29534,15 @@\n px, 36\n py, 36\n pz, 36\n ref, 37\n \n Generated by Doxygen\n \n-317\n+315\n \n siscone::Cquadtree, 42\n \u223cCquadtree, 44\n add, 44\n centre_x, 47\n centre_y, 47\n children, 48\n@@ -29599,15 +29595,15 @@\n merge_collinear_and_remove_soft, 128\n merge_identical_protocones, 131\n most_ambiguous_split, 132\n n, 132\n n_left, 132\n n_pass, 132\n \n-\f318\n+\f316\n \n p_remain, 133\n p_uncol_hard, 133\n partial_clear, 128\n particles, 133\n perform, 129\n pt, 133\n@@ -29786,15 +29782,15 @@\n CSphsplit_merge, 90\n full_clear, 91\n idx_size, 95\n indices, 95\n \n Generated by Doxygen\n \n-319\n+317\n \n init, 92\n init_particles, 92\n init_pleft, 93\n jets, 96\n merge_collinear_and_remove_soft, 93\n merge_identical_protocones, 96\n@@ -29847,15 +29843,15 @@\n phi_range, 110\n theta_max, 110\n theta_min, 110\n theta_range, 110\n siscone_spherical::CSphvicinity, 111\n \u223cCSphvicinity, 113\n \n-\f320\n+\f318\n \n INDEX\n \n angular_dir1, 115\n sph_hash_cones\n angular_dir2, 115\n siscone_spherical::sph_hash_cones, 170\n@@ -29978,10 +29974,10 @@\n \n siscone::Ctwovect, 144\n y\n siscone::Ctwovect, 145\n \n Generated by Doxygen\n \n-321\n+319\n \n \f\n"}]}]}]}]}]}]}