{"diffoscope-json-version": 1, "source1": "/srv/reproducible-results/rbuild-debian/r-b-build.dlOtrsQv/b1/siscone_3.0.5-3_i386.changes", "source2": "/srv/reproducible-results/rbuild-debian/r-b-build.dlOtrsQv/b2/siscone_3.0.5-3_i386.changes", "unified_diff": null, "details": [{"source1": "Files", "source2": "Files", "unified_diff": "@@ -1,10 +1,10 @@\n \n 92e61817b36843bd0beed900603af10b 87860 libdevel optional libsiscone-dev_3.0.5-3_i386.deb\n 7f096381283f19f62abedca21d0c6836 79020 libdevel optional libsiscone-spherical-dev_3.0.5-3_i386.deb\n 1dcdad953fd003e6fe60123ef8b1a9b0 413136 debug optional libsiscone-spherical0v5-dbgsym_3.0.5-3_i386.deb\n 2b0167eacb8a848a2f874852bae17128 63936 libs optional libsiscone-spherical0v5_3.0.5-3_i386.deb\n 44edab2c828b68eedae09b52299c07d0 485556 debug optional libsiscone0v5-dbgsym_3.0.5-3_i386.deb\n 506b39dd257d483474a078ea940645a2 70092 libs optional libsiscone0v5_3.0.5-3_i386.deb\n- 2611081bf9e43354c537fa28c6b7c491 1187516 doc optional siscone-doc-html_3.0.5-3_all.deb\n- 50e268a4718e46d467efa0748919b946 1650624 doc optional siscone-doc-pdf_3.0.5-3_all.deb\n+ 451af1c53b83bb3220465375fcdfb4ab 1186556 doc optional siscone-doc-html_3.0.5-3_all.deb\n+ 76298cf825b7ec66426611fe22f825d0 1646344 doc optional siscone-doc-pdf_3.0.5-3_all.deb\n f55d27b2dd0698dc0b12d200da3aa5bf 34864 devel optional siscone-examples_3.0.5-3_all.deb\n"}, {"source1": "siscone-doc-html_3.0.5-3_all.deb", "source2": "siscone-doc-html_3.0.5-3_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 2025-01-07 11:57:28.000000 debian-binary\n--rw-r--r-- 0 0 0 8556 2025-01-07 11:57:28.000000 control.tar.xz\n--rw-r--r-- 0 0 0 1178768 2025-01-07 11:57:28.000000 data.tar.xz\n+-rw-r--r-- 0 0 0 8560 2025-01-07 11:57:28.000000 control.tar.xz\n+-rw-r--r-- 0 0 0 1177804 2025-01-07 11:57:28.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-html\n Source: siscone\n Version: 3.0.5-3\n Architecture: all\n Maintainer: Debian Science Maintainers \n-Installed-Size: 5829\n+Installed-Size: 5805\n Depends: libjs-jquery\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 (HTML)\n SISCone implements a Seedless Infrared (IR) Safe Cone jet algorithm, it takes\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": "@@ -211,15 +211,15 @@\n -rw-r--r-- 0 root (0) root (0) 6638 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_s.html\n -rw-r--r-- 0 root (0) root (0) 3190 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_t.html\n -rw-r--r-- 0 root (0) root (0) 2318 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_u.html\n -rw-r--r-- 0 root (0) root (0) 4263 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_v.html\n -rw-r--r-- 0 root (0) root (0) 30417 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_vars.html\n -rw-r--r-- 0 root (0) root (0) 2154 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_x.html\n -rw-r--r-- 0 root (0) root (0) 5351 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_~.html\n--rw-r--r-- 0 root (0) root (0) 34266 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/geom__2d_8cpp_source.html\n+-rw-r--r-- 0 root (0) root (0) 31815 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/geom__2d_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 30772 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/geom__2d_8h_source.html\n -rw-r--r-- 0 root (0) root (0) 2551 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/globals.html\n -rw-r--r-- 0 root (0) root (0) 2433 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/globals_defs.html\n -rw-r--r-- 0 root (0) root (0) 2058 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/globals_vars.html\n -rw-r--r-- 0 root (0) root (0) 6196 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/graph_legend.html\n -rw-r--r-- 0 root (0) root (0) 23370 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/graph_legend.png\n -rw-r--r-- 0 root (0) root (0) 52932 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/hash_8cpp_source.html\n@@ -281,41 +281,41 @@\n -rw-r--r-- 0 root (0) root (0) 255 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/inherit_graph_8.map\n -rw-r--r-- 0 root (0) root (0) 1737 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/inherit_graph_8.png\n -rw-r--r-- 0 root (0) root (0) 1317 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/inherit_graph_9.map\n -rw-r--r-- 0 root (0) root (0) 10333 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/inherit_graph_9.png\n -rw-r--r-- 0 root (0) root (0) 14156 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/inherits.html\n -rw-r--r-- 0 root (0) root (0) 30264 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/main_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 41790 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/momentum_8cpp_source.html\n--rw-r--r-- 0 root (0) root (0) 41438 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/momentum_8h_source.html\n+-rw-r--r-- 0 root (0) root (0) 39162 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/momentum_8h_source.html\n -rw-r--r-- 0 root (0) root (0) 153 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/nav_f.png\n -rw-r--r-- 0 root (0) root (0) 169 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/nav_fd.png\n -rw-r--r-- 0 root (0) root (0) 95 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/nav_g.png\n -rw-r--r-- 0 root (0) root (0) 98 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/nav_h.png\n -rw-r--r-- 0 root (0) root (0) 114 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/nav_hd.png\n -rw-r--r-- 0 root (0) root (0) 123 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/open.png\n -rw-r--r-- 0 root (0) root (0) 52456 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/options_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 19814 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/options_8h_source.html\n -rw-r--r-- 0 root (0) root (0) 151302 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/protocones_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 42169 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/protocones_8h_source.html\n--rw-r--r-- 0 root (0) root (0) 78917 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/quadtree_8cpp_source.html\n--rw-r--r-- 0 root (0) root (0) 23576 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/quadtree_8h_source.html\n--rw-r--r-- 0 root (0) root (0) 27767 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/ranlux_8cpp_source.html\n+-rw-r--r-- 0 root (0) root (0) 69505 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/quadtree_8cpp_source.html\n+-rw-r--r-- 0 root (0) root (0) 22116 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/quadtree_8h_source.html\n+-rw-r--r-- 0 root (0) root (0) 27191 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/ranlux_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 7901 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/ranlux_8h.html\n -rw-r--r-- 0 root (0) root (0) 1021 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/ranlux_8h__dep__incl.map\n -rw-r--r-- 0 root (0) root (0) 12914 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/ranlux_8h__dep__incl.png\n -rw-r--r-- 0 root (0) root (0) 9110 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/ranlux_8h_source.html\n--rw-r--r-- 0 root (0) root (0) 31722 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/reference_8cpp_source.html\n--rw-r--r-- 0 root (0) root (0) 25626 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/reference_8h_source.html\n+-rw-r--r-- 0 root (0) root (0) 30527 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/reference_8cpp_source.html\n+-rw-r--r-- 0 root (0) root (0) 24184 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/reference_8h_source.html\n -rw-r--r-- 0 root (0) root (0) 20314 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/sample_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 82494 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/siscone_2area_8cpp_source.html\n--rw-r--r-- 0 root (0) root (0) 69584 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/siscone_8cpp_source.html\n+-rw-r--r-- 0 root (0) root (0) 64452 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/siscone_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 23913 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/siscone_8h_source.html\n -rw-r--r-- 0 root (0) root (0) 8010 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/siscone__error_8cpp_source.html\n--rw-r--r-- 0 root (0) root (0) 15205 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/siscone__error_8h_source.html\n--rw-r--r-- 0 root (0) root (0) 38354 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/spherical_2geom__2d_8cpp_source.html\n+-rw-r--r-- 0 root (0) root (0) 14493 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/siscone__error_8h_source.html\n+-rw-r--r-- 0 root (0) root (0) 38932 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/spherical_2geom__2d_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 22147 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/spherical_2geom__2d_8h_source.html\n -rw-r--r-- 0 root (0) root (0) 47436 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/spherical_2hash_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 22598 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/spherical_2hash_8h_source.html\n -rw-r--r-- 0 root (0) root (0) 81643 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/spherical_2momentum_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 70241 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/spherical_2momentum_8h_source.html\n -rw-r--r-- 0 root (0) root (0) 165885 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/spherical_2protocones_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 43293 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-html/html/devel/spherical_2protocones_8h_source.html\n"}, {"source1": "./usr/share/doc/siscone-doc-html/html/devel/geom__2d_8cpp_source.html", "source2": "./usr/share/doc/siscone-doc-html/html/devel/geom__2d_8cpp_source.html", "unified_diff": "@@ -111,55 +111,55 @@\n
57// ctor with initialisation
\n
58// we initialise with a centre (in eta,phi) and a radius
\n
59// - c_eta eta coordinate of the centre
\n
60// - c_phi phi coordinate of the centre
\n
61// - R radius
\n
62//-------------------------------------------------------
\n
\n-
63Ceta_phi_range::Ceta_phi_range(double c_eta, double c_phi, double R){
\n+
63Ceta_phi_range::Ceta_phi_range(double c_eta, double c_phi, double R){
\n
64 // determination of the eta range
\n
65 //-------------------------------
\n-
66 double xmin = max(c_eta-R,eta_min+0.0001);
\n-
67 double xmax = min(c_eta+R,eta_max-0.0001);
\n+
66 double xmin = max(c_eta-R,eta_min+0.0001);
\n+
67 double xmax = min(c_eta+R,eta_max-0.0001);
\n
68
\n-
69 unsigned int cell_min = get_eta_cell(xmin);
\n-
70 unsigned int cell_max = get_eta_cell(xmax);
\n+
69 unsigned int cell_min = get_eta_cell(xmin);
\n+
70 unsigned int cell_max = get_eta_cell(xmax);
\n
71
\n
72 // warning: if cell_max==2^31, 2*cell_max==0 hence,
\n
73 // even if the next formula is formally (2*cell_max-cell_min),
\n
74 // expressing it as (cell_max-cell_min)+cell_max is safe.
\n-\n+
75 eta_range = (cell_max-cell_min)+cell_max;
\n
76
\n
77 // determination of the phi range
\n
78 // !! taking care of periodicity !!
\n
79 //---------------------------------
\n-
80 xmin = phi_in_range(c_phi-R);
\n-
81 xmax = phi_in_range(c_phi+R);
\n+
80 xmin = phi_in_range(c_phi-R);
\n+
81 xmax = phi_in_range(c_phi+R);
\n
82
\n-
83 cell_min = get_phi_cell(xmin);
\n-
84 cell_max = get_phi_cell(xmax);
\n+
83 cell_min = get_phi_cell(xmin);
\n+
84 cell_max = get_phi_cell(xmax);
\n
85
\n
86 // Also, if the interval goes through pi, inversion is needed
\n-
87 if (xmax>xmin)
\n-\n+
87 if (xmax>xmin)
\n+
88 phi_range = (cell_max-cell_min)+cell_max;
\n
89 else {
\n-\n+
90 phi_range = (cell_min==cell_max)
\n
91 ? PHI_RANGE_MASK
\n-
92 : ((PHI_RANGE_MASK^(cell_min-cell_max)) + cell_max);
\n+
92 : ((PHI_RANGE_MASK^(cell_min-cell_max)) + cell_max);
\n
93 }
\n
94}
\n
\n
95
\n
96// assignment of range
\n
97// - r range to assign to current one
\n
98//---------------------------------------
\n
\n-\n-
100 eta_range = r.eta_range;
\n-
101 phi_range = r.phi_range;
\n+\n+\n+\n
102
\n
103 return *this;
\n
104}
\n
\n
105
\n
106// add a particle to the range
\n
107// - eta eta coordinate of the particle
\n@@ -180,30 +180,30 @@\n
120
\n
121
\n
122// test overlap
\n
123// - r1 first range
\n
124// - r2 second range
\n
125// return true if overlap, false otherwise.
\n
126//------------------------------------------
\n-
127bool is_range_overlap(const Ceta_phi_range &r1, const Ceta_phi_range &r2){
\n+
127bool is_range_overlap(const Ceta_phi_range &r1, const Ceta_phi_range &r2){
\n
128 // check overlap in eta AND phi
\n-
129 return ((r1.eta_range & r2.eta_range) && (r1.phi_range & r2.phi_range));
\n+
129 return ((r1.eta_range & r2.eta_range) && (r1.phi_range & r2.phi_range));
\n
130}
\n
131
\n
132// compute union
\n
133// Note: we assume that the two intervals overlap
\n
134// - r1 first range
\n
135// - r2 second range
\n
136// \\return union of the two ranges
\n
137//------------------------------------------
\n
138const Ceta_phi_range range_union (const Ceta_phi_range &r1, const Ceta_phi_range &r2){
\n
139 Ceta_phi_range tmp;
\n
140
\n
141 // compute union in eta
\n-
142 tmp.eta_range = r1.eta_range | r2.eta_range;
\n+
142 tmp.eta_range = r1.eta_range | r2.eta_range;
\n
143
\n
144 // compute union in phi
\n
145 tmp.phi_range = r1.phi_range | r2.phi_range;
\n
146
\n
147 return tmp;
\n
148}
\n
149
\n@@ -212,15 +212,14 @@\n
unsigned int eta_range
eta range as a binary coding of covered cells
Definition geom_2d.h:143
\n
static double eta_max
maximal value for eta
Definition geom_2d.h:150
\n
int add_particle(const double eta, const double phi)
add a particle to the range
Definition geom_2d.cpp:111
\n
static double eta_min
minimal value for eta
Definition geom_2d.h:149
\n
Ceta_phi_range & operator=(const Ceta_phi_range &r)
assignment of range
Definition geom_2d.cpp:99
\n
Ceta_phi_range()
default ctor
Definition geom_2d.cpp:52
\n
unsigned int phi_range
phi range as a binary coding of covered cells
Definition geom_2d.h:146
\n-
a circulator that is foreseen to take as template member either a pointer or an iterator;
Definition circulator.h:36
\n \n \n
\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by \"doxygen\"/ 1.9.8\n
\n \n \n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -59,53 +59,53 @@\n 56\n 57// ctor with initialisation\n 58// we initialise with a centre (in eta,phi) and a radius\n 59// - c_eta eta coordinate of the centre\n 60// - c_phi phi coordinate of the centre\n 61// - R radius\n 62//-------------------------------------------------------\n-_\b6_\b3_\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be_\b:_\b:_\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be(double _\bc_\b__\be_\bt_\ba, double _\bc_\b__\bp_\bh_\bi, double R){\n+_\b6_\b3_\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be_\b:_\b:_\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be(double c_eta, double c_phi, double R){\n 64 // determination of the eta range\n 65 //-------------------------------\n-66 double _\bx_\bm_\bi_\bn = _\bm_\ba_\bx(_\bc_\b__\be_\bt_\ba-R,_\be_\bt_\ba_\b__\bm_\bi_\bn+0.0001);\n-67 double _\bx_\bm_\ba_\bx = _\bm_\bi_\bn(_\bc_\b__\be_\bt_\ba+R,_\be_\bt_\ba_\b__\bm_\ba_\bx-0.0001);\n+66 double xmin = max(c_eta-R,_\be_\bt_\ba_\b__\bm_\bi_\bn+0.0001);\n+67 double xmax = min(c_eta+R,_\be_\bt_\ba_\b__\bm_\ba_\bx-0.0001);\n 68\n-69 unsigned int _\bc_\be_\bl_\bl_\b__\bm_\bi_\bn = get_eta_cell(_\bx_\bm_\bi_\bn);\n-70 unsigned int _\bc_\be_\bl_\bl_\b__\bm_\ba_\bx = get_eta_cell(_\bx_\bm_\ba_\bx);\n+69 unsigned int cell_min = get_eta_cell(xmin);\n+70 unsigned int cell_max = get_eta_cell(xmax);\n 71\n 72 // warning: if cell_max==2^31, 2*cell_max==0 hence,\n 73 // even if the next formula is formally (2*cell_max-cell_min),\n 74 // expressing it as (cell_max-cell_min)+cell_max is safe.\n-75 _\be_\bt_\ba_\b__\br_\ba_\bn_\bg_\be = (_\bc_\be_\bl_\bl_\b__\bm_\ba_\bx-_\bc_\be_\bl_\bl_\b__\bm_\bi_\bn)+_\bc_\be_\bl_\bl_\b__\bm_\ba_\bx;\n+75 _\be_\bt_\ba_\b__\br_\ba_\bn_\bg_\be = (cell_max-cell_min)+cell_max;\n 76\n 77 // determination of the phi range\n 78 // !! taking care of periodicity !!\n 79 //---------------------------------\n-80 _\bx_\bm_\bi_\bn = phi_in_range(_\bc_\b__\bp_\bh_\bi-R);\n-81 _\bx_\bm_\ba_\bx = phi_in_range(_\bc_\b__\bp_\bh_\bi+R);\n+80 xmin = phi_in_range(c_phi-R);\n+81 xmax = phi_in_range(c_phi+R);\n 82\n-83 _\bc_\be_\bl_\bl_\b__\bm_\bi_\bn = get_phi_cell(_\bx_\bm_\bi_\bn);\n-84 _\bc_\be_\bl_\bl_\b__\bm_\ba_\bx = get_phi_cell(_\bx_\bm_\ba_\bx);\n+83 cell_min = get_phi_cell(xmin);\n+84 cell_max = get_phi_cell(xmax);\n 85\n 86 // Also, if the interval goes through pi, inversion is needed\n-87 if (_\bx_\bm_\ba_\bx>_\bx_\bm_\bi_\bn)\n-88 _\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be = (_\bc_\be_\bl_\bl_\b__\bm_\ba_\bx-_\bc_\be_\bl_\bl_\b__\bm_\bi_\bn)+_\bc_\be_\bl_\bl_\b__\bm_\ba_\bx;\n+87 if (xmax>xmin)\n+88 _\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be = (cell_max-cell_min)+cell_max;\n 89 else {\n-90 _\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be = (_\bc_\be_\bl_\bl_\b__\bm_\bi_\bn==_\bc_\be_\bl_\bl_\b__\bm_\ba_\bx)\n+90 _\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be = (cell_min==cell_max)\n 91 ? PHI_RANGE_MASK\n-92 : ((PHI_RANGE_MASK^(_\bc_\be_\bl_\bl_\b__\bm_\bi_\bn-_\bc_\be_\bl_\bl_\b__\bm_\ba_\bx)) + _\bc_\be_\bl_\bl_\b__\bm_\ba_\bx);\n+92 : ((PHI_RANGE_MASK^(cell_min-cell_max)) + cell_max);\n 93 }\n 94}\n 95\n 96// assignment of range\n 97// - r range to assign to current one\n 98//---------------------------------------\n-_\b9_\b9_\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be& _\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be_\b:_\b:_\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b=_\b (const _\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be &_\br){\n-100 _\be_\bt_\ba_\b__\br_\ba_\bn_\bg_\be = _\br.eta_range;\n-101 _\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be = _\br.phi_range;\n+_\b9_\b9_\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be& _\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be_\b:_\b:_\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b=_\b (const _\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be &r){\n+100 _\be_\bt_\ba_\b__\br_\ba_\bn_\bg_\be = r._\be_\bt_\ba_\b__\br_\ba_\bn_\bg_\be;\n+101 _\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be = r._\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be;\n 102\n 103 return *this;\n 104}\n 105\n 106// add a particle to the range\n 107// - eta eta coordinate of the particle\n 108// - phi phi coordinate of the particle\n@@ -123,31 +123,31 @@\n 120\n 121\n 122// test overlap\n 123// - r1 first range\n 124// - r2 second range\n 125// return true if overlap, false otherwise.\n 126//------------------------------------------\n-127bool is_range_overlap(const _\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be &_\br_\b1, const _\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be &_\br_\b2){\n+127bool is_range_overlap(const _\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be &r1, const _\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be &r2){\n 128 // check overlap in eta AND phi\n-129 return ((_\br_\b1.eta_range & _\br_\b2.eta_range) && (_\br_\b1.phi_range & _\br_\b2.phi_range));\n+129 return ((r1._\be_\bt_\ba_\b__\br_\ba_\bn_\bg_\be & r2._\be_\bt_\ba_\b__\br_\ba_\bn_\bg_\be) && (r1._\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be & r2._\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be));\n 130}\n 131\n 132// compute union\n 133// Note: we assume that the two intervals overlap\n 134// - r1 first range\n 135// - r2 second range\n 136// \\return union of the two ranges\n 137//------------------------------------------\n 138const Ceta_phi_range range_union (const Ceta_phi_range &r1, const\n Ceta_phi_range &r2){\n 139 Ceta_phi_range tmp;\n 140\n 141 // compute union in eta\n-142 tmp.eta_range = r1.eta_range | r2.eta_range;\n+142 tmp._\be_\bt_\ba_\b__\br_\ba_\bn_\bg_\be = r1.eta_range | r2.eta_range;\n 143\n 144 // compute union in phi\n 145 tmp.phi_range = r1.phi_range | r2.phi_range;\n 146\n 147 return tmp;\n 148}\n 149\n@@ -179,13 +179,9 @@\n Ceta_phi_range()\n default ctor\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bg_\be_\bo_\bm_\b__\b2_\bd_\b._\bc_\bp_\bp_\b:_\b5_\b2\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be_\b:_\b:_\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be\n unsigned int phi_range\n phi range as a binary coding of covered cells\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bg_\be_\bo_\bm_\b__\b2_\bd_\b._\bh_\b:_\b1_\b4_\b6\n-_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br\n-a circulator that is foreseen to take as template member either a pointer or an\n-iterator;\n-D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br_\b._\bh_\b:_\b3_\b6\n ===============================================================================\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by\u00a0_\b[_\bd_\bo_\bx_\by_\bg_\be_\bn_\b] 1.9.8\n"}]}, {"source1": "./usr/share/doc/siscone-doc-html/html/devel/momentum_8h_source.html", "source2": "./usr/share/doc/siscone-doc-html/html/devel/momentum_8h_source.html", "unified_diff": "@@ -88,33 +88,33 @@\n
37namespace siscone{
\n
38
\n
\n \n
50 public:
\n
52 Cmomentum();
\n
53
\n-
55 Cmomentum(double _px, double _py, double _pz, double _E);
\n+
55 Cmomentum(double _px, double _py, double _pz, double _E);
\n
56
\n-
58 Cmomentum(double _eta, double _phi, Creference _ref);
\n+
58 Cmomentum(double _eta, double _phi, Creference _ref);
\n
59
\n
61 ~Cmomentum();
\n
62
\n-
64 inline double perp() const {return sqrt(perp2());}
\n+
64 inline double perp() const {return sqrt(perp2());}
\n
65
\n
67 inline double perp2() const {return px*px+py*py;}
\n
68
\n-
70 inline double mass() const {return sqrt(mass2());}
\n+
70 inline double mass() const {return sqrt(mass2());}
\n
71
\n
73 inline double mass2() const {return perpmass2()-perp2();}
\n
74
\n-
76 inline double perpmass() const {return sqrt((E-pz)*(E+pz));}
\n+
76 inline double perpmass() const {return sqrt((E-pz)*(E+pz));}
\n
77
\n
79 inline double perpmass2() const {return (E-pz)*(E+pz);}
\n
80
\n-
82 inline double Et() const {return E/sqrt(1.0+pz*pz/perp2());}
\n+
82 inline double Et() const {return E/sqrt(1.0+pz*pz/perp2());}
\n
83
\n
85 inline double Et2() const {return E*E/(1.0+pz*pz/perp2());}
\n
86
\n \n
89
\n
92 const Cmomentum operator + (const Cmomentum &v);
\n
93
\n@@ -135,32 +135,32 @@\n
117 int index;
\n
118
\n
120 // the following part is used for checksums //
\n \n
123};
\n
\n
124
\n-
127bool operator < (const Cmomentum &v1, const Cmomentum &v2);
\n+
127bool operator < (const Cmomentum &v1, const Cmomentum &v2);
\n
128
\n-
130bool momentum_eta_less(const Cmomentum &v1, const Cmomentum &v2);
\n+
130bool momentum_eta_less(const Cmomentum &v1, const Cmomentum &v2);
\n
131
\n-
133bool momentum_pt_less(const Cmomentum &v1, const Cmomentum &v2);
\n+
133bool momentum_pt_less(const Cmomentum &v1, const Cmomentum &v2);
\n
134
\n
135
\n
137// some handy utilities //
\n
139
\n
144inline double get_distance(double eta, double phi, Cmomentum *v){
\n-
145 double dx, dy;
\n+
145 double dx, dy;
\n
146
\n-
147 dx = eta - v->eta;
\n-
148 dy = fabs(phi - v->phi);
\n-
149 if (dy>M_PI)
\n-
150 dy -= twopi;
\n+
147 dx = eta - v->eta;
\n+
148 dy = fabs(phi - v->phi);
\n+
149 if (dy>M_PI)
\n+
150 dy -= twopi;
\n
151
\n-
152 return dx*dx+dy*dy;
\n+
152 return dx*dx+dy*dy;
\n
153}
\n
154
\n
155}
\n
156
\n
157#endif
\n
base class for dynamic coordinates management
Definition momentum.h:49
\n
Cmomentum & operator+=(const Cmomentum &v)
incrementation of vectors !!! WARNING !!! no updating of eta and phi !!!
Definition momentum.cpp:104
\n@@ -184,15 +184,14 @@\n
double E
energy
Definition momentum.h:112
\n
double pz
z-momentum
Definition momentum.h:111
\n
double perp() const
computes pT
Definition momentum.h:64
\n
Cmomentum()
default ctor
Definition momentum.cpp:42
\n
double phi
particle azimuthal angle
Definition momentum.h:115
\n
double perpmass() const
transverse mass, mt = sqrt(pt^2+m^2) = sqrt(E^2 - pz^2)
Definition momentum.h:76
\n
references used for checksums.
Definition reference.h:43
\n-
a circulator that is foreseen to take as template member either a pointer or an iterator;
Definition circulator.h:36
\n
\n
const double twopi
definition of 2*M_PI which is useful a bit everyhere!
Definition defines.h:114
\n \n \n
\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by \"doxygen\"/ 1.9.8\n
\n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -38,33 +38,33 @@\n 36\n 37namespace siscone{\n 38\n _\b4_\b9class _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm{\n 50 public:\n 52 _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm();\n 53\n-55 _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm(double _\b__\bp_\bx, double _\b__\bp_\by, double _\b__\bp_\bz, double _\b__\bE);\n+55 _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm(double _px, double _py, double _pz, double _E);\n 56\n-58 _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm(double _\b__\be_\bt_\ba, double _phi, _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\b__\br_\be_\bf);\n+58 _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm(double _eta, double _phi, _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _ref);\n 59\n 61 _\b~_\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm();\n 62\n-_\b6_\b4 inline double _\bp_\be_\br_\bp() const {return _\bs_\bq_\br_\bt(_\bp_\be_\br_\bp_\b2());}\n+_\b6_\b4 inline double _\bp_\be_\br_\bp() const {return sqrt(_\bp_\be_\br_\bp_\b2());}\n 65\n _\b6_\b7 inline double _\bp_\be_\br_\bp_\b2() const {return _\bp_\bx*_\bp_\bx+_\bp_\by*_\bp_\by;}\n 68\n-_\b7_\b0 inline double _\bm_\ba_\bs_\bs() const {return _\bs_\bq_\br_\bt(_\bm_\ba_\bs_\bs_\b2());}\n+_\b7_\b0 inline double _\bm_\ba_\bs_\bs() const {return sqrt(_\bm_\ba_\bs_\bs_\b2());}\n 71\n _\b7_\b3 inline double _\bm_\ba_\bs_\bs_\b2() const {return _\bp_\be_\br_\bp_\bm_\ba_\bs_\bs_\b2()-_\bp_\be_\br_\bp_\b2();}\n 74\n-_\b7_\b6 inline double _\bp_\be_\br_\bp_\bm_\ba_\bs_\bs() const {return _\bs_\bq_\br_\bt((_\bE-_\bp_\bz)*(_\bE+_\bp_\bz));}\n+_\b7_\b6 inline double _\bp_\be_\br_\bp_\bm_\ba_\bs_\bs() const {return sqrt((_\bE-_\bp_\bz)*(_\bE+_\bp_\bz));}\n 77\n _\b7_\b9 inline double _\bp_\be_\br_\bp_\bm_\ba_\bs_\bs_\b2() const {return (_\bE-_\bp_\bz)*(_\bE+_\bp_\bz);}\n 80\n-_\b8_\b2 inline double _\bE_\bt() const {return _\bE/_\bs_\bq_\br_\bt(1.0+_\bp_\bz*_\bp_\bz/_\bp_\be_\br_\bp_\b2());}\n+_\b8_\b2 inline double _\bE_\bt() const {return _\bE/sqrt(1.0+_\bp_\bz*_\bp_\bz/_\bp_\be_\br_\bp_\b2());}\n 83\n _\b8_\b5 inline double _\bE_\bt_\b2() const {return _\bE*_\bE/(1.0+_\bp_\bz*_\bp_\bz/_\bp_\be_\br_\bp_\b2());}\n 86\n 88 _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm& _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b=_\b (const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &v);\n 89\n 92 const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b+_\b (const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &v);\n 93\n@@ -84,32 +84,32 @@\n _\b1_\b1_\b6 int _\bp_\ba_\br_\be_\bn_\bt_\b__\bi_\bn_\bd_\be_\bx;\n _\b1_\b1_\b7 int _\bi_\bn_\bd_\be_\bx;\n 118\n 120 // the following part is used for checksums //\n _\b1_\b2_\b2 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\br_\be_\bf;\n 123};\n 124\n-127bool _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b<_\b (const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &_\bv_\b1, const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &_\bv_\b2);\n+127bool operator < (const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &v1, const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &v2);\n 128\n-130bool momentum_eta_less(const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &_\bv_\b1, const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &_\bv_\b2);\n+130bool momentum_eta_less(const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &v1, const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &v2);\n 131\n-133bool momentum_pt_less(const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &_\bv_\b1, const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &_\bv_\b2);\n+133bool momentum_pt_less(const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &v1, const _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm &v2);\n 134\n 135\n 137// some handy utilities //\n 139\n 144inline double get_distance(double eta, double phi, _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm *v){\n-145 double _\bd_\bx, _\bd_\by;\n+145 double dx, dy;\n 146\n-147 _\bd_\bx = eta - v->_\be_\bt_\ba;\n-148 _\bd_\by = _\bf_\ba_\bb_\bs(phi - v->_\bp_\bh_\bi);\n-149 if (_\bd_\by>M_PI)\n-150 _\bd_\by -= _\bt_\bw_\bo_\bp_\bi;\n+147 dx = eta - v->_\be_\bt_\ba;\n+148 dy = fabs(phi - v->_\bp_\bh_\bi);\n+149 if (dy>M_PI)\n+150 dy -= _\bt_\bw_\bo_\bp_\bi;\n 151\n-152 return _\bd_\bx*_\bd_\bx+_\bd_\by*_\bd_\by;\n+152 return dx*dx+dy*dy;\n 153}\n 154\n 155}\n 156\n 157#endif\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm\n base class for dynamic coordinates management\n@@ -210,18 +210,14 @@\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm_\b:_\b:_\bp_\be_\br_\bp_\bm_\ba_\bs_\bs\n double perpmass() const\n transverse mass, mt = sqrt(pt^2+m^2) = sqrt(E^2 - pz^2)\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm_\b._\bh_\b:_\b7_\b6\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be\n references used for checksums.\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b._\bh_\b:_\b4_\b3\n-_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br\n-a circulator that is foreseen to take as template member either a pointer or an\n-iterator;\n-D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br_\b._\bh_\b:_\b3_\b6\n _\bd_\be_\bf_\bi_\bn_\be_\bs_\b._\bh\n _\bt_\bw_\bo_\bp_\bi\n const double twopi\n definition of 2*M_PI which is useful a bit everyhere!\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bd_\be_\bf_\bi_\bn_\be_\bs_\b._\bh_\b:_\b1_\b1_\b4\n ===============================================================================\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by\u00a0_\b[_\bd_\bo_\bx_\by_\bg_\be_\bn_\b] 1.9.8\n"}]}, {"source1": "./usr/share/doc/siscone-doc-html/html/devel/quadtree_8cpp_source.html", "source2": "./usr/share/doc/siscone-doc-html/html/devel/quadtree_8cpp_source.html", "unified_diff": "@@ -92,44 +92,44 @@\n
40 * The elements at each node are of 'Cmomentum' type. *
\n
41 *******************************************************************/
\n
42
\n
43// default ctor
\n
44//--------------
\n
\n \n-
46 v = NULL;
\n+
46 v = NULL;
\n
47
\n-
48 children[0][0] = children[0][1] = children[1][0] = children[1][1] = NULL;
\n+
48 children[0][0] = children[0][1] = children[1][0] = children[1][1] = NULL;
\n
49 has_child = false;
\n
50}
\n
\n
51
\n
52
\n
53// ctor with initialisation (see init for details)
\n
54//--------------------------
\n
\n-
55Cquadtree::Cquadtree(double _x, double _y, double _half_size_x, double _half_size_y){
\n-
56 v = NULL;
\n+
55Cquadtree::Cquadtree(double _x, double _y, double _half_size_x, double _half_size_y){
\n+
56 v = NULL;
\n
57
\n-
58 children[0][0] = children[0][1] = children[1][0] = children[1][1] = NULL;
\n+
58 children[0][0] = children[0][1] = children[1][0] = children[1][1] = NULL;
\n
59 has_child = false;
\n
60
\n-\n+
61 init(_x, _y, _half_size_x, _half_size_y);
\n
62}
\n
\n
63
\n
64
\n
65// default destructor
\n
66// at destruction, everything is destroyed except
\n
67// physical values at the leaves
\n
68//------------------------------------------------
\n
\n \n
70 if (has_child){
\n-
71 if (v!=NULL) delete v;
\n+
71 if (v!=NULL) delete v;
\n
72 delete children[0][0];
\n
73 delete children[0][1];
\n
74 delete children[1][0];
\n
75 delete children[1][1];
\n
76 }
\n
77}
\n
\n@@ -143,86 +143,86 @@\n
85 * - _y y-position of the center
\n
86 * - half_size_x half x-size of the cell
\n
87 * - half_size_y half y-size of the cell
\n
88 * return 0 on success, 1 on error. Note that if the cell
\n
89 * is already filled, we return an error.
\n
90 ******************************************************************/
\n
\n-
91int Cquadtree::init(double _x, double _y, double _half_size_x, double _half_size_y){
\n-
92 if (v!=NULL)
\n+
91int Cquadtree::init(double _x, double _y, double _half_size_x, double _half_size_y){
\n+
92 if (v!=NULL)
\n
93 return 1;
\n
94
\n-
95 centre_x = _x;
\n-
96 centre_y = _y;
\n-\n-\n+
95 centre_x = _x;
\n+
96 centre_y = _y;
\n+
97 half_size_x = _half_size_x;
\n+
98 half_size_y = _half_size_y;
\n
99
\n
100 return 0;
\n
101}
\n
\n
102
\n
103
\n
104/*
\n
105 * adding a particle to the tree.
\n
106 * This method adds one vector to the quadtree structure which
\n
107 * is updated consequently.
\n
108 * - v vector to add
\n
109 * return 0 on success 1 on error
\n
110 ******************************************************************/
\n
\n-\n+\n
112 // Description of the method:
\n
113 // --------------------------
\n
114 // the addition process goes as follows:
\n
115 // 1. check if the cell is empty, in which case, add the particle
\n
116 // here and leave.
\n
117 // 2. If there is a unique particle already inside,
\n
118 // (a) create children
\n
119 // (b) forward the existing particle to the appropriate child
\n
120 // 3. Add current particle to this cell and forward to the
\n
121 // adequate child
\n
122 // NOTE: we assume in the whole procedure that the particle is
\n
123 // indeed inside the cell !
\n
124
\n
125 // step 1: the case of empty cells
\n-
126 if (v==NULL){
\n-
127 v = v_add;
\n+
126 if (v==NULL){
\n+
127 v = v_add;
\n
128 return 0;
\n
129 }
\n
130
\n
131 // step 2: additional work if 1! particle already present
\n
132 // we use the fact that only 1-particle systems have no child
\n
133 if (!has_child){
\n-
134 double new_half_size_x = 0.5*half_size_x;
\n-
135 double new_half_size_y = 0.5*half_size_y;
\n+
134 double new_half_size_x = 0.5*half_size_x;
\n+
135 double new_half_size_y = 0.5*half_size_y;
\n
136 // create children
\n-\n-\n-\n-\n-\n-\n-\n-\n+
137 children[0][0] = new Cquadtree(centre_x-new_half_size_x, centre_y-new_half_size_y,
\n+
138 new_half_size_x, new_half_size_y);
\n+
139 children[0][1] = new Cquadtree(centre_x-new_half_size_x, centre_y+new_half_size_y,
\n+
140 new_half_size_x, new_half_size_y);
\n+
141 children[1][0] = new Cquadtree(centre_x+new_half_size_x, centre_y-new_half_size_y,
\n+
142 new_half_size_x, new_half_size_y);
\n+
143 children[1][1] = new Cquadtree(centre_x+new_half_size_x, centre_y+new_half_size_y,
\n+
144 new_half_size_x, new_half_size_y);
\n
145
\n
146 has_child = true;
\n
147
\n
148 // forward to child
\n
149 //? The following line assumes 'true'==1 and 'false'==0
\n
150 // Note: v being a single particle, eta and phi are correct
\n \n
152
\n
153 // copy physical params
\n
154 v = new Cmomentum(*v);
\n
155 }
\n
156
\n
157 // step 3: add new particle
\n
158 // Note: v_add being a single particle, eta and phi are correct
\n-\n-
160 *v+=*v_add;
\n+
159 children[v_add->eta>centre_x][v_add->phi>centre_y]->add(v_add);
\n+
160 *v+=*v_add;
\n
161
\n
162 return 0;
\n
163}
\n
\n
164
\n
165
\n
166/*
\n@@ -232,112 +232,112 @@\n
170 * in the circle.
\n
171 * - cx circle centre x coordinate
\n
172 * - cy circle centre y coordinate
\n
173 * - cR2 circle radius SQUARED
\n
174 * return the checksum for the intersection
\n
175 ******************************************************************/
\n
\n-\n+
176Creference Cquadtree::circle_intersect(double cx, double cy, double cR2){
\n
177 // Description of the method:
\n
178 // --------------------------
\n
179 // 1. check if cell is empty => no intersection
\n
180 // 2. if cell has 1! particle, check if it is inside the circle.
\n
181 // If yes, add it and return, if not simply return.
\n
182 // 3. check if the circle intersects the square. If not, return.
\n
183 // 4. check if the square is inside the circle.
\n
184 // If yes, add it to qt and return.
\n
185 // 5. check intersections with children.
\n
186
\n
187 // step 1: if there is no particle inside te square, no reason to go further
\n-
188 if (v==NULL)
\n+
188 if (v==NULL)
\n
189 return Creference();
\n
190
\n-
191 double dx, dy;
\n+
191 double dx, dy;
\n
192
\n
193 // step 2: if there is only one particle inside the square, test if it is in
\n
194 // the circle, in which case return associated reference
\n
195 if (!has_child){
\n
196 // compute the distance
\n
197 // Note: v has only one particle => eta and phi are defined
\n-
198 dx = cx - v->eta;
\n-
199 dy = fabs(cy - v->phi);
\n-
200 if (dy>M_PI)
\n-
201 dy -= 2.0*M_PI;
\n+
198 dx = cx - v->eta;
\n+
199 dy = fabs(cy - v->phi);
\n+
200 if (dy>M_PI)
\n+
201 dy -= 2.0*M_PI;
\n
202
\n
203 // test distance
\n-
204 if (dx*dx+dy*dy<cR2){
\n+
204 if (dx*dx+dy*dy<cR2){
\n
205 return v->ref;
\n
206 }
\n
207
\n
208 return Creference();
\n
209 }
\n
210
\n
211 // step 3: check if there is an intersection
\n
212 //double ryp, rym;
\n-
213 double dx_c, dy_c;
\n+
213 double dx_c, dy_c;
\n
214
\n
215 // store distance with the centre of the square
\n-
216 dx_c = fabs(cx-centre_x);
\n-
217 dy_c = fabs(cy-centre_y);
\n-
218 if (dy_c>M_PI) dy_c = 2.0*M_PI-dy_c;
\n+
216 dx_c = fabs(cx-centre_x);
\n+
217 dy_c = fabs(cy-centre_y);
\n+
218 if (dy_c>M_PI) dy_c = 2.0*M_PI-dy_c;
\n
219
\n
220 // compute (minimal) the distance (pay attention to the periodicity in phi).
\n-\n-
222 if (dx<0) dx=0;
\n-\n-
224 if (dy<0) dy=0;
\n+
221 dx = dx_c-half_size_x;
\n+
222 if (dx<0) dx=0;
\n+
223 dy = dy_c-half_size_y;
\n+
224 if (dy<0) dy=0;
\n
225
\n
226 // check the distance
\n-
227 if (dx*dx+dy*dy>=cR2){
\n+
227 if (dx*dx+dy*dy>=cR2){
\n
228 // no intersection
\n
229 return Creference();
\n
230 }
\n
231
\n
232 // step 4: check if included
\n
233
\n
234 // compute the (maximal) distance
\n-\n-\n-
237 if (dy>M_PI) dy = M_PI;
\n+
235 dx = dx_c+half_size_x;
\n+
236 dy = dy_c+half_size_y;
\n+
237 if (dy>M_PI) dy = M_PI;
\n
238
\n
239 // compute the distance
\n-
240 if (dx*dx+dy*dy<cR2){
\n+
240 if (dx*dx+dy*dy<cR2){
\n
241 return v->ref;
\n
242 }
\n
243
\n
244 // step 5: the square is not fully in. Recurse to children
\n-
245 return children[0][0]->circle_intersect(cx, cy, cR2)
\n-
246 + children[0][1]->circle_intersect(cx, cy, cR2)
\n-
247 + children[1][0]->circle_intersect(cx, cy, cR2)
\n-
248 + children[1][1]->circle_intersect(cx, cy, cR2);
\n+
245 return children[0][0]->circle_intersect(cx, cy, cR2)
\n+
246 + children[0][1]->circle_intersect(cx, cy, cR2)
\n+
247 + children[1][0]->circle_intersect(cx, cy, cR2)
\n+
248 + children[1][1]->circle_intersect(cx, cy, cR2);
\n
249}
\n
\n
250
\n
251
\n
252/*
\n
253 * output a data file for drawing the grid.
\n
254 * This can be used to output a data file containing all the
\n
255 * grid subdivisions. The file contents is as follows:
\n
256 * first and second columns give center of the cell, the third
\n
257 * gives the size.
\n
258 * - flux opened stream to write to
\n
259 * return 0 on success, 1 on error
\n
260 ******************************************************************/
\n
\n-\n+
261int Cquadtree::save(FILE *flux){
\n
262
\n-
263 if (flux==NULL)
\n+
263 if (flux==NULL)
\n
264 return 1;
\n
265
\n
266 if (has_child){
\n-
267 fprintf(flux, "%e\\t%e\\t%e\\t%e\\n", centre_x, centre_y, half_size_x, half_size_y);
\n-
268 children[0][0]->save(flux);
\n-
269 children[0][1]->save(flux);
\n-
270 children[1][0]->save(flux);
\n-
271 children[1][1]->save(flux);
\n+
267 fprintf(flux, "%e\\t%e\\t%e\\t%e\\n", centre_x, centre_y, half_size_x, half_size_y);
\n+
268 children[0][0]->save(flux);
\n+
269 children[0][1]->save(flux);
\n+
270 children[1][0]->save(flux);
\n+
271 children[1][1]->save(flux);
\n
272 }
\n
273
\n
274 return 0;
\n
275}
\n
\n
276
\n
277
\n@@ -347,26 +347,26 @@\n
281 * tree leaves. The file contents is as follows:
\n
282 * first and second columns give center of the cell, the third
\n
283 * gives the size.
\n
284 * - flux opened stream to write to
\n
285 * return 0 on success, 1 on error
\n
286 ******************************************************************/
\n
\n-\n+\n
288
\n-
289 if (flux==NULL)
\n+
289 if (flux==NULL)
\n
290 return 1;
\n
291
\n
292 if (has_child){
\n-
293 if (children[0][0]!=NULL) children[0][0]->save_leaves(flux);
\n-
294 if (children[0][1]!=NULL) children[0][1]->save_leaves(flux);
\n-
295 if (children[1][0]!=NULL) children[1][0]->save_leaves(flux);
\n-
296 if (children[1][1]!=NULL) children[1][1]->save_leaves(flux);
\n+
293 if (children[0][0]!=NULL) children[0][0]->save_leaves(flux);
\n+
294 if (children[0][1]!=NULL) children[0][1]->save_leaves(flux);
\n+
295 if (children[1][0]!=NULL) children[1][0]->save_leaves(flux);
\n+
296 if (children[1][1]!=NULL) children[1][1]->save_leaves(flux);
\n
297 } else {
\n-
298 fprintf(flux, "%e\\t%e\\t%e\\t%e\\n", centre_x, centre_y, half_size_x, half_size_y);
\n+
298 fprintf(flux, "%e\\t%e\\t%e\\t%e\\n", centre_x, centre_y, half_size_x, half_size_y);
\n
299 }
\n
300
\n
301 return 0;
\n
302}
\n
\n
303
\n
304}
\n@@ -385,15 +385,14 @@\n
int save_leaves(FILE *flux)
output a data file for drawing the tree leaves.
Definition quadtree.cpp:287
\n
double centre_y
y-position of the centre of the cell
Definition quadtree.h:113
\n
bool has_child
true if not a leaf
Definition quadtree.h:120
\n
Cmomentum * v
physical contents
Definition quadtree.h:117
\n
int init(double _x, double _y, double _half_size_x, double _half_size_y)
init the tree.
Definition quadtree.cpp:91
\n
Cquadtree * children[2][2]
sub-cells ( 0,1->left-right; 0,1->bottom,top)
Definition quadtree.h:119
\n
references used for checksums.
Definition reference.h:43
\n-
a circulator that is foreseen to take as template member either a pointer or an iterator;
Definition circulator.h:36
\n \n \n
\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by \"doxygen\"/ 1.9.8\n
\n \n \n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -42,41 +42,41 @@\n 39 * This class implements the traditional two-dimensional quadtree. *\n 40 * The elements at each node are of 'Cmomentum' type. *\n 41 *******************************************************************/\n 42\n 43// default ctor\n 44//--------------\n _\b4_\b5_\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(){\n-46 _\bv = _\bN_\bU_\bL_\bL;\n+46 _\bv = NULL;\n 47\n-48 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1] = _\bN_\bU_\bL_\bL;\n+48 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1] = NULL;\n 49 _\bh_\ba_\bs_\b__\bc_\bh_\bi_\bl_\bd = false;\n 50}\n 51\n 52\n 53// ctor with initialisation (see init for details)\n 54//--------------------------\n-_\b5_\b5_\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(double _\b__\bx, double _\b__\by, double _\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx, double\n-_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by){\n-56 _\bv = _\bN_\bU_\bL_\bL;\n+_\b5_\b5_\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(double _x, double _y, double _half_size_x, double\n+_half_size_y){\n+56 _\bv = NULL;\n 57\n-58 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1] = _\bN_\bU_\bL_\bL;\n+58 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0] = _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1] = NULL;\n 59 _\bh_\ba_\bs_\b__\bc_\bh_\bi_\bl_\bd = false;\n 60\n-61 _\bi_\bn_\bi_\bt(_\b__\bx, _\b__\by, _\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx, _\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by);\n+61 _\bi_\bn_\bi_\bt(_x, _y, _half_size_x, _half_size_y);\n 62}\n 63\n 64\n 65// default destructor\n 66// at destruction, everything is destroyed except\n 67// physical values at the leaves\n 68//------------------------------------------------\n _\b6_\b9_\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\b~_\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(){\n 70 if (_\bh_\ba_\bs_\b__\bc_\bh_\bi_\bl_\bd){\n-71 if (_\bv!=_\bN_\bU_\bL_\bL) delete _\bv;\n+71 if (_\bv!=NULL) delete _\bv;\n 72 delete _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0];\n 73 delete _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1];\n 74 delete _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0];\n 75 delete _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1];\n 76 }\n 77}\n 78\n@@ -88,89 +88,89 @@\n 84 * - _x x-position of the center\n 85 * - _y y-position of the center\n 86 * - half_size_x half x-size of the cell\n 87 * - half_size_y half y-size of the cell\n 88 * return 0 on success, 1 on error. Note that if the cell\n 89 * is already filled, we return an error.\n 90 ******************************************************************/\n-_\b9_\b1int _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bi_\bn_\bi_\bt(double _\b__\bx, double _\b__\by, double _\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx, double\n-_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by){\n-92 if (_\bv!=_\bN_\bU_\bL_\bL)\n+_\b9_\b1int _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bi_\bn_\bi_\bt(double _x, double _y, double _half_size_x, double\n+_half_size_y){\n+92 if (_\bv!=NULL)\n 93 return 1;\n 94\n-95 _\bc_\be_\bn_\bt_\br_\be_\b__\bx = _\b__\bx;\n-96 _\bc_\be_\bn_\bt_\br_\be_\b__\by = _\b__\by;\n-97 _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx = _\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx;\n-98 _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by = _\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by;\n+95 _\bc_\be_\bn_\bt_\br_\be_\b__\bx = _x;\n+96 _\bc_\be_\bn_\bt_\br_\be_\b__\by = _y;\n+97 _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx = _half_size_x;\n+98 _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by = _half_size_y;\n 99\n 100 return 0;\n 101}\n 102\n 103\n 104/*\n 105 * adding a particle to the tree.\n 106 * This method adds one vector to the quadtree structure which\n 107 * is updated consequently.\n 108 * - v vector to add\n 109 * return 0 on success 1 on error\n 110 ******************************************************************/\n-_\b1_\b1_\b1int _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\ba_\bd_\bd(_\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm *_\bv_\b__\ba_\bd_\bd){\n+_\b1_\b1_\b1int _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\ba_\bd_\bd(_\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm *v_add){\n 112 // Description of the method:\n 113 // --------------------------\n 114 // the addition process goes as follows:\n 115 // 1. check if the cell is empty, in which case, add the particle\n 116 // here and leave.\n 117 // 2. If there is a unique particle already inside,\n 118 // (a) create children\n 119 // (b) forward the existing particle to the appropriate child\n 120 // 3. Add current particle to this cell and forward to the\n 121 // adequate child\n 122 // NOTE: we assume in the whole procedure that the particle is\n 123 // indeed inside the cell !\n 124\n 125 // step 1: the case of empty cells\n-126 if (_\bv==_\bN_\bU_\bL_\bL){\n-127 _\bv = _\bv_\b__\ba_\bd_\bd;\n+126 if (_\bv==NULL){\n+127 _\bv = v_add;\n 128 return 0;\n 129 }\n 130\n 131 // step 2: additional work if 1! particle already present\n 132 // we use the fact that only 1-particle systems have no child\n 133 if (!_\bh_\ba_\bs_\b__\bc_\bh_\bi_\bl_\bd){\n-134 double _\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx = 0.5*_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx;\n-135 double _\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by = 0.5*_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by;\n+134 double new_half_size_x = 0.5*_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx;\n+135 double new_half_size_y = 0.5*_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by;\n 136 // create children\n-137 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0] = new _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(_\bc_\be_\bn_\bt_\br_\be_\b__\bx-_\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx, _\bc_\be_\bn_\bt_\br_\be_\b__\by-\n-_\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by,\n-138 _\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx, _\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by);\n-139 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1] = new _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(_\bc_\be_\bn_\bt_\br_\be_\b__\bx-_\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx,\n-_\bc_\be_\bn_\bt_\br_\be_\b__\by+_\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by,\n-140 _\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx, _\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by);\n-141 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0] = new _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(_\bc_\be_\bn_\bt_\br_\be_\b__\bx+_\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx, _\bc_\be_\bn_\bt_\br_\be_\b__\by-\n-_\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by,\n-142 _\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx, _\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by);\n-143 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1] = new _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(_\bc_\be_\bn_\bt_\br_\be_\b__\bx+_\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx,\n-_\bc_\be_\bn_\bt_\br_\be_\b__\by+_\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by,\n-144 _\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx, _\bn_\be_\bw_\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by);\n+137 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0] = new _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(_\bc_\be_\bn_\bt_\br_\be_\b__\bx-new_half_size_x, _\bc_\be_\bn_\bt_\br_\be_\b__\by-\n+new_half_size_y,\n+138 new_half_size_x, new_half_size_y);\n+139 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1] = new _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(_\bc_\be_\bn_\bt_\br_\be_\b__\bx-new_half_size_x,\n+_\bc_\be_\bn_\bt_\br_\be_\b__\by+new_half_size_y,\n+140 new_half_size_x, new_half_size_y);\n+141 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0] = new _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(_\bc_\be_\bn_\bt_\br_\be_\b__\bx+new_half_size_x, _\bc_\be_\bn_\bt_\br_\be_\b__\by-\n+new_half_size_y,\n+142 new_half_size_x, new_half_size_y);\n+143 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1] = new _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(_\bc_\be_\bn_\bt_\br_\be_\b__\bx+new_half_size_x,\n+_\bc_\be_\bn_\bt_\br_\be_\b__\by+new_half_size_y,\n+144 new_half_size_x, new_half_size_y);\n 145\n 146 _\bh_\ba_\bs_\b__\bc_\bh_\bi_\bl_\bd = true;\n 147\n 148 // forward to child\n 149 //? The following line assumes 'true'==1 and 'false'==0\n 150 // Note: v being a single particle, eta and phi are correct\n 151 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[_\bv->_\be_\bt_\ba>_\bc_\be_\bn_\bt_\br_\be_\b__\bx][_\bv->_\bp_\bh_\bi>_\bc_\be_\bn_\bt_\br_\be_\b__\by]->_\ba_\bd_\bd(_\bv);\n 152\n 153 // copy physical params\n 154 _\bv = new _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm(*_\bv);\n 155 }\n 156\n 157 // step 3: add new particle\n 158 // Note: v_add being a single particle, eta and phi are correct\n-159 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[_\bv_\b__\ba_\bd_\bd->eta>_\bc_\be_\bn_\bt_\br_\be_\b__\bx][_\bv_\b__\ba_\bd_\bd->phi>_\bc_\be_\bn_\bt_\br_\be_\b__\by]->_\ba_\bd_\bd(_\bv_\b__\ba_\bd_\bd);\n-160 *_\bv+=*_\bv_\b__\ba_\bd_\bd;\n+159 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[v_add->_\be_\bt_\ba>_\bc_\be_\bn_\bt_\br_\be_\b__\bx][v_add->_\bp_\bh_\bi>_\bc_\be_\bn_\bt_\br_\be_\b__\by]->_\ba_\bd_\bd(v_add);\n+160 *_\bv+=*v_add;\n 161\n 162 return 0;\n 163}\n 164\n 165\n 166/*\n 167 * circle intersection.\n@@ -178,114 +178,114 @@\n 169 * The output takes the form of a quadtree with all squares included\n 170 * in the circle.\n 171 * - cx circle centre x coordinate\n 172 * - cy circle centre y coordinate\n 173 * - cR2 circle radius SQUARED\n 174 * return the checksum for the intersection\n 175 ******************************************************************/\n-_\b1_\b7_\b6_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(double _\bc_\bx, double _\bc_\by, double _\bc_\bR_\b2){\n+_\b1_\b7_\b6_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(double cx, double cy, double cR2){\n 177 // Description of the method:\n 178 // --------------------------\n 179 // 1. check if cell is empty => no intersection\n 180 // 2. if cell has 1! particle, check if it is inside the circle.\n 181 // If yes, add it and return, if not simply return.\n 182 // 3. check if the circle intersects the square. If not, return.\n 183 // 4. check if the square is inside the circle.\n 184 // If yes, add it to qt and return.\n 185 // 5. check intersections with children.\n 186\n 187 // step 1: if there is no particle inside te square, no reason to go\n further\n-188 if (_\bv==_\bN_\bU_\bL_\bL)\n+188 if (_\bv==NULL)\n 189 return _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be();\n 190\n-191 double _\bd_\bx, _\bd_\by;\n+191 double dx, dy;\n 192\n 193 // step 2: if there is only one particle inside the square, test if it is\n in\n 194 // the circle, in which case return associated reference\n 195 if (!_\bh_\ba_\bs_\b__\bc_\bh_\bi_\bl_\bd){\n 196 // compute the distance\n 197 // Note: v has only one particle => eta and phi are defined\n-198 _\bd_\bx = _\bc_\bx - _\bv->_\be_\bt_\ba;\n-199 _\bd_\by = _\bf_\ba_\bb_\bs(_\bc_\by - _\bv->_\bp_\bh_\bi);\n-200 if (_\bd_\by>M_PI)\n-201 _\bd_\by -= 2.0*M_PI;\n+198 dx = cx - _\bv->_\be_\bt_\ba;\n+199 dy = fabs(cy - _\bv->_\bp_\bh_\bi);\n+200 if (dy>M_PI)\n+201 dy -= 2.0*M_PI;\n 202\n 203 // test distance\n-204 if (_\bd_\bx*_\bd_\bx+_\bd_\by*_\bd_\by<_\bc_\bR_\b2){\n+204 if (dx*dx+dy*dy_\br_\be_\bf;\n 206 }\n 207\n 208 return _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be();\n 209 }\n 210\n 211 // step 3: check if there is an intersection\n 212 //double ryp, rym;\n-213 double _\bd_\bx_\b__\bc, _\bd_\by_\b__\bc;\n+213 double dx_c, dy_c;\n 214\n 215 // store distance with the centre of the square\n-216 _\bd_\bx_\b__\bc = _\bf_\ba_\bb_\bs(_\bc_\bx-_\bc_\be_\bn_\bt_\br_\be_\b__\bx);\n-217 _\bd_\by_\b__\bc = _\bf_\ba_\bb_\bs(_\bc_\by-_\bc_\be_\bn_\bt_\br_\be_\b__\by);\n-218 if (_\bd_\by_\b__\bc>M_PI) _\bd_\by_\b__\bc = 2.0*M_PI-_\bd_\by_\b__\bc;\n+216 dx_c = fabs(cx-_\bc_\be_\bn_\bt_\br_\be_\b__\bx);\n+217 dy_c = fabs(cy-_\bc_\be_\bn_\bt_\br_\be_\b__\by);\n+218 if (dy_c>M_PI) dy_c = 2.0*M_PI-dy_c;\n 219\n 220 // compute (minimal) the distance (pay attention to the periodicity in\n phi).\n-221 _\bd_\bx = _\bd_\bx_\b__\bc-_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx;\n-222 if (_\bd_\bx<0) _\bd_\bx=0;\n-223 _\bd_\by = _\bd_\by_\b__\bc-_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by;\n-224 if (_\bd_\by<0) _\bd_\by=0;\n+221 dx = dx_c-_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx;\n+222 if (dx<0) dx=0;\n+223 dy = dy_c-_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by;\n+224 if (dy<0) dy=0;\n 225\n 226 // check the distance\n-227 if (_\bd_\bx*_\bd_\bx+_\bd_\by*_\bd_\by>=_\bc_\bR_\b2){\n+227 if (dx*dx+dy*dy>=cR2){\n 228 // no intersection\n 229 return _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be();\n 230 }\n 231\n 232 // step 4: check if included\n 233\n 234 // compute the (maximal) distance\n-235 _\bd_\bx = _\bd_\bx_\b__\bc+_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx;\n-236 _\bd_\by = _\bd_\by_\b__\bc+_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by;\n-237 if (_\bd_\by>M_PI) _\bd_\by = M_PI;\n+235 dx = dx_c+_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx;\n+236 dy = dy_c+_\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by;\n+237 if (dy>M_PI) dy = M_PI;\n 238\n 239 // compute the distance\n-240 if (_\bd_\bx*_\bd_\bx+_\bd_\by*_\bd_\by<_\bc_\bR_\b2){\n+240 if (dx*dx+dy*dy_\br_\be_\bf;\n 242 }\n 243\n 244 // step 5: the square is not fully in. Recurse to children\n-245 return _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0]->_\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(_\bc_\bx, _\bc_\by, _\bc_\bR_\b2)\n-246 + _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1]->_\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(_\bc_\bx, _\bc_\by, _\bc_\bR_\b2)\n-247 + _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0]->_\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(_\bc_\bx, _\bc_\by, _\bc_\bR_\b2)\n-248 + _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1]->_\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(_\bc_\bx, _\bc_\by, _\bc_\bR_\b2);\n+245 return _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0]->_\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(cx, cy, cR2)\n+246 + _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1]->_\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(cx, cy, cR2)\n+247 + _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0]->_\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(cx, cy, cR2)\n+248 + _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1]->_\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(cx, cy, cR2);\n 249}\n 250\n 251\n 252/*\n 253 * output a data file for drawing the grid.\n 254 * This can be used to output a data file containing all the\n 255 * grid subdivisions. The file contents is as follows:\n 256 * first and second columns give center of the cell, the third\n 257 * gives the size.\n 258 * - flux opened stream to write to\n 259 * return 0 on success, 1 on error\n 260 ******************************************************************/\n-_\b2_\b6_\b1int _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bs_\ba_\bv_\be(_\bF_\bI_\bL_\bE *_\bf_\bl_\bu_\bx){\n+_\b2_\b6_\b1int _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bs_\ba_\bv_\be(FILE *flux){\n 262\n-263 if (_\bf_\bl_\bu_\bx==_\bN_\bU_\bL_\bL)\n+263 if (flux==NULL)\n 264 return 1;\n 265\n 266 if (_\bh_\ba_\bs_\b__\bc_\bh_\bi_\bl_\bd){\n-267 _\bf_\bp_\br_\bi_\bn_\bt_\bf(_\bf_\bl_\bu_\bx, \"%e\\t%e\\t%e\\t%e\\n\", _\bc_\be_\bn_\bt_\br_\be_\b__\bx, _\bc_\be_\bn_\bt_\br_\be_\b__\by, _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx,\n+267 fprintf(flux, \"%e\\t%e\\t%e\\t%e\\n\", _\bc_\be_\bn_\bt_\br_\be_\b__\bx, _\bc_\be_\bn_\bt_\br_\be_\b__\by, _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx,\n _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by);\n-268 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0]->_\bs_\ba_\bv_\be(_\bf_\bl_\bu_\bx);\n-269 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1]->_\bs_\ba_\bv_\be(_\bf_\bl_\bu_\bx);\n-270 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0]->_\bs_\ba_\bv_\be(_\bf_\bl_\bu_\bx);\n-271 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1]->_\bs_\ba_\bv_\be(_\bf_\bl_\bu_\bx);\n+268 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0]->_\bs_\ba_\bv_\be(flux);\n+269 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1]->_\bs_\ba_\bv_\be(flux);\n+270 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0]->_\bs_\ba_\bv_\be(flux);\n+271 _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1]->_\bs_\ba_\bv_\be(flux);\n 272 }\n 273\n 274 return 0;\n 275}\n 276\n 277\n 278/*\n@@ -293,26 +293,26 @@\n 280 * This can be used to output a data file containing all the\n 281 * tree leaves. The file contents is as follows:\n 282 * first and second columns give center of the cell, the third\n 283 * gives the size.\n 284 * - flux opened stream to write to\n 285 * return 0 on success, 1 on error\n 286 ******************************************************************/\n-_\b2_\b8_\b7int _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(_\bF_\bI_\bL_\bE *_\bf_\bl_\bu_\bx){\n+_\b2_\b8_\b7int _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(FILE *flux){\n 288\n-289 if (_\bf_\bl_\bu_\bx==_\bN_\bU_\bL_\bL)\n+289 if (flux==NULL)\n 290 return 1;\n 291\n 292 if (_\bh_\ba_\bs_\b__\bc_\bh_\bi_\bl_\bd){\n-293 if (_\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0]!=_\bN_\bU_\bL_\bL) _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0]->_\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(_\bf_\bl_\bu_\bx);\n-294 if (_\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1]!=_\bN_\bU_\bL_\bL) _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1]->_\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(_\bf_\bl_\bu_\bx);\n-295 if (_\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0]!=_\bN_\bU_\bL_\bL) _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0]->_\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(_\bf_\bl_\bu_\bx);\n-296 if (_\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1]!=_\bN_\bU_\bL_\bL) _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1]->_\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(_\bf_\bl_\bu_\bx);\n+293 if (_\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0]!=NULL) _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][0]->_\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(flux);\n+294 if (_\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1]!=NULL) _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[0][1]->_\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(flux);\n+295 if (_\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0]!=NULL) _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][0]->_\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(flux);\n+296 if (_\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1]!=NULL) _\bc_\bh_\bi_\bl_\bd_\br_\be_\bn[1][1]->_\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(flux);\n 297 } else {\n-298 _\bf_\bp_\br_\bi_\bn_\bt_\bf(_\bf_\bl_\bu_\bx, \"%e\\t%e\\t%e\\t%e\\n\", _\bc_\be_\bn_\bt_\br_\be_\b__\bx, _\bc_\be_\bn_\bt_\br_\be_\b__\by, _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx,\n+298 fprintf(flux, \"%e\\t%e\\t%e\\t%e\\n\", _\bc_\be_\bn_\bt_\br_\be_\b__\bx, _\bc_\be_\bn_\bt_\br_\be_\b__\by, _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx,\n _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by);\n 299 }\n 300\n 301 return 0;\n 302}\n 303\n 304}\n@@ -387,13 +387,9 @@\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bc_\bh_\bi_\bl_\bd_\br_\be_\bn\n Cquadtree * children[2][2]\n sub-cells ( 0,1->left-right; 0,1->bottom,top)\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b._\bh_\b:_\b1_\b1_\b9\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be\n references used for checksums.\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b._\bh_\b:_\b4_\b3\n-_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br\n-a circulator that is foreseen to take as template member either a pointer or an\n-iterator;\n-D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br_\b._\bh_\b:_\b3_\b6\n ===============================================================================\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by\u00a0_\b[_\bd_\bo_\bx_\by_\bg_\be_\bn_\b] 1.9.8\n"}]}, {"source1": "./usr/share/doc/siscone-doc-html/html/devel/quadtree_8h_source.html", "source2": "./usr/share/doc/siscone-doc-html/html/devel/quadtree_8h_source.html", "unified_diff": "@@ -85,27 +85,27 @@\n
34namespace siscone{
\n
35
\n
\n \n
44 public:
\n
46 Cquadtree();
\n
47
\n-
49 Cquadtree(double _x, double _y, double _half_size_x, double _half_size_y);
\n+
49 Cquadtree(double _x, double _y, double _half_size_x, double _half_size_y);
\n
50
\n
54 ~Cquadtree();
\n
55
\n-
67 int init(double _x, double _y, double _half_size_x, double _half_size_y);
\n+
67 int init(double _x, double _y, double _half_size_x, double _half_size_y);
\n
68
\n-
76 int add(Cmomentum *v_add);
\n+
76 int add(Cmomentum *v_add);
\n
77
\n-
88 Creference circle_intersect(double cx, double cy, double cR2);
\n+
88 Creference circle_intersect(double cx, double cy, double cR2);
\n
89
\n-
99 int save(FILE *flux);
\n+
99 int save(FILE *flux);
\n
100
\n-
110 int save_leaves(FILE *flux);
\n+
110 int save_leaves(FILE *flux);
\n
111
\n
112 double centre_x;
\n
113 double centre_y;
\n
114 double half_size_x;
\n
115 double half_size_y;
\n
116
\n \n@@ -130,15 +130,14 @@\n
int save_leaves(FILE *flux)
output a data file for drawing the tree leaves.
Definition quadtree.cpp:287
\n
double centre_y
y-position of the centre of the cell
Definition quadtree.h:113
\n
bool has_child
true if not a leaf
Definition quadtree.h:120
\n
Cmomentum * v
physical contents
Definition quadtree.h:117
\n
int init(double _x, double _y, double _half_size_x, double _half_size_y)
init the tree.
Definition quadtree.cpp:91
\n
Cquadtree * children[2][2]
sub-cells ( 0,1->left-right; 0,1->bottom,top)
Definition quadtree.h:119
\n
references used for checksums.
Definition reference.h:43
\n-
a circulator that is foreseen to take as template member either a pointer or an iterator;
Definition circulator.h:36
\n
\n \n
\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by \"doxygen\"/ 1.9.8\n
\n \n \n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -35,27 +35,27 @@\n 33\n 34namespace siscone{\n 35\n _\b4_\b3class _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be{\n 44 public:\n 46 _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be();\n 47\n-49 _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(double _\b__\bx, double _\b__\by, double _\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx, double _\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by);\n+49 _\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be(double _x, double _y, double _half_size_x, double _half_size_y);\n 50\n 54 _\b~_\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be();\n 55\n-67 int _\bi_\bn_\bi_\bt(double _\b__\bx, double _\b__\by, double _\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx, double _\b__\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by);\n+67 int _\bi_\bn_\bi_\bt(double _x, double _y, double _half_size_x, double _half_size_y);\n 68\n-76 int _\ba_\bd_\bd(_\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm *_\bv_\b__\ba_\bd_\bd);\n+76 int _\ba_\bd_\bd(_\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm *v_add);\n 77\n-88 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(double _\bc_\bx, double _\bc_\by, double _\bc_\bR_\b2);\n+88 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\bc_\bi_\br_\bc_\bl_\be_\b__\bi_\bn_\bt_\be_\br_\bs_\be_\bc_\bt(double cx, double cy, double cR2);\n 89\n-99 int _\bs_\ba_\bv_\be(_\bF_\bI_\bL_\bE *_\bf_\bl_\bu_\bx);\n+99 int _\bs_\ba_\bv_\be(FILE *flux);\n 100\n-110 int _\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(_\bF_\bI_\bL_\bE *_\bf_\bl_\bu_\bx);\n+110 int _\bs_\ba_\bv_\be_\b__\bl_\be_\ba_\bv_\be_\bs(FILE *flux);\n 111\n _\b1_\b1_\b2 double _\bc_\be_\bn_\bt_\br_\be_\b__\bx;\n _\b1_\b1_\b3 double _\bc_\be_\bn_\bt_\br_\be_\b__\by;\n _\b1_\b1_\b4 double _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\bx;\n _\b1_\b1_\b5 double _\bh_\ba_\bl_\bf_\b__\bs_\bi_\bz_\be_\b__\by;\n 116\n _\b1_\b1_\b7 _\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm *_\bv;\n@@ -128,13 +128,9 @@\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b:_\b:_\bc_\bh_\bi_\bl_\bd_\br_\be_\bn\n Cquadtree * children[2][2]\n sub-cells ( 0,1->left-right; 0,1->bottom,top)\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bq_\bu_\ba_\bd_\bt_\br_\be_\be_\b._\bh_\b:_\b1_\b1_\b9\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be\n references used for checksums.\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b._\bh_\b:_\b4_\b3\n-_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br\n-a circulator that is foreseen to take as template member either a pointer or an\n-iterator;\n-D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br_\b._\bh_\b:_\b3_\b6\n ===============================================================================\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by\u00a0_\b[_\bd_\bo_\bx_\by_\bg_\be_\bn_\b] 1.9.8\n"}]}, {"source1": "./usr/share/doc/siscone-doc-html/html/devel/ranlux_8cpp_source.html", "source2": "./usr/share/doc/siscone-doc-html/html/devel/ranlux_8cpp_source.html", "unified_diff": "@@ -114,20 +114,20 @@\n
59
\n
60
\n
61// incrementation of the generator state
\n
62//---------------------------------------
\n
63static inline unsigned long int increment_state(){
\n
64 unsigned int i = local_ranlux_state.i;
\n
65 unsigned int j = local_ranlux_state.j;
\n-
66 long int delta = local_ranlux_state.u[j] - local_ranlux_state.u[i]
\n+
66 long int delta = local_ranlux_state.u[j] - local_ranlux_state.u[i]
\n
67 - local_ranlux_state.carry;
\n
68
\n-
69 if (delta & mask_hi){
\n+
69 if (delta & mask_hi){
\n
70 local_ranlux_state.carry = 1;
\n-
71 delta &= mask_lo;
\n+
71 delta &= mask_lo;
\n
72 } else {
\n
73 local_ranlux_state.carry = 0;
\n
74 }
\n
75
\n
76 local_ranlux_state.u[i] = delta;
\n
77
\n
78 if (i==0)
\n@@ -220,15 +220,14 @@\n
165 for (i=0;i<n;i++){
\n
166 /* FIXME: we're assuming that a char is 8 bits */
\n
167 printf("%.2x", *(p+i));
\n
168 }
\n
169}
\n
170
\n
171}
\n-
a circulator that is foreseen to take as template member either a pointer or an iterator;
Definition circulator.h:36
\n \n \n \n \n
\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by \"doxygen\"/ 1.9.8\n
\n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -62,20 +62,20 @@\n 59\n 60\n 61// incrementation of the generator state\n 62//---------------------------------------\n 63static inline unsigned long int increment_state(){\n 64 unsigned int i = local_ranlux_state.i;\n 65 unsigned int j = local_ranlux_state.j;\n-66 long int _\bd_\be_\bl_\bt_\ba = local_ranlux_state.u[j] - local_ranlux_state.u[i]\n+66 long int delta = local_ranlux_state.u[j] - local_ranlux_state.u[i]\n 67 - local_ranlux_state.carry;\n 68\n-69 if (_\bd_\be_\bl_\bt_\ba & mask_hi){\n+69 if (delta & mask_hi){\n 70 local_ranlux_state.carry = 1;\n-71 _\bd_\be_\bl_\bt_\ba &= mask_lo;\n+71 delta &= mask_lo;\n 72 } else {\n 73 local_ranlux_state.carry = 0;\n 74 }\n 75\n 76 local_ranlux_state.u[i] = delta;\n 77\n 78 if (i==0)\n@@ -168,16 +168,12 @@\n 165 for (i=0;i\n \n
55// ref[0] = reference_bit;
\n
56// ref[1] = 0;
\n
57// ref[2] = 0;
\n
58// reference_bit <<= 1;
\n
59
\n-
60 unsigned int r1 = ranlux_get();
\n-
61 unsigned int r2 = ranlux_get();
\n-
62 unsigned int r3 = ranlux_get();
\n-
63 unsigned int r4 = ranlux_get();
\n+
60 unsigned int r1 = ranlux_get();
\n+
61 unsigned int r2 = ranlux_get();
\n+
62 unsigned int r3 = ranlux_get();
\n+
63 unsigned int r4 = ranlux_get();
\n
64 // since ranlux only produces 24 bits, take r4 and add 8 bits
\n
65 // from it to each of r1,r2, r3 to get 3*32 bits.
\n-
66 ref[0] = r1+((r4 & 0x00ff0000) << 8);
\n-
67 ref[1] = r2+((r4 & 0x0000ff00) << 16);
\n-
68 ref[2] = r3+((r4 & 0x000000ff) << 24);
\n+
66 ref[0] = r1+((r4 & 0x00ff0000) << 8);
\n+
67 ref[1] = r2+((r4 & 0x0000ff00) << 16);
\n+
68 ref[2] = r3+((r4 & 0x000000ff) << 24);
\n
69
\n
70 if (is_empty()) randomize();
\n
71}
\n \n
72
\n
73// test emptyness
\n
74//----------------
\n@@ -140,49 +140,49 @@\n
82 return (ref[0]!=0) || (ref[1]!=0) || (ref[2]!=0);
\n
83}
\n \n
84
\n
85// assignment of reference
\n
86//-------------------------
\n
\n-\n-
88 ref[0] = r.ref[0];
\n-
89 ref[1] = r.ref[1];
\n-
90 ref[2] = r.ref[2];
\n+\n+
88 ref[0] = r.ref[0];
\n+
89 ref[1] = r.ref[1];
\n+
90 ref[2] = r.ref[2];
\n
91 return *this;
\n
92}
\n
\n
93
\n
94// addition of reference
\n
95//-----------------------
\n
\n-\n-
97 Creference tmp = *this;
\n-
98 return tmp+=r;
\n+\n+
97 Creference tmp = *this;
\n+
98 return tmp+=r;
\n
99}
\n
\n
100
\n
101// incrementation of reference
\n
102//-----------------------------
\n
\n-\n-
104 ref[0] ^= r.ref[0];
\n-
105 ref[1] ^= r.ref[1];
\n-
106 ref[2] ^= r.ref[2];
\n+\n+
104 ref[0] ^= r.ref[0];
\n+
105 ref[1] ^= r.ref[1];
\n+
106 ref[2] ^= r.ref[2];
\n
107 return *this;
\n
108}
\n
\n
109
\n
110// decrementation of reference
\n
111//-----------------------------
\n
\n-\n-
113 ref[0] ^= r.ref[0];
\n-
114 ref[1] ^= r.ref[1];
\n-
115 ref[2] ^= r.ref[2];
\n+\n+
113 ref[0] ^= r.ref[0];
\n+
114 ref[1] ^= r.ref[1];
\n+
115 ref[2] ^= r.ref[2];
\n
116 return *this;
\n
117}
\n
\n
118
\n
119}
\n
120
\n
references used for checksums.
Definition reference.h:43
\n@@ -191,15 +191,14 @@\n
Creference & operator=(const Creference &r)
assignment of reference
Definition reference.cpp:87
\n
Creference()
default constructor
Definition reference.cpp:46
\n
void randomize()
create a random reference
Definition reference.cpp:54
\n
Creference & operator+=(const Creference &r)
incrementation of reference
\n
bool not_empty()
test non-emptyness
Definition reference.cpp:81
\n
Creference & operator-=(const Creference &r)
decrementation of reference
\n
unsigned int ref[3]
actual data for the reference
Definition reference.h:72
\n-
a circulator that is foreseen to take as template member either a pointer or an iterator;
Definition circulator.h:36
\n \n \n \n
\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by \"doxygen\"/ 1.9.8\n
\n \n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -55,23 +55,23 @@\n 53//---------------------------\n _\b5_\b4void _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\br_\ba_\bn_\bd_\bo_\bm_\bi_\bz_\be(){\n 55// ref[0] = reference_bit;\n 56// ref[1] = 0;\n 57// ref[2] = 0;\n 58// reference_bit <<= 1;\n 59\n-60 unsigned int _\br_\b1 = ranlux_get();\n-61 unsigned int _\br_\b2 = ranlux_get();\n-62 unsigned int _\br_\b3 = ranlux_get();\n-63 unsigned int _\br_\b4 = ranlux_get();\n+60 unsigned int r1 = ranlux_get();\n+61 unsigned int r2 = ranlux_get();\n+62 unsigned int r3 = ranlux_get();\n+63 unsigned int r4 = ranlux_get();\n 64 // since ranlux only produces 24 bits, take r4 and add 8 bits\n 65 // from it to each of r1,r2, r3 to get 3*32 bits.\n-66 _\br_\be_\bf[0] = _\br_\b1+((_\br_\b4 & 0x00ff0000) << 8);\n-67 _\br_\be_\bf[1] = _\br_\b2+((_\br_\b4 & 0x0000ff00) << 16);\n-68 _\br_\be_\bf[2] = _\br_\b3+((_\br_\b4 & 0x000000ff) << 24);\n+66 _\br_\be_\bf[0] = r1+((r4 & 0x00ff0000) << 8);\n+67 _\br_\be_\bf[1] = r2+((r4 & 0x0000ff00) << 16);\n+68 _\br_\be_\bf[2] = r3+((r4 & 0x000000ff) << 24);\n 69\n 70 if (_\bi_\bs_\b__\be_\bm_\bp_\bt_\by()) _\br_\ba_\bn_\bd_\bo_\bm_\bi_\bz_\be();\n 71}\n 72\n 73// test emptyness\n 74//----------------\n _\b7_\b5bool _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\bi_\bs_\b__\be_\bm_\bp_\bt_\by(){\n@@ -82,43 +82,43 @@\n 80//--------------------\n _\b8_\b1bool _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\bn_\bo_\bt_\b__\be_\bm_\bp_\bt_\by(){\n 82 return (_\br_\be_\bf[0]!=0) || (_\br_\be_\bf[1]!=0) || (_\br_\be_\bf[2]!=0);\n 83}\n 84\n 85// assignment of reference\n 86//-------------------------\n-_\b8_\b7_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br){\n-88 _\br_\be_\bf[0] = _\br.ref[0];\n-89 _\br_\be_\bf[1] = _\br.ref[1];\n-90 _\br_\be_\bf[2] = _\br.ref[2];\n+_\b8_\b7_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r){\n+88 _\br_\be_\bf[0] = r._\br_\be_\bf[0];\n+89 _\br_\be_\bf[1] = r._\br_\be_\bf[1];\n+90 _\br_\be_\bf[2] = r._\br_\be_\bf[2];\n 91 return *this;\n 92}\n 93\n 94// addition of reference\n 95//-----------------------\n-_\b9_\b6_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b+_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br){\n-97 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\bt_\bm_\bp = *this;\n-98 return _\bt_\bm_\bp+=_\br;\n+_\b9_\b6_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b+_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r){\n+97 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be tmp = *this;\n+98 return tmp+=r;\n 99}\n 100\n 101// incrementation of reference\n 102//-----------------------------\n-_\b1_\b0_\b3_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b+_\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br){\n-104 _\br_\be_\bf[0] ^= _\br.ref[0];\n-105 _\br_\be_\bf[1] ^= _\br.ref[1];\n-106 _\br_\be_\bf[2] ^= _\br.ref[2];\n+_\b1_\b0_\b3_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b+_\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r){\n+104 _\br_\be_\bf[0] ^= r._\br_\be_\bf[0];\n+105 _\br_\be_\bf[1] ^= r._\br_\be_\bf[1];\n+106 _\br_\be_\bf[2] ^= r._\br_\be_\bf[2];\n 107 return *this;\n 108}\n 109\n 110// decrementation of reference\n 111//-----------------------------\n-_\b1_\b1_\b2_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b-_\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br){\n-113 _\br_\be_\bf[0] ^= _\br.ref[0];\n-114 _\br_\be_\bf[1] ^= _\br.ref[1];\n-115 _\br_\be_\bf[2] ^= _\br.ref[2];\n+_\b1_\b1_\b2_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b-_\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r){\n+113 _\br_\be_\bf[0] ^= r._\br_\be_\bf[0];\n+114 _\br_\be_\bf[1] ^= r._\br_\be_\bf[1];\n+115 _\br_\be_\bf[2] ^= r._\br_\be_\bf[2];\n 116 return *this;\n 117}\n 118\n 119}\n 120\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be\n references used for checksums.\n@@ -155,14 +155,10 @@\n Creference & operator-=(const Creference &r)\n decrementation of reference\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b._\bc_\bp_\bp_\b:_\b1_\b1_\b2\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\br_\be_\bf\n unsigned int ref[3]\n actual data for the reference\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b._\bh_\b:_\b7_\b2\n-_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br\n-a circulator that is foreseen to take as template member either a pointer or an\n-iterator;\n-D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br_\b._\bh_\b:_\b3_\b6\n _\br_\ba_\bn_\bl_\bu_\bx_\b._\bh\n ===============================================================================\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by\u00a0_\b[_\bd_\bo_\bx_\by_\bg_\be_\bn_\b] 1.9.8\n"}]}, {"source1": "./usr/share/doc/siscone-doc-html/html/devel/reference_8h_source.html", "source2": "./usr/share/doc/siscone-doc-html/html/devel/reference_8h_source.html", "unified_diff": "@@ -88,43 +88,43 @@\n
47
\n
49 void randomize();
\n
50
\n
52 bool is_empty();
\n
53
\n
55 bool not_empty();
\n
56
\n-\n+\n
59
\n-\n+\n
62
\n-\n+\n
65
\n-\n+\n
68
\n
70 inline unsigned int operator[] (int i) {return ref[i];}
\n
71
\n
72 unsigned int ref[3];
\n
73};
\n \n
74
\n-\n+
76Creference operator + (Creference &r1, Creference &r2);
\n
77
\n-
79bool operator == (const Creference &r1, const Creference &r2);
\n+
79bool operator == (const Creference &r1, const Creference &r2);
\n
80
\n-
82bool operator != (const Creference &r1, const Creference &r2);
\n+
82bool operator != (const Creference &r1, const Creference &r2);
\n
83
\n-
85bool operator < (const Creference &r1, const Creference &r2);
\n+
85bool operator < (const Creference &r1, const Creference &r2);
\n
86
\n
87
\n
88//=============== inline material ================
\n
89
\n
90// equality test for two references
\n
91//----------------------------------
\n-
92inline bool operator == (const Creference &r1, const Creference &r2){
\n-
93 return (r1.ref[0]==r2.ref[0]) && (r1.ref[1]==r2.ref[1]) && (r1.ref[2]==r2.ref[2]);
\n+
92inline bool operator == (const Creference &r1, const Creference &r2){
\n+
93 return (r1.ref[0]==r2.ref[0]) && (r1.ref[1]==r2.ref[1]) && (r1.ref[2]==r2.ref[2]);
\n
94}
\n
95
\n
96// difference test for two references
\n
97//----------------------------------
\n
98inline bool operator != (const Creference &r1, const Creference &r2){
\n
99 return (r1.ref[0]!=r2.ref[0]) || (r1.ref[1]!=r2.ref[1]) || (r1.ref[2]!=r2.ref[2]);
\n
100}
\n@@ -146,15 +146,14 @@\n
unsigned int operator[](int i)
accessing the reference
Definition reference.h:70
\n
Creference()
default constructor
Definition reference.cpp:46
\n
void randomize()
create a random reference
Definition reference.cpp:54
\n
Creference & operator+=(const Creference &r)
incrementation of reference
\n
bool not_empty()
test non-emptyness
Definition reference.cpp:81
\n
Creference & operator-=(const Creference &r)
decrementation of reference
\n
unsigned int ref[3]
actual data for the reference
Definition reference.h:72
\n-
a circulator that is foreseen to take as template member either a pointer or an iterator;
Definition circulator.h:36
\n \n \n
\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by \"doxygen\"/ 1.9.8\n
\n \n \n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -38,43 +38,43 @@\n 47\n 49 void _\br_\ba_\bn_\bd_\bo_\bm_\bi_\bz_\be();\n 50\n 52 bool _\bi_\bs_\b__\be_\bm_\bp_\bt_\by();\n 53\n 55 bool _\bn_\bo_\bt_\b__\be_\bm_\bp_\bt_\by();\n 56\n-58 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br);\n+58 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r);\n 59\n-61 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b+_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br);\n+61 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b+_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r);\n 62\n-64 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b+_\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br);\n+64 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b+_\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r);\n 65\n-67 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b-_\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br);\n+67 _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be& _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b-_\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r);\n 68\n _\b7_\b0 inline unsigned int _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b[_\b]_\b (int i) {return _\br_\be_\bf[i];}\n 71\n _\b7_\b2 unsigned int _\br_\be_\bf[3];\n 73};\n 74\n-76_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b+_\b (_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br_\b1, _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br_\b2);\n+76_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be operator + (_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r1, _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r2);\n 77\n-79bool _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b=_\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br_\b1, const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br_\b2);\n+79bool operator == (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r1, const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r2);\n 80\n-82bool _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b!_\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br_\b1, const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br_\b2);\n+82bool operator != (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r1, const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r2);\n 83\n-85bool _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b<_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br_\b1, const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br_\b2);\n+85bool operator < (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r1, const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r2);\n 86\n 87\n 88//=============== inline material ================\n 89\n 90// equality test for two references\n 91//----------------------------------\n-92inline bool _\bo_\bp_\be_\br_\ba_\bt_\bo_\br_\b _\b=_\b=_\b (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br_\b1, const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &_\br_\b2){\n-93 return (_\br_\b1.ref[0]==_\br_\b2.ref[0]) && (_\br_\b1.ref[1]==_\br_\b2.ref[1]) && (_\br_\b1.ref\n-[2]==_\br_\b2.ref[2]);\n+92inline bool operator == (const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r1, const _\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be &r2){\n+93 return (r1._\br_\be_\bf[0]==r2._\br_\be_\bf[0]) && (r1._\br_\be_\bf[1]==r2._\br_\be_\bf[1]) && (r1._\br_\be_\bf\n+[2]==r2._\br_\be_\bf[2]);\n 94}\n 95\n 96// difference test for two references\n 97//----------------------------------\n 98inline bool operator != (const Creference &r1, const Creference &r2){\n 99 return (r1.ref[0]!=r2.ref[0]) || (r1.ref[1]!=r2.ref[1]) || (r1.ref\n [2]!=r2.ref[2]);\n@@ -129,13 +129,9 @@\n Creference & operator-=(const Creference &r)\n decrementation of reference\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b._\bc_\bp_\bp_\b:_\b1_\b1_\b2\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b:_\b:_\br_\be_\bf\n unsigned int ref[3]\n actual data for the reference\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\br_\be_\bf_\be_\br_\be_\bn_\bc_\be_\b._\bh_\b:_\b7_\b2\n-_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br\n-a circulator that is foreseen to take as template member either a pointer or an\n-iterator;\n-D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br_\b._\bh_\b:_\b3_\b6\n ===============================================================================\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by\u00a0_\b[_\bd_\bo_\bx_\by_\bg_\be_\bn_\b] 1.9.8\n"}]}, {"source1": "./usr/share/doc/siscone-doc-html/html/devel/siscone_8cpp_source.html", "source2": "./usr/share/doc/siscone-doc-html/html/devel/siscone_8cpp_source.html", "unified_diff": "@@ -111,15 +111,15 @@\n
\n \n
58 rerun_allowed = false;
\n
59}
\n
\n
60
\n
61bool Csiscone::init_done=false;
\n-
62std::ostream* Csiscone::_banner_ostr = &cout;
\n+
62std::ostream* Csiscone::_banner_ostr = &cout;
\n
63
\n
64/*
\n
65 * compute the jets from a given particle set doing multiple passes
\n
66 * such pass N looks for jets among all particles not put into jets
\n
67 * during previous passes.
\n
68 * - _particles list of particles
\n
69 * - _radius cone radius
\n@@ -129,76 +129,76 @@\n
73 * - _split_merge_scale the scale choice for the split-merge procedure
\n
74 * NOTE: using pt leads to IR unsafety for some events with momentum
\n
75 * conservation. So we strongly advise not to change the default
\n
76 * value.
\n
77 * return the number of jets found.
\n
78 **********************************************************************/
\n
\n-\n-
80 int _n_pass_max, double _ptmin,
\n-
81 Esplit_merge_scale _split_merge_scale){
\n+
79int Csiscone::compute_jets(vector<Cmomentum> &_particles, double _radius, double _f,
\n+
80 int _n_pass_max, double _ptmin,
\n+
81 Esplit_merge_scale _split_merge_scale){
\n
82 _initialise_if_needed();
\n
83
\n
84 // run some general safety tests (NB: f will be checked in split-merge)
\n-
85 if (_radius <= 0.0 || _radius >= 0.5*M_PI) {
\n-
86 ostringstream message;
\n-
87 message << "Illegal value for cone radius, R = " << _radius
\n+
85 if (_radius <= 0.0 || _radius >= 0.5*M_PI) {
\n+
86 ostringstream message;
\n+
87 message << "Illegal value for cone radius, R = " << _radius
\n
88 << " (legal values are 0<R<pi/2)";
\n
89 throw Csiscone_error(message.str());
\n
90 }
\n
91
\n
92
\n
93
\n-\n+
94 ptcomparison.split_merge_scale = _split_merge_scale;
\n
95 partial_clear(); // make sure some things are initialised properly
\n
96
\n
97 // init the split_merge algorithm with the initial list of particles
\n
98 // this initialises particle list p_left of remaining particles to deal with
\n-\n+
99 init_particles(_particles);
\n
100
\n-
101 bool finished = false;
\n+
101 bool finished = false;
\n
102
\n
103 rerun_allowed = false;
\n
104 protocones_list.clear();
\n
105
\n
106#ifdef DEBUG_STABLE_CONES
\n-\n-\n+
107 nb_hash_cones_total = 0;
\n+
108 nb_hash_occupied_total = 0;
\n
109#endif
\n
110
\n
111 do{
\n
112 // initialise stable_cone finder
\n
113 // here we use the list of remaining particles
\n
114 // AFTER COLLINEAR CLUSTERING !!!!!!
\n \n
116
\n
117 // get stable cones
\n-\n+
118 if (get_stable_cones(_radius)){
\n
119 // we have some new protocones; add them to candidates
\n
120 // Note that add_protocones has to be called first
\n
121 // if we want the 4-vect components to be available
\n
122 // on top of eta and phi.
\n-\n+
123 add_protocones(&protocones, R2, _ptmin);
\n
124 protocones_list.push_back(protocones);
\n
125#ifdef DEBUG_STABLE_CONES
\n-\n-\n+
126 nb_hash_cones_total += nb_hash_cones;
\n+
127 nb_hash_occupied_total += nb_hash_occupied;
\n
128#endif
\n
129 } else {
\n
130 // no new protocone: leave
\n-
131 finished=true;
\n+
131 finished=true;
\n
132 }
\n
133
\n-
134 _n_pass_max--;
\n-
135 } while ((!finished) && (n_left>0) && (_n_pass_max!=0));
\n+
134 _n_pass_max--;
\n+
135 } while ((!finished) && (n_left>0) && (_n_pass_max!=0));
\n
136
\n
137 rerun_allowed = true;
\n
138
\n
139 // split & merge
\n-
140 return perform(_f, _ptmin);
\n+
140 return perform(_f, _ptmin);
\n
141}
\n
\n
142
\n
143
\n
144/*
\n
145 * compute the jets from a given particle set doing multiple passes
\n
146 * such pass N looks for jets among all particles not put into jets
\n@@ -208,57 +208,57 @@\n
150 * - _n_pass_max maximum number of runs
\n
151 * - _ptmin minimum pT of the protojets
\n
152 * - _ordering_scale the ordering scale to decide which stable
\n
153 * cone is removed
\n
154 * return the number of jets found.
\n
155 **********************************************************************/
\n
\n-\n-
157 int _n_pass_max, double _ptmin,
\n-
158 Esplit_merge_scale _ordering_scale){
\n+
156int Csiscone::compute_jets_progressive_removal(vector<Cmomentum> &_particles, double _radius,
\n+
157 int _n_pass_max, double _ptmin,
\n+
158 Esplit_merge_scale _ordering_scale){
\n
159 _initialise_if_needed();
\n
160
\n
161 // run some general safety tests (NB: f will be checked in split-merge)
\n-
162 if (_radius <= 0.0 || _radius >= 0.5*M_PI) {
\n-
163 ostringstream message;
\n-
164 message << "Illegal value for cone radius, R = " << _radius
\n+
162 if (_radius <= 0.0 || _radius >= 0.5*M_PI) {
\n+
163 ostringstream message;
\n+
164 message << "Illegal value for cone radius, R = " << _radius
\n
165 << " (legal values are 0<R<pi/2)";
\n
166 throw Csiscone_error(message.str());
\n
167 }
\n
168
\n-\n+
169 ptcomparison.split_merge_scale = _ordering_scale;
\n
170 partial_clear(); // make sure some things are initialised properly
\n
171
\n
172 // init the split_merge algorithm with the initial list of particles
\n
173 // this initialises particle list p_left of remaining particles to deal with
\n
174 //
\n
175 // this stores the "processed" particles in p_uncol_hard
\n-\n+
176 init_particles(_particles);
\n
177 jets.clear();
\n
178
\n-
179 bool unclustered_left;
\n+
179 bool unclustered_left;
\n
180 rerun_allowed = false;
\n
181 protocones_list.clear();
\n
182
\n
183 do{
\n
184 //cout << n_left << " particle left" << endl;
\n
185
\n
186 // initialise stable_cone finder
\n
187 // here we use the list of remaining particles
\n
188 // AFTER COLLINEAR CLUSTERING !!!!!!
\n \n
190
\n
191 // get stable cones (stored in 'protocones')
\n-\n+
192 unclustered_left = get_stable_cones(_radius);
\n
193
\n
194 // add the hardest stable cone to the list of jets
\n-\n+
195 if (add_hardest_protocone_to_jets(&protocones, R2, _ptmin)) break;
\n
196
\n-
197 _n_pass_max--;
\n-
198 } while ((unclustered_left) && (n_left>0) && (_n_pass_max!=0));
\n+
197 _n_pass_max--;
\n+
198 } while ((unclustered_left) && (n_left>0) && (_n_pass_max!=0));
\n
199
\n
200 // split & merge
\n
201 return jets.size();
\n
202}
\n
\n
203
\n
204
\n@@ -270,32 +270,32 @@\n
210 * - _split_merge_scale the scale choice for the split-merge procedure
\n
211 * NOTE: using pt leads to IR unsafety for some events with momentum
\n
212 * conservation. So we strongly advise not to change the default
\n
213 * value.
\n
214 * return the number of jets found, -1 if recomputation not allowed.
\n
215 ********************************************************************/
\n
\n-\n-
217 Esplit_merge_scale _split_merge_scale){
\n+
216int Csiscone::recompute_jets(double _f, double _ptmin,
\n+
217 Esplit_merge_scale _split_merge_scale){
\n
218 if (!rerun_allowed)
\n
219 return -1;
\n
220
\n-\n+
221 ptcomparison.split_merge_scale = _split_merge_scale;
\n
222
\n
223 // restore particle list
\n \n
225 init_pleft();
\n
226
\n
227 // initialise split/merge algorithm
\n
228 unsigned int i;
\n
229 for (i=0;i<protocones_list.size();i++)
\n-\n+
230 add_protocones(&(protocones_list[i]), R2, _ptmin);
\n
231
\n
232 // split & merge
\n-
233 return perform(_f, _ptmin);
\n+
233 return perform(_f, _ptmin);
\n
234}
\n
\n
235
\n
236// ensure things are initialised
\n
237void Csiscone::_initialise_if_needed(){
\n
238 // initialise random number generator
\n
239 if (init_done) return;
\n@@ -304,32 +304,32 @@\n
242 ranlux_init();
\n
243
\n
244 // do not do this again
\n
245 init_done=true;
\n
246
\n
247 // print the banner
\n
248 if (_banner_ostr != 0){
\n-
249 ios::fmtflags flags_to_restore(_banner_ostr->flags());
\n+
249 ios::fmtflags flags_to_restore(_banner_ostr->flags());
\n
250
\n-
251 (*_banner_ostr) << "#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" << endl;
\n-
252 (*_banner_ostr) << "# SISCone version " << setw(28) << left << siscone_version() << "o" << endl;
\n-
253 (*_banner_ostr) << "# http://projects.hepforge.org/siscone o" << endl;
\n-
254 (*_banner_ostr) << "# o" << endl;
\n-
255 (*_banner_ostr) << "# This is SISCone: the Seedless Infrared Safe Cone Jet Algorithm o" << endl;
\n-
256 (*_banner_ostr) << "# SISCone was written by Gavin Salam and Gregory Soyez o" << endl;
\n-
257 (*_banner_ostr) << "# It is released under the terms of the GNU General Public License o" << endl;
\n-
258 (*_banner_ostr) << "# o" << endl;
\n-
259 (*_banner_ostr) << "# A description of the algorithm is available in the publication o" << endl;
\n-
260 (*_banner_ostr) << "# JHEP 05 (2007) 086 [arXiv:0704.0292 (hep-ph)]. o" << endl;
\n-
261 (*_banner_ostr) << "# Please cite it if you use SISCone. o" << endl;
\n-
262 (*_banner_ostr) << "#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" << endl;
\n-
263 (*_banner_ostr) << endl;
\n+
251 (*_banner_ostr) << "#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" << endl;
\n+
252 (*_banner_ostr) << "# SISCone version " << setw(28) << left << siscone_version() << "o" << endl;
\n+
253 (*_banner_ostr) << "# http://projects.hepforge.org/siscone o" << endl;
\n+
254 (*_banner_ostr) << "# o" << endl;
\n+
255 (*_banner_ostr) << "# This is SISCone: the Seedless Infrared Safe Cone Jet Algorithm o" << endl;
\n+
256 (*_banner_ostr) << "# SISCone was written by Gavin Salam and Gregory Soyez o" << endl;
\n+
257 (*_banner_ostr) << "# It is released under the terms of the GNU General Public License o" << endl;
\n+
258 (*_banner_ostr) << "# o" << endl;
\n+
259 (*_banner_ostr) << "# A description of the algorithm is available in the publication o" << endl;
\n+
260 (*_banner_ostr) << "# JHEP 05 (2007) 086 [arXiv:0704.0292 (hep-ph)]. o" << endl;
\n+
261 (*_banner_ostr) << "# Please cite it if you use SISCone. o" << endl;
\n+
262 (*_banner_ostr) << "#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" << endl;
\n+
263 (*_banner_ostr) << endl;
\n
264
\n
265 _banner_ostr->flush();
\n-
266 _banner_ostr->flags(flags_to_restore);
\n+
266 _banner_ostr->flags(flags_to_restore);
\n
267 }
\n
268}
\n
269
\n
270// finally, a bunch of functions to access to
\n
271// basic information (package name, version)
\n
272//---------------------------------------------
\n
273
\n@@ -373,15 +373,14 @@\n
std::vector< Cmomentum > p_uncol_hard
list of particles remaining with collinear clustering
\n
std::vector< Cjet > jets
list of jets
\n
int init_particles(std::vector< Cmomentum > &_particles)
initialisation function for particle list
\n
void init(std::vector< Cmomentum > &_particle_list)
initialisation
\n
std::vector< Cmomentum > protocones
list of stable cones
Definition protocones.h:109
\n
double R2
cone radius SQUARED
Definition protocones.h:125
\n
int get_stable_cones(double _radius)
compute stable cones.
\n-
a circulator that is foreseen to take as template member either a pointer or an iterator;
Definition circulator.h:36
\n \n \n \n \n
\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by \"doxygen\"/ 1.9.8\n
\n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -58,15 +58,15 @@\n 55// default dtor\n 56//--------------\n _\b5_\b7_\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\b~_\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be(){\n 58 rerun_allowed = false;\n 59}\n 60\n 61bool _\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bi_\bn_\bi_\bt_\b__\bd_\bo_\bn_\be=false;\n-62std::ostream* Csiscone::_banner_ostr = &_\bc_\bo_\bu_\bt;\n+62std::ostream* Csiscone::_banner_ostr = &cout;\n 63\n 64/*\n 65 * compute the jets from a given particle set doing multiple passes\n 66 * such pass N looks for jets among all particles not put into jets\n 67 * during previous passes.\n 68 * - _particles list of particles\n 69 * - _radius cone radius\n@@ -75,77 +75,77 @@\n 72 * - _ptmin minimum pT of the protojets\n 73 * - _split_merge_scale the scale choice for the split-merge procedure\n 74 * NOTE: using pt leads to IR unsafety for some events with momentum\n 75 * conservation. So we strongly advise not to change the default\n 76 * value.\n 77 * return the number of jets found.\n 78 **********************************************************************/\n-_\b7_\b9int _\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bo_\bm_\bp_\bu_\bt_\be_\b__\bj_\be_\bt_\bs(_\bv_\be_\bc_\bt_\bo_\br_\b<_\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm_\b> &_\b__\bp_\ba_\br_\bt_\bi_\bc_\bl_\be_\bs, double _\b__\br_\ba_\bd_\bi_\bu_\bs,\n-double _\b__\bf,\n-80 int _\b__\bn_\b__\bp_\ba_\bs_\bs_\b__\bm_\ba_\bx, double _\b__\bp_\bt_\bm_\bi_\bn,\n-81 Esplit_merge_scale _\b__\bs_\bp_\bl_\bi_\bt_\b__\bm_\be_\br_\bg_\be_\b__\bs_\bc_\ba_\bl_\be){\n+_\b7_\b9int _\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bo_\bm_\bp_\bu_\bt_\be_\b__\bj_\be_\bt_\bs(vector &_particles, double _radius,\n+double _f,\n+80 int _n_pass_max, double _ptmin,\n+81 Esplit_merge_scale _split_merge_scale){\n 82 _initialise_if_needed();\n 83\n 84 // run some general safety tests (NB: f will be checked in split-merge)\n-85 if (_\b__\br_\ba_\bd_\bi_\bu_\bs_\b _\b<_\b=_\b _\b0_\b._\b0_\b _\b|_\b|_\b _\b__\br_\ba_\bd_\bi_\bu_\bs_\b _\b>= 0.5*M_PI) {\n-86 _\bo_\bs_\bt_\br_\bi_\bn_\bg_\bs_\bt_\br_\be_\ba_\bm message;\n-87 message << \"Illegal value for cone radius, R = \" << _\b__\br_\ba_\bd_\bi_\bu_\bs\n+85 if (_radius <= 0.0 || _radius >= 0.5*M_PI) {\n+86 ostringstream message;\n+87 message << \"Illegal value for cone radius, R = \" << _radius\n 88 << \" (legal values are 00) && (_\b__\bn_\b__\bp_\ba_\bs_\bs_\b__\bm_\ba_\bx!=0));\n+134 _n_pass_max--;\n+135 } while ((!finished) && (_\bn_\b__\bl_\be_\bf_\bt>0) && (_n_pass_max!=0));\n 136\n 137 rerun_allowed = true;\n 138\n 139 // split & merge\n-140 return _\bp_\be_\br_\bf_\bo_\br_\bm(_\b__\bf, _\b__\bp_\bt_\bm_\bi_\bn);\n+140 return _\bp_\be_\br_\bf_\bo_\br_\bm(_f, _ptmin);\n 141}\n 142\n 143\n 144/*\n 145 * compute the jets from a given particle set doing multiple passes\n 146 * such pass N looks for jets among all particles not put into jets\n 147 * during previous passes.\n@@ -153,59 +153,59 @@\n 149 * - _radius cone radius\n 150 * - _n_pass_max maximum number of runs\n 151 * - _ptmin minimum pT of the protojets\n 152 * - _ordering_scale the ordering scale to decide which stable\n 153 * cone is removed\n 154 * return the number of jets found.\n 155 **********************************************************************/\n-_\b1_\b5_\b6int _\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bo_\bm_\bp_\bu_\bt_\be_\b__\bj_\be_\bt_\bs_\b__\bp_\br_\bo_\bg_\br_\be_\bs_\bs_\bi_\bv_\be_\b__\br_\be_\bm_\bo_\bv_\ba_\bl(_\bv_\be_\bc_\bt_\bo_\br_\b<_\bC_\bm_\bo_\bm_\be_\bn_\bt_\bu_\bm_\b>\n-&_\b__\bp_\ba_\br_\bt_\bi_\bc_\bl_\be_\bs, double _\b__\br_\ba_\bd_\bi_\bu_\bs,\n-157 int _\b__\bn_\b__\bp_\ba_\bs_\bs_\b__\bm_\ba_\bx, double _\b__\bp_\bt_\bm_\bi_\bn,\n-158 Esplit_merge_scale _\b__\bo_\br_\bd_\be_\br_\bi_\bn_\bg_\b__\bs_\bc_\ba_\bl_\be){\n+_\b1_\b5_\b6int _\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bo_\bm_\bp_\bu_\bt_\be_\b__\bj_\be_\bt_\bs_\b__\bp_\br_\bo_\bg_\br_\be_\bs_\bs_\bi_\bv_\be_\b__\br_\be_\bm_\bo_\bv_\ba_\bl(vector\n+&_particles, double _radius,\n+157 int _n_pass_max, double _ptmin,\n+158 Esplit_merge_scale _ordering_scale){\n 159 _initialise_if_needed();\n 160\n 161 // run some general safety tests (NB: f will be checked in split-merge)\n-162 if (_\b__\br_\ba_\bd_\bi_\bu_\bs_\b _\b<_\b=_\b _\b0_\b._\b0_\b _\b|_\b|_\b _\b__\br_\ba_\bd_\bi_\bu_\bs_\b _\b>= 0.5*M_PI) {\n-163 _\bo_\bs_\bt_\br_\bi_\bn_\bg_\bs_\bt_\br_\be_\ba_\bm message;\n-164 message << \"Illegal value for cone radius, R = \" << _\b__\br_\ba_\bd_\bi_\bu_\bs\n+162 if (_radius <= 0.0 || _radius >= 0.5*M_PI) {\n+163 ostringstream message;\n+164 message << \"Illegal value for cone radius, R = \" << _radius\n 165 << \" (legal values are 00) && (_\b__\bn_\b__\bp_\ba_\bs_\bs_\b__\bm_\ba_\bx!=0));\n+197 _n_pass_max--;\n+198 } while ((unclustered_left) && (_\bn_\b__\bl_\be_\bf_\bt>0) && (_n_pass_max!=0));\n 199\n 200 // split & merge\n 201 return _\bj_\be_\bt_\bs.size();\n 202}\n 203\n 204\n 205/*\n@@ -215,32 +215,32 @@\n 209 * - _ptmin minimum pT of the protojets\n 210 * - _split_merge_scale the scale choice for the split-merge procedure\n 211 * NOTE: using pt leads to IR unsafety for some events with momentum\n 212 * conservation. So we strongly advise not to change the default\n 213 * value.\n 214 * return the number of jets found, -1 if recomputation not allowed.\n 215 ********************************************************************/\n-_\b2_\b1_\b6int _\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\br_\be_\bc_\bo_\bm_\bp_\bu_\bt_\be_\b__\bj_\be_\bt_\bs(double _\b__\bf, double _\b__\bp_\bt_\bm_\bi_\bn,\n-217 Esplit_merge_scale _\b__\bs_\bp_\bl_\bi_\bt_\b__\bm_\be_\br_\bg_\be_\b__\bs_\bc_\ba_\bl_\be){\n+_\b2_\b1_\b6int _\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\br_\be_\bc_\bo_\bm_\bp_\bu_\bt_\be_\b__\bj_\be_\bt_\bs(double _f, double _ptmin,\n+217 Esplit_merge_scale _split_merge_scale){\n 218 if (!rerun_allowed)\n 219 return -1;\n 220\n-221 _\bp_\bt_\bc_\bo_\bm_\bp_\ba_\br_\bi_\bs_\bo_\bn._\bs_\bp_\bl_\bi_\bt_\b__\bm_\be_\br_\bg_\be_\b__\bs_\bc_\ba_\bl_\be = _\b__\bs_\bp_\bl_\bi_\bt_\b__\bm_\be_\br_\bg_\be_\b__\bs_\bc_\ba_\bl_\be;\n+221 _\bp_\bt_\bc_\bo_\bm_\bp_\ba_\br_\bi_\bs_\bo_\bn._\bs_\bp_\bl_\bi_\bt_\b__\bm_\be_\br_\bg_\be_\b__\bs_\bc_\ba_\bl_\be = _split_merge_scale;\n 222\n 223 // restore particle list\n 224 _\bp_\ba_\br_\bt_\bi_\ba_\bl_\b__\bc_\bl_\be_\ba_\br();\n 225 _\bi_\bn_\bi_\bt_\b__\bp_\bl_\be_\bf_\bt();\n 226\n 227 // initialise split/merge algorithm\n 228 unsigned int i;\n 229 for (i=0;i<_\bp_\br_\bo_\bt_\bo_\bc_\bo_\bn_\be_\bs_\b__\bl_\bi_\bs_\bt.size();i++)\n-230 _\ba_\bd_\bd_\b__\bp_\br_\bo_\bt_\bo_\bc_\bo_\bn_\be_\bs(&(_\bp_\br_\bo_\bt_\bo_\bc_\bo_\bn_\be_\bs_\b__\bl_\bi_\bs_\bt[i]), _\bR_\b2, _\b__\bp_\bt_\bm_\bi_\bn);\n+230 _\ba_\bd_\bd_\b__\bp_\br_\bo_\bt_\bo_\bc_\bo_\bn_\be_\bs(&(_\bp_\br_\bo_\bt_\bo_\bc_\bo_\bn_\be_\bs_\b__\bl_\bi_\bs_\bt[i]), _\bR_\b2, _ptmin);\n 231\n 232 // split & merge\n-233 return _\bp_\be_\br_\bf_\bo_\br_\bm(_\b__\bf, _\b__\bp_\bt_\bm_\bi_\bn);\n+233 return _\bp_\be_\br_\bf_\bo_\br_\bm(_f, _ptmin);\n 234}\n 235\n 236// ensure things are initialised\n 237void Csiscone::_initialise_if_needed(){\n 238 // initialise random number generator\n 239 if (_\bi_\bn_\bi_\bt_\b__\bd_\bo_\bn_\be) return;\n 240\n@@ -248,40 +248,40 @@\n 242 ranlux_init();\n 243\n 244 // do not do this again\n 245 _\bi_\bn_\bi_\bt_\b__\bd_\bo_\bn_\be=true;\n 246\n 247 // print the banner\n 248 if (_banner_ostr != 0){\n-249 ios::fmtflags _\bf_\bl_\ba_\bg_\bs_\b__\bt_\bo_\b__\br_\be_\bs_\bt_\bo_\br_\be(_banner_ostr->flags());\n+249 ios::fmtflags flags_to_restore(_banner_ostr->flags());\n 250\n 251 (*_banner_ostr) <<\n-\"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" << _\be_\bn_\bd_\bl;\n-252 (*_banner_ostr) << \"# SISCone version \" << _\bs_\be_\bt_\bw(28) << _\bl_\be_\bf_\bt <<\n-siscone_version() << \"o\" << _\be_\bn_\bd_\bl;\n-253 (*_banner_ostr) << \"# http://projects.hepforge.org/siscone o\" << _\be_\bn_\bd_\bl;\n-254 (*_banner_ostr) << \"# o\" << _\be_\bn_\bd_\bl;\n+\"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" << endl;\n+252 (*_banner_ostr) << \"# SISCone version \" << setw(28) << left <<\n+siscone_version() << \"o\" << endl;\n+253 (*_banner_ostr) << \"# http://projects.hepforge.org/siscone o\" << endl;\n+254 (*_banner_ostr) << \"# o\" << endl;\n 255 (*_banner_ostr) << \"# This is SISCone: the Seedless Infrared Safe Cone Jet\n-Algorithm o\" << _\be_\bn_\bd_\bl;\n+Algorithm o\" << endl;\n 256 (*_banner_ostr) << \"# SISCone was written by Gavin Salam and Gregory Soyez\n-o\" << _\be_\bn_\bd_\bl;\n+o\" << endl;\n 257 (*_banner_ostr) << \"# It is released under the terms of the GNU General\n-Public License o\" << _\be_\bn_\bd_\bl;\n-258 (*_banner_ostr) << \"# o\" << _\be_\bn_\bd_\bl;\n+Public License o\" << endl;\n+258 (*_banner_ostr) << \"# o\" << endl;\n 259 (*_banner_ostr) << \"# A description of the algorithm is available in the\n-publication o\" << _\be_\bn_\bd_\bl;\n+publication o\" << endl;\n 260 (*_banner_ostr) << \"# JHEP 05 (2007) 086 [arXiv:0704.0292 (hep-ph)]. o\" <<\n-_\be_\bn_\bd_\bl;\n-261 (*_banner_ostr) << \"# Please cite it if you use SISCone. o\" << _\be_\bn_\bd_\bl;\n+endl;\n+261 (*_banner_ostr) << \"# Please cite it if you use SISCone. o\" << endl;\n 262 (*_banner_ostr) <<\n-\"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" << _\be_\bn_\bd_\bl;\n-263 (*_banner_ostr) << _\be_\bn_\bd_\bl;\n+\"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" << endl;\n+263 (*_banner_ostr) << endl;\n 264\n 265 _banner_ostr->flush();\n-266 _banner_ostr->flags(_\bf_\bl_\ba_\bg_\bs_\b__\bt_\bo_\b__\br_\be_\bs_\bt_\bo_\br_\be);\n+266 _banner_ostr->flags(flags_to_restore);\n 267 }\n 268}\n 269\n 270// finally, a bunch of functions to access to\n 271// basic information (package name, version)\n 272//---------------------------------------------\n 273\n@@ -403,15 +403,11 @@\n double R2\n cone radius SQUARED\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bp_\br_\bo_\bt_\bo_\bc_\bo_\bn_\be_\bs_\b._\bh_\b:_\b1_\b2_\b5\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\bs_\bt_\ba_\bb_\bl_\be_\b__\bc_\bo_\bn_\be_\bs_\b:_\b:_\bg_\be_\bt_\b__\bs_\bt_\ba_\bb_\bl_\be_\b__\bc_\bo_\bn_\be_\bs\n int get_stable_cones(double _radius)\n compute stable cones.\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bp_\br_\bo_\bt_\bo_\bc_\bo_\bn_\be_\bs_\b._\bc_\bp_\bp_\b:_\b1_\b4_\b1\n-_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br\n-a circulator that is foreseen to take as template member either a pointer or an\n-iterator;\n-D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br_\b._\bh_\b:_\b3_\b6\n _\bd_\be_\bf_\bi_\bn_\be_\bs_\b._\bh\n _\br_\ba_\bn_\bl_\bu_\bx_\b._\bh\n ===============================================================================\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by\u00a0_\b[_\bd_\bo_\bx_\by_\bg_\be_\bn_\b] 1.9.8\n"}]}, {"source1": "./usr/share/doc/siscone-doc-html/html/devel/siscone__error_8h_source.html", "source2": "./usr/share/doc/siscone-doc-html/html/devel/siscone__error_8h_source.html", "unified_diff": "@@ -86,25 +86,25 @@\n
35
\n
\n \n
39public:
\n \n
42
\n
\n-
45 Csiscone_error(const std::string & message_in) {
\n-
46 m_message = message_in;
\n-
47 if (m_print_errors) std::cerr << "siscone::Csiscone_error: "<< message_in << std::endl;
\n+
45 Csiscone_error(const std::string & message_in) {
\n+
46 m_message = message_in;
\n+
47 if (m_print_errors) std::cerr << "siscone::Csiscone_error: "<< message_in << std::endl;
\n
48 };
\n
\n
49
\n
51 std::string message() const {return m_message;};
\n
52
\n
\n-
55 static void setm_print_errors(bool print_errors) {
\n-
56 m_print_errors = print_errors;};
\n+
55 static void setm_print_errors(bool print_errors) {
\n+
56 m_print_errors = print_errors;};
\n
\n
57
\n
58private:
\n
59 std::string m_message;
\n
60 static bool m_print_errors;
\n
61};
\n
\n@@ -112,15 +112,14 @@\n
63}
\n
64#endif
\n
class corresponding to errors that will be thrown by siscone
\n
Csiscone_error()
default ctor
\n
Csiscone_error(const std::string &message_in)
ctor with a given error message
\n
std::string message() const
access to the error message
\n
static void setm_print_errors(bool print_errors)
switch on/off the error message printing
\n-
a circulator that is foreseen to take as template member either a pointer or an iterator;
Definition circulator.h:36
\n \n \n
\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by \"doxygen\"/ 1.9.8\n
\n \n \n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -35,24 +35,24 @@\n 33\n 34namespace siscone{\n 35\n _\b3_\b8class _\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b__\be_\br_\br_\bo_\br {\n 39public:\n _\b4_\b1 _\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b__\be_\br_\br_\bo_\br() {;};\n 42\n-_\b4_\b5 _\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b__\be_\br_\br_\bo_\br(const std::string & _\bm_\be_\bs_\bs_\ba_\bg_\be_\b__\bi_\bn) {\n-46 m_message = _\bm_\be_\bs_\bs_\ba_\bg_\be_\b__\bi_\bn;\n-47 if (m_print_errors) std::cerr << \"siscone::Csiscone_error: \"<< _\bm_\be_\bs_\bs_\ba_\bg_\be_\b__\bi_\bn <<\n+_\b4_\b5 _\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b__\be_\br_\br_\bo_\br(const std::string & message_in) {\n+46 m_message = message_in;\n+47 if (m_print_errors) std::cerr << \"siscone::Csiscone_error: \"<< message_in <<\n std::endl;\n 48 };\n 49\n _\b5_\b1 std::string _\bm_\be_\bs_\bs_\ba_\bg_\be() const {return m_message;};\n 52\n-_\b5_\b5 static void _\bs_\be_\bt_\bm_\b__\bp_\br_\bi_\bn_\bt_\b__\be_\br_\br_\bo_\br_\bs(bool _\bp_\br_\bi_\bn_\bt_\b__\be_\br_\br_\bo_\br_\bs) {\n-56 m_print_errors = _\bp_\br_\bi_\bn_\bt_\b__\be_\br_\br_\bo_\br_\bs;};\n+_\b5_\b5 static void _\bs_\be_\bt_\bm_\b__\bp_\br_\bi_\bn_\bt_\b__\be_\br_\br_\bo_\br_\bs(bool print_errors) {\n+56 m_print_errors = print_errors;};\n 57\n 58private:\n 59 std::string m_message;\n 60 static bool m_print_errors;\n 61};\n 62\n 63}\n@@ -72,13 +72,9 @@\n std::string message() const\n access to the error message\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b__\be_\br_\br_\bo_\br_\b._\bh_\b:_\b5_\b1\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b__\be_\br_\br_\bo_\br_\b:_\b:_\bs_\be_\bt_\bm_\b__\bp_\br_\bi_\bn_\bt_\b__\be_\br_\br_\bo_\br_\bs\n static void setm_print_errors(bool print_errors)\n switch on/off the error message printing\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b__\be_\br_\br_\bo_\br_\b._\bh_\b:_\b5_\b5\n-_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br\n-a circulator that is foreseen to take as template member either a pointer or an\n-iterator;\n-D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bc_\bi_\br_\bc_\bu_\bl_\ba_\bt_\bo_\br_\b._\bh_\b:_\b3_\b6\n ===============================================================================\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by\u00a0_\b[_\bd_\bo_\bx_\by_\bg_\be_\bn_\b] 1.9.8\n"}]}, {"source1": "./usr/share/doc/siscone-doc-html/html/devel/spherical_2geom__2d_8cpp_source.html", "source2": "./usr/share/doc/siscone-doc-html/html/devel/spherical_2geom__2d_8cpp_source.html", "unified_diff": "@@ -226,20 +226,21 @@\n
166const CSphtheta_phi_range range_union (const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2){
\n
167 CSphtheta_phi_range tmp;
\n
168
\n
169 // compute union in eta
\n
170 tmp.theta_range = r1.theta_range | r2.theta_range;
\n
171
\n
172 // compute union in phi
\n-
173 tmp.phi_range = r1.phi_range | r2.phi_range;
\n+
173 tmp.phi_range = r1.phi_range | r2.phi_range;
\n
174
\n
175 return tmp;
\n
176}
\n
177
\n
178}
\n+
unsigned int phi_range
phi range as a binary coding of covered cells
Definition geom_2d.h:146
\n
class for holding a covering range in eta-phi
Definition geom_2d.h:52
\n
int add_particle(const double theta, const double phi)
add a particle to the range
Definition geom_2d.cpp:130
\n
CSphtheta_phi_range & operator=(const CSphtheta_phi_range &r)
assignment of range
Definition geom_2d.cpp:118
\n
static double theta_max
maximal value for theta (set to pi)
Definition geom_2d.h:82
\n
unsigned int theta_range
theta range as a binary coding of covered cells
Definition geom_2d.h:75
\n
static double theta_min
extremal value for theta
Definition geom_2d.h:81
\n \n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -175,20 +175,24 @@\n CSphtheta_phi_range &r2){\n 167 CSphtheta_phi_range tmp;\n 168\n 169 // compute union in eta\n 170 tmp.theta_range = r1.theta_range | r2.theta_range;\n 171\n 172 // compute union in phi\n-173 tmp.phi_range = r1.phi_range | r2.phi_range;\n+173 tmp._\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be = r1.phi_range | r2.phi_range;\n 174\n 175 return tmp;\n 176}\n 177\n 178}\n+_\bs_\bi_\bs_\bc_\bo_\bn_\be_\b:_\b:_\bC_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be_\b:_\b:_\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be\n+unsigned int phi_range\n+phi range as a binary coding of covered cells\n+D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bg_\be_\bo_\bm_\b__\b2_\bd_\b._\bh_\b:_\b1_\b4_\b6\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b__\bs_\bp_\bh_\be_\br_\bi_\bc_\ba_\bl_\b:_\b:_\bC_\bS_\bp_\bh_\bt_\bh_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be\n class for holding a covering range in eta-phi\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bg_\be_\bo_\bm_\b__\b2_\bd_\b._\bh_\b:_\b5_\b2\n _\bs_\bi_\bs_\bc_\bo_\bn_\be_\b__\bs_\bp_\bh_\be_\br_\bi_\bc_\ba_\bl_\b:_\b:_\bC_\bS_\bp_\bh_\bt_\bh_\be_\bt_\ba_\b__\bp_\bh_\bi_\b__\br_\ba_\bn_\bg_\be_\b:_\b:_\ba_\bd_\bd_\b__\bp_\ba_\br_\bt_\bi_\bc_\bl_\be\n int add_particle(const double theta, const double phi)\n add a particle to the range\n D\bDe\bef\bfi\bin\bni\bit\bti\bio\bon\bn _\bg_\be_\bo_\bm_\b__\b2_\bd_\b._\bc_\bp_\bp_\b:_\b1_\b3_\b0\n"}]}]}]}]}, {"source1": "siscone-doc-pdf_3.0.5-3_all.deb", "source2": "siscone-doc-pdf_3.0.5-3_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 2025-01-07 11:57:28.000000 debian-binary\n -rw-r--r-- 0 0 0 808 2025-01-07 11:57:28.000000 control.tar.xz\n--rw-r--r-- 0 0 0 1649624 2025-01-07 11:57:28.000000 data.tar.xz\n+-rw-r--r-- 0 0 0 1645344 2025-01-07 11:57:28.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-3\n Architecture: all\n Maintainer: Debian Science Maintainers \n-Installed-Size: 1622\n+Installed-Size: 1618\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 2025-01-07 11:57:28.000000 ./usr/share/\n drwxr-xr-x 0 root (0) root (0) 0 2025-01-07 11:57:28.000000 ./usr/share/doc/\n drwxr-xr-x 0 root (0) root (0) 0 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-pdf/\n -rw-r--r-- 0 root (0) root (0) 1083 2025-01-07 11:57:28.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 2025-01-07 11:56:31.000000 ./usr/share/doc/siscone-doc-pdf/copyright\n drwxr-xr-x 0 root (0) root (0) 0 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-pdf/pdf/\n--rw-r--r-- 0 root (0) root (0) 1629649 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-pdf/pdf/refman.pdf.gz\n+-rw-r--r-- 0 root (0) root (0) 1625405 2025-01-07 11:57:28.000000 ./usr/share/doc/siscone-doc-pdf/pdf/refman.pdf.gz\n drwxr-xr-x 0 root (0) root (0) 0 2025-01-07 11:57:28.000000 ./usr/share/doc-base/\n -rw-r--r-- 0 root (0) root (0) 240 2025-01-07 11:56:31.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": "@@ -1683,66 +1683,66 @@\n 5.14.1.4 PT_TSHOLD\n \n . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 201\n \n 5.14.2 Variable Documentation . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 201\n 5.14.2.1 twopi . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 201\n 5.15 defines.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 201\n-5.16 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 202\n-5.17 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 204\n-5.18 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 204\n-5.19 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 207\n-5.20 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 210\n-5.21 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 211\n-5.22 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 211\n-5.23 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 213\n-5.24 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 217\n-5.25 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 226\n-5.26 quadtree.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 236\n-5.27 quadtree.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 240\n-5.28 ranlux.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 240\n-5.29 siscone/ranlux.h File Reference . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n-5.29.1 Function Documentation . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n-5.29.1.1 ranlux_get() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n-5.29.1.2 ranlux_init() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n-5.29.1.3 ranlux_print_state() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n-5.30 ranlux.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 244\n-5.31 reference.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 244\n-5.32 reference.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 246\n-5.33 siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 247\n-5.34 siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 250\n-5.35 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 254\n-5.36 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 255\n-5.37 siscone_error.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 256\n-5.38 siscone_error.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 256\n-5.39 geom_2d.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 257\n-5.40 geom_2d.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 259\n-5.41 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 261\n-5.42 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 262\n+5.16 geom_2d.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 202\n+5.17 geom_2d.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 204\n+5.18 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 206\n+5.19 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 209\n+5.20 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 211\n+5.21 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 212\n+5.22 quadtree.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 213\n+5.23 quadtree.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 216\n+5.24 ranlux.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 217\n+5.25 siscone/ranlux.h File Reference . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 220\n+5.25.1 Function Documentation . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 220\n+5.25.1.1 ranlux_get() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 220\n+5.25.1.2 ranlux_init() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 220\n+5.25.1.3 ranlux_print_state() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 220\n+5.26 ranlux.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 221\n+5.27 reference.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 221\n+5.28 reference.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 223\n+5.29 siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 224\n+5.30 siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 227\n+5.31 siscone_error.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 231\n+5.32 siscone_error.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 231\n+5.33 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 232\n+5.34 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 233\n+5.35 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 234\n+5.36 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 236\n+5.37 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 240\n+5.38 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 241\n+5.39 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n+5.40 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 253\n+5.41 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 262\n+5.42 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 264\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \fxvi\n \n-5.43 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 264\n-5.44 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 266\n+5.43 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 266\n+5.44 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 267\n 5.45 split_merge.cpp\n \n . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 268\n \n 5.46 split_merge.cpp\n \n . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 282\n \n-5.47 vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 296\n-5.48 vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 297\n-5.49 split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 298\n-5.50 split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 301\n-5.51 vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 304\n-5.52 vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 307\n+5.47 split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 296\n+5.48 split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 298\n+5.49 vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 301\n+5.50 vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 304\n+5.51 vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 308\n+5.52 vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 309\n Index\n \n 311\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \fChapter 1\n@@ -2023,35 +2023,35 @@\n 188\n 191\n 195\n 196\n 197\n 198\n 199\n-257\n 202\n-204\n-210\n+232\n+206\n 211\n-261\n-217\n-264\n-236\n-240\n+234\n 240\n 243\n-244\n-246\n-247\n-254\n-256\n-256\n+262\n+213\n+216\n+217\n+220\n+221\n+223\n+224\n+266\n+231\n+231\n 282\n-301\n-307\n+298\n+304\n \n \f6\n \n File Index\n \n siscone/vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/spherical/geom_2d.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n@@ -2065,29 +2065,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-297\n-259\n+309\n 204\n-207\n-211\n-213\n-262\n-226\n-266\n-250\n-255\n+233\n+209\n+212\n+236\n+241\n+253\n+264\n+227\n+267\n 268\n-298\n-304\n 296\n+301\n+308\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \fChapter 4\n \n Class Documentation\n \n@@ -15575,330 +15575,541 @@\n 00125 #endif\n 00126\n 00127 #endif // __DEFINES_H__\n 00128\n \n 5.16\n \n-geom_2d.h\n+geom_2d.cpp\n \n-00001 // -*- C++ -*00003 // File: geom_2d.h\n+00001\n+00002 // File: geom_2d.cpp\n //\n-00004 // Description: header file for two-dimensional geometry tools\n+00003 // Description: source file for two-dimensional geometry tools\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:: 422\n+00023 // $Revision:: 171\n $//\n-00025 // $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)\n+00024 // $Date:: 2007-06-19 16:26:05 +0200 (Tue, 19 Jun 2007)\n $//\n-00027\n-00028 #ifndef __GEOM_2D_H__\n-00029 #define __GEOM_2D_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+00026\n+00027 #include \"geom_2d.h\"\n+00028 #include \n+00029\n+00030 namespace siscone{\n+00031\n+00032 #define PHI_RANGE_MASK 0xFFFFFFFF\n+00033\n+00034 /*********************************************************\n+00035 * class Ceta_phi_range implementation\n+*\n+00036 * class for holding a covering range in eta-phi\n+*\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n-\f5.16 geom_2d.h\n+\f5.16 geom_2d.cpp\n \n-00038\n-00039 namespace siscone{\n-00040\n-00043 inline double phi_in_range(double phi) {\n+00037 *\n+*\n+00038 * This class deals with ranges in the eta-phi plane. It *\n+00039 * implements methods to test if two ranges overlap and *\n+00040 * to take the union of two overlapping intervals.\n+*\n+00041 *********************************************************/\n+00042\n+00043 using namespace std;\n 00044\n-if\n-(phi <= -M_PI) phi += twopi;\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+00045 // static member default init\n+00046 //---------------------------00047 double Ceta_phi_range::eta_min = -100.0;\n+00048 double Ceta_phi_range::eta_max = 100.0;\n+00049\n+00050 // default ctor\n+00051 //-------------00052 Ceta_phi_range::Ceta_phi_range(){\n 00053\n-return phi_in_range(phi1-phi2);\n-00054 }\n-00055\n+eta_range = 0;\n+00054\n+phi_range = 0;\n+00055 }\n 00056\n-00060 inline double abs_dphi(double phi1, double phi2) {\n-00061\n-double delta = fabs(phi1-phi2);\n-00062\n-return delta > M_PI ? twopi-delta : delta;\n-00063 }\n+00057 // ctor with initialisation\n+00058 // we initialise with a centre (in eta,phi) and a radius\n+00059 // - c_eta\n+eta coordinate of the centre\n+00060 // - c_phi\n+phi coordinate of the centre\n+00061 // - R\n+radius\n+00062 //------------------------------------------------------00063 Ceta_phi_range::Ceta_phi_range(double c_eta, double c_phi, double R){\n 00064\n-00066 inline double pow2(double x) {return x*x;}\n+// determination of the eta range\n+00065\n+//------------------------------00066\n+double xmin = max(c_eta-R,eta_min+0.0001);\n 00067\n+double xmax = min(c_eta+R,eta_max-0.0001);\n 00068\n-00073 class Ctwovect {\n-00074 public:\n+00069\n+unsigned int cell_min = get_eta_cell(xmin);\n+00070\n+unsigned int cell_max = get_eta_cell(xmax);\n+00071\n+00072\n+// warning: if cell_max==2^31, 2*cell_max==0 hence,\n+00073\n+// even if the next formula is formally (2*cell_max-cell_min),\n+00074\n+// expressing it as (cell_max-cell_min)+cell_max is safe.\n+00075\n+eta_range = (cell_max-cell_min)+cell_max;\n 00076\n-Ctwovect() : x(0.0), y(0.0) {}\n 00077\n+// determination of the phi range\n+00078\n+// !! taking care of periodicity !!\n+00079\n+//--------------------------------00080\n+xmin = phi_in_range(c_phi-R);\n 00081\n-Ctwovect(double _x, double _y) : x(_x), y(_y) {}\n+xmax = phi_in_range(c_phi+R);\n 00082\n+00083\n+cell_min = get_phi_cell(xmin);\n 00084\n-double x, y;\n+cell_max = get_phi_cell(xmax);\n 00085\n+00086\n+// Also, if the interval goes through pi, inversion is needed\n 00087\n-inline double mod2() const {return pow2(x)+pow2(y);}\n+if (xmax>xmin)\n 00088\n+phi_range = (cell_max-cell_min)+cell_max;\n+00089\n+else {\n 00090\n-inline double modulus() const {return sqrt(mod2());}\n-00091 };\n+phi_range = (cell_min==cell_max)\n+00091\n+? PHI_RANGE_MASK\n 00092\n+: ((PHI_RANGE_MASK^(cell_min-cell_max)) + cell_max);\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+}\n+00094 }\n+00095\n+00096 // assignment of range\n+00097 // - r\n+range to assign to current one\n+00098 //--------------------------------------00099 Ceta_phi_range& Ceta_phi_range::operator = (const Ceta_phi_range &r){\n+00100\n+eta_range = r.eta_range;\n 00101\n+phi_range = r.phi_range;\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+00103\n+return *this;\n+00104 }\n+00105\n+00106 // add a particle to the range\n+00107 // - eta eta coordinate of the particle\n+00108 // - phi phi coordinate of the particle\n+00109 // \\return 0 on success, 1 on error\n+00110 //---------------------------------------00111 int Ceta_phi_range::add_particle(const double eta, const double phi){\n+00112\n+// deal with the eta coordinate\n+00113\n+eta_range |= get_eta_cell(eta);\n+00114\n+00115\n+// deal with the phi coordinate\n+00116\n+phi_range |= get_phi_cell(phi);\n+00117\n+00118\n+return 0;\n+00119 }\n+00120\n+00121\n+00122 // test overlap\n+00123 // - r1 first range\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+203\n+\n+\f204\n+\n+File Documentation\n+\n+00124 // - r2 second range\n+00125 // return true if overlap, false otherwise.\n+00126 //-----------------------------------------00127 bool is_range_overlap(const Ceta_phi_range &r1, const Ceta_phi_range &r2){\n+00128\n+// check overlap in eta AND phi\n+00129\n+return ((r1.eta_range & r2.eta_range) && (r1.phi_range & r2.phi_range));\n+00130 }\n 00131\n-00134\n-Ceta_phi_range& operator = (const Ceta_phi_range &r);\n-00135\n+00132 // compute union\n+00133 // Note: we assume that the two intervals overlap\n+00134 // - r1 first range\n+00135 // - r2 second range\n+00136 // \\return union of the two ranges\n+00137 //-----------------------------------------00138 const Ceta_phi_range range_union (const Ceta_phi_range &r1, const Ceta_phi_range &r2){\n+00139\n+Ceta_phi_range tmp;\n 00140\n-int add_particle(const double eta, const double phi);\n 00141\n+// compute union in eta\n+00142\n+tmp.eta_range = r1.eta_range | r2.eta_range;\n 00143\n-unsigned int eta_range;\n 00144\n+// compute union in phi\n+00145\n+tmp.phi_range = r1.phi_range | r2.phi_range;\n 00146\n-unsigned int phi_range;\n 00147\n-00148\n-// extremal value for eta\n+return tmp;\n+00148 }\n 00149\n-static double eta_min;\n-00150\n-static double eta_max;\n-00151\n-00152 private:\n-00154\n-inline unsigned int get_eta_cell(double eta){\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-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-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-203\n-\n-\f204\n+00150 }\n \n 5.17\n \n-File Documentation\n-\n-geom_2d.h\n+geom_2d.cpp\n \n-00001 // -*- C++ -*00003 // File: geom_2d.h\n+00001\n+00002 // File: geom_2d.cpp\n //\n-00004 // Description: header file for two-dimensional geometry tools\n+00003 // Description: source file for two-dimensional geometry tools\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-//\n-00009 //\n+00007 // For more details, see http://projects.hepforge.org/siscone\n //\n-00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n+00008 //\n //\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:: 422\n+00025 // $Revision:: 378\n $//\n-00027 // $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)\n+00026 // $Date:: 2016-02-24 15:10:38 +0100 (Wed, 24 Feb 2016)\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+00028\n+00029 #include \"geom_2d.h\"\n+00030 #include \n+00031\n+00032 namespace siscone_spherical{\n+00033\n+00034 #define PHI_RANGE_MASK 0xFFFFFFFF\n+00035\n+00036 /*********************************************************\n+00037 * class CSphtheta_phi_range implementation\n+*\n+00038 * class for holding a covering range in eta-phi\n+*\n+00039 *\n+*\n+00040 * This class deals with ranges in the eta-phi plane. It *\n+00041 * implements methods to test if two ranges overlap and *\n+00042 * to take the union of two overlapping intervals.\n+*\n+00043 *********************************************************/\n+00044\n+00045 using namespace std;\n+00046\n+00047 // static member default init\n+00048 //---------------------------00049 double CSphtheta_phi_range::theta_min = 0.0;\n+00050 double CSphtheta_phi_range::theta_max = M_PI;\n+00051\n+00052 // default ctor\n+00053 //-------------00054 CSphtheta_phi_range::CSphtheta_phi_range(){\n+\n+//\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.17 geom_2d.cpp\n+\n 00055\n-CSphtheta_phi_range();\n+theta_range = 0;\n 00056\n-00062\n-CSphtheta_phi_range(double c_theta, double c_phi, double R);\n-00063\n+phi_range = 0;\n+00057 }\n+00058\n+00059 // ctor with initialisation\n+00060 // we initialise with a centre (in eta,phi) and a radius\n+00061 // - c_theta theta coordinate of the centre\n+00062 // - c_phi\n+phi coordinate of the centre\n+00063 // - R\n+radius\n+00064 //------------------------------------------------------00065 CSphtheta_phi_range::CSphtheta_phi_range(double c_theta, double c_phi, double R){\n 00066\n-CSphtheta_phi_range& operator = (const CSphtheta_phi_range &r);\n+// determination of the eta range\n 00067\n+//------------------------------00068\n+double xmin = max(c_theta-R,theta_min+0.00001);\n+00069\n+double xmax = min(c_theta+R,theta_max-0.00001);\n+00070\n+00071\n+unsigned int cell_min = get_theta_cell(xmin);\n 00072\n-int add_particle(const double theta, const double phi);\n+unsigned int cell_max = get_theta_cell(xmax);\n 00073\n+00074\n+// warning: if cell_max==2^31, 2*cell_max==0 hence,\n 00075\n-unsigned int theta_range;\n+// even if the next formula is formally (2*cell_max-cell_min),\n 00076\n+// expressing it as (cell_max-cell_min)+cell_max is safe.\n+00077\n+theta_range = (cell_max-cell_min)+cell_max;\n 00078\n-unsigned int phi_range;\n 00079\n+// determination of the phi range\n+00080\n+// !! taking care of periodicity !!\n 00081\n-static double theta_min;\n+// !! and the theta dependence\n+!!\n 00082\n-static double theta_max;\n-00083\n-00084 private:\n+//--------------------------------00083\n+double ymin,ymax;\n+00084\n+double extra = asin(R/M_PI);\n+00085\n+// if the theta range comes too close to the endpoints (theta=0 or\n 00086\n-inline unsigned int get_theta_cell(double theta){\n+// theta=pi), then keep the full phi range\n 00087\n-if (theta>=theta_max) return 1u\u00ab31;\n+if (xmin<=theta_min+extra){\n 00088\n-return (unsigned int) (1u \u00ab ((int) (32*((theta-theta_min)/(theta_max-theta_min)))));\n+ymin = -M_PI+0.00001;\n 00089\n-}\n+ymax = M_PI-0.00001;\n 00090\n+} else if (xmax>=theta_max-extra){\n+00091\n+ymin = -M_PI+0.00001;\n 00092\n-inline unsigned int get_phi_cell(double phi){\n+ymax = M_PI-0.00001;\n 00093\n-return (unsigned int) (1u \u00ab ((int) (32*phi/twopi+16)%32));\n+} else {\n 00094\n-}\n-00095 };\n+extra = max(1.0/sin(xmin), 1.0/sin(xmax));\n+00095\n+ymin = (c_phi-R)*extra;\n 00096\n-00101 bool is_range_overlap(const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2);\n+while (ymin<-M_PI) ymin+=twopi;\n+00097\n+while (ymin> M_PI) ymin-=twopi;\n+00098\n+ymax = (c_phi-R)*extra;\n+00099\n+while (ymax<-M_PI) ymax+=twopi;\n+00100\n+while (ymax> M_PI) ymax-=twopi;\n+00101\n+}\n 00102\n-00108 const CSphtheta_phi_range range_union(const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2);\n+cell_min = get_phi_cell(ymin);\n+00103\n+cell_max = get_phi_cell(ymax);\n+00104\n+00105\n+// Also, if the interval goes through pi, inversion is needed\n+00106\n+if (ymax>ymin)\n+00107\n+phi_range = (cell_max-cell_min)+cell_max;\n+00108\n+else {\n 00109\n-00110 }\n+phi_range = (cell_min==cell_max)\n+00110\n+? PHI_RANGE_MASK\n 00111\n-00112 #endif\n+: ((PHI_RANGE_MASK^(cell_min-cell_max)) + cell_max);\n+00112\n+}\n+00113 }\n+00114\n+00115 // assignment of range\n+00116 // - r\n+range to assign to current one\n+00117 //--------------------------------------00118 CSphtheta_phi_range& CSphtheta_phi_range::operator = (const CSphtheta_phi_range &r){\n+00119\n+theta_range = r.theta_range;\n+00120\n+phi_range = r.phi_range;\n+00121\n+00122\n+return *this;\n+00123 }\n+00124\n+00125 // add a particle to the range\n+00126 // - eta eta coordinate of the particle\n+00127 // - phi phi coordinate of the particle\n+00128 // \\return 0 on success, 1 on error\n+00129 //---------------------------------------00130 int CSphtheta_phi_range::add_particle(const double theta, const double phi){\n+00131\n+// get the theta cell\n+00132\n+unsigned int theta_cell = get_theta_cell(theta);\n+00133\n+00134\n+// deal with the eta coordinate\n+00135\n+theta_range |= theta_cell;\n+00136\n+00137\n+// deal with the phi coordinate\n+00138\n+//\n+00139\n+// watch out: if the theta_cell includes theta==0 or theta==pi,\n+00140\n+// incude the full phi range\n+00141\n+if ((theta_cell == 0x1) || (theta_cell == 0x80000000))\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+205\n+\n+\f206\n+\n+File Documentation\n+\n+00142\n+phi_range = 0xffffffff;\n+00143\n+else\n+00144\n+phi_range |= get_phi_cell(phi);\n+00145\n+00146\n+return 0;\n+00147 }\n+00148\n+00149\n+00150 // test overlap\n+00151 // - r1 first range\n+00152 // - r2 second range\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+00157\n+return ((r1.theta_range & r2.theta_range) && (r1.phi_range & r2.phi_range));\n+00158 }\n+00159\n+00160 // compute union\n+00161 // Note: we assume that the two intervals overlap\n+00162 // - r1 first range\n+00163 // - r2 second range\n+00164 // \\return union of the two ranges\n+00165 //-----------------------------------------00166 const CSphtheta_phi_range range_union (const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2){\n+00167\n+CSphtheta_phi_range tmp;\n+00168\n+00169\n+// compute union in eta\n+00170\n+tmp.theta_range = r1.theta_range | r2.theta_range;\n+00171\n+00172\n+// compute union in phi\n+00173\n+tmp.phi_range = r1.phi_range | r2.phi_range;\n+00174\n+00175\n+return tmp;\n+00176 }\n+00177\n+00178 }\n \n 5.18\n \n hash.cpp\n \n 00001\n 00002 // File: hash.cpp\n-\n //\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.18 hash.cpp\n-\n 00003 // Description: source file for classes hash_element and hash_cones\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@@ -15957,14 +16168,19 @@\n *\n 00040 * functions to manipulate them.\n *\n 00041 **************************************************************/\n 00042\n 00043 // constructor with initialisation\n 00044 // - _Np number of particles\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.18 hash.cpp\n+\n 00045 // - _R2 cone radius (squared)\n 00046 //----------------------------------00047 hash_cones::hash_cones(int _Np, double _R2){\n 00048\n int i;\n 00049\n 00050\n n_cones = 0;\n@@ -16029,23 +16245,14 @@\n }\n 00087\n }\n 00088\n 00089\n delete[] hash_array;\n 00090 }\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-205\n-\n-\f206\n-\n-File Documentation\n-\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@@ -16106,14 +16313,23 @@\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+207\n+\n+\f208\n+\n+File Documentation\n+\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@@ -16185,21 +16401,14 @@\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.19 hash.cpp\n-\n-207\n-\n 00178\n do{\n 00179\n // if it is not present, add it\n 00180\n if (elm==NULL){\n 00181\n@@ -16261,14 +16470,21 @@\n 00214 * centered at \u2019centre\u2019.\n 00215 * - centre\n centre of the circle\n 00216 * - v\n particle to test\n 00217 * return true if inside, false if outside\n 00218 ******************************************************************************/\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.19 hash.cpp\n+\n+209\n+\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@@ -16334,23 +16550,14 @@\n 00024 //\n //\n 00025 // $Revision:: 294\n $//\n 00026 // $Date:: 2009-05-01 17:15:04 +0200 (Fri, 01 May 2009)\n $//\n 00028\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-//\n-\n-\f208\n-\n-File Documentation\n-\n 00029 #include \n 00030 #include \n 00031 #include \"hash.h\"\n 00032 #include \n 00033\n 00034 namespace siscone_spherical{\n 00035\n@@ -16402,14 +16609,23 @@\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+//\n+\n+\f210\n+\n+File Documentation\n+\n 00070\n //? needed ?\n 00071\n for (i=0;inext;\n 00157\n } while (1);\n 00158\n 00159\n return 1;\n@@ -16631,23 +16847,14 @@\n 00198\n return 0;\n 00199\n }\n 00200\n 00201\n elm = elm->next;\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-209\n-\n-\f210\n-\n-File Documentation\n-\n 00202\n } while (1);\n 00203\n 00204\n return 1;\n 00205 }\n 00206\n@@ -16702,14 +16909,23 @@\n $//\n 00025 // $Date:: 2008-05-16 19:58:30 +0200 (Fri, 16 May 2008)\n $//\n 00027\n 00028 #ifndef __HASH_H__\n 00029 #define __HASH_H__\n 00030\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+211\n+\n+\f212\n+\n+File Documentation\n+\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@@ -16760,22 +16976,16 @@\n 00118\n inline bool is_inside(Cmomentum *centre, Cmomentum *v);\n 00119 };\n 00120\n 00121 }\n 00122 #endif\n \n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.21 hash.h\n-\n 5.21\n \n-211\n-\n hash.h\n \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@@ -16786,15 +16996,14 @@\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@@ -16834,14 +17043,21 @@\n 00036\n 00046 class sph_hash_element{\n 00047 public:\n 00048\n CSph3vector centre;\n 00049\n bool is_stable;\n+\n+//\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.22 quadtree.cpp\n+\n 00050\n 00051\n sph_hash_element *next;\n 00052 };\n 00053\n 00061 class sph_hash_cones{\n 00062 public:\n@@ -16879,41 +17095,2873 @@\n 00110 };\n 00111\n 00112 }\n 00113 #endif\n \n 5.22\n \n-momentum.cpp\n+quadtree.cpp\n \n 00001\n-00002 // File: momentum.cpp\n-00003 // Description: source file for 4-momentum class Cmomentum\n+00002 // File: quadtree.cpp\n+//\n+00003 // Description: source file for quadtree management (Cquadtree 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:: 320\n+$//\n+00024 // $Date:: 2011-11-15 09:54:50 +0100 (Tue, 15 Nov 2011)\n+$//\n+00026\n+00027 #include \"quadtree.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 * Cquadtree implementation\n+*\n+00038 * Implementation of a 2D quadtree.\n+*\n+00039 * This class implements the traditional two-dimensional quadtree. *\n+00040 * The elements at each node are of \u2019Cmomentum\u2019 type.\n+*\n+00041 *******************************************************************/\n+00042\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 on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+213\n+\n+\f214\n+\n+File Documentation\n+\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+00058\n+children[0][0] = children[0][1] = children[1][0] = children[1][1] = NULL;\n+00059\n+has_child = false;\n+00060\n+00061\n+init(_x, _y, _half_size_x, _half_size_y);\n+00062 }\n+00063\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+00072\n+delete children[0][0];\n+00073\n+delete children[0][1];\n+00074\n+delete children[1][0];\n+00075\n+delete children[1][1];\n+00076\n+}\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+00085 * - _y\n+y-position of the center\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+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+00093\n+return 1;\n+00094\n+00095\n+centre_x = _x;\n+00096\n+centre_y = _y;\n+00097\n+half_size_x = _half_size_x;\n+00098\n+half_size_y = _half_size_y;\n+00099\n+00100\n+return 0;\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+00109 * return 0 on success 1 on error\n+00110 ******************************************************************/\n+00111 int Cquadtree::add(Cmomentum *v_add){\n+00112\n+// Description of the method:\n+00113\n+// -------------------------00114\n+// the addition process goes as follows:\n+00115\n+// 1. check if the cell is empty, in which case, add the particle\n+00116\n+//\n+here and leave.\n+00117\n+// 2. If there is a unique particle already inside,\n+00118\n+//\n+(a) create children\n+00119\n+//\n+(b) forward the existing particle to the appropriate child\n+00120\n+// 3. Add current particle to this cell and forward to the\n+00121\n+//\n+adequate child\n+00122\n+// NOTE: we assume in the whole procedure that the particle is\n+00123\n+//\n+indeed inside the cell !\n+00124\n+00125\n+// step 1: the case of empty cells\n+00126\n+if (v==NULL){\n+00127\n+v = v_add;\n+00128\n+return 0;\n+00129\n+}\n+00130\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+00134\n+double new_half_size_x = 0.5*half_size_x;\n+00135\n+double new_half_size_y = 0.5*half_size_y;\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.22 quadtree.cpp\n+\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+children[1][0] = new Cquadtree(centre_x+new_half_size_x, centre_y-new_half_size_y,\n+00142\n+new_half_size_x, new_half_size_y);\n+00143\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+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+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+00158\n+// Note: v_add being a single particle, eta and phi are correct\n+00159\n+children[v_add->eta>centre_x][v_add->phi>centre_y]->add(v_add);\n+00160\n+*v+=*v_add;\n+00161\n+00162\n+return 0;\n+00163 }\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+00172 * - cy\n+circle centre y coordinate\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+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+If yes, add it and return, if not simply return.\n+00182\n+// 3. check if the circle intersects the square. If not, return.\n+00183\n+// 4. check if the square is inside the circle.\n+00184\n+//\n+If yes, add it to qt and return.\n+00185\n+// 5. check intersections with children.\n+00186\n+00187\n+// step 1: if there is no particle inside te square, no reason to go further\n+00188\n+if (v==NULL)\n+00189\n+return Creference();\n+00190\n+00191\n+double dx, dy;\n+00192\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+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+00200\n+if (dy>M_PI)\n+00201\n+dy -= 2.0*M_PI;\n+00202\n+00203\n+// test distance\n+00204\n+if (dx*dx+dy*dyref;\n+00206\n+}\n+00207\n+00208\n+return Creference();\n+00209\n+}\n+00210\n+00211\n+// step 3: check if there is an intersection\n+00212\n+//double ryp, rym;\n+00213\n+double dx_c, dy_c;\n+00214\n+00215\n+// store distance with the centre of the square\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+00219\n+00220\n+// compute (minimal) the distance (pay attention to the periodicity in phi).\n+00221\n+dx = dx_c-half_size_x;\n+00222\n+if (dx<0) dx=0;\n+00223\n+dy = dy_c-half_size_y;\n+00224\n+if (dy<0) dy=0;\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+215\n+\n+\f216\n+\n+File Documentation\n+\n+00225\n+00226\n+// check the distance\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+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+00237\n+if (dy>M_PI) dy = M_PI;\n+00238\n+00239\n+// compute the distance\n+00240\n+if (dx*dx+dy*dyref;\n+00242\n+}\n+00243\n+00244\n+// step 5: the square is not fully in. Recurse to children\n+00245\n+return children[0][0]->circle_intersect(cx, cy, cR2)\n+00246\n++ children[0][1]->circle_intersect(cx, cy, cR2)\n+00247\n++ children[1][0]->circle_intersect(cx, cy, cR2)\n+00248\n++ children[1][1]->circle_intersect(cx, cy, cR2);\n+00249 }\n+00250\n+00251\n+00252 /*\n+00253 * output a data file for drawing the grid.\n+00254 * This can be used to output a data file containing all the\n+00255 * grid subdivisions. The file contents is as follows:\n+00256 * first and second columns give center of the cell, the third\n+00257 * gives the size.\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+00263\n+if (flux==NULL)\n+00264\n+return 1;\n+00265\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+children[1][0]->save(flux);\n+00271\n+children[1][1]->save(flux);\n+00272\n+}\n+00273\n+00274\n+return 0;\n+00275 }\n+00276\n+00277\n+00278 /*\n+00279 * output a data file for drawing the tree leaves.\n+00280 * This can be used to output a data file containing all the\n+00281 * tree leaves. The file contents is as follows:\n+00282 * first and second columns give center of the cell, the third\n+00283 * gives the size.\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+00289\n+if (flux==NULL)\n+00290\n+return 1;\n+00291\n+00292\n+if (has_child){\n+00293\n+if (children[0][0]!=NULL) children[0][0]->save_leaves(flux);\n+00294\n+if (children[0][1]!=NULL) children[0][1]->save_leaves(flux);\n+00295\n+if (children[1][0]!=NULL) children[1][0]->save_leaves(flux);\n+00296\n+if (children[1][1]!=NULL) children[1][1]->save_leaves(flux);\n+00297\n+} else {\n+00298\n+fprintf(flux, \"%e\\t%e\\t%e\\t%e\\n\", centre_x, centre_y, half_size_x, half_size_y);\n+00299\n+}\n+00300\n+00301\n+return 0;\n+00302 }\n+00303\n+00304 }\n+\n+5.23\n+\n+quadtree.h\n+\n+00001 // -*- C++ -*-\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n+\f5.24 ranlux.cpp\n+\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+00007 //\n+//\n+00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n+//\n+00009 //\n+//\n+00010 // 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+//\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:: 123\n+$//\n+00025 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n+$//\n+00027\n+00028 #ifndef __QUADTREE_H__\n+00029 #define __QUADTREE_H__\n+00030\n+00031 #include \"momentum.h\"\n+00032 #include \n+00033\n+00034 namespace siscone{\n+00035\n+00043 class Cquadtree{\n+00044 public:\n+00046\n+Cquadtree();\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+00067\n+int init(double _x, double _y, double _half_size_x, double _half_size_y);\n+00068\n+00076\n+int add(Cmomentum *v_add);\n+00077\n+00088\n+Creference circle_intersect(double cx, double cy, double cR2);\n+00089\n+00099\n+int save(FILE *flux);\n+00100\n+00110\n+int save_leaves(FILE *flux);\n+00111\n+00112\n+double centre_x;\n+00113\n+double centre_y;\n+00114\n+double half_size_x;\n+00115\n+double half_size_y;\n+00116\n+00117\n+Cmomentum *v;\n+00118\n+00119\n+Cquadtree* children[2][2];\n+00120\n+bool has_child;\n+00121 };\n+00122\n+00123 }\n+00124 #endif\n \n-\f212\n+5.24\n+\n+ranlux.cpp\n+\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\n+The sequence is a series of 24-bit integers, x_n,\n+00008\n+00009\n+x_n = d_n + b_n\n+00010\n+00011\n+where d_n = x_{n-10} - x_{n-24} - c_{n-1}, b_n = 0 if d_n >= 0 and\n+00012\n+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\n+where after 24 samples a group of p integers are \"skipped\", to\n+00014\n+reduce correlations. By default p = 199, but can be increased to\n+00015\n+365.\n+00016\n+00017\n+The period of the generator is around 10^171.\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+217\n+\n+\f218\n+\n+File Documentation\n+\n+00018\n+00019\n+From: M. Luescher, \"A portable high-quality random number generator\n+00020\n+for lattice field theory calculations\", Computer Physics\n+00021\n+Communications, 79 (1994) 100-110.\n+00022\n+00023\n+Available on the net as hep-lat/9309020 at http://xxx.lanl.gov/\n+00024\n+00025\n+See also,\n+00026\n+00027\n+F. James, \"RANLUX: A Fortran implementation of the high-quality\n+00028\n+pseudo-random number generator of Luscher\", Computer Physics\n+00029\n+Communications, 79 (1994) 111-114\n+00030\n+00031\n+Kenneth G. Hamilton, F. James, \"Acceleration of RANLUX\", Computer\n+00032\n+Physics Communications, 101 (1997) 241-248\n+00033\n+00034\n+Kenneth G. Hamilton, \"Assembler RANLUX for PCs\", Computer Physics\n+00035\n+Communications, 101 (1997) 249-253 */\n+00036\n+00037 namespace siscone{\n+00038\n+00039 static const unsigned long int mask_lo = 0x00ffffffUL; // 2^24 - 1\n+00040 static const unsigned long int mask_hi = ~0x00ffffffUL;\n+00041 static const unsigned long int two24 = 16777216;\n+// 2^24\n+00042\n+00043\n+00044 // internal generator structure\n+00045 //-----------------------------00046 typedef struct {\n+00047\n+unsigned int i;\n+00048\n+unsigned int j;\n+00049\n+unsigned int n;\n+00050\n+unsigned int skip;\n+00051\n+unsigned int carry;\n+00052\n+unsigned long int u[24];\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+00065\n+unsigned int j = local_ranlux_state.j;\n+00066\n+long int delta = local_ranlux_state.u[j] - local_ranlux_state.u[i]\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+00071\n+delta &= mask_lo;\n+00072\n+} else {\n+00073\n+local_ranlux_state.carry = 0;\n+00074\n+}\n+00075\n+00076\n+local_ranlux_state.u[i] = delta;\n+00077\n+00078\n+if (i==0)\n+00079\n+i = 23;\n+00080\n+else\n+00081\n+i--;\n+00082\n+00083\n+local_ranlux_state.i = i;\n+00084\n+00085\n+if (j == 0)\n+00086\n+j = 23;\n+00087\n+else\n+00088\n+j--;\n+00089\n+00090\n+local_ranlux_state.j = j;\n+00091\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+00099\n+int i;\n+00100\n+long int seed;\n+00101\n+00102\n+if (s==0)\n+00103\n+s = 314159265;\n+/* default seed is 314159265 */\n+00104\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.24 ranlux.cpp\n+\n+00105\n+seed = s;\n+00106\n+00107\n+/* This is the initialization algorithm of F. James, widely in use\n+00108\n+for RANLUX. */\n+00109\n+00110\n+for (i=0;i<24;i++){\n+00111\n+unsigned long int k = seed/53668;\n+00112\n+seed = 40014*(seed-k*53668)-k*12211;\n+00113\n+if (seed<0){\n+00114\n+seed += 2147483563;\n+00115\n+}\n+00116\n+local_ranlux_state.u[i] = seed%two24;\n+00117\n+}\n+00118\n+00119\n+local_ranlux_state.i = 23;\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+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+}\n+00129 }\n+00130\n+00131\n+00132 // generator initialization\n+00133 //-------------------------00134 void ranlux_init(){\n+00135\n+// seed the generator\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+00143\n+const unsigned int skip = local_ranlux_state.skip;\n+00144\n+unsigned long int r = increment_state();\n+00145\n+00146\n+local_ranlux_state.n++;\n+00147\n+00148\n+if (local_ranlux_state.n == 24){\n+00149\n+unsigned int i;\n+00150\n+local_ranlux_state.n = 0;\n+00151\n+for (i = 0; i < skip; i++)\n+00152\n+increment_state();\n+00153\n+}\n+00154\n+00155\n+return r;\n+00156 }\n+00157\n+00158 // print generator state\n+00159 //----------------------00160 void ranlux_print_state(){\n+00161\n+size_t i;\n+00162\n+unsigned char *p = (unsigned char *) (&local_ranlux_state);\n+00163\n+const size_t n = sizeof (ranlux_state_t);\n+00164\n+00165\n+for (i=0;i= 0 and\n+00012\n+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\n+where after 24 samples a group of p integers are \"skipped\", to\n+00014\n+reduce correlations. By default p = 199, but can be increased to\n+00015\n+365.\n+00016\n+00017\n+The period of the generator is around 10^171.\n+00018\n+00019\n+From: M. Luescher, \"A portable high-quality random number generator\n+00020\n+for lattice field theory calculations\", Computer Physics\n+00021\n+Communications, 79 (1994) 100-110.\n+00022\n+00023\n+Available on the net as hep-lat/9309020 at http://xxx.lanl.gov/\n+00024\n+00025\n+See also,\n+00026\n+00027\n+F. James, \"RANLUX: A Fortran implementation of the high-quality\n+00028\n+pseudo-random number generator of Luscher\", Computer Physics\n+00029\n+Communications, 79 (1994) 111-114\n+00030\n+00031\n+Kenneth G. Hamilton, F. James, \"Acceleration of RANLUX\", Computer\n+00032\n+Physics Communications, 101 (1997) 241-248\n+00033\n+00034\n+Kenneth G. Hamilton, \"Assembler RANLUX for PCs\", Computer Physics\n+00035\n+Communications, 101 (1997) 249-253 */\n+00036\n+00037 namespace siscone{\n+00038\n+00040 void ranlux_init();\n+00041\n+00043 unsigned long int ranlux_get();\n+00044\n+00046 void ranlux_print_state();\n+00047\n+00048 }\n+00049 #endif\n+\n+5.27\n+\n+reference.cpp\n+\n+00001\n+00002 // File: reference.cpp\n+//\n+00003 // Description: source file for checkxor management (Creference 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:: 311\n+$//\n+00024 // $Date:: 2011-10-05 23:27:09 +0200 (Wed, 05 Oct 2011)\n+$//\n+00026\n+00027 #include \"reference.h\"\n+00028 #include \"ranlux.h\"\n+00029 #include \n+00030\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+221\n+\n+\f222\n+\n+File Documentation\n+\n+00031 namespace siscone{\n+00032\n+00033 /*******************************************************\n+00034 * Creference implementation\n+*\n+00035 * references used for checksums.\n+*\n+00036 *\n+*\n+00037 * This class implements some reference variable\n+*\n+00038 * that can be used for checksums. Those checksums\n+*\n+00039 * are useful to disentengle between contents of two\n+*\n+00040 * cones without looking into their explicit particle *\n+00041 * contents.\n+*\n+00042 *******************************************************/\n+00043\n+00044 // default constructor\n+00046 Creference::Creference(){\n+00047\n+ref[0] = ref[1] = ref[2] = 0;\n+00048 }\n+00049\n+00050\n+//static unsigned int reference_bit = 1;\n+00051\n+00052 // create a random reference\n+00053 //--------------------------00054 void Creference::randomize(){\n+00055 // ref[0] = reference_bit;\n+00056 // ref[1] = 0;\n+00057 // ref[2] = 0;\n+00058 // reference_bit \u00ab= 1;\n+00059\n+00060\n+unsigned int r1 = ranlux_get();\n+00061\n+unsigned int r2 = ranlux_get();\n+00062\n+unsigned int r3 = ranlux_get();\n+00063\n+unsigned int r4 = ranlux_get();\n+00064\n+// since ranlux only produces 24 bits, take r4 and add 8 bits\n+00065\n+// from it to each of r1,r2, r3 to get 3*32 bits.\n+00066\n+ref[0] = r1+((r4 & 0x00ff0000) \u00ab 8);\n+00067\n+ref[1] = r2+((r4 & 0x0000ff00) \u00ab 16);\n+00068\n+ref[2] = r3+((r4 & 0x000000ff) \u00ab 24);\n+00069\n+00070\n+if (is_empty()) randomize();\n+00071 }\n+00072\n+00073 // test emptyness\n+00074 //---------------00075 bool Creference::is_empty(){\n+00076\n+return (ref[0]==0) && (ref[1]==0) && (ref[2]==0);\n+00077 }\n+00078\n+00079 // test non-emptyness\n+00080 //-------------------00081 bool Creference::not_empty(){\n+00082\n+return (ref[0]!=0) || (ref[1]!=0) || (ref[2]!=0);\n+00083 }\n+00084\n+00085 // assignment of reference\n+00086 //------------------------00087 Creference& Creference::operator = (const Creference &r){\n+00088\n+ref[0] = r.ref[0];\n+00089\n+ref[1] = r.ref[1];\n+00090\n+ref[2] = r.ref[2];\n+00091\n+return *this;\n+00092 }\n+00093\n+00094 // addition of reference\n+00095 //----------------------00096 Creference Creference::operator + (const Creference &r){\n+00097\n+Creference tmp = *this;\n+00098\n+return tmp+=r;\n+00099 }\n+00100\n+00101 // incrementation of reference\n+00102 //----------------------------00103 Creference& Creference::operator += (const Creference &r){\n+00104\n+ref[0] ^= r.ref[0];\n+00105\n+ref[1] ^= r.ref[1];\n+00106\n+ref[2] ^= r.ref[2];\n+00107\n+return *this;\n+00108 }\n+00109\n+00110 // decrementation of reference\n+00111 //----------------------------00112 Creference& Creference::operator -= (const Creference &r){\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+00116\n+return *this;\n+00117 }\n+00118\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.28 reference.h\n+\n+00119 }\n+00120\n+\n+5.28\n+\n+reference.h\n+\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+//\n+00007 //\n+//\n+00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n+//\n+00009 //\n+//\n+00010 // 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+//\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:: 123\n+$//\n+00025 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n+$//\n+00027\n+00028 #ifndef __REFERENCE_H__\n+00029 #define __REFERENCE_H__\n+00030\n+00031 namespace siscone{\n+00032\n+00043 class Creference{\n+00044 public:\n+00046\n+Creference();\n+00047\n+00049\n+void randomize();\n+00050\n+00052\n+bool is_empty();\n+00053\n+00055\n+bool not_empty();\n+00056\n+00058\n+Creference& operator = (const Creference &r);\n+00059\n+00061\n+Creference operator + (const Creference &r);\n+00062\n+00064\n+Creference& operator += (const Creference &r);\n+00065\n+00067\n+Creference& operator -= (const Creference &r);\n+00068\n+00070\n+inline unsigned int operator[] (int i) {return ref[i];}\n+00071\n+00072\n+unsigned int ref[3];\n+00073 };\n+00074\n+00076 Creference operator + (Creference &r1, Creference &r2);\n+00077\n+00079 bool operator == (const Creference &r1, const Creference &r2);\n+00080\n+00082 bool operator != (const Creference &r1, const Creference &r2);\n+00083\n+00085 bool operator < (const Creference &r1, const Creference &r2);\n+00086\n+00087\n+00088 //=============== inline material ================\n+00089\n+00090 // equality test for two references\n+00091 //---------------------------------00092 inline bool operator == (const Creference &r1, const Creference &r2){\n+00093\n+return (r1.ref[0]==r2.ref[0]) && (r1.ref[1]==r2.ref[1]) && (r1.ref[2]==r2.ref[2]);\n+00094 }\n+00095\n+00096 // difference test for two references\n+00097 //---------------------------------00098 inline bool operator != (const Creference &r1, const Creference &r2){\n+00099\n+return (r1.ref[0]!=r2.ref[0]) || (r1.ref[1]!=r2.ref[1]) || (r1.ref[2]!=r2.ref[2]);\n+00100 }\n+00101\n+00102 // difference test for two references\n+00103 //----------------------------------\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+223\n+\n+\f224\n+\n+File Documentation\n+\n+00104 inline bool operator < (const Creference &r1, const Creference &r2){\n+00105\n+return (r1.ref[0]\n+00034 #include \n+00035 #include \n+00036\n+00037 namespace siscone{\n+00038 using namespace std;\n+00039\n+00040 /***************************************************************\n+00041 * Csiscone implementation\n+*\n+00042 * final class: gather everything to compute the jet contents. *\n+00043 *\n+*\n+00044 * This is the class user should use.\n+*\n+00045 * It computes the jet contents of a list of particles\n+*\n+00046 * given a cone radius and a threshold for splitting/merging. *\n+00047 ***************************************************************/\n+00048\n+00049 // default ctor\n+00050 //-------------00051 Csiscone::Csiscone(){\n+00052\n+rerun_allowed = false;\n+00053 }\n+00054\n+00055 // default dtor\n+00056 //-------------00057 Csiscone::~Csiscone(){\n+00058\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+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+00069 * - _radius\n+cone radius\n+00070 * - _f\n+shared energy threshold for splitting&merging\n+00071 * - _n_pass_max maximum number of runs\n+00072 * - _ptmin\n+minimum pT of the protojets\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.29 siscone.cpp\n+\n+00073 * - _split_merge_scale\n+the scale choice for the split-merge procedure\n+00074 *\n+NOTE: using pt leads to IR unsafety for some events with momentum\n+00075 *\n+conservation. So we strongly advise not to change the default\n+00076 *\n+value.\n+00077 * return the number of jets found.\n+00078 **********************************************************************/\n+00079 int Csiscone::compute_jets(vector &_particles, double _radius, double _f,\n+00080\n+int _n_pass_max, double _ptmin,\n+00081\n+Esplit_merge_scale _split_merge_scale){\n+00082\n+_initialise_if_needed();\n+00083\n+00084\n+// run some general safety tests (NB: f will be checked in split-merge)\n+00085\n+if (_radius <= 0.0 || _radius >= 0.5*M_PI) {\n+00086\n+ostringstream message;\n+00087\n+message \u00ab \"Illegal value for cone radius, R = \" \u00ab _radius\n+00088\n+\u00ab \" (legal values are 00) && (_n_pass_max!=0));\n+00136\n+00137\n+rerun_allowed = true;\n+00138\n+00139\n+// split & merge\n+00140\n+return perform(_f, _ptmin);\n+00141 }\n+00142\n+00143\n+00144 /*\n+00145 * compute the jets from a given particle set doing multiple passes\n+00146 * such pass N looks for jets among all particles not put into jets\n+00147 * during previous passes.\n+00148 * - _particles\n+list of particles\n+00149 * - _radius\n+cone radius\n+00150 * - _n_pass_max maximum number of runs\n+00151 * - _ptmin\n+minimum pT of the protojets\n+00152 * - _ordering_scale\n+the ordering scale to decide which stable\n+00153 *\n+cone is removed\n+00154 * return the number of jets found.\n+00155 **********************************************************************/\n+00156 int Csiscone::compute_jets_progressive_removal(vector &_particles, double _radius,\n+00157\n+int _n_pass_max, double _ptmin,\n+00158\n+Esplit_merge_scale _ordering_scale){\n+00159\n+_initialise_if_needed();\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+225\n+\n+\f226\n+\n+File Documentation\n+\n+00160\n+00161\n+// run some general safety tests (NB: f will be checked in split-merge)\n+00162\n+if (_radius <= 0.0 || _radius >= 0.5*M_PI) {\n+00163\n+ostringstream message;\n+00164\n+message \u00ab \"Illegal value for cone radius, R = \" \u00ab _radius\n+00165\n+\u00ab \" (legal values are 00) && (_n_pass_max!=0));\n+00199\n+00200\n+// split & merge\n+00201\n+return jets.size();\n+00202 }\n+00203\n+00204\n+00205 /*\n+00206 * recompute the jets with a different overlap parameter.\n+00207 * we use the same particles and R as in the preceeding call.\n+00208 * - _f\n+shared energy threshold for splitting&merging\n+00209 * - _ptmin\n+minimum pT of the protojets\n+00210 * - _split_merge_scale\n+the scale choice for the split-merge procedure\n+00211 *\n+NOTE: using pt leads to IR unsafety for some events with momentum\n+00212 *\n+conservation. So we strongly advise not to change the default\n+00213 *\n+value.\n+00214 * return the number of jets found, -1 if recomputation not allowed.\n+00215 ********************************************************************/\n+00216 int Csiscone::recompute_jets(double _f, double _ptmin,\n+00217\n+Esplit_merge_scale _split_merge_scale){\n+00218\n+if (!rerun_allowed)\n+00219\n+return -1;\n+00220\n+00221\n+ptcomparison.split_merge_scale = _split_merge_scale;\n+00222\n+00223\n+// restore particle list\n+00224\n+partial_clear();\n+00225\n+init_pleft();\n+00226\n+00227\n+// initialise split/merge algorithm\n+00228\n+unsigned int i;\n+00229\n+for (i=0;iflags());\n+\n+5.30\n+\n+siscone.cpp\n+\n+227\n+\n+(*_banner_ostr) \u00ab \"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" \u00ab endl;\n+(*_banner_ostr) \u00ab \"#\n+SISCone\n+version \" \u00ab setw(28) \u00ab left \u00ab siscone_version()\n+\u00ab \"o\" \u00ab endl;\n+00253\n+(*_banner_ostr) \u00ab \"#\n+http://projects.hepforge.org/siscone\n+o\" \u00ab endl;\n+00254\n+(*_banner_ostr) \u00ab \"#\n+o\" \u00ab endl;\n+00255\n+(*_banner_ostr) \u00ab \"# This is SISCone: the Seedless Infrared Safe Cone Jet Algorithm\n+o\" \u00ab endl;\n+00256\n+(*_banner_ostr) \u00ab \"# SISCone was written by Gavin Salam and Gregory Soyez\n+o\" \u00ab endl;\n+00257\n+(*_banner_ostr) \u00ab \"# It is released under the terms of the GNU General Public License o\" \u00ab endl;\n+00258\n+(*_banner_ostr) \u00ab \"#\n+o\" \u00ab endl;\n+00259\n+(*_banner_ostr) \u00ab \"# A description of the algorithm is available in the publication\n+o\" \u00ab endl;\n+00260\n+(*_banner_ostr) \u00ab \"# JHEP 05 (2007) 086 [arXiv:0704.0292 (hep-ph)].\n+o\" \u00ab endl;\n+00261\n+(*_banner_ostr) \u00ab \"# Please cite it if you use SISCone.\n+o\" \u00ab endl;\n+00262\n+(*_banner_ostr) \u00ab \"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" \u00ab endl;\n+00263\n+(*_banner_ostr) \u00ab endl;\n+00264\n+00265\n+_banner_ostr->flush();\n+00266\n+_banner_ostr->flags(flags_to_restore);\n+00267\n+}\n+00268 }\n+00269\n+00270 // finally, a bunch of functions to access to\n+00271 // basic information (package name, version)\n+00272 //--------------------------------------------00273\n+00274 /*\n+00275 * return SISCone package name.\n+00276 * This is nothing but \"SISCone\", it is a replacement to the\n+00277 * SISCONE_PACKAGE_NAME string defined in config.h and which is not\n+00278 * guaranteed to be public.\n+00279 * return the SISCone name as a string\n+00280 */\n+00281 string siscone_package_name(){\n+00282\n+return SISCONE_PACKAGE_NAME;\n+00283 }\n+00284\n+00285 /*\n+00286 * return SISCone version number.\n+00287 * return a string of the form \"X.Y.Z\" with possible additional tag\n+00288 *\n+(alpha, beta, devel) to mention stability status\n+00289 */\n+00290 string siscone_version(){\n+00291\n+return SISCONE_VERSION;\n+00292 }\n+00293\n+00294 }\n+\n+00001\n+00002 // File: siscone.cpp\n+//\n+00003 // Description: source file for the main SISCone class\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+//\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:: 403\n+$//\n+00026 // $Date:: 2016-05-19 16:52:05 +0200 (Thu, 19 May 2016)\n+$//\n+00028\n+00029 #include \n+00030 #include \n+00031 #include \n+00032 #include \n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f228\n+\n+File Documentation\n+\n+00033 #include \"momentum.h\"\n+00034 #include \"siscone.h\"\n+00035 #include \n+00036 #include \n+00037 #include \n+00038\n+00039 namespace siscone_spherical{\n+00040 using namespace std;\n+00041\n+00042 /***************************************************************\n+00043 * CSphsiscone implementation\n+*\n+00044 * final class: gather everything to compute the jet contents. *\n+00045 *\n+*\n+00046 * This is the class user should use.\n+*\n+00047 * It computes the jet contents of a list of particles\n+*\n+00048 * given a cone radius and a threshold for splitting/merging. *\n+00049 ***************************************************************/\n+00050\n+00051 // default ctor\n+00052 //-------------00053 CSphsiscone::CSphsiscone(){\n+00054\n+rerun_allowed = false;\n+00055 }\n+00056\n+00057 // default dtor\n+00058 //-------------00059 CSphsiscone::~CSphsiscone(){\n+00060\n+rerun_allowed = false;\n+00061 }\n+00062\n+00063 bool CSphsiscone::init_done=false;\n+00064 std::ostream* CSphsiscone::_banner_ostr=&cout;\n+00065\n+00066 /*\n+00067 * compute the jets from a given particle set doing multiple passes\n+00068 * such pass N looks for jets among all particles not put into jets\n+00069 * during previous passes.\n+00070 * - _particles\n+list of particles\n+00071 * - _radius\n+cone radius\n+00072 * - _f\n+shared energy threshold for splitting&merging\n+00073 * - _n_pass_max maximum number of runs\n+00074 * - _Emin\n+minimum energy of the protojets\n+00075 * - _split_merge_scale\n+the scale choice for the split-merge procedure\n+00076 *\n+NOTE: using pt leads to IR unsafety for some events with momentum\n+00077 *\n+conservation. So we strongly advise not to change the default\n+00078 *\n+value.\n+00079 * return the number of jets found.\n+00080 **********************************************************************/\n+00081 int CSphsiscone::compute_jets(vector &_particles, double _radius, double _f,\n+00082\n+int _n_pass_max, double _Emin,\n+00083\n+Esplit_merge_scale _split_merge_scale){\n+00084\n+// make sure things are initialised\n+00085\n+_initialise_if_needed();\n+00086\n+00087\n+// run some general safety tests (NB: f will be checked in split-merge)\n+00088\n+if (_radius <= 0.0 || _radius >= 0.5*M_PI) {\n+00089\n+ostringstream message;\n+00090\n+message \u00ab \"Illegal value for cone radius, R = \" \u00ab _radius\n+00091\n+\u00ab \" (legal values are 00) && (_n_pass_max!=0));\n+00137\n+00138\n+rerun_allowed = true;\n+00139\n+00140\n+// split & merge\n+00141\n+return perform(_f, _Emin);\n+00142 }\n+00143\n+00144 /*\n+00145 * compute the jets from a given particle set doing multiple passes\n+00146 * such pass N looks for jets among all particles not put into jets\n+00147 * during previous passes.\n+00148 * - _particles\n+list of particles\n+00149 * - _radius\n+cone radius\n+00150 * - _n_pass_max maximum number of runs\n+00151 * - _Emin\n+minimum energy of the protojets\n+00152 * - _ordering_scale\n+the ordering scale to decide which stable\n+00153 *\n+cone is removed\n+00154 * return the number of jets found.\n+00155 **********************************************************************/\n+00156 int CSphsiscone::compute_jets_progressive_removal(vector &_particles, double _radius,\n+00157\n+int _n_pass_max, double _Emin,\n+00158\n+Esplit_merge_scale _ordering_scale){\n+00159\n+// make sure things are initialised\n+00160\n+_initialise_if_needed();\n+00161\n+00162\n+// run some general safety tests (NB: f will be checked in split-merge)\n+00163\n+if (_radius <= 0.0 || _radius >= 0.5*M_PI) {\n+00164\n+ostringstream message;\n+00165\n+message \u00ab \"Illegal value for cone radius, R = \" \u00ab _radius\n+00166\n+\u00ab \" (legal values are 00) && (_n_pass_max!=0));\n+00200\n+00201\n+// split & merge\n+00202\n+return jets.size();\n+00203 }\n+00204 /*\n+00205 * recompute the jets with a different overlap parameter.\n+00206 * we use the same particles and R as in the preceeding call.\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f230\n+\n+File Documentation\n+\n+00207 * - _f\n+shared energy threshold for splitting&merging\n+00208 * - _Emin\n+minimum Energy of the protojets\n+00209 * - _split_merge_scale\n+the scale choice for the split-merge procedure\n+00210 *\n+NOTE: using pt leads to IR unsafety for some events with momentum\n+00211 *\n+conservation. So we strongly advise not to change the default\n+00212 *\n+value.\n+00213 * return the number of jets found, -1 if recomputation not allowed.\n+00214 ********************************************************************/\n+00215 int CSphsiscone::recompute_jets(double _f, double _Emin,\n+00216\n+Esplit_merge_scale _split_merge_scale){\n+00217\n+if (!rerun_allowed)\n+00218\n+return -1;\n+00219\n+00220\n+ptcomparison.split_merge_scale = _split_merge_scale;\n+00221\n+00222\n+// restore particle list\n+00223\n+partial_clear();\n+00224\n+init_pleft();\n+00225\n+00226\n+// initialise split/merge algorithm\n+00227\n+unsigned int i;\n+00228\n+for (i=0;iflags());\n+00250\n+00251\n+(*_banner_ostr) \u00ab \"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" \u00ab endl;\n+00252\n+(*_banner_ostr) \u00ab \"#\n+SISCone\n+version \" \u00ab setw(28) \u00ab left \u00ab siscone_version()\n+\u00ab \"o\" \u00ab endl;\n+00253\n+(*_banner_ostr) \u00ab \"#\n+http://projects.hepforge.org/siscone\n+o\" \u00ab endl;\n+00254\n+(*_banner_ostr) \u00ab \"#\n+o\" \u00ab endl;\n+00255\n+(*_banner_ostr) \u00ab \"# This is SISCone: the Seedless Infrared Safe Cone Jet Algorithm\n+o\" \u00ab endl;\n+00256\n+(*_banner_ostr) \u00ab \"# SISCone was written by Gavin Salam and Gregory Soyez\n+o\" \u00ab endl;\n+00257\n+(*_banner_ostr) \u00ab \"# It is released under the terms of the GNU General Public License o\" \u00ab endl;\n+00258\n+(*_banner_ostr) \u00ab \"#\n+o\" \u00ab endl;\n+00259\n+(*_banner_ostr) \u00ab \"#\n+!!!\n+WARNING\n+!!!\n+o\" \u00ab endl;\n+00260\n+(*_banner_ostr) \u00ab \"#\n+This is the version of SISCone using spherical coordinates\n+o\" \u00ab endl;\n+00261\n+(*_banner_ostr) \u00ab \"#\n+o\" \u00ab endl;\n+00262\n+(*_banner_ostr) \u00ab \"# A description of the algorithm is available in the publication\n+o\" \u00ab endl;\n+00263\n+(*_banner_ostr) \u00ab \"# JHEP 05 (2007) 086 [arXiv:0704.0292 (hep-ph)].\n+o\" \u00ab endl;\n+00264\n+(*_banner_ostr) \u00ab \"# Please cite it if you use SISCone.\n+o\" \u00ab endl;\n+00265\n+(*_banner_ostr) \u00ab \"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" \u00ab endl;\n+00266\n+(*_banner_ostr) \u00ab endl;\n+00267\n+00268\n+_banner_ostr->flush();\n+00269\n+_banner_ostr->flags(flags_to_restore);\n+00270\n+}\n+00271 }\n+00272\n+00273 // finally, a bunch of functions to access to\n+00274 // basic information (package name, version)\n+00275 //--------------------------------------------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+00282 * return the SISCone name as a string\n+00283 */\n+00284 string siscone_package_name(){\n+00285\n+return SISCONE_PACKAGE_NAME;\n+00286 }\n+00287\n+00288 /*\n+00289 * return SISCone version number.\n+00290 * return a string of the form \"X.Y.Z\" with possible additional tag\n+00291 *\n+(alpha, beta, devel) to mention stability status\n+00292 */\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.31 siscone_error.cpp\n+\n+00293 string siscone_version(){\n+00294\n+return SISCONE_VERSION;\n+00295 }\n+00296\n+00297 }\n+\n+5.31\n+\n+siscone_error.cpp\n+\n+00001\n+00002 // File: siscone_error.cpp\n+//\n+00003 // Description: source file for SISCone error messages (Csiscone_error)\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 \"siscone_error.h\"\n+00028\n+00029 namespace siscone{\n+00030\n+00031 bool Csiscone_error::m_print_errors = true;\n+00032\n+00033 }\n+\n+5.32\n+\n+siscone_error.h\n+\n+00001 // -*- C++ -*00003 // File: siscone_error.h\n+//\n+00004 // Description: header file for SISCone error messages (Csiscone_error)\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+00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n+//\n+00009 //\n+//\n+00010 // 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+//\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:: 327\n+$//\n+00025 // $Date:: 2011-11-25 15:19:39 +0100 (Fri, 25 Nov 2011)\n+$//\n+00027\n+00028 #ifndef __SISCONE_ERROR_H__\n+00029 #define __SISCONE_ERROR_H__\n+00030\n+00031 #include\n+00032 #include\n+00033\n+00034 namespace siscone{\n+00035\n+00038 class Csiscone_error {\n+00039 public:\n+00041\n+Csiscone_error() {;};\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+231\n+\n+\f232\n+\n+File Documentation\n+\n+00042\n+00045\n+Csiscone_error(const std::string & message_in) {\n+00046\n+m_message = message_in;\n+00047\n+if (m_print_errors) std::cerr \u00ab \"siscone::Csiscone_error: \"\u00ab message_in \u00ab std::endl;\n+00048\n+};\n+00049\n+00051\n+std::string message() const {return m_message;};\n+00052\n+00055\n+static void setm_print_errors(bool print_errors) {\n+00056\n+m_print_errors = print_errors;};\n+00057\n+00058 private:\n+00059\n+std::string m_message;\n+00060\n+static bool m_print_errors;\n+00061 };\n+00062\n+00063 }\n+00064 #endif\n+\n+5.33\n+\n+geom_2d.h\n+\n+00001 // -*- C++ -*00003 // File: geom_2d.h\n+//\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+00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n+//\n+00009 //\n+//\n+00010 // 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+//\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:: 422\n+$//\n+00025 // $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)\n+$//\n+00027\n+00028 #ifndef __GEOM_2D_H__\n+00029 #define __GEOM_2D_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+00044\n+if\n+(phi <= -M_PI) phi += twopi;\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+00061\n+double delta = fabs(phi1-phi2);\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.34 geom_2d.h\n+\n+233\n+\n+00082\n+00084\n+double x, y;\n+00085\n+00087\n+inline double mod2() const {return pow2(x)+pow2(y);}\n+00088\n+00090\n+inline double modulus() const {return sqrt(mod2());}\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+00140\n+int add_particle(const double eta, const double phi);\n+00141\n+00143\n+unsigned int eta_range;\n+00144\n+00146\n+unsigned int phi_range;\n+00147\n+00148\n+// extremal value for eta\n+00149\n+static double eta_min;\n+00150\n+static double eta_max;\n+00151\n+00152 private:\n+00154\n+inline unsigned int get_eta_cell(double eta){\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+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.34\n+\n+geom_2d.h\n+\n+00001 // -*- C++ -*00003 // File: geom_2d.h\n+//\n+00004 // Description: header file for two-dimensional geometry tools\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:: 422\n+$//\n+00027 // $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)\n+$//\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+//\n+\n+\f234\n \n File Documentation\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+00072\n+int add_particle(const double theta, const double phi);\n+00073\n+00075\n+unsigned int theta_range;\n+00076\n+00078\n+unsigned int phi_range;\n+00079\n+00081\n+static double theta_min;\n+00082\n+static double theta_max;\n+00083\n+00084 private:\n+00086\n+inline unsigned int get_theta_cell(double theta){\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+00092\n+inline unsigned int get_phi_cell(double phi){\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.35\n+\n+momentum.cpp\n+\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 // 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@@ -16941,14 +19989,19 @@\n $//\n 00026\n 00027 #include \"momentum.h\"\n 00028 #include \n 00029 #include \n 00030\n 00031 namespace siscone{\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.35 momentum.cpp\n+\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@@ -17028,21 +20081,14 @@\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.23 momentum.cpp\n-\n-213\n-\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@@ -17061,14 +20107,23 @@\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+235\n+\n+\f236\n+\n+File Documentation\n+\n 00119\n px-=v.px;\n 00120\n py-=v.py;\n 00121\n pz-=v.pz;\n 00122\n@@ -17116,58 +20171,49 @@\n 00157\n return v1.perp2() < v2.perp2();\n 00158 }\n 00159\n 00160 }\n 00161\n \n-5.23\n+5.36\n \n momentum.cpp\n \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-00011 // This program is free software; you can redistribute it and/or modify\n-00012 // it under the terms of the GNU General Public License as published by\n-00013 // the Free Software Foundation; either version 2 of the License, or\n-00014 // (at your option) any later version.\n-00015 //\n-00016 // This program is distributed in the hope that it will be useful,\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\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-\n-\f214\n-\n-File Documentation\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@@ -17193,14 +20239,21 @@\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+\n+//\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.36 momentum.cpp\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@@ -17276,19 +20329,14 @@\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.23 momentum.cpp\n-\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@@ -17308,14 +20356,23 @@\n pz-=v.pz;\n 00121\n 00122\n return *this;\n 00123 }\n 00124\n 00125 // multiplication by a constant\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+237\n+\n+\f238\n+\n+File Documentation\n+\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@@ -17408,23 +20465,14 @@\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-215\n-\n-\f216\n-\n-File Documentation\n-\n 00192 // default ctor\n 00193 //-------------00194 CSphmomentum::CSphmomentum(){\n 00195\n E=0.0;\n 00196\n index = -1;\n 00197 }\n@@ -17442,14 +20490,19 @@\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.36 momentum.cpp\n+\n 00213\n E = _E;\n 00214 }\n 00215\n 00216 // default dtor\n 00217 //-------------00218 CSphmomentum::~CSphmomentum(){\n 00219\n@@ -17528,19 +20581,14 @@\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.24 protocones.cpp\n-\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 00284\n return v1._theta < v2._theta;\n 00285 }\n@@ -17550,370 +20598,871 @@\n 00290\n return v1.perp2() < v2.perp2();\n 00291 }\n 00292\n 00293 }\n 00294\n \n-5.24\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n-protocones.cpp\n+239\n \n-00001\n-00002 // File: protocones.cpp\n+\f240\n+\n+5.37\n+\n+File Documentation\n+\n+momentum.h\n+\n+00001 // -*- C++ -*00003 // File: momentum.h\n //\n-00003 // Description: source file for stable cones determination (Cstable_cones)\n+00004 // Description: header file for 4-momentum class Cmomentum\n //\n-00004 // This file is part of the SISCone project.\n+00005 // This file is part of the SISCone project.\n //\n-00005 // For more details, see http://projects.hepforge.org/siscone\n+00006 // For more details, see http://projects.hepforge.org/siscone\n //\n-00006 //\n+00007 //\n //\n-00007 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n+00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n //\n-00008 //\n+00009 //\n //\n-00009 // This program is free software; you can redistribute it and/or modify\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:: 322\n+00024 // $Revision:: 163\n $//\n-00024 // $Date:: 2011-11-15 10:12:36 +0100 (Tue, 15 Nov 2011)\n+00025 // $Date:: 2007-04-26 22:31:02 +0200 (Thu, 26 Apr 2007)\n $//\n-00026\n-00027 /*******************************************************\n-00028 * Introductory note:\n-*\n-00029 * Since this file has many member functions, we have *\n-00030 * structured them in categories:\n-*\n-00031 * INITIALISATION FUNCTIONS\n-*\n-00032 * - ctor()\n-*\n-00033 * - ctor(particle_list)\n-*\n-00034 * - dtor()\n-*\n-00035 * - init(particle_list)\n-*\n-00036 * ALGORITHM MAIN ENTRY\n-*\n-00037 * - get_stable_cone(radius)\n-*\n-00038 * ALGORITHM MAIN STEPS\n-*\n-00039 * - init_cone()\n-*\n-00040 * - test_cone()\n-*\n-00041 * - update_cone()\n-*\n-00042 * - proceed_with_stability()\n-*\n-00043 * ALGORITHM MAIN STEPS FOR COCIRCULAR SITUATIONS\n-*\n-00044 * - cocircular_pt_less(v1, v2)\n-*\n-00045 * - prepare_cocircular_list()\n-*\n-00046 * - test_cone_cocircular()\n-*\n-00047 * - test_stability(candidate, border_list)\n-*\n-00048 * - updat_cone_cocircular()\n-*\n-00049 * RECOMPUTATION OF CONE CONTENTS\n-*\n-00050 * - compute_cone_contents()\n-*\n-00051 * - recompute_cone_contents()\n-*\n-00052 * - recompute_cone_contents_if_needed()\n-*\n-00053 * VARIOUS TOOLS\n-*\n-00054 * - circle_intersect()\n-*\n-00055 * - is_inside()\n-*\n-00056 * - abs_dangle()\n-*\n-00057 *******************************************************/\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-00059 #include \"protocones.h\"\n-00060 #include \"siscone_error.h\"\n-00061 #include \"defines.h\"\n-00062 #include \n-00063 #include \n-00064 #include \"circulator.h\"\n-00065 #include \n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-217\n-\n-\f218\n-\n-File Documentation\n-\n-00066\n-00067 namespace siscone{\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+00067\n+inline double perp2() const {return px*px+py*py;}\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-*\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-00081 // - ctor()\n-//\n-00082 // - ctor(particle_list)\n-//\n-00083 // - dtor()\n-//\n-00084 // - init(particle_list)\n-//\n+inline double mass() const {return sqrt(mass2());}\n+00071\n+00073\n+inline double mass2() const {return perpmass2()-perp2();}\n+00074\n+00076\n+inline double perpmass() const {return sqrt((E-pz)*(E+pz));}\n+00077\n+00079\n+inline double perpmass2() const {return (E-pz)*(E+pz);}\n+00080\n+00082\n+inline double Et() const {return E/sqrt(1.0+pz*pz/perp2());}\n+00083\n+00085\n+inline double Et2() const {return E*E/(1.0+pz*pz/perp2());}\n 00086\n-00087 // default ctor\n-00088 //-------------00089 Cstable_cones::Cstable_cones(){\n-00090\n-nb_tot = 0;\n-00091\n-hc = NULL;\n-00092 }\n+00088\n+Cmomentum& operator = (const Cmomentum &v);\n+00089\n+00092\n+const Cmomentum operator + (const Cmomentum &v);\n 00093\n-00094 // ctor with initialisation\n-00095 //-------------------------00096 Cstable_cones::Cstable_cones(vector &_particle_list)\n+00096\n+Cmomentum& operator += (const Cmomentum &v);\n 00097\n-: Cvicinity(_particle_list){\n-00098\n-00099\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-00106\n-if (hc!=NULL) delete hc;\n-00107 }\n+Cmomentum& operator -= (const Cmomentum &v);\n+00101\n+00107\n+void build_etaphi();\n 00108\n-00109 /*\n-00110 * initialisation\n-00111 * - _particle_list list of particles\n-00112 * - _n\n-number of particles\n-00113 *********************************************************************/\n-00114 void Cstable_cones::init(vector &_particle_list){\n+00109\n+double px;\n+00110\n+double py;\n+00111\n+double pz;\n+00112\n+double E;\n+00113\n+00114\n+double eta;\n 00115\n-// check already allocated mem\n+double phi;\n 00116\n-if (hc!=NULL){\n+int parent_index;\n 00117\n-delete hc;\n+int index;\n 00118\n-}\n-00119\n-if (protocones.size()!=0)\n 00120\n-protocones.clear();\n-00121\n+// the following part is used for checksums //\n 00122\n-multiple_centre_done.clear();\n-00123\n+Creference ref;\n+00123 };\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.38 momentum.h\n+\n 00124\n-// initialisation\n-00125\n-set_particle_list(_particle_list);\n-00126 }\n-00127\n+00127 bool operator < (const Cmomentum &v1, const Cmomentum &v2);\n 00128\n-00130 // ALGORITHM MAIN ENTRY\n-//\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-00138 * - _radius: 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-00143\n-00144\n-// check if everything is correctly initialised\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-if (n_part==0){\n+double dx, dy;\n 00146\n-return 0;\n 00147\n-}\n+dx = eta - v->eta;\n 00148\n+dy = fabs(phi - v->phi);\n 00149\n-R = _radius;\n+if (dy>M_PI)\n 00150\n-R2 = R*R;\n+dy -= twopi;\n 00151\n 00152\n-// allow hash for cones candidates\n-00153\n-hc = new hash_cones(n_part, R2);\n+return dx*dx+dy*dy;\n+00153 }\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+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+00070\n+const CSph3vector operator + (const CSph3vector &v);\n+00071\n+00074\n+const CSph3vector operator - (const CSph3vector &v);\n+00075\n+00078\n+const CSph3vector operator / (const double &r);\n+00079\n+00082\n+CSph3vector& operator += (const CSph3vector &v);\n+00083\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+241\n+\n+\f242\n+\n+File Documentation\n+\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+00097\n+inline double perp() const {return sqrt(perp2());}\n+00098\n+00100\n+inline double perp2() const {return px*px+py*py;}\n+00101\n+00103\n+inline double norm() const {return sqrt(px*px+py*py+pz*pz);}\n+00104\n+00106\n+inline double norm2() const {return px*px+py*py+pz*pz;}\n+00107\n+00109\n+inline double phi() const {return atan2(py, px);}\n+00110\n+00112\n+inline double theta() const {return atan2(perp(),pz);}\n+00113\n+00120\n+void build_norm();\n+00121\n+00125\n+void build_thetaphi();\n+00126\n+00129\n+void get_angular_directions(CSph3vector &angular_dir1, CSph3vector &angular_dir2);\n+00130\n+00131\n+double px;\n+00132\n+double py;\n+00133\n+double pz;\n+00134\n+00135\n+double _norm;\n+00136\n+double _theta;\n+00137\n+double _phi;\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+00176\n+inline double mass() const {return sqrt(mass2());}\n+00177\n+00179\n+inline double mass2() const {return perpmass2()-perp2();}\n+00180\n+00182\n+inline double perpmass() const {return sqrt((E-pz)*(E+pz));}\n+00183\n+00185\n+inline double perpmass2() const {return (E-pz)*(E+pz);}\n+00186\n+00188\n+inline double Et() const {return E/sqrt(1.0+pz*pz/perp2());}\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+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+00208\n+double E;\n+00209\n+00210\n+int parent_index;\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+00236\n+//double tmp = v1.px*v2.px + v1.py*v2.py + v1.pz*v2.pz;\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.39 protocones.cpp\n+\n+00237\n+00238\n+00239\n+\n+243\n+\n+//if (!isfinite(tmp)){\n+// std::cout \u00ab \"dot_product inf: \" \u00ab std::endl;\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+00250\n+//CSph3vector tmp;\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+00278\n+return atan2(sqrt(norm2_cross_product3(*v1,*v2)), dot_product3(*v1,*v2));\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+00291\n+return (dot>=0) && (norm2_cross_product3(*v1,*v2)<=tan2R*dot*dot);\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+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+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+*\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+00081 // - ctor()\n+//\n+00082 // - ctor(particle_list)\n+//\n+00083 // - dtor()\n+//\n+00084 // - init(particle_list)\n+//\n+00086\n+00087 // default ctor\n+00088 //-------------00089 Cstable_cones::Cstable_cones(){\n+00090\n+nb_tot = 0;\n+00091\n+hc = NULL;\n+00092 }\n+00093\n+00094 // ctor with initialisation\n+00095 //-------------------------00096 Cstable_cones::Cstable_cones(vector &_particle_list)\n+00097\n+: Cvicinity(_particle_list){\n+00098\n+00099\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+00106\n+if (hc!=NULL) delete hc;\n+00107 }\n+00108\n+00109 /*\n+00110 * initialisation\n+00111 * - _particle_list list of particles\n+00112 * - _n\n+number of particles\n+00113 *********************************************************************/\n+00114 void Cstable_cones::init(vector &_particle_list){\n+00115\n+// check already allocated mem\n+00116\n+if (hc!=NULL){\n+00117\n+delete hc;\n+00118\n+}\n+00119\n+if (protocones.size()!=0)\n+00120\n+protocones.clear();\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.39 protocones.cpp\n+\n+00121\n+00122\n+multiple_centre_done.clear();\n+00123\n+00124\n+// initialisation\n+00125\n+set_particle_list(_particle_list);\n+00126 }\n+00127\n+00128\n+00130 // ALGORITHM MAIN ENTRY\n+//\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+00138 * - _radius: 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+00143\n+00144\n+// check if everything is correctly initialised\n+00145\n+if (n_part==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+00152\n+// allow hash for cones candidates\n+00153\n+hc = new hash_cones(n_part, R2);\n+00154\n+00155\n+// browse all particles\n+00156\n+for (p_idx=0;p_idxv;\n+00216\n+centre_idx = first_cone;\n+00217\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@@ -17948,23 +21497,14 @@\n 00242\n 00243\n // here are the tests entering the first series:\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-219\n-\n-\f220\n-\n-File Documentation\n-\n 00246\n 00247\n if (centre->side){\n 00248\n // test when both particles are not in the cone\n 00249\n // or when both are in.\n@@ -18046,14 +21586,19 @@\n 00295\n // update info on particles inside\n 00296\n centre->is_inside->cone = true;\n 00297\n 00298\n // update stability check quantities\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.39 protocones.cpp\n+\n 00299\n dpt += fabs(child->px)+fabs(child->py);\n 00300\n }\n 00301\n 00302\n // update centre and child to correspond to the new position\n@@ -18107,19 +21652,14 @@\n 00329\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.24 protocones.cpp\n-\n 00333\n // since last recomputation and once the ratio overpasses a threshold\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@@ -18203,14 +21743,23 @@\n // jump to the next one\n 00383\n elm = elm->next;\n 00384\n }\n 00385\n }\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+247\n+\n+\f248\n+\n+File Documentation\n+\n 00386\n 00387\n // free hash\n 00388\n // we do that at this level because hash eats rather a lot of memory\n 00389\n // we want to free it before running the split/merge algorithm\n@@ -18252,23 +21801,14 @@\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-221\n-\n-\f222\n-\n-File Documentation\n-\n 00423 **********************************************************************/\n 00424 void Cstable_cones::prepare_cocircular_lists() {\n 00425\n circulator::iterator > here(vicinity.begin(),\n 00426\n vicinity.begin(),\n 00427\n@@ -18349,14 +21889,21 @@\n 00471 * half-circle is filled (but going to a full circle is simpler)\n 00472 ******************************************************************/\n 00473 void Cstable_cones::test_cone_cocircular(Cmomentum & borderless_cone,\n 00474\n list & border_list) {\n 00475\n vector border_vect;\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.39 protocones.cpp\n+\n+249\n+\n 00476\n 00477\n border_vect.reserve(border_list.size());\n 00478\n for (list::iterator it = border_list.begin();\n 00479\n it != border_list.end(); it++) {\n@@ -18411,21 +21958,14 @@\n candidate = borderless_cone;\n 00507\n while (++mid != start) {\n 00508\n // will begin with start+1 and go up to start-1\n 00509\n mid()->is_in = true;\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.24 protocones.cpp\n-\n-223\n-\n 00510\n candidate += *(mid()->mom);\n 00511\n test_stability(candidate, border_vect);\n 00512\n }\n 00513\n@@ -18502,178 +22042,187 @@\n 00565\n // update cone\n 00566\n cone -= (*child);\n 00567\n 00568\n // update info on particles inside\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f250\n+\n 00569\n-centre->is_inside->cone = false;\n 00570\n 00571\n-// update stability check quantities\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 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 00581\n-list border_list;\n 00582\n 00583\n-Cmomentum cone_removal;\n 00584\n-Cmomentum border = *parent;\n 00585\n-border_list.push_back(parent);\n 00586\n 00587\n-// make sure child appears in the border region\n 00588\n-centre->cocircular.push_back(centre);\n 00589\n 00590\n-// now establish the full contents of the cone minus the cocircular\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 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 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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f224\n-\n-File Documentation\n-\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 00605\n-if (!(*it)->is_inside->cocirc) {\n 00606\n-border += *((*it)->v);\n 00607\n-(*it)->is_inside->cocirc = true;\n 00608\n-put_in_border.push_back((*it)->is_inside);\n 00609\n-border_list.push_back((*it)->v);\n 00610\n-}\n 00611\n-}\n 00612\n 00613\n 00614\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 00617\n-bool consider = true;\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 00631\n-double local_dpt = fabs(cone_removal.px) + fabs(cone_removal.py);\n 00632\n-double total_dpt = dpt + local_dpt;\n 00633\n 00634\n-recompute_cone_contents_if_needed(borderless_cone, total_dpt);\n 00635\n-if (total_dpt == 0) {\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-}\n 00641\n 00642\n-test_cone_cocircular(borderless_cone, border_list);\n 00643\n-}\n 00644\n 00645\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-}\n 00651\n 00652\n-// relabel things that got put into the border\n 00653\n-for(list::iterator is_in = put_in_border.begin();\n 00654\n-is_in != put_in_border.end(); is_in++) {\n 00655\n+\n+File Documentation\n+\n+centre->is_inside->cone = false;\n+// update stability check quantities\n+dpt += fabs(child->px)+fabs(child->py); //child->perp2();\n+}\n+\n+// now establish the list of unique children in the list\n+// first make sure parent and child are in!\n+list removed_from_cone;\n+list put_in_border;\n+list border_list;\n+Cmomentum cone_removal;\n+Cmomentum 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+cone_removal\n++= *((*it)->v);\n+(*it)->is_inside->cone = false;\n+removed_from_cone.push_back((*it)->is_inside);\n+}\n+// if a point appears twice (i.e. with + and - sign) in the list of\n+// points on the border, we take care not to include it twice.\n+// Note that this situation may appear when a point is at a distance\n+// close to 2R from the parent\n+if (!(*it)->is_inside->cocirc) {\n+border += *((*it)->v);\n+(*it)->is_inside->cocirc = true;\n+put_in_border.push_back((*it)->is_inside);\n+border_list.push_back((*it)->v);\n+}\n+}\n+\n+// figure out whether this pairing has been observed before\n+Cmomentum borderless_cone = cone;\n+borderless_cone -= cone_removal;\n+bool consider = true;\n+for (unsigned int i=0;i(borderless_cone.ref,\n+border.ref));\n+// first figure out whether our cone momentum is good\n+double local_dpt = fabs(cone_removal.px) + fabs(cone_removal.py);\n+double total_dpt = dpt + local_dpt;\n+recompute_cone_contents_if_needed(borderless_cone, total_dpt);\n+if (total_dpt == 0) {\n+// a recomputation has taken place -- so take advantage of this\n+// and update the member cone momentum\n+cone = borderless_cone + cone_removal;\n+dpt = local_dpt;\n+}\n+test_cone_cocircular(borderless_cone, border_list);\n+}\n+\n+// relabel things that were in the cone but got removed\n+for(list::iterator is_in = removed_from_cone.begin();\n+is_in != removed_from_cone.end(); is_in++) {\n+(*is_in)->cone = true;\n+}\n+// relabel things that got put into the border\n+for(list::iterator is_in = put_in_border.begin();\n+is_in != put_in_border.end(); is_in++) {\n (*is_in)->cocirc = false;\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.39 protocones.cpp\n+\n 00656\n }\n 00657\n 00658\n // we\u2019re done with everything -- return true to signal to user that we\u2019ve\n 00659\n // been through the co-circularity rigmarole\n@@ -18723,19 +22272,14 @@\n if (!(*here())->side) ((*here())->is_inside->cone) = 1;\n 00696\n 00697\n // move on to the next position\n 00698\n ++here;\n 00699\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.24 protocones.cpp\n-\n 00700\n // as we arrive at this position a particle leaves if its side is positive\n 00701\n if ((*here())->side) ((*here())->is_inside->cone) = 0;\n 00702\n } while (here != start);\n 00703\n@@ -18809,14 +22353,23 @@\n if (this_dpt > PT_TSHOLD*(fabs(this_cone.px)+fabs(this_cone.py))) {\n 00750\n if (cone.ref.is_empty()) {\n 00751\n this_cone = Cmomentum();\n 00752\n } else {\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+251\n+\n+\f252\n+\n+File Documentation\n+\n 00753\n // set momentum to 0\n 00754\n this_cone = Cmomentum();\n 00755\n 00756\n // Important note: we can browse only the particles\n@@ -18865,23 +22418,14 @@\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 00787 * - cx\n circle centre x coordinate\n 00788 * - cy\n circle centre y coordinate\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-225\n-\n-\f226\n-\n-File Documentation\n-\n 00789 * return the checkxor for the intersection\n 00790 ******************************************************************/\n 00791 Creference Cstable_cones::circle_intersect(double cx, double cy){\n 00792\n Creference intersection;\n 00793\n int i;\n@@ -18953,75 +22497,74 @@\n second angle\n 00837 * return the absolute value of the difference between the angles\n 00838 *****************************************************************/\n 00839 inline double abs_dangle(double &angle1, double &angle2){\n 00840\n double dphi;\n 00841\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.40 protocones.cpp\n+\n 00842\n dphi = fabs(angle1-angle2);\n 00843\n if (dphi>M_PI)\n 00844\n dphi = dphi-twopi;\n 00845\n 00846\n return dphi;\n 00847 }\n 00848\n 00849 }\n \n-5.25\n+5.40\n \n protocones.cpp\n \n 00001\n 00002 // File: protocones.cpp\n+//\n 00003 // Description: source file for stable cones determination (Cstable_cones)\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-00007 // For more details, see http://projects.hepforge.org/siscone\n-00008 //\n-00009 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n-00010 //\n-00011 // This program is free software; you can redistribute it and/or modify\n-00012 // it under the terms of the GNU General Public License as published by\n-00013 // the Free Software Foundation; either version 2 of the License, or\n-00014 // (at your option) any later version.\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-//\n-//\n-//\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.25 protocones.cpp\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@@ -19101,14 +22644,23 @@\n 00067 #include \n 00068\n 00069 namespace siscone_spherical{\n 00070\n 00071 using namespace std;\n 00072\n 00073 /**********************************************************************\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+253\n+\n+\f254\n+\n+File Documentation\n+\n 00074 * CSphstable_cones implementation\n *\n 00075 * Computes the list of stable comes from a particle list.\n *\n 00076 * This class does the first fundamental task of te cone algorithm:\n *\n 00077 * it is used to compute the list of stable cones given a list\n@@ -19148,23 +22700,14 @@\n 00103 }\n 00104\n 00105 // default dtor\n 00106 //-------------00107 CSphstable_cones::~CSphstable_cones(){\n 00108\n if (hc!=NULL) delete hc;\n 00109 }\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-227\n-\n-\f228\n-\n-File Documentation\n-\n 00110\n 00111 /*\n 00112 * initialisation\n 00113 * - _particle_list list of particles\n 00114 * - _n\n number of particles\n 00115 *********************************************************************/\n@@ -19239,14 +22782,19 @@\n // step 0: compute the child list CL.\n 00162\n //\n Note that this automatically sets the parent P\n 00163\n build(&plist[p_idx], 2.0*R);\n 00164\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.40 protocones.cpp\n+\n 00165\n // special case:\n 00166\n //\n if the vicinity is empty, the parent particle is a\n 00167\n //\n@@ -19299,19 +22847,14 @@\n //\n 00197 // - test_cone()\n //\n 00198 // - update_cone()\n //\n 00199 // - proceed_with_stability()\n //\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.25 protocones.cpp\n-\n 00201\n 00202 /*\n 00203 * initialise the cone.\n 00204 * We take the first particle in the angular ordering to compute\n 00205 * this one\n 00206 * return 0 on success, 1 on error\n 00207 *********************************************************************/\n@@ -19384,14 +22927,23 @@\n 00250\n // are tested when taking the pair of particle parent+child\n 00251\n // and child+parent.\n 00252\n 00253\n // here are the tests entering the first series:\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+255\n+\n+\f256\n+\n+File Documentation\n+\n 00254\n // 1. check if the cone is already inserted\n 00255\n // 2. check cone stability for the parent and child particles\n 00256\n 00257\n //UPDATED(see below): if (centre->side){\n@@ -19465,23 +23017,14 @@\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 00287\n hc->insert(&cone_candidate, parent, child, false, false);\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-229\n-\n-\f230\n-\n-File Documentation\n-\n 00288\n }\n 00289\n 00290\n // test when 1! of the particles is in the cone\n 00291\n cone_candidate += *parent;\n@@ -19558,14 +23101,19 @@\n 00337\n // update cone\n 00338\n cone += (*child);\n 00339\n 00340\n // update info on particles inside\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.40 protocones.cpp\n+\n 00341\n centre->is_inside->cone = true;\n 00342\n 00343\n // update stability check quantities\n 00344\n dpt += fabs(child->px)+fabs(child->py)+fabs(child->pz);\n@@ -19616,19 +23164,14 @@\n 00370 #endif\n 00371\n 00372\n // update cone\n 00373\n cone -= (*child);\n 00374\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.25 protocones.cpp\n-\n 00375\n // update info on particles inside\n 00376\n centre->is_inside->cone = false;\n 00377\n 00378\n // update stability check quantities\n@@ -19707,14 +23250,23 @@\n if (quadtree->circle_intersect(elm->eta, elm->phi, R2)==elm->ref)\n 00424 #else\n 00425\n // => testing stability with the particle-list intersection\n 00426\n if (circle_intersect(elm->centre)==elm->centre.ref)\n 00427 #endif\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+257\n+\n+\f258\n+\n+File Documentation\n+\n 00428\n protocones.push_back(CSphmomentum(elm->centre,1.0));\n 00429\n }\n 00430\n 00431\n // jump to the next one\n@@ -19761,23 +23313,14 @@\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 00464 //}\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-231\n-\n-\f232\n-\n-File Documentation\n-\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 00471 * particle may appear in a list -- this needs to be watched out for\n@@ -19856,14 +23399,19 @@\n 00512\n } while (here() != vicinity.begin());\n 00513 }\n 00514\n 00515 /*\n 00516 * Testing cocircular configurations in p^3 time,\n 00517 * rather than 2^p time; we will test all contiguous subsets of points\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.40 protocones.cpp\n+\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@@ -19915,19 +23463,14 @@\n 00548\n 00549\n // test the borderless cone\n 00550\n CSphmomentum candidate = borderless_cone;\n 00551\n //candidate.build_etaphi();\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.25 protocones.cpp\n-\n 00552\n if (candidate.ref.not_empty())\n 00553\n test_stability(candidate, border_vect);\n 00554\n 00555\n do {\n@@ -20005,14 +23548,23 @@\n 00603 /*\n 00604 * check if we are in a situation of cocircularity.\n 00605 * if it is the case, update and test in the corresponding way\n 00606 * return \u2019false\u2019 if no cocircularity detected, \u2019true\u2019 otherwise\n 00607 * Note that if cocircularity is detected, we need to\n 00608 * recall \u2019update\u2019 from \u2019update\u2019 !!!\n 00609 ***************************************************************/\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+259\n+\n+\f260\n+\n+File Documentation\n+\n 00610 bool CSphstable_cones::cocircular_check(){\n 00611\n // check if many configurations have the same centre.\n 00612\n // if this is the case, branch on the algorithm for this\n 00613\n // special case.\n@@ -20063,70 +23615,59 @@\n 00640\n CSphmomentum cone_removal;\n 00641\n CSphmomentum border = *parent;\n 00642\n border_list.push_back(parent);\n 00643\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-233\n-\n-\f234\n-\n 00644\n+// make sure child appears in the border region\n 00645\n+centre->cocircular.push_back(centre);\n 00646\n 00647\n+// now establish the full contents of the cone minus the cocircular\n 00648\n+// region and of the cocircular region itself\n 00649\n+for(list::iterator it = centre->cocircular.begin();\n 00650\n+it != centre->cocircular.end(); it++) {\n 00651\n 00652\n-00653\n-00654\n-00655\n-00656\n-00657\n-00658\n-00659\n-00660\n-00661\n-00662\n-00663\n-00664\n-00665\n-00666\n-00667\n-\n-File Documentation\n-\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+00653\n cone_removal\n += *((*it)->v);\n+00654\n (*it)->is_inside->cone = false;\n+00655\n removed_from_cone.push_back((*it)->is_inside);\n+00656\n }\n-\n+00657\n+00658\n // if a point appears twice (i.e. with + and - sign) in the list of\n+00659\n // points on the border, we take care not to include it twice.\n+00660\n // Note that this situation may appear when a point is at a distance\n+00661\n // close to 2R from the parent\n+00662\n if (!(*it)->is_inside->cocirc) {\n+00663\n border += *((*it)->v);\n+00664\n (*it)->is_inside->cocirc = true;\n+00665\n put_in_border.push_back((*it)->is_inside);\n+00666\n border_list.push_back((*it)->v);\n+00667\n //cout \u00ab \" adding particle \" \u00ab (*it)->v->_theta \u00ab \", \" \u00ab (*it)->v->_phi \u00ab \" to the border list\"\n \u00ab endl;\n 00668\n }\n 00669\n }\n 00670\n@@ -20172,14 +23713,19 @@\n recompute_cone_contents_if_needed(borderless_cone, total_dpt);\n 00693\n if (total_dpt == 0) {\n 00694\n // a recomputation has taken place -- so take advantage of this\n 00695\n // and update the member cone momentum\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.40 protocones.cpp\n+\n 00696\n cone = borderless_cone + cone_removal;\n 00697\n dpt = local_dpt;\n 00698\n }\n 00699\n@@ -20230,19 +23776,14 @@\n //\n 00728\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.25 protocones.cpp\n-\n 00740\n 00741\n siscone::circulator::iterator > here(start);\n 00742\n 00743\n // note that in the following algorithm, the cone contents never includes\n 00744\n@@ -20322,14 +23863,23 @@\n 00789\n if ((vicinity[i]->side) && (vicinity[i]->is_inside->cone))\n 00790\n cone += *vicinity[i]->v;\n 00791\n }\n 00792\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+261\n+\n+\f262\n+\n+File Documentation\n+\n 00793\n // set check variables back to 0\n 00794\n dpt = 0.0;\n 00795 }\n 00796\n 00797\n@@ -20377,23 +23927,14 @@\n 00823\n }\n 00824\n 00825\n }\n 00826\n // set check variables back to 0\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-235\n-\n-\f236\n-\n-File Documentation\n-\n 00827\n this_dpt = 0.0;\n 00828\n }\n 00829\n 00830 }\n 00831\n@@ -20437,3853 +23978,46 @@\n 00858\n 00859\n return intersection;\n 00860 }\n 00861\n 00862 }\n \n-5.26\n-\n-quadtree.cpp\n-\n-00001\n-00002 // File: quadtree.cpp\n-//\n-00003 // Description: source file for quadtree management (Cquadtree 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:: 320\n-$//\n-00024 // $Date:: 2011-11-15 09:54:50 +0100 (Tue, 15 Nov 2011)\n-$//\n-00026\n-00027 #include \"quadtree.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 * Cquadtree implementation\n-*\n-00038 * Implementation of a 2D quadtree.\n-*\n-00039 * This class implements the traditional two-dimensional quadtree. *\n-00040 * The elements at each node are of \u2019Cmomentum\u2019 type.\n-*\n-00041 *******************************************************************/\n-00042\n-00043 // default ctor\n-00044 //-------------00045 Cquadtree::Cquadtree(){\n-00046\n-v = NULL;\n-00047\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.26 quadtree.cpp\n-\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-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-00058\n-children[0][0] = children[0][1] = children[1][0] = children[1][1] = NULL;\n-00059\n-has_child = false;\n-00060\n-00061\n-init(_x, _y, _half_size_x, _half_size_y);\n-00062 }\n-00063\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-00072\n-delete children[0][0];\n-00073\n-delete children[0][1];\n-00074\n-delete children[1][0];\n-00075\n-delete children[1][1];\n-00076\n-}\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-00085 * - _y\n-y-position of the center\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-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-00093\n-return 1;\n-00094\n-00095\n-centre_x = _x;\n-00096\n-centre_y = _y;\n-00097\n-half_size_x = _half_size_x;\n-00098\n-half_size_y = _half_size_y;\n-00099\n-00100\n-return 0;\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-00109 * return 0 on success 1 on error\n-00110 ******************************************************************/\n-00111 int Cquadtree::add(Cmomentum *v_add){\n-00112\n-// Description of the method:\n-00113\n-// -------------------------00114\n-// the addition process goes as follows:\n-00115\n-// 1. check if the cell is empty, in which case, add the particle\n-00116\n-//\n-here and leave.\n-00117\n-// 2. If there is a unique particle already inside,\n-00118\n-//\n-(a) create children\n-00119\n-//\n-(b) forward the existing particle to the appropriate child\n-00120\n-// 3. Add current particle to this cell and forward to the\n-00121\n-//\n-adequate child\n-00122\n-// NOTE: we assume in the whole procedure that the particle is\n-00123\n-//\n-indeed inside the cell !\n-00124\n-00125\n-// step 1: the case of empty cells\n-00126\n-if (v==NULL){\n-00127\n-v = v_add;\n-00128\n-return 0;\n-00129\n-}\n-00130\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-00134\n-double new_half_size_x = 0.5*half_size_x;\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-237\n-\n-\f238\n-\n-File Documentation\n-\n-00135\n-double new_half_size_y = 0.5*half_size_y;\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-children[1][0] = new Cquadtree(centre_x+new_half_size_x, centre_y-new_half_size_y,\n-00142\n-new_half_size_x, new_half_size_y);\n-00143\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-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-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-00158\n-// Note: v_add being a single particle, eta and phi are correct\n-00159\n-children[v_add->eta>centre_x][v_add->phi>centre_y]->add(v_add);\n-00160\n-*v+=*v_add;\n-00161\n-00162\n-return 0;\n-00163 }\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-00172 * - cy\n-circle centre y coordinate\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-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-If yes, add it and return, if not simply return.\n-00182\n-// 3. check if the circle intersects the square. If not, return.\n-00183\n-// 4. check if the square is inside the circle.\n-00184\n-//\n-If yes, add it to qt and return.\n-00185\n-// 5. check intersections with children.\n-00186\n-00187\n-// step 1: if there is no particle inside te square, no reason to go further\n-00188\n-if (v==NULL)\n-00189\n-return Creference();\n-00190\n-00191\n-double dx, dy;\n-00192\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-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-00200\n-if (dy>M_PI)\n-00201\n-dy -= 2.0*M_PI;\n-00202\n-00203\n-// test distance\n-00204\n-if (dx*dx+dy*dyref;\n-00206\n-}\n-00207\n-00208\n-return Creference();\n-00209\n-}\n-00210\n-00211\n-// step 3: check if there is an intersection\n-00212\n-//double ryp, rym;\n-00213\n-double dx_c, dy_c;\n-00214\n-00215\n-// store distance with the centre of the square\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-00219\n-00220\n-// compute (minimal) the distance (pay attention to the periodicity in phi).\n-00221\n-dx = dx_c-half_size_x;\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.26 quadtree.cpp\n-\n-00222\n-if (dx<0) dx=0;\n-00223\n-dy = dy_c-half_size_y;\n-00224\n-if (dy<0) dy=0;\n-00225\n-00226\n-// check the distance\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-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-00237\n-if (dy>M_PI) dy = M_PI;\n-00238\n-00239\n-// compute the distance\n-00240\n-if (dx*dx+dy*dyref;\n-00242\n-}\n-00243\n-00244\n-// step 5: the square is not fully in. Recurse to children\n-00245\n-return children[0][0]->circle_intersect(cx, cy, cR2)\n-00246\n-+ children[0][1]->circle_intersect(cx, cy, cR2)\n-00247\n-+ children[1][0]->circle_intersect(cx, cy, cR2)\n-00248\n-+ children[1][1]->circle_intersect(cx, cy, cR2);\n-00249 }\n-00250\n-00251\n-00252 /*\n-00253 * output a data file for drawing the grid.\n-00254 * This can be used to output a data file containing all the\n-00255 * grid subdivisions. The file contents is as follows:\n-00256 * first and second columns give center of the cell, the third\n-00257 * gives the size.\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-00263\n-if (flux==NULL)\n-00264\n-return 1;\n-00265\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-children[1][0]->save(flux);\n-00271\n-children[1][1]->save(flux);\n-00272\n-}\n-00273\n-00274\n-return 0;\n-00275 }\n-00276\n-00277\n-00278 /*\n-00279 * output a data file for drawing the tree leaves.\n-00280 * This can be used to output a data file containing all the\n-00281 * tree leaves. The file contents is as follows:\n-00282 * first and second columns give center of the cell, the third\n-00283 * gives the size.\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-00289\n-if (flux==NULL)\n-00290\n-return 1;\n-00291\n-00292\n-if (has_child){\n-00293\n-if (children[0][0]!=NULL) children[0][0]->save_leaves(flux);\n-00294\n-if (children[0][1]!=NULL) children[0][1]->save_leaves(flux);\n-00295\n-if (children[1][0]!=NULL) children[1][0]->save_leaves(flux);\n-00296\n-if (children[1][1]!=NULL) children[1][1]->save_leaves(flux);\n-00297\n-} else {\n-00298\n-fprintf(flux, \"%e\\t%e\\t%e\\t%e\\n\", centre_x, centre_y, half_size_x, half_size_y);\n-00299\n-}\n-00300\n-00301\n-return 0;\n-00302 }\n-00303\n-00304 }\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-239\n-\n-\f240\n-\n-5.27\n-\n-File Documentation\n-\n-quadtree.h\n-\n-00001 // -*- C++ -*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-00007 //\n-//\n-00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-//\n-00009 //\n-//\n-00010 // 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-//\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:: 123\n-$//\n-00025 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n-$//\n-00027\n-00028 #ifndef __QUADTREE_H__\n-00029 #define __QUADTREE_H__\n-00030\n-00031 #include \"momentum.h\"\n-00032 #include \n-00033\n-00034 namespace siscone{\n-00035\n-00043 class Cquadtree{\n-00044 public:\n-00046\n-Cquadtree();\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-00067\n-int init(double _x, double _y, double _half_size_x, double _half_size_y);\n-00068\n-00076\n-int add(Cmomentum *v_add);\n-00077\n-00088\n-Creference circle_intersect(double cx, double cy, double cR2);\n-00089\n-00099\n-int save(FILE *flux);\n-00100\n-00110\n-int save_leaves(FILE *flux);\n-00111\n-00112\n-double centre_x;\n-00113\n-double centre_y;\n-00114\n-double half_size_x;\n-00115\n-double half_size_y;\n-00116\n-00117\n-Cmomentum *v;\n-00118\n-00119\n-Cquadtree* children[2][2];\n-00120\n-bool has_child;\n-00121 };\n-00122\n-00123 }\n-00124 #endif\n-\n-5.28\n-\n-ranlux.cpp\n-\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\n-The sequence is a series of 24-bit integers, x_n,\n-00008\n-00009\n-x_n = d_n + b_n\n-00010\n-00011\n-where d_n = x_{n-10} - x_{n-24} - c_{n-1}, b_n = 0 if d_n >= 0 and\n-00012\n-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\n-where after 24 samples a group of p integers are \"skipped\", to\n-00014\n-reduce correlations. By default p = 199, but can be increased to\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.28 ranlux.cpp\n-\n-00015\n-365.\n-00016\n-00017\n-The period of the generator is around 10^171.\n-00018\n-00019\n-From: M. Luescher, \"A portable high-quality random number generator\n-00020\n-for lattice field theory calculations\", Computer Physics\n-00021\n-Communications, 79 (1994) 100-110.\n-00022\n-00023\n-Available on the net as hep-lat/9309020 at http://xxx.lanl.gov/\n-00024\n-00025\n-See also,\n-00026\n-00027\n-F. James, \"RANLUX: A Fortran implementation of the high-quality\n-00028\n-pseudo-random number generator of Luscher\", Computer Physics\n-00029\n-Communications, 79 (1994) 111-114\n-00030\n-00031\n-Kenneth G. Hamilton, F. James, \"Acceleration of RANLUX\", Computer\n-00032\n-Physics Communications, 101 (1997) 241-248\n-00033\n-00034\n-Kenneth G. Hamilton, \"Assembler RANLUX for PCs\", Computer Physics\n-00035\n-Communications, 101 (1997) 249-253 */\n-00036\n-00037 namespace siscone{\n-00038\n-00039 static const unsigned long int mask_lo = 0x00ffffffUL; // 2^24 - 1\n-00040 static const unsigned long int mask_hi = ~0x00ffffffUL;\n-00041 static const unsigned long int two24 = 16777216;\n-// 2^24\n-00042\n-00043\n-00044 // internal generator structure\n-00045 //-----------------------------00046 typedef struct {\n-00047\n-unsigned int i;\n-00048\n-unsigned int j;\n-00049\n-unsigned int n;\n-00050\n-unsigned int skip;\n-00051\n-unsigned int carry;\n-00052\n-unsigned long int u[24];\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-00065\n-unsigned int j = local_ranlux_state.j;\n-00066\n-long int delta = local_ranlux_state.u[j] - local_ranlux_state.u[i]\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-00071\n-delta &= mask_lo;\n-00072\n-} else {\n-00073\n-local_ranlux_state.carry = 0;\n-00074\n-}\n-00075\n-00076\n-local_ranlux_state.u[i] = delta;\n-00077\n-00078\n-if (i==0)\n-00079\n-i = 23;\n-00080\n-else\n-00081\n-i--;\n-00082\n-00083\n-local_ranlux_state.i = i;\n-00084\n-00085\n-if (j == 0)\n-00086\n-j = 23;\n-00087\n-else\n-00088\n-j--;\n-00089\n-00090\n-local_ranlux_state.j = j;\n-00091\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-00099\n-int i;\n-00100\n-long int seed;\n-00101\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-241\n-\n-\f242\n-\n-File Documentation\n-\n-00102\n-if (s==0)\n-00103\n-s = 314159265;\n-/* default seed is 314159265 */\n-00104\n-00105\n-seed = s;\n-00106\n-00107\n-/* This is the initialization algorithm of F. James, widely in use\n-00108\n-for RANLUX. */\n-00109\n-00110\n-for (i=0;i<24;i++){\n-00111\n-unsigned long int k = seed/53668;\n-00112\n-seed = 40014*(seed-k*53668)-k*12211;\n-00113\n-if (seed<0){\n-00114\n-seed += 2147483563;\n-00115\n-}\n-00116\n-local_ranlux_state.u[i] = seed%two24;\n-00117\n-}\n-00118\n-00119\n-local_ranlux_state.i = 23;\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-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-}\n-00129 }\n-00130\n-00131\n-00132 // generator initialization\n-00133 //-------------------------00134 void ranlux_init(){\n-00135\n-// seed the generator\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-00143\n-const unsigned int skip = local_ranlux_state.skip;\n-00144\n-unsigned long int r = increment_state();\n-00145\n-00146\n-local_ranlux_state.n++;\n-00147\n-00148\n-if (local_ranlux_state.n == 24){\n-00149\n-unsigned int i;\n-00150\n-local_ranlux_state.n = 0;\n-00151\n-for (i = 0; i < skip; i++)\n-00152\n-increment_state();\n-00153\n-}\n-00154\n-00155\n-return r;\n-00156 }\n-00157\n-00158 // print generator state\n-00159 //----------------------00160 void ranlux_print_state(){\n-00161\n-size_t i;\n-00162\n-unsigned char *p = (unsigned char *) (&local_ranlux_state);\n-00163\n-const size_t n = sizeof (ranlux_state_t);\n-00164\n-00165\n-for (i=0;i= 0 and\n-00012\n-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\n-where after 24 samples a group of p integers are \"skipped\", to\n-00014\n-reduce correlations. By default p = 199, but can be increased to\n-00015\n-365.\n-00016\n-00017\n-The period of the generator is around 10^171.\n-00018\n-00019\n-From: M. Luescher, \"A portable high-quality random number generator\n-00020\n-for lattice field theory calculations\", Computer Physics\n-00021\n-Communications, 79 (1994) 100-110.\n-00022\n-00023\n-Available on the net as hep-lat/9309020 at http://xxx.lanl.gov/\n-00024\n-00025\n-See also,\n-00026\n-00027\n-F. James, \"RANLUX: A Fortran implementation of the high-quality\n-00028\n-pseudo-random number generator of Luscher\", Computer Physics\n-00029\n-Communications, 79 (1994) 111-114\n-00030\n-00031\n-Kenneth G. Hamilton, F. James, \"Acceleration of RANLUX\", Computer\n-00032\n-Physics Communications, 101 (1997) 241-248\n-00033\n-00034\n-Kenneth G. Hamilton, \"Assembler RANLUX for PCs\", Computer Physics\n-00035\n-Communications, 101 (1997) 249-253 */\n-00036\n-00037 namespace siscone{\n-00038\n-00040 void ranlux_init();\n-00041\n-00043 unsigned long int ranlux_get();\n-00044\n-00046 void ranlux_print_state();\n-00047\n-00048 }\n-00049 #endif\n-\n-5.31\n-\n-reference.cpp\n-\n-00001\n-00002 // File: reference.cpp\n-//\n-00003 // Description: source file for checkxor management (Creference 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:: 311\n-$//\n-00024 // $Date:: 2011-10-05 23:27:09 +0200 (Wed, 05 Oct 2011)\n-$//\n-00026\n-00027 #include \"reference.h\"\n-00028 #include \"ranlux.h\"\n-00029 #include \n-00030\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.31 reference.cpp\n-\n-00031 namespace siscone{\n-00032\n-00033 /*******************************************************\n-00034 * Creference implementation\n-*\n-00035 * references used for checksums.\n-*\n-00036 *\n-*\n-00037 * This class implements some reference variable\n-*\n-00038 * that can be used for checksums. Those checksums\n-*\n-00039 * are useful to disentengle between contents of two\n-*\n-00040 * cones without looking into their explicit particle *\n-00041 * contents.\n-*\n-00042 *******************************************************/\n-00043\n-00044 // default constructor\n-00046 Creference::Creference(){\n-00047\n-ref[0] = ref[1] = ref[2] = 0;\n-00048 }\n-00049\n-00050\n-//static unsigned int reference_bit = 1;\n-00051\n-00052 // create a random reference\n-00053 //--------------------------00054 void Creference::randomize(){\n-00055 // ref[0] = reference_bit;\n-00056 // ref[1] = 0;\n-00057 // ref[2] = 0;\n-00058 // reference_bit \u00ab= 1;\n-00059\n-00060\n-unsigned int r1 = ranlux_get();\n-00061\n-unsigned int r2 = ranlux_get();\n-00062\n-unsigned int r3 = ranlux_get();\n-00063\n-unsigned int r4 = ranlux_get();\n-00064\n-// since ranlux only produces 24 bits, take r4 and add 8 bits\n-00065\n-// from it to each of r1,r2, r3 to get 3*32 bits.\n-00066\n-ref[0] = r1+((r4 & 0x00ff0000) \u00ab 8);\n-00067\n-ref[1] = r2+((r4 & 0x0000ff00) \u00ab 16);\n-00068\n-ref[2] = r3+((r4 & 0x000000ff) \u00ab 24);\n-00069\n-00070\n-if (is_empty()) randomize();\n-00071 }\n-00072\n-00073 // test emptyness\n-00074 //---------------00075 bool Creference::is_empty(){\n-00076\n-return (ref[0]==0) && (ref[1]==0) && (ref[2]==0);\n-00077 }\n-00078\n-00079 // test non-emptyness\n-00080 //-------------------00081 bool Creference::not_empty(){\n-00082\n-return (ref[0]!=0) || (ref[1]!=0) || (ref[2]!=0);\n-00083 }\n-00084\n-00085 // assignment of reference\n-00086 //------------------------00087 Creference& Creference::operator = (const Creference &r){\n-00088\n-ref[0] = r.ref[0];\n-00089\n-ref[1] = r.ref[1];\n-00090\n-ref[2] = r.ref[2];\n-00091\n-return *this;\n-00092 }\n-00093\n-00094 // addition of reference\n-00095 //----------------------00096 Creference Creference::operator + (const Creference &r){\n-00097\n-Creference tmp = *this;\n-00098\n-return tmp+=r;\n-00099 }\n-00100\n-00101 // incrementation of reference\n-00102 //----------------------------00103 Creference& Creference::operator += (const Creference &r){\n-00104\n-ref[0] ^= r.ref[0];\n-00105\n-ref[1] ^= r.ref[1];\n-00106\n-ref[2] ^= r.ref[2];\n-00107\n-return *this;\n-00108 }\n-00109\n-00110 // decrementation of reference\n-00111 //----------------------------00112 Creference& Creference::operator -= (const Creference &r){\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-00116\n-return *this;\n-00117 }\n-00118\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-245\n-\n-\f246\n-\n-File Documentation\n-\n-00119 }\n-00120\n-\n-5.32\n-\n-reference.h\n-\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-//\n-00007 //\n-//\n-00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-//\n-00009 //\n-//\n-00010 // 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-//\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:: 123\n-$//\n-00025 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n-$//\n-00027\n-00028 #ifndef __REFERENCE_H__\n-00029 #define __REFERENCE_H__\n-00030\n-00031 namespace siscone{\n-00032\n-00043 class Creference{\n-00044 public:\n-00046\n-Creference();\n-00047\n-00049\n-void randomize();\n-00050\n-00052\n-bool is_empty();\n-00053\n-00055\n-bool not_empty();\n-00056\n-00058\n-Creference& operator = (const Creference &r);\n-00059\n-00061\n-Creference operator + (const Creference &r);\n-00062\n-00064\n-Creference& operator += (const Creference &r);\n-00065\n-00067\n-Creference& operator -= (const Creference &r);\n-00068\n-00070\n-inline unsigned int operator[] (int i) {return ref[i];}\n-00071\n-00072\n-unsigned int ref[3];\n-00073 };\n-00074\n-00076 Creference operator + (Creference &r1, Creference &r2);\n-00077\n-00079 bool operator == (const Creference &r1, const Creference &r2);\n-00080\n-00082 bool operator != (const Creference &r1, const Creference &r2);\n-00083\n-00085 bool operator < (const Creference &r1, const Creference &r2);\n-00086\n-00087\n-00088 //=============== inline material ================\n-00089\n-00090 // equality test for two references\n-00091 //---------------------------------00092 inline bool operator == (const Creference &r1, const Creference &r2){\n-00093\n-return (r1.ref[0]==r2.ref[0]) && (r1.ref[1]==r2.ref[1]) && (r1.ref[2]==r2.ref[2]);\n-00094 }\n-00095\n-00096 // difference test for two references\n-00097 //---------------------------------00098 inline bool operator != (const Creference &r1, const Creference &r2){\n-00099\n-return (r1.ref[0]!=r2.ref[0]) || (r1.ref[1]!=r2.ref[1]) || (r1.ref[2]!=r2.ref[2]);\n-00100 }\n-00101\n-00102 // difference test for two references\n-00103 //----------------------------------\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.33 siscone.cpp\n-\n-00104 inline bool operator < (const Creference &r1, const Creference &r2){\n-00105\n-return (r1.ref[0]\n-00034 #include \n-00035 #include \n-00036\n-00037 namespace siscone{\n-00038 using namespace std;\n-00039\n-00040 /***************************************************************\n-00041 * Csiscone implementation\n-*\n-00042 * final class: gather everything to compute the jet contents. *\n-00043 *\n-*\n-00044 * This is the class user should use.\n-*\n-00045 * It computes the jet contents of a list of particles\n-*\n-00046 * given a cone radius and a threshold for splitting/merging. *\n-00047 ***************************************************************/\n-00048\n-00049 // default ctor\n-00050 //-------------00051 Csiscone::Csiscone(){\n-00052\n-rerun_allowed = false;\n-00053 }\n-00054\n-00055 // default dtor\n-00056 //-------------00057 Csiscone::~Csiscone(){\n-00058\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-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-00069 * - _radius\n-cone radius\n-00070 * - _f\n-shared energy threshold for splitting&merging\n-00071 * - _n_pass_max maximum number of runs\n-00072 * - _ptmin\n-minimum pT of the protojets\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-247\n-\n-\f248\n-\n-File Documentation\n-\n-00073 * - _split_merge_scale\n-the scale choice for the split-merge procedure\n-00074 *\n-NOTE: using pt leads to IR unsafety for some events with momentum\n-00075 *\n-conservation. So we strongly advise not to change the default\n-00076 *\n-value.\n-00077 * return the number of jets found.\n-00078 **********************************************************************/\n-00079 int Csiscone::compute_jets(vector &_particles, double _radius, double _f,\n-00080\n-int _n_pass_max, double _ptmin,\n-00081\n-Esplit_merge_scale _split_merge_scale){\n-00082\n-_initialise_if_needed();\n-00083\n-00084\n-// run some general safety tests (NB: f will be checked in split-merge)\n-00085\n-if (_radius <= 0.0 || _radius >= 0.5*M_PI) {\n-00086\n-ostringstream message;\n-00087\n-message \u00ab \"Illegal value for cone radius, R = \" \u00ab _radius\n-00088\n-\u00ab \" (legal values are 00) && (_n_pass_max!=0));\n-00136\n-00137\n-rerun_allowed = true;\n-00138\n-00139\n-// split & merge\n-00140\n-return perform(_f, _ptmin);\n-00141 }\n-00142\n-00143\n-00144 /*\n-00145 * compute the jets from a given particle set doing multiple passes\n-00146 * such pass N looks for jets among all particles not put into jets\n-00147 * during previous passes.\n-00148 * - _particles\n-list of particles\n-00149 * - _radius\n-cone radius\n-00150 * - _n_pass_max maximum number of runs\n-00151 * - _ptmin\n-minimum pT of the protojets\n-00152 * - _ordering_scale\n-the ordering scale to decide which stable\n-00153 *\n-cone is removed\n-00154 * return the number of jets found.\n-00155 **********************************************************************/\n-00156 int Csiscone::compute_jets_progressive_removal(vector &_particles, double _radius,\n-00157\n-int _n_pass_max, double _ptmin,\n-00158\n-Esplit_merge_scale _ordering_scale){\n-00159\n-_initialise_if_needed();\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.33 siscone.cpp\n-\n-00160\n-00161\n-// run some general safety tests (NB: f will be checked in split-merge)\n-00162\n-if (_radius <= 0.0 || _radius >= 0.5*M_PI) {\n-00163\n-ostringstream message;\n-00164\n-message \u00ab \"Illegal value for cone radius, R = \" \u00ab _radius\n-00165\n-\u00ab \" (legal values are 00) && (_n_pass_max!=0));\n-00199\n-00200\n-// split & merge\n-00201\n-return jets.size();\n-00202 }\n-00203\n-00204\n-00205 /*\n-00206 * recompute the jets with a different overlap parameter.\n-00207 * we use the same particles and R as in the preceeding call.\n-00208 * - _f\n-shared energy threshold for splitting&merging\n-00209 * - _ptmin\n-minimum pT of the protojets\n-00210 * - _split_merge_scale\n-the scale choice for the split-merge procedure\n-00211 *\n-NOTE: using pt leads to IR unsafety for some events with momentum\n-00212 *\n-conservation. So we strongly advise not to change the default\n-00213 *\n-value.\n-00214 * return the number of jets found, -1 if recomputation not allowed.\n-00215 ********************************************************************/\n-00216 int Csiscone::recompute_jets(double _f, double _ptmin,\n-00217\n-Esplit_merge_scale _split_merge_scale){\n-00218\n-if (!rerun_allowed)\n-00219\n-return -1;\n-00220\n-00221\n-ptcomparison.split_merge_scale = _split_merge_scale;\n-00222\n-00223\n-// restore particle list\n-00224\n-partial_clear();\n-00225\n-init_pleft();\n-00226\n-00227\n-// initialise split/merge algorithm\n-00228\n-unsigned int i;\n-00229\n-for (i=0;iflags());\n-\n-5.34\n-\n-siscone.cpp\n-\n-(*_banner_ostr) \u00ab \"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" \u00ab endl;\n-(*_banner_ostr) \u00ab \"#\n-SISCone\n-version \" \u00ab setw(28) \u00ab left \u00ab siscone_version()\n-\u00ab \"o\" \u00ab endl;\n-00253\n-(*_banner_ostr) \u00ab \"#\n-http://projects.hepforge.org/siscone\n-o\" \u00ab endl;\n-00254\n-(*_banner_ostr) \u00ab \"#\n-o\" \u00ab endl;\n-00255\n-(*_banner_ostr) \u00ab \"# This is SISCone: the Seedless Infrared Safe Cone Jet Algorithm\n-o\" \u00ab endl;\n-00256\n-(*_banner_ostr) \u00ab \"# SISCone was written by Gavin Salam and Gregory Soyez\n-o\" \u00ab endl;\n-00257\n-(*_banner_ostr) \u00ab \"# It is released under the terms of the GNU General Public License o\" \u00ab endl;\n-00258\n-(*_banner_ostr) \u00ab \"#\n-o\" \u00ab endl;\n-00259\n-(*_banner_ostr) \u00ab \"# A description of the algorithm is available in the publication\n-o\" \u00ab endl;\n-00260\n-(*_banner_ostr) \u00ab \"# JHEP 05 (2007) 086 [arXiv:0704.0292 (hep-ph)].\n-o\" \u00ab endl;\n-00261\n-(*_banner_ostr) \u00ab \"# Please cite it if you use SISCone.\n-o\" \u00ab endl;\n-00262\n-(*_banner_ostr) \u00ab \"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" \u00ab endl;\n-00263\n-(*_banner_ostr) \u00ab endl;\n-00264\n-00265\n-_banner_ostr->flush();\n-00266\n-_banner_ostr->flags(flags_to_restore);\n-00267\n-}\n-00268 }\n-00269\n-00270 // finally, a bunch of functions to access to\n-00271 // basic information (package name, version)\n-00272 //--------------------------------------------00273\n-00274 /*\n-00275 * return SISCone package name.\n-00276 * This is nothing but \"SISCone\", it is a replacement to the\n-00277 * SISCONE_PACKAGE_NAME string defined in config.h and which is not\n-00278 * guaranteed to be public.\n-00279 * return the SISCone name as a string\n-00280 */\n-00281 string siscone_package_name(){\n-00282\n-return SISCONE_PACKAGE_NAME;\n-00283 }\n-00284\n-00285 /*\n-00286 * return SISCone version number.\n-00287 * return a string of the form \"X.Y.Z\" with possible additional tag\n-00288 *\n-(alpha, beta, devel) to mention stability status\n-00289 */\n-00290 string siscone_version(){\n-00291\n-return SISCONE_VERSION;\n-00292 }\n-00293\n-00294 }\n-\n-00001\n-00002 // File: siscone.cpp\n-//\n-00003 // Description: source file for the main SISCone class\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-//\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:: 403\n-$//\n-00026 // $Date:: 2016-05-19 16:52:05 +0200 (Thu, 19 May 2016)\n-$//\n-00028\n-00029 #include \n-00030 #include \n-00031 #include \n-00032 #include \n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.34 siscone.cpp\n-\n-00033 #include \"momentum.h\"\n-00034 #include \"siscone.h\"\n-00035 #include \n-00036 #include \n-00037 #include \n-00038\n-00039 namespace siscone_spherical{\n-00040 using namespace std;\n-00041\n-00042 /***************************************************************\n-00043 * CSphsiscone implementation\n-*\n-00044 * final class: gather everything to compute the jet contents. *\n-00045 *\n-*\n-00046 * This is the class user should use.\n-*\n-00047 * It computes the jet contents of a list of particles\n-*\n-00048 * given a cone radius and a threshold for splitting/merging. *\n-00049 ***************************************************************/\n-00050\n-00051 // default ctor\n-00052 //-------------00053 CSphsiscone::CSphsiscone(){\n-00054\n-rerun_allowed = false;\n-00055 }\n-00056\n-00057 // default dtor\n-00058 //-------------00059 CSphsiscone::~CSphsiscone(){\n-00060\n-rerun_allowed = false;\n-00061 }\n-00062\n-00063 bool CSphsiscone::init_done=false;\n-00064 std::ostream* CSphsiscone::_banner_ostr=&cout;\n-00065\n-00066 /*\n-00067 * compute the jets from a given particle set doing multiple passes\n-00068 * such pass N looks for jets among all particles not put into jets\n-00069 * during previous passes.\n-00070 * - _particles\n-list of particles\n-00071 * - _radius\n-cone radius\n-00072 * - _f\n-shared energy threshold for splitting&merging\n-00073 * - _n_pass_max maximum number of runs\n-00074 * - _Emin\n-minimum energy of the protojets\n-00075 * - _split_merge_scale\n-the scale choice for the split-merge procedure\n-00076 *\n-NOTE: using pt leads to IR unsafety for some events with momentum\n-00077 *\n-conservation. So we strongly advise not to change the default\n-00078 *\n-value.\n-00079 * return the number of jets found.\n-00080 **********************************************************************/\n-00081 int CSphsiscone::compute_jets(vector &_particles, double _radius, double _f,\n-00082\n-int _n_pass_max, double _Emin,\n-00083\n-Esplit_merge_scale _split_merge_scale){\n-00084\n-// make sure things are initialised\n-00085\n-_initialise_if_needed();\n-00086\n-00087\n-// run some general safety tests (NB: f will be checked in split-merge)\n-00088\n-if (_radius <= 0.0 || _radius >= 0.5*M_PI) {\n-00089\n-ostringstream message;\n-00090\n-message \u00ab \"Illegal value for cone radius, R = \" \u00ab _radius\n-00091\n-\u00ab \" (legal values are 00) && (_n_pass_max!=0));\n-00137\n-00138\n-rerun_allowed = true;\n-00139\n-00140\n-// split & merge\n-00141\n-return perform(_f, _Emin);\n-00142 }\n-00143\n-00144 /*\n-00145 * compute the jets from a given particle set doing multiple passes\n-00146 * such pass N looks for jets among all particles not put into jets\n-00147 * during previous passes.\n-00148 * - _particles\n-list of particles\n-00149 * - _radius\n-cone radius\n-00150 * - _n_pass_max maximum number of runs\n-00151 * - _Emin\n-minimum energy of the protojets\n-00152 * - _ordering_scale\n-the ordering scale to decide which stable\n-00153 *\n-cone is removed\n-00154 * return the number of jets found.\n-00155 **********************************************************************/\n-00156 int CSphsiscone::compute_jets_progressive_removal(vector &_particles, double _radius,\n-00157\n-int _n_pass_max, double _Emin,\n-00158\n-Esplit_merge_scale _ordering_scale){\n-00159\n-// make sure things are initialised\n-00160\n-_initialise_if_needed();\n-00161\n-00162\n-// run some general safety tests (NB: f will be checked in split-merge)\n-00163\n-if (_radius <= 0.0 || _radius >= 0.5*M_PI) {\n-00164\n-ostringstream message;\n-00165\n-message \u00ab \"Illegal value for cone radius, R = \" \u00ab _radius\n-00166\n-\u00ab \" (legal values are 00) && (_n_pass_max!=0));\n-00200\n-00201\n-// split & merge\n-00202\n-return jets.size();\n-00203 }\n-00204 /*\n-00205 * recompute the jets with a different overlap parameter.\n-00206 * we use the same particles and R as in the preceeding call.\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.34 siscone.cpp\n-\n-253\n-\n-00207 * - _f\n-shared energy threshold for splitting&merging\n-00208 * - _Emin\n-minimum Energy of the protojets\n-00209 * - _split_merge_scale\n-the scale choice for the split-merge procedure\n-00210 *\n-NOTE: using pt leads to IR unsafety for some events with momentum\n-00211 *\n-conservation. So we strongly advise not to change the default\n-00212 *\n-value.\n-00213 * return the number of jets found, -1 if recomputation not allowed.\n-00214 ********************************************************************/\n-00215 int CSphsiscone::recompute_jets(double _f, double _Emin,\n-00216\n-Esplit_merge_scale _split_merge_scale){\n-00217\n-if (!rerun_allowed)\n-00218\n-return -1;\n-00219\n-00220\n-ptcomparison.split_merge_scale = _split_merge_scale;\n-00221\n-00222\n-// restore particle list\n-00223\n-partial_clear();\n-00224\n-init_pleft();\n-00225\n-00226\n-// initialise split/merge algorithm\n-00227\n-unsigned int i;\n-00228\n-for (i=0;iflags());\n-00250\n-00251\n-(*_banner_ostr) \u00ab \"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" \u00ab endl;\n-00252\n-(*_banner_ostr) \u00ab \"#\n-SISCone\n-version \" \u00ab setw(28) \u00ab left \u00ab siscone_version()\n-\u00ab \"o\" \u00ab endl;\n-00253\n-(*_banner_ostr) \u00ab \"#\n-http://projects.hepforge.org/siscone\n-o\" \u00ab endl;\n-00254\n-(*_banner_ostr) \u00ab \"#\n-o\" \u00ab endl;\n-00255\n-(*_banner_ostr) \u00ab \"# This is SISCone: the Seedless Infrared Safe Cone Jet Algorithm\n-o\" \u00ab endl;\n-00256\n-(*_banner_ostr) \u00ab \"# SISCone was written by Gavin Salam and Gregory Soyez\n-o\" \u00ab endl;\n-00257\n-(*_banner_ostr) \u00ab \"# It is released under the terms of the GNU General Public License o\" \u00ab endl;\n-00258\n-(*_banner_ostr) \u00ab \"#\n-o\" \u00ab endl;\n-00259\n-(*_banner_ostr) \u00ab \"#\n-!!!\n-WARNING\n-!!!\n-o\" \u00ab endl;\n-00260\n-(*_banner_ostr) \u00ab \"#\n-This is the version of SISCone using spherical coordinates\n-o\" \u00ab endl;\n-00261\n-(*_banner_ostr) \u00ab \"#\n-o\" \u00ab endl;\n-00262\n-(*_banner_ostr) \u00ab \"# A description of the algorithm is available in the publication\n-o\" \u00ab endl;\n-00263\n-(*_banner_ostr) \u00ab \"# JHEP 05 (2007) 086 [arXiv:0704.0292 (hep-ph)].\n-o\" \u00ab endl;\n-00264\n-(*_banner_ostr) \u00ab \"# Please cite it if you use SISCone.\n-o\" \u00ab endl;\n-00265\n-(*_banner_ostr) \u00ab \"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" \u00ab endl;\n-00266\n-(*_banner_ostr) \u00ab endl;\n-00267\n-00268\n-_banner_ostr->flush();\n-00269\n-_banner_ostr->flags(flags_to_restore);\n-00270\n-}\n-00271 }\n-00272\n-00273 // finally, a bunch of functions to access to\n-00274 // basic information (package name, version)\n-00275 //--------------------------------------------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-00282 * return the SISCone name as a string\n-00283 */\n-00284 string siscone_package_name(){\n-00285\n-return SISCONE_PACKAGE_NAME;\n-00286 }\n-00287\n-00288 /*\n-00289 * return SISCone version number.\n-00290 * return a string of the form \"X.Y.Z\" with possible additional tag\n-00291 *\n-(alpha, beta, devel) to mention stability status\n-00292 */\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f254\n-\n-File Documentation\n-\n-00293 string siscone_version(){\n-00294\n-return SISCONE_VERSION;\n-00295 }\n-00296\n-00297 }\n-\n-5.35\n-\n-siscone.h\n-\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-//\n-00007 //\n-//\n-00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-//\n-00009 //\n-//\n-00010 // 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-//\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:: 401\n-$//\n-00025 // $Date:: 2016-05-19 16:44:37 +0200 (Thu, 19 May 2016)\n-$//\n-00027\n-00028 #ifndef __SISCONE_H__\n-00029 #define __SISCONE_H__\n-00030\n-00031 #include \"protocones.h\"\n-00032 #include \"split_merge.h\"\n-00033\n-00034 namespace siscone{\n-00035\n-00048 class Csiscone : public Cstable_cones, public Csplit_merge{\n-00049 public:\n-00051\n-Csiscone();\n-00052\n-00054\n-~Csiscone();\n-00055\n-00076\n-int compute_jets(std::vector &_particles, double _radius, double _f,\n-00077\n-int _n_pass_max=0, double _ptmin=0.0,\n-00078\n-Esplit_merge_scale _split_merge_scale=SM_pttilde);\n-00079\n-00097\n-int compute_jets_progressive_removal(std::vector &_particles, double _radius,\n-00098\n-int _n_pass_max=0, double _ptmin=0.0,\n-00099\n-Esplit_merge_scale _ordering_scale=SM_pttilde);\n-00100\n-00113\n-int recompute_jets(double _f, double _ptmin = 0.0,\n-00114\n-Esplit_merge_scale _split_merge_scale=SM_pttilde);\n-00115\n-00117\n-std::vector > protocones_list;\n-00118\n-00119\n-// random number initialisation\n-00120\n-static bool init_done;\n-00121\n-00122 #ifdef DEBUG_STABLE_CONES\n-00123\n-int nb_hash_cones_total, nb_hash_occupied_total;\n-00124 #endif\n-00125\n-00137\n-static void set_banner_stream(std::ostream * ostr) {_banner_ostr = ostr;}\n-00138\n-00143\n-static std::ostream * banner_stream() {return _banner_ostr;}\n-00144\n-00145 private:\n-00146\n-bool rerun_allowed;\n-00147\n-static std::ostream * _banner_ostr;\n-00148\n-00150\n-void _initialise_if_needed();\n-00151\n-00152 };\n-00153\n-00154\n-00155 // finally, a bunch of functions to access to\n-00156 // basic information (package name, version)\n-00157 //---------------------------------------------\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.36 siscone.h\n-\n-00158\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.36\n-\n-siscone.h\n-\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-//\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:: 401\n-$//\n-00027 // $Date:: 2016-05-19 16:44:37 +0200 (Thu, 19 May 2016)\n-$//\n-00029\n-00030 #ifndef __SPH_SISCONE_H__\n-00031 #define __SPH_SISCONE_H__\n-00032\n-00033 #include \"protocones.h\"\n-00034 #include \"split_merge.h\"\n-00035\n-00036 namespace siscone_spherical{\n-00037\n-00050 class CSphsiscone : public CSphstable_cones, public CSphsplit_merge{\n-00051 public:\n-00053\n-CSphsiscone();\n-00054\n-00056\n-~CSphsiscone();\n-00057\n-00076\n-int compute_jets(std::vector &_particles, double _radius, double _f,\n-00077\n-int _n_pass_max=0, double _Emin=0.0,\n-00078\n-Esplit_merge_scale _split_merge_scale=SM_Etilde);\n-00079\n-00094\n-int compute_jets_progressive_removal(std::vector &_particles, double _radius,\n-00095\n-int _n_pass_max=0, double _Emin=0.0,\n-00096\n-Esplit_merge_scale _ordering_scale=SM_Etilde);\n-00097\n-00110\n-int recompute_jets(double _f, double _Emin = 0.0,\n-00111\n-Esplit_merge_scale _split_merge_scale=SM_Etilde);\n-00112\n-00114\n-std::vector > protocones_list;\n-00115\n-00116\n-// random number initialisation\n-00117\n-static bool init_done;\n-00118\n-00119 #ifdef DEBUG_STABLE_CONES\n-00120\n-int nb_hash_cones_total, nb_hash_occupied_total;\n-00121 #endif\n-00122\n-00134\n-static void set_banner_stream(std::ostream * ostr) {_banner_ostr = ostr;}\n-00135\n-00140\n-static std::ostream * banner_stream() {return _banner_ostr;}\n-00141\n-00142 private:\n-00143\n-bool rerun_allowed;\n-00144\n-static std::ostream * _banner_ostr;\n-00145\n-00147\n-void _initialise_if_needed();\n-00148\n-00149 };\n-00150\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-255\n-\n-\f256\n-\n-File Documentation\n-\n-00151\n-00152 // finally, a bunch of functions to access to\n-00153 // basic information (package name, version)\n-00154 //--------------------------------------------00155\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.37\n-\n-siscone_error.cpp\n-\n-00001\n-00002 // File: siscone_error.cpp\n-//\n-00003 // Description: source file for SISCone error messages (Csiscone_error)\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 \"siscone_error.h\"\n-00028\n-00029 namespace siscone{\n-00030\n-00031 bool Csiscone_error::m_print_errors = true;\n-00032\n-00033 }\n-\n-5.38\n-\n-siscone_error.h\n-\n-00001 // -*- C++ -*00003 // File: siscone_error.h\n-//\n-00004 // Description: header file for SISCone error messages (Csiscone_error)\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-00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-//\n-00009 //\n-//\n-00010 // 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-//\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:: 327\n-$//\n-00025 // $Date:: 2011-11-25 15:19:39 +0100 (Fri, 25 Nov 2011)\n-$//\n-00027\n-00028 #ifndef __SISCONE_ERROR_H__\n-00029 #define __SISCONE_ERROR_H__\n-00030\n-00031 #include\n-00032 #include\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.39 geom_2d.cpp\n-\n-00033\n-00034 namespace siscone{\n-00035\n-00038 class Csiscone_error {\n-00039 public:\n-00041\n-Csiscone_error() {;};\n-00042\n-00045\n-Csiscone_error(const std::string & message_in) {\n-00046\n-m_message = message_in;\n-00047\n-if (m_print_errors) std::cerr \u00ab \"siscone::Csiscone_error: \"\u00ab message_in \u00ab std::endl;\n-00048\n-};\n-00049\n-00051\n-std::string message() const {return m_message;};\n-00052\n-00055\n-static void setm_print_errors(bool print_errors) {\n-00056\n-m_print_errors = print_errors;};\n-00057\n-00058 private:\n-00059\n-std::string m_message;\n-00060\n-static bool m_print_errors;\n-00061 };\n-00062\n-00063 }\n-00064 #endif\n-\n-5.39\n-\n-geom_2d.cpp\n-\n-00001\n-00002 // File: geom_2d.cpp\n-//\n-00003 // Description: source file for two-dimensional geometry tools\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:: 171\n-$//\n-00024 // $Date:: 2007-06-19 16:26:05 +0200 (Tue, 19 Jun 2007)\n-$//\n-00026\n-00027 #include \"geom_2d.h\"\n-00028 #include \n-00029\n-00030 namespace siscone{\n-00031\n-00032 #define PHI_RANGE_MASK 0xFFFFFFFF\n-00033\n-00034 /*********************************************************\n-00035 * class Ceta_phi_range implementation\n-*\n-00036 * class for holding a covering range in eta-phi\n-*\n-00037 *\n-*\n-00038 * This class deals with ranges in the eta-phi plane. It *\n-00039 * implements methods to test if two ranges overlap and *\n-00040 * to take the union of two overlapping intervals.\n-*\n-00041 *********************************************************/\n-00042\n-00043 using namespace std;\n-00044\n-00045 // static member default init\n-00046 //---------------------------00047 double Ceta_phi_range::eta_min = -100.0;\n-00048 double Ceta_phi_range::eta_max = 100.0;\n-00049\n-00050 // default ctor\n-00051 //-------------00052 Ceta_phi_range::Ceta_phi_range(){\n-00053\n-eta_range = 0;\n-00054\n-phi_range = 0;\n-00055 }\n-00056\n-00057 // ctor with initialisation\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-257\n-\n-\f258\n-\n-File Documentation\n-\n-00058 // we initialise with a centre (in eta,phi) and a radius\n-00059 // - c_eta\n-eta coordinate of the centre\n-00060 // - c_phi\n-phi coordinate of the centre\n-00061 // - R\n-radius\n-00062 //------------------------------------------------------00063 Ceta_phi_range::Ceta_phi_range(double c_eta, double c_phi, double R){\n-00064\n-// determination of the eta range\n-00065\n-//------------------------------00066\n-double xmin = max(c_eta-R,eta_min+0.0001);\n-00067\n-double xmax = min(c_eta+R,eta_max-0.0001);\n-00068\n-00069\n-unsigned int cell_min = get_eta_cell(xmin);\n-00070\n-unsigned int cell_max = get_eta_cell(xmax);\n-00071\n-00072\n-// warning: if cell_max==2^31, 2*cell_max==0 hence,\n-00073\n-// even if the next formula is formally (2*cell_max-cell_min),\n-00074\n-// expressing it as (cell_max-cell_min)+cell_max is safe.\n-00075\n-eta_range = (cell_max-cell_min)+cell_max;\n-00076\n-00077\n-// determination of the phi range\n-00078\n-// !! taking care of periodicity !!\n-00079\n-//--------------------------------00080\n-xmin = phi_in_range(c_phi-R);\n-00081\n-xmax = phi_in_range(c_phi+R);\n-00082\n-00083\n-cell_min = get_phi_cell(xmin);\n-00084\n-cell_max = get_phi_cell(xmax);\n-00085\n-00086\n-// Also, if the interval goes through pi, inversion is needed\n-00087\n-if (xmax>xmin)\n-00088\n-phi_range = (cell_max-cell_min)+cell_max;\n-00089\n-else {\n-00090\n-phi_range = (cell_min==cell_max)\n-00091\n-? PHI_RANGE_MASK\n-00092\n-: ((PHI_RANGE_MASK^(cell_min-cell_max)) + cell_max);\n-00093\n-}\n-00094 }\n-00095\n-00096 // assignment of range\n-00097 // - r\n-range to assign to current one\n-00098 //--------------------------------------00099 Ceta_phi_range& Ceta_phi_range::operator = (const Ceta_phi_range &r){\n-00100\n-eta_range = r.eta_range;\n-00101\n-phi_range = r.phi_range;\n-00102\n-00103\n-return *this;\n-00104 }\n-00105\n-00106 // add a particle to the range\n-00107 // - eta eta coordinate of the particle\n-00108 // - phi phi coordinate of the particle\n-00109 // \\return 0 on success, 1 on error\n-00110 //---------------------------------------00111 int Ceta_phi_range::add_particle(const double eta, const double phi){\n-00112\n-// deal with the eta coordinate\n-00113\n-eta_range |= get_eta_cell(eta);\n-00114\n-00115\n-// deal with the phi coordinate\n-00116\n-phi_range |= get_phi_cell(phi);\n-00117\n-00118\n-return 0;\n-00119 }\n-00120\n-00121\n-00122 // test overlap\n-00123 // - r1 first range\n-00124 // - r2 second range\n-00125 // return true if overlap, false otherwise.\n-00126 //-----------------------------------------00127 bool is_range_overlap(const Ceta_phi_range &r1, const Ceta_phi_range &r2){\n-00128\n-// check overlap in eta AND phi\n-00129\n-return ((r1.eta_range & r2.eta_range) && (r1.phi_range & r2.phi_range));\n-00130 }\n-00131\n-00132 // compute union\n-00133 // Note: we assume that the two intervals overlap\n-00134 // - r1 first range\n-00135 // - r2 second range\n-00136 // \\return union of the two ranges\n-00137 //-----------------------------------------00138 const Ceta_phi_range range_union (const Ceta_phi_range &r1, const Ceta_phi_range &r2){\n-00139\n-Ceta_phi_range tmp;\n-00140\n-00141\n-// compute union in eta\n-00142\n-tmp.eta_range = r1.eta_range | r2.eta_range;\n-00143\n-00144\n-// compute union in phi\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.40 geom_2d.cpp\n-\n-00145\n-tmp.phi_range = r1.phi_range | r2.phi_range;\n-00146\n-00147\n-return tmp;\n-00148 }\n-00149\n-00150 }\n-\n-5.40\n-\n-geom_2d.cpp\n-\n-00001\n-00002 // File: geom_2d.cpp\n-//\n-00003 // Description: source file for two-dimensional geometry tools\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-//\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:: 378\n-$//\n-00026 // $Date:: 2016-02-24 15:10:38 +0100 (Wed, 24 Feb 2016)\n-$//\n-00028\n-00029 #include \"geom_2d.h\"\n-00030 #include \n-00031\n-00032 namespace siscone_spherical{\n-00033\n-00034 #define PHI_RANGE_MASK 0xFFFFFFFF\n-00035\n-00036 /*********************************************************\n-00037 * class CSphtheta_phi_range implementation\n-*\n-00038 * class for holding a covering range in eta-phi\n-*\n-00039 *\n-*\n-00040 * This class deals with ranges in the eta-phi plane. It *\n-00041 * implements methods to test if two ranges overlap and *\n-00042 * to take the union of two overlapping intervals.\n-*\n-00043 *********************************************************/\n-00044\n-00045 using namespace std;\n-00046\n-00047 // static member default init\n-00048 //---------------------------00049 double CSphtheta_phi_range::theta_min = 0.0;\n-00050 double CSphtheta_phi_range::theta_max = M_PI;\n-00051\n-00052 // default ctor\n-00053 //-------------00054 CSphtheta_phi_range::CSphtheta_phi_range(){\n-00055\n-theta_range = 0;\n-00056\n-phi_range = 0;\n-00057 }\n-00058\n-00059 // ctor with initialisation\n-00060 // we initialise with a centre (in eta,phi) and a radius\n-00061 // - c_theta theta coordinate of the centre\n-00062 // - c_phi\n-phi coordinate of the centre\n-00063 // - R\n-radius\n-00064 //------------------------------------------------------00065 CSphtheta_phi_range::CSphtheta_phi_range(double c_theta, double c_phi, double R){\n-00066\n-// determination of the eta range\n-00067\n-//------------------------------00068\n-double xmin = max(c_theta-R,theta_min+0.00001);\n-00069\n-double xmax = min(c_theta+R,theta_max-0.00001);\n-00070\n-00071\n-unsigned int cell_min = get_theta_cell(xmin);\n-00072\n-unsigned int cell_max = get_theta_cell(xmax);\n-00073\n-00074\n-// warning: if cell_max==2^31, 2*cell_max==0 hence,\n-00075\n-// even if the next formula is formally (2*cell_max-cell_min),\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-259\n-\n-\f260\n-\n-File Documentation\n-\n-00076\n-// expressing it as (cell_max-cell_min)+cell_max is safe.\n-00077\n-theta_range = (cell_max-cell_min)+cell_max;\n-00078\n-00079\n-// determination of the phi range\n-00080\n-// !! taking care of periodicity !!\n-00081\n-// !! and the theta dependence\n-!!\n-00082\n-//--------------------------------00083\n-double ymin,ymax;\n-00084\n-double extra = asin(R/M_PI);\n-00085\n-// if the theta range comes too close to the endpoints (theta=0 or\n-00086\n-// theta=pi), then keep the full phi range\n-00087\n-if (xmin<=theta_min+extra){\n-00088\n-ymin = -M_PI+0.00001;\n-00089\n-ymax = M_PI-0.00001;\n-00090\n-} else if (xmax>=theta_max-extra){\n-00091\n-ymin = -M_PI+0.00001;\n-00092\n-ymax = M_PI-0.00001;\n-00093\n-} else {\n-00094\n-extra = max(1.0/sin(xmin), 1.0/sin(xmax));\n-00095\n-ymin = (c_phi-R)*extra;\n-00096\n-while (ymin<-M_PI) ymin+=twopi;\n-00097\n-while (ymin> M_PI) ymin-=twopi;\n-00098\n-ymax = (c_phi-R)*extra;\n-00099\n-while (ymax<-M_PI) ymax+=twopi;\n-00100\n-while (ymax> M_PI) ymax-=twopi;\n-00101\n-}\n-00102\n-cell_min = get_phi_cell(ymin);\n-00103\n-cell_max = get_phi_cell(ymax);\n-00104\n-00105\n-// Also, if the interval goes through pi, inversion is needed\n-00106\n-if (ymax>ymin)\n-00107\n-phi_range = (cell_max-cell_min)+cell_max;\n-00108\n-else {\n-00109\n-phi_range = (cell_min==cell_max)\n-00110\n-? PHI_RANGE_MASK\n-00111\n-: ((PHI_RANGE_MASK^(cell_min-cell_max)) + cell_max);\n-00112\n-}\n-00113 }\n-00114\n-00115 // assignment of range\n-00116 // - r\n-range to assign to current one\n-00117 //--------------------------------------00118 CSphtheta_phi_range& CSphtheta_phi_range::operator = (const CSphtheta_phi_range &r){\n-00119\n-theta_range = r.theta_range;\n-00120\n-phi_range = r.phi_range;\n-00121\n-00122\n-return *this;\n-00123 }\n-00124\n-00125 // add a particle to the range\n-00126 // - eta eta coordinate of the particle\n-00127 // - phi phi coordinate of the particle\n-00128 // \\return 0 on success, 1 on error\n-00129 //---------------------------------------00130 int CSphtheta_phi_range::add_particle(const double theta, const double phi){\n-00131\n-// get the theta cell\n-00132\n-unsigned int theta_cell = get_theta_cell(theta);\n-00133\n-00134\n-// deal with the eta coordinate\n-00135\n-theta_range |= theta_cell;\n-00136\n-00137\n-// deal with the phi coordinate\n-00138\n-//\n-00139\n-// watch out: if the theta_cell includes theta==0 or theta==pi,\n-00140\n-// incude the full phi range\n-00141\n-if ((theta_cell == 0x1) || (theta_cell == 0x80000000))\n-00142\n-phi_range = 0xffffffff;\n-00143\n-else\n-00144\n-phi_range |= get_phi_cell(phi);\n-00145\n-00146\n-return 0;\n-00147 }\n-00148\n-00149\n-00150 // test overlap\n-00151 // - r1 first range\n-00152 // - r2 second range\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-00157\n-return ((r1.theta_range & r2.theta_range) && (r1.phi_range & r2.phi_range));\n-00158 }\n-00159\n-00160 // compute union\n-00161 // Note: we assume that the two intervals overlap\n-00162 // - r1 first range\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.41 momentum.h\n-\n-261\n-\n-00163 // - r2 second range\n-00164 // \\return union of the two ranges\n-00165 //-----------------------------------------00166 const CSphtheta_phi_range range_union (const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2){\n-00167\n-CSphtheta_phi_range tmp;\n-00168\n-00169\n-// compute union in eta\n-00170\n-tmp.theta_range = r1.theta_range | r2.theta_range;\n-00171\n-00172\n-// compute union in phi\n-00173\n-tmp.phi_range = r1.phi_range | r2.phi_range;\n-00174\n-00175\n-return tmp;\n-00176 }\n-00177\n-00178 }\n-\n 5.41\n \n-momentum.h\n+protocones.h\n \n-00001 // -*- C++ -*00003 // File: momentum.h\n-//\n-00004 // Description: header file for 4-momentum class Cmomentum\n-//\n+00001 // -*- C++ -*00003 // File: protocones.h\n+00004 // Description: header file for stable cones determination (Cstable_cones)\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 00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-//\n 00009 //\n-//\n 00010 // 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-//\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-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-00067\n-inline double perp2() const {return px*px+py*py;}\n-00068\n-00070\n-inline double mass() const {return sqrt(mass2());}\n-00071\n-00073\n-inline double mass2() const {return perpmass2()-perp2();}\n-00074\n-00076\n-inline double perpmass() const {return sqrt((E-pz)*(E+pz));}\n-00077\n-00079\n-inline double perpmass2() const {return (E-pz)*(E+pz);}\n-00080\n-00082\n-inline double Et() const {return E/sqrt(1.0+pz*pz/perp2());}\n-00083\n-00085\n-inline double Et2() const {return E*E/(1.0+pz*pz/perp2());}\n-00086\n-00088\n-Cmomentum& operator = (const Cmomentum &v);\n-00089\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f262\n-\n-File Documentation\n-\n-00092\n-const Cmomentum operator + (const Cmomentum &v);\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-00109\n-double px;\n-00110\n-double py;\n-00111\n-double pz;\n-00112\n-double E;\n-00113\n-00114\n-double eta;\n-00115\n-double phi;\n-00116\n-int parent_index;\n-00117\n-int index;\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-00149\n-if (dy>M_PI)\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.42\n \n-momentum.h\n-\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 \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n-\f5.42 momentum.h\n+\f5.41 protocones.h\n \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-00070\n-const CSph3vector operator + (const CSph3vector &v);\n-00071\n-00074\n-const CSph3vector operator - (const CSph3vector &v);\n-00075\n-00078\n-const CSph3vector operator / (const double &r);\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-00097\n-inline double perp() const {return sqrt(perp2());}\n-00098\n-00100\n-inline double perp2() const {return px*px+py*py;}\n-00101\n-00103\n-inline double norm() const {return sqrt(px*px+py*py+pz*pz);}\n-00104\n-00106\n-inline double norm2() const {return px*px+py*py+pz*pz;}\n-00107\n-00109\n-inline double phi() const {return atan2(py, px);}\n-00110\n-00112\n-inline double theta() const {return atan2(perp(),pz);}\n-00113\n-00120\n-void build_norm();\n-00121\n-00125\n-void build_thetaphi();\n-00126\n-00129\n-void get_angular_directions(CSph3vector &angular_dir1, CSph3vector &angular_dir2);\n-00130\n-00131\n-double px;\n-00132\n-double py;\n-00133\n-double pz;\n-00134\n-00135\n-double _norm;\n-00136\n-double _theta;\n-00137\n-double _phi;\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-00176\n-inline double mass() const {return sqrt(mass2());}\n-00177\n-00179\n-inline double mass2() const {return perpmass2()-perp2();}\n-00180\n-00182\n-inline double perpmass() const {return sqrt((E-pz)*(E+pz));}\n-00183\n-00185\n-inline double perpmass2() const {return (E-pz)*(E+pz);}\n-00186\n-00188\n-inline double Et() const {return E/sqrt(1.0+pz*pz/perp2());}\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-00198\n-const CSphmomentum operator + (const CSphmomentum &v);\n-00199\n-00202\n-CSphmomentum& operator += (const CSphmomentum &v);\n-00203\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-263\n-\n-\f264\n-\n-File Documentation\n-\n-00206\n-CSphmomentum& operator -= (const CSphmomentum &v);\n-00207\n-00208\n-double E;\n-00209\n-00210\n-int parent_index;\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-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-00249 inline CSph3vector cross_product3(const CSph3vector &v1, const CSph3vector &v2){\n-00250\n-//CSph3vector tmp;\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-00278\n-return atan2(sqrt(norm2_cross_product3(*v1,*v2)), dot_product3(*v1,*v2));\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-00291\n-return (dot>=0) && (norm2_cross_product3(*v1,*v2)<=tan2R*dot*dot);\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-00301\n-//double dot = dot_product3(*v1,*v2);\n-00302\n-//return (dot>=0) && (norm2_cross_product3(*v1,*v2) &_particles, double _radius, double _f,\n+00077\n+int _n_pass_max=0, double _ptmin=0.0,\n+00078\n+Esplit_merge_scale _split_merge_scale=SM_pttilde);\n+00079\n+00097\n+int compute_jets_progressive_removal(std::vector &_particles, double _radius,\n+00098\n+int _n_pass_max=0, double _ptmin=0.0,\n+00099\n+Esplit_merge_scale _ordering_scale=SM_pttilde);\n+00100\n+00113\n+int recompute_jets(double _f, double _ptmin = 0.0,\n+00114\n+Esplit_merge_scale _split_merge_scale=SM_pttilde);\n+00115\n+00117\n+std::vector > protocones_list;\n+00118\n+00119\n+// random number initialisation\n+00120\n+static bool init_done;\n+00121\n+00122 #ifdef DEBUG_STABLE_CONES\n+00123\n+int nb_hash_cones_total, nb_hash_occupied_total;\n+00124 #endif\n+00125\n+00137\n+static void set_banner_stream(std::ostream * ostr) {_banner_ostr = ostr;}\n+00138\n+00143\n+static std::ostream * banner_stream() {return _banner_ostr;}\n+00144\n+00145 private:\n+00146\n+bool rerun_allowed;\n+00147\n+static std::ostream * _banner_ostr;\n+00148\n+00150\n+void _initialise_if_needed();\n+00151\n+00152 };\n+00153\n+00154\n+00155 // finally, a bunch of functions to access to\n+00156 // basic information (package name, version)\n+00157 //--------------------------------------------00158\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.44\n+\n+siscone.h\n+\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+//\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+//\n+\n+\f268\n+\n+File Documentation\n+\n+00025 //\n+//\n+00026 // $Revision:: 401\n+$//\n+00027 // $Date:: 2016-05-19 16:44:37 +0200 (Thu, 19 May 2016)\n+$//\n+00029\n+00030 #ifndef __SPH_SISCONE_H__\n+00031 #define __SPH_SISCONE_H__\n+00032\n+00033 #include \"protocones.h\"\n+00034 #include \"split_merge.h\"\n+00035\n+00036 namespace siscone_spherical{\n+00037\n+00050 class CSphsiscone : public CSphstable_cones, public CSphsplit_merge{\n+00051 public:\n+00053\n+CSphsiscone();\n+00054\n+00056\n+~CSphsiscone();\n+00057\n+00076\n+int compute_jets(std::vector &_particles, double _radius, double _f,\n+00077\n+int _n_pass_max=0, double _Emin=0.0,\n+00078\n+Esplit_merge_scale _split_merge_scale=SM_Etilde);\n+00079\n+00094\n+int compute_jets_progressive_removal(std::vector &_particles, double _radius,\n+00095\n+int _n_pass_max=0, double _Emin=0.0,\n+00096\n+Esplit_merge_scale _ordering_scale=SM_Etilde);\n+00097\n+00110\n+int recompute_jets(double _f, double _Emin = 0.0,\n+00111\n+Esplit_merge_scale _split_merge_scale=SM_Etilde);\n+00112\n+00114\n+std::vector > protocones_list;\n+00115\n+00116\n+// random number initialisation\n+00117\n+static bool init_done;\n+00118\n+00119 #ifdef DEBUG_STABLE_CONES\n+00120\n+int nb_hash_cones_total, nb_hash_occupied_total;\n+00121 #endif\n+00122\n+00134\n+static void set_banner_stream(std::ostream * ostr) {_banner_ostr = ostr;}\n+00135\n+00140\n+static std::ostream * banner_stream() {return _banner_ostr;}\n+00141\n+00142 private:\n+00143\n+bool rerun_allowed;\n+00144\n+static std::ostream * _banner_ostr;\n+00145\n+00147\n+void _initialise_if_needed();\n+00148\n+00149 };\n+00150\n+00151\n+00152 // finally, a bunch of functions to access to\n+00153 // basic information (package name, version)\n+00154 //--------------------------------------------00155\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.45\n \n split_merge.cpp\n \n 00001\n 00002 // File: split_merge.cpp\n 00003 // Description: source file for splitting/merging (contains the CJet class)\n@@ -24809,17 +24815,14 @@\n 00013 // the Free Software Foundation; either version 2 of the License, or\n 00014 // (at your option) any later version.\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-00020 //\n-00021 // You should have received a copy of the GNU General Public License\n-00022 // along with this program; if not, write to the Free Software\n \n //\n //\n //\n //\n //\n //\n@@ -24831,22 +24834,25 @@\n //\n //\n //\n //\n //\n //\n //\n-//\n-//\n-//\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f5.45 split_merge.cpp\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@@ -24944,28 +24950,28 @@\n 00104\n bool res = q1 > q2;\n 00105\n 00106\n // if we enable the refined version of the comparison (see defines.h),\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 \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n 269\n \n \f270\n \n File Documentation\n \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@@ -25104,25 +25110,25 @@\n } else if (j1.contents[i1]j2.contents[i2]){\n 00198\n const CSphmomentum &p = (*particles)[j2.contents[i2]];\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.45 split_merge.cpp\n-\n 00199\n (*v) -= p;\n 00200\n (*E_tilde) -= p.E*norm2_cross_product3(p,jet2_axis)/(*particles_norm2)[j2.contents[i2]];\n 00201\n i2++;\n 00202\n@@ -25239,28 +25245,28 @@\n 00275\n 00276\n 00277 // initialisation function for particle list\n 00278 // - _particles list of particles\n 00279 //------------------------------------------------------------00280 int CSphsplit_merge::init_particles(vector &_particles){\n 00281\n full_clear();\n-00282\n-00283\n-// compute the list of particles\n-00284\n-// here, we do not need to throw away particles\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n 271\n \n \f272\n \n File Documentation\n \n+00282\n+00283\n+// compute the list of particles\n+00284\n+// here, we do not need to throw away particles\n 00285\n // with infinite rapidity (colinear with the beam)\n 00286\n particles = _particles;\n 00287\n n = particles.size();\n 00288\n@@ -25397,26 +25403,26 @@\n 00365\n // ptcomparison (which may have changed since we constructed the\n 00366\n // class)\n 00367\n candidates.reset(new multiset(ptcomparison));\n 00368\n-00369\n-// start off with huge number\n-00370\n-most_ambiguous_split = numeric_limits::max();\n-00371\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f5.45 split_merge.cpp\n \n 273\n \n+00369\n+// start off with huge number\n+00370\n+most_ambiguous_split = numeric_limits::max();\n+00371\n 00372\n jets.clear();\n 00373 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 00374\n if (merge_identical_protocones)\n 00375\n cand_refs.clear();\n@@ -25546,24 +25552,24 @@\n i++;\n 00451\n }\n 00452\n 00453\n return 0;\n 00454 }\n-00455\n-00456\n-00457 // add a list of protocones\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f274\n \n File Documentation\n \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 00460 // - Emin\n minimal energy allowed for jets\n 00461 //------------------------------------------------------------00462 int CSphsplit_merge::add_protocones(vector *protocones, double R2, double Emin){\n 00463\n@@ -25701,26 +25707,26 @@\n 00537\n 00538\n // update list of included particles\n 00539\n n_pass++;\n 00540\n 00541 #ifdef DEBUG_SPLIT_MERGE\n-00542\n-cout \u00ab \"remaining particles: \";\n-00543 #endif\n-00544\n-int j=0;\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f5.45 split_merge.cpp\n \n 275\n \n+00542\n+cout \u00ab \"remaining particles: \";\n+00543 #endif\n+00544\n+int j=0;\n 00545\n for (i=0;ibuild_thetaphi();\n 00626\n 00627\n // set the jet range\n-00628\n-jet_candidate.range=CSphtheta_phi_range(c->_theta,c->_phi,R);\n-00629\n-00630\n-// check that the protojet has large enough pt\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f276\n \n File Documentation\n \n+00628\n+jet_candidate.range=CSphtheta_phi_range(c->_theta,c->_phi,R);\n+00629\n+00630\n+// check that the protojet has large enough pt\n 00631\n if (jet_candidate.v.Eend()) {\n 00800\n // all \"second jet\" passed without overlapping\n 00801\n // (otherwise we won\u2019t leave the j2 loop)\n-00802\n-// => store jet 1 as real jet\n-00803\n-jets.push_back(*j1);\n-00804\n-jets[jets.size()-1].v.build_thetaphi();\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n 277\n \n \f278\n \n File Documentation\n \n+00802\n+// => store jet 1 as real jet\n+00803\n+jets.push_back(*j1);\n+00804\n+jets[jets.size()-1].v.build_thetaphi();\n 00805\n jets[jets.size()-1].v.build_norm();\n 00806\n // a bug where the contents has non-zero size has been cropping\n 00807\n // up in many contexts -- so catch it!\n 00808\n@@ -26323,24 +26329,24 @@\n 00885\n 00886\n for (it_c = candidates->begin(), i1=0 ; it_c != candidates->end() ; it_c++, i1++){\n 00887\n c = &(*it_c);\n 00888\n fprintf(stdout, \"cdt %2d: %e\\t%e\\t%e\\t%e\\t%e\\t\", i1+1,\n-00889\n-c->v.px, c->v.py, c->v.pz, c->v.E, sqrt(c->sm_var2));\n-00890\n-00891\n-unsigned int phirange=c->range.phi_range;\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f5.45 split_merge.cpp\n \n+00889\n+c->v.px, c->v.py, c->v.pz, c->v.E, sqrt(c->sm_var2));\n+00890\n+00891\n+unsigned int phirange=c->range.phi_range;\n 00892\n for (i2=0;i2<32;i2++) fprintf(stdout, \"%d\", (phirange&(1\u00abi2)) \u00bb i2 );\n 00893\n fprintf(stdout, \"\\t\");\n 00894\n unsigned int thetarange=c->range.theta_range;\n 00895\n@@ -26474,198 +26480,197 @@\n 00970 // during this procedure, the jets j1 & j2 are replaced\n 00971 // by 2 new jets. Common particles are associted to the\n 00972 // closest initial jet.\n 00973 // - it_j1 iterator of the first jet in \u2019candidates\u2019\n 00974 // - it_j2 iterator of the second jet in \u2019candidates\u2019\n 00975 // - j1\n first jet (CSphjet instance)\n-00976 // - j2\n-second jet (CSphjet instance)\n-00977 // return true on success, false on error\n-00979 bool CSphsplit_merge::split(cjet_iterator &it_j1, cjet_iterator &it_j2){\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n 279\n \n \f280\n \n+File Documentation\n+\n+00976 // - j2\n+second jet (CSphjet instance)\n+00977 // return true on success, false on error\n+00979 bool CSphsplit_merge::split(cjet_iterator &it_j1, cjet_iterator &it_j2){\n 00980\n+int i1, i2;\n 00981\n+CSphjet jet1, jet2;\n 00982\n+double E1_weight, E2_weight;\n 00983\n+CSphmomentum tmp;\n 00984\n+CSphmomentum *v;\n 00985\n 00986\n+// shorthand to avoid having \"->\" all over the place\n 00987\n+const CSphjet & j1 = * it_j1;\n 00988\n+const CSphjet & j2 = * it_j2;\n 00989\n 00990\n+i1=i2=0;\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 01012\n+// particle i2 belong only to jet 2\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 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 01023\n+//TODO: improve this brutal use of atan2 and sqrt !!!!\n 01024\n 01025\n+//? what when == ?\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 01030\n+double d2 = get_distance(&(j2.v), v)*E2_weight;\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 01035\n+if (d1_theta,v->_phi);\n 01041\n+} else {\n 01042\n+// particle i2 belong only to jet 2\n 01043\n+jet2.contents.push_back(j2.contents[i2]);\n 01044\n+jet2.v += *v;\n 01045\n+//jet2.pt_tilde += pt[j2.contents[i2]];\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\" all over the place\n-const CSphjet & j1 = * it_j1;\n-const CSphjet & j2 = * it_j2;\n-i1=i2=0;\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+01061\n }\n+01062\n while (i2_theta,v->_phi);\n 01069\n }\n 01070\n@@ -26793,28 +26798,28 @@\n return false;\n 01153\n 01154\n // assign SM variable\n 01155\n jet.sm_var2 = get_sm_var2(jet.v, jet.E_tilde);\n 01156\n-01157\n-// insert the jet.\n-01158\n-candidates->insert(jet);\n-01159\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n 281\n \n \f282\n \n File Documentation\n \n+01157\n+// insert the jet.\n+01158\n+candidates->insert(jet);\n+01159\n 01160\n return true;\n 01161 }\n 01162\n 01169 double CSphsplit_merge::get_sm_var2(CSphmomentum &v, double &E_tilde){\n 01170\n switch(ptcomparison.split_merge_scale) {\n@@ -26937,24 +26942,24 @@\n 00039 using namespace std;\n 00040\n 00041 /********************************************************\n 00042 * class Cjet implementation\n *\n 00043 * real Jet information.\n *\n-00044 * This class contains information for one single jet. *\n-00045 * That is, first, its momentum carrying information\n-*\n-00046 * about its centre and pT, and second, its particle\n-*\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f5.46 split_merge.cpp\n \n+00044 * This class contains information for one single jet. *\n+00045 * That is, first, its momentum carrying information\n+*\n+00046 * about its centre and pT, and second, its particle\n+*\n 00047 * contents\n *\n 00048 ********************************************************/\n 00049 // default ctor\n 00050 //-------------00051 Cjet::Cjet(){\n 00052\n n = 0;\n@@ -27066,29 +27071,29 @@\n qdiff = sum.px*difference.px + sum.py*difference.py;\n 00128\n break;\n 00129\n case SM_pttilde:\n 00130\n qdiff = pt_tilde_sum*pt_tilde_difference;\n-00131\n-break;\n-00132\n-case SM_Et:\n-00133\n-// diff = E^2 (dpt^2 pz^2- pt^2 dpz^2)\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n 283\n \n \f284\n \n File Documentation\n \n+00131\n+break;\n+00132\n+case SM_Et:\n+00133\n+// diff = E^2 (dpt^2 pz^2- pt^2 dpz^2)\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@@ -27230,25 +27235,25 @@\n (*pt_tilde) -= (*pt)[j2.contents[i2]];\n 00215\n i2++;\n 00216\n }\n 00217 }\n 00218\n-00219\n-00220 /********************************************************\n-00221 * class Csplit_merge implementation\n-*\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f5.46 split_merge.cpp\n \n 285\n \n+00219\n+00220 /********************************************************\n+00221 * class Csplit_merge implementation\n+*\n 00222 * Class used to split and merge jets.\n *\n 00223 ********************************************************/\n 00224 // default ctor\n 00225 //-------------00226 Csplit_merge::Csplit_merge(){\n 00227\n merge_identical_protocones = false;\n@@ -27358,27 +27363,27 @@\n 00298 }\n 00299\n 00300\n 00301 // build initial list of remaining particles\n 00302 //-----------------------------------------00303 int Csplit_merge::init_pleft(){\n 00304\n // at this level, we only rule out particles with\n-00305\n-// infinite rapidity\n-00306\n-// in the parent particle list, index contain the run\n-00307\n-// at which particles are puts in jets:\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f286\n \n File Documentation\n \n+00305\n+// infinite rapidity\n+00306\n+// in the parent particle list, index contain the run\n+00307\n+// at which particles are puts in jets:\n 00308\n // - -1 means infinity rapidity\n 00309\n // - 0 means not included\n 00310\n // - i mean included at run i\n 00311\n@@ -27512,27 +27517,27 @@\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 \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f5.46 split_merge.cpp\n \n 287\n \n+00392\n+// clear previously allocated memory\n+00393\n+if (indices != NULL){\n+00394\n+delete[] indices;\n 00395\n }\n 00396\n particles.clear();\n 00397\n 00398\n return 0;\n@@ -27667,26 +27672,26 @@\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 00478\n // initialise variables\n-00479\n-c = &(*p_it);\n-00480\n-00481\n-// note: cones have been tested => their (eta,phi) coordinates are computed\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f288\n \n File Documentation\n \n+00479\n+c = &(*p_it);\n+00480\n+00481\n+// note: cones have been tested => their (eta,phi) coordinates are computed\n 00482\n eta = c->eta;\n 00483\n phi = c->phi;\n 00484\n 00485\n // browse particles to create cone contents\n@@ -27824,24 +27829,24 @@\n 00561 /*\n 00562 * remove the hardest protocone and declare it a a jet\n 00563 * - protocones list of protocones (initial jet candidates)\n 00564 * - R2\n cone radius (squared)\n 00565 * - ptmin\n minimal pT allowed for jets\n-00566 * return 0 on success, 1 on error\n-00567 *\n-00568 * The list of remaining particles (and the uncollinear-hard ones)\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f5.46 split_merge.cpp\n \n 289\n \n+00566 * return 0 on success, 1 on error\n+00567 *\n+00568 * The list of remaining particles (and the uncollinear-hard ones)\n 00569 * is updated.\n 00570 */\n 00571 int Csplit_merge::add_hardest_protocone_to_jets(std::vector *protocones, double R2, double\n ptmin){\n 00572\n 00573\n int i;\n@@ -27987,26 +27992,26 @@\n (_user_scale ? _user_scale->is_larger(jet_candidate, jet)\n 00649\n : ptcomparison(jet_candidate, jet))){\n 00650\n jet = jet_candidate;\n 00651\n found_jet = true;\n-00652\n-}\n-00653\n-}\n-00654\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f290\n \n File Documentation\n \n+00652\n+}\n+00653\n+}\n+00654\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 00658\n // add the jet to the list of jets\n@@ -28139,24 +28144,24 @@\n 00735\n // Note that the square of the ovelap is used\n 00736\n double overlap2;\n 00737\n 00738\n // avoid to compute tshold*tshold at each overlap\n-00739\n-double overlap_tshold2 = overlap_tshold*overlap_tshold;\n-00740\n-00741\n-do{\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f5.46 split_merge.cpp\n \n+00739\n+double overlap_tshold2 = overlap_tshold*overlap_tshold;\n+00740\n+00741\n+do{\n 00742\n if (candidates->size()>0){\n 00743\n // browse for the first jet\n 00744\n j1 = candidates->begin();\n 00745\n@@ -28296,26 +28301,26 @@\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-00828 //-------------------------------------------00829 int Csplit_merge::save_contents(FILE *flux){\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n 291\n \n \f292\n \n File Documentation\n \n+00827 // - flux\n+stream used to save jet contents\n+00828 //-------------------------------------------00829 int Csplit_merge::save_contents(FILE *flux){\n 00830\n jet_iterator it_j;\n 00831\n Cjet *j1;\n 00832\n int i1, i2;\n 00833\n@@ -28451,25 +28456,25 @@\n // at the same time, we store union in indices\n 00911\n do{\n 00912\n if (j1.contents[i1]j2.contents[i2]){\n 00916\n indices[idx_size] = j2.contents[i2];\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.46 split_merge.cpp\n-\n 00917\n i2++;\n 00918\n } else { // (j1.contents[i1]==j2.contents[i2])\n 00919\n v += particles[j1.contents[i1]];\n 00920\n@@ -28609,29 +28614,29 @@\n do{\n 00999\n if (j1.contents[i1]eta,v->phi);\n 01007\n } else if (j1.contents[i1]>j2.contents[i2]){\n 01008\n@@ -28781,24 +28786,24 @@\n // remove previous jets\n 01085 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 01086\n cand_refs.erase(j1.v.ref);\n 01087\n cand_refs.erase(j2.v.ref);\n 01088 #endif\n-01089\n-candidates->erase(it_j1);\n-01090\n-candidates->erase(it_j2);\n-01091\n \n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \f5.46 split_merge.cpp\n \n+01089\n+candidates->erase(it_j1);\n+01090\n+candidates->erase(it_j2);\n+01091\n 01092\n // reinsert new ones\n 01093\n insert(jet1);\n 01094\n insert(jet2);\n 01095\n@@ -28937,380 +28942,14 @@\n \n \f296\n \n 5.47\n \n File Documentation\n \n-vicinity.h\n-\n-00001 // -*- C++ -*00003 // File: vicinity.h\n-//\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-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:: 255\n-$//\n-00027 // $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-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-00059\n-00060\n-// centre variables\n-00061\n-CSph3vector centre;\n-00062\n-double angle;\n-00063\n-bool side;\n-00064\n-double cocircular_range;\n-00066\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-00083 class CSphvicinity{\n-00084 public:\n-00086\n-CSphvicinity();\n-00087\n-00089\n-CSphvicinity(std::vector &_particle_list);\n-00090\n-00092\n-~CSphvicinity();\n-00093\n-00098\n-void set_particle_list(std::vector &_particle_list);\n-00099\n-00105\n-void build(CSphmomentum *_parent, double _VR);\n-00106\n-00107\n-// cone kinematical information\n-00108\n-CSphmomentum *parent;\n-00109\n-double VR;\n-00110\n-double VR2;\n-00111\n-double cosVR;\n-00112\n-double R;\n-00113\n-double R2;\n-00114\n-double tan2R;\n-00115\n-double D2_R;\n-00116\n-double inv_R_EPS_COCIRC;\n-00117\n-double inv_R_2EPS_COCIRC;\n-00118\n-00119\n-// particle list information\n-\n-//\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.48 vicinity.h\n-\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-00141\n-// internal variables\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.48\n-\n-vicinity.h\n-\n-00001 // -*- C++ -*00003 // File: vicinity.h\n-//\n-00004 // Description: header file for particle vicinity (Cvicinity 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-00007 //\n-//\n-00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-//\n-00009 //\n-//\n-00010 // 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-//\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:: 123\n-$//\n-00025 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n-$//\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-00051\n-bool cone;\n-00052\n-bool cocirc;\n-00053 };\n-00054\n-00055\n-00063 class Cvicinity_elm{\n-00064 public:\n-00066\n-Cmomentum *v;\n-00067\n-00069\n-Cvicinity_inclusion *is_inside;\n-00070\n-00071\n-// centre variables\n-00072\n-double eta;\n-00073\n-double phi;\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-297\n-\n-\f298\n-\n-File Documentation\n-\n-00074\n-double angle;\n-00075\n-bool side;\n-00076\n-double cocircular_range;\n-00078\n-00081\n-std::list cocircular;\n-00082 };\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-00104\n-~Cvicinity();\n-00105\n-00110\n-void set_particle_list(std::vector &_particle_list);\n-00111\n-00117\n-void build(Cmomentum *_parent, double _VR);\n-00118\n-00119\n-// cone kinematical information\n-00120\n-Cmomentum *parent;\n-00121\n-double VR;\n-00122\n-double VR2;\n-00123\n-double R;\n-00124\n-double R2;\n-00125\n-double inv_R_EPS_COCIRC;\n-00126\n-double inv_R_2EPS_COCIRC;\n-00127\n-00128\n-// particle list information\n-00129\n-int n_part;\n-00130\n-std::vector plist;\n-00131\n-std::vector pincluded;\n-00132\n-Cvicinity_elm *ve_list;\n-00133 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n-00134\n-Cquadtree *quadtree;\n-00135 #endif\n-00136\n-00137\n-// vicinity information\n-00138\n-std::vector vicinity;\n-00139\n-unsigned int vicinity_size;\n-00140\n-00141 protected:\n-00147\n-void append_to_vicinity(Cmomentum *v);\n-00148\n-00149\n-// internal variables\n-00150\n-double pcx;\n-00151\n-double pcy;\n-00152 };\n-00153\n-00154 }\n-00155\n-00156 #endif\n-\n-5.49\n-\n split_merge.h\n \n 00001 // -*- C++ -*00003 // File: split_merge.h\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@@ -29351,23 +28990,14 @@\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:: 404\n $//\n-\n-//\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.49 split_merge.h\n-\n-299\n-\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@@ -29439,14 +29069,23 @@\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+\n+//\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.47 split_merge.h\n+\n+297\n+\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 00159 };\n@@ -29472,167 +29111,159 @@\n 00185\n // initialisation functions //\n 00187\n 00196\n int init(std::vector &_particles, std::vector *protocones, double R2,\n double Emin=0.0);\n 00197\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f300\n-\n 00203\n+int init_particles(std::vector &_particles);\n 00204\n 00208\n+int init_pleft();\n 00209\n 00221\n+inline int set_E_weighted_splitting(bool _use_E_weighted_splitting){\n 00222\n+use_E_weighted_splitting = _use_E_weighted_splitting;\n 00223\n+return 0;\n 00224\n+}\n 00225\n 00227\n+// cleaning functions //\n 00229\n 00231\n+int partial_clear();\n 00232\n 00234\n+int full_clear();\n 00235\n 00237\n+// user-defined stable-cone ordering //\n 00239\n 00245\n+class Cuser_scale_base{\n 00246\n+public:\n 00248\n+virtual ~Cuser_scale_base(){}\n 00249\n 00254\n+virtual double operator()(const CSphjet & jet) const = 0;\n 00255\n 00266\n+virtual bool is_larger(const CSphjet & a, const CSphjet & b) const{\n 00267\n+return (a.sm_var2 > b.sm_var2);\n 00268\n+}\n 00269\n+};\n 00270\n 00275\n+void set_user_scale(const Cuser_scale_base * user_scale_in){\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 00284\n+// main parts of the algorithm //\n 00286\n 00296\n+int merge_collinear_and_remove_soft();\n 00297\n 00305\n+int add_protocones(std::vector *protocones, double R2, double Emin=0.0);\n 00306\n 00317\n+int add_hardest_protocone_to_jets(std::vector *protocones, double R2, double\n+Emin=0.0);\n 00318\n 00328\n+int perform(double overlap_tshold, double Emin=0.0);\n 00329\n 00330\n 00332\n+// save and debug functions //\n 00334\n 00337\n+int save_contents(FILE *flux);\n 00338\n 00340\n+int show();\n 00341\n 00342\n+// particle information\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f298\n+\n+File Documentation\n+\n 00349\n+int n_pass;\n 00350\n 00354\n+double most_ambiguous_split;\n 00355\n 00356\n+// jets information\n 00357\n+std::vector jets;\n 00358\n 00359\n+// working entries\n 00360\n+int *indices;\n 00361\n+int idx_size;\n 00362\n 00371\n+bool merge_identical_protocones;\n 00372\n 00374\n+CSphsplit_merge_ptcomparison ptcomparison;\n 00375\n 00382\n+double SM_var2_hardest_cut_off;\n 00383\n 00391\n+double stable_cone_soft_E2_cutoff;\n 00392\n-00393\n+00393 private:\n 00401\n+bool get_overlap(const CSphjet &j1, const CSphjet &j2, double *v);\n 00402\n 00403\n 00415\n+bool split(cjet_iterator &it_j1, cjet_iterator &it_j2);\n 00416\n 00425\n-00426\n-\n-File Documentation\n-\n-int init_particles(std::vector &_particles);\n-int init_pleft();\n-inline int set_E_weighted_splitting(bool _use_E_weighted_splitting){\n-use_E_weighted_splitting = _use_E_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 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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.50 split_merge.h\n-\n+00426\n 00433\n bool insert(CSphjet &jet);\n 00434\n 00441\n double get_sm_var2(CSphmomentum &v, double &E_tilde);\n 00442\n 00444\n@@ -29664,15 +29295,15 @@\n 00472 };\n 00473\n 00474 }\n 00475\n 00476\n 00477 #endif\n \n-5.50\n+5.48\n \n split_merge.h\n \n 00001 // -*- C++ -*00003 // File: split_merge.h\n //\n 00004 // Description: header file for splitting/merging (contains the CJet class) //\n 00005 // This file is part of the SISCone project.\n@@ -29713,14 +29344,21 @@\n 00023 //\n //\n 00024 // $Revision:: 405\n $//\n 00025 // $Date:: 2016-05-23 20:15:02 +0200 (Mon, 23 May 2016)\n $//\n 00027\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.48 split_merge.h\n+\n+299\n+\n 00028 #ifndef __SPLIT_MERGE_H__\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@@ -29746,23 +29384,14 @@\n Cmomentum v;\n 00063\n double pt_tilde;\n 00064\n int n;\n 00065\n std::vector contents;\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-301\n-\n-\f302\n-\n-File Documentation\n-\n 00066\n 00073\n double sm_var2;\n 00074\n 00076\n Ceta_phi_range range;\n 00077\n@@ -29836,160 +29465,170 @@\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f300\n+\n 00213\n-int init_pleft();\n 00214\n 00226\n-inline int set_pt_weighted_splitting(bool _use_pt_weighted_splitting){\n 00227\n-use_pt_weighted_splitting = _use_pt_weighted_splitting;\n 00228\n-return 0;\n 00229\n-}\n 00230\n 00232\n-// cleaning functions //\n 00234\n 00236\n-int partial_clear();\n 00237\n 00239\n-int full_clear();\n 00240\n 00242\n-// user-defined stable-cone ordering //\n 00244\n 00250\n-class Cuser_scale_base{\n 00251\n-public:\n 00253\n-virtual ~Cuser_scale_base(){}\n 00254\n 00259\n-virtual double operator()(const Cjet & jet) const = 0;\n 00260\n 00271\n-virtual bool is_larger(const Cjet & a, const Cjet & b) const{\n 00272\n-return (a.sm_var2 > b.sm_var2);\n 00273\n-}\n 00274\n-};\n 00275\n 00280\n-void set_user_scale(const Cuser_scale_base * user_scale_in){\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.50 split_merge.h\n-\n-303\n-\n 00281\n-_user_scale = user_scale_in;\n 00282\n-}\n 00283\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 00308\n-int add_protocones(std::vector *protocones, double R2, double ptmin=0.0);\n 00309\n 00320\n-int add_hardest_protocone_to_jets(std::vector *protocones, double R2, double ptmin=0.0);\n 00321\n 00331\n-int perform(double overlap_tshold, double ptmin=0.0);\n 00332\n 00333\n 00335\n-// save and debug functions //\n 00337\n 00340\n-int save_contents(FILE *flux);\n 00341\n 00343\n-int show();\n 00344\n 00345\n-// particle information\n 00346\n-int n;\n 00347\n-std::vector particles;\n 00348\n-std::vector pt;\n 00349\n-int n_left;\n 00350\n-std::vector p_remain;\n 00351\n-std::vector p_uncol_hard;\n 00352\n-int n_pass;\n 00353\n 00357\n-double most_ambiguous_split;\n 00358\n 00359\n-// jets information\n 00360\n-std::vector jets;\n 00361\n 00362\n-// working entries\n 00363\n-int *indices;\n 00364\n-int idx_size;\n 00365\n 00374\n-bool merge_identical_protocones;\n 00375\n 00377\n-Csplit_merge_ptcomparison ptcomparison;\n 00378\n 00385\n-double SM_var2_hardest_cut_off;\n 00386\n 00394\n-double stable_cone_soft_pt2_cutoff;\n 00395\n-00396 private:\n+00396\n 00404\n-bool get_overlap(const Cjet &j1, const Cjet &j2, double *v);\n 00405\n 00406\n 00418\n-bool split(cjet_iterator &it_j1, cjet_iterator &it_j2);\n 00419\n 00428\n-bool merge(cjet_iterator &it_j1, cjet_iterator &it_j2);\n 00429\n 00436\n-bool insert(Cjet &jet);\n 00437\n 00444\n+\n+File Documentation\n+\n+int init_pleft();\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 on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.49 vicinity.cpp\n+\n+301\n+\n 00445\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@@ -30013,21 +29652,15 @@\n 00472 };\n 00473\n 00474 }\n 00475\n 00476\n 00477 #endif\n \n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f304\n-\n-5.51\n-\n-File Documentation\n+5.49\n \n vicinity.cpp\n \n 00001\n 00002 // File: vicinity.cpp\n //\n 00003 // Description: source file for particle vicinity (Cvicinity class)\n@@ -30112,14 +29745,23 @@\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+//\n+\n+\f302\n+\n+File Documentation\n+\n 00059\n 00060 // default constructor\n 00061 //--------------------00062 CSphvicinity::CSphvicinity(){\n 00063\n n_part = 0;\n 00064\n 00065\n@@ -30148,21 +29790,14 @@\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-//\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.51 vicinity.cpp\n-\n 00087\n 00088 // default destructor\n 00089 //-------------------00090 CSphvicinity::~CSphvicinity(){\n 00091\n if (ve_list!=NULL)\n 00092\n delete[] ve_list;\n@@ -30249,14 +29884,19 @@\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.49 vicinity.cpp\n+\n 00146\n n_part++;\n 00147\n //}\n 00148\n }\n 00149\n@@ -30293,23 +29933,14 @@\n }\n 00168\n 00169 }\n 00170\n 00171\n 00172 /*\n 00173 * build the vicinity list from a list of points.\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-305\n-\n-\f306\n-\n-File Documentation\n-\n 00174 * - _parent\n reference particle\n 00175 * - _VR\n vicinity radius\n 00176 ************************************************************/\n 00177 void CSphvicinity::build(CSphmomentum *_parent, double _VR){\n 00178\n@@ -30399,14 +30030,23 @@\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+303\n+\n+\f304\n+\n+File Documentation\n+\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@@ -30449,47 +30089,34 @@\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 on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.52 vicinity.cpp\n-\n-307\n-\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 00267\n-00268\n-00269\n-00270\n-00271\n-00272\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-5.52\n-\n-vicinity.cpp\n-\n // second angle (-)\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@@ -30536,37 +30163,47 @@\n ve_list[i+1].cocircular_range = ve_list[i].cocircular_range;\n 00297\n }\n 00298 }\n 00299\n 00300 }\n \n+5.50\n+\n+vicinity.cpp\n+\n 00001\n 00002 // File: vicinity.cpp\n-//\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+//\n+//\n+//\n+//\n+//\n //\n+//\n+//\n+//\n+//\n+//\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.50 vicinity.cpp\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@@ -30602,21 +30239,14 @@\n 00038 * element in the vicinity of a parent.\n *\n 00039 * class used to manage one points in the vicinity\n *\n 00040 * of a parent point.\n *\n 00041 *************************************************************/\n-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f308\n-\n-File Documentation\n-\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@@ -30684,14 +30314,23 @@\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+305\n+\n+\f306\n+\n+File Documentation\n+\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@@ -30733,19 +30372,14 @@\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-\f5.52 vicinity.cpp\n-\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@@ -30835,14 +30469,19 @@\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+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.50 vicinity.cpp\n+\n 00188\n // clear vicinity\n 00189\n vicinity.clear();\n 00190\n 00191\n // init parent variables\n@@ -30878,23 +30517,14 @@\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-\n-Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n-\n-309\n-\n-\f310\n-\n-File Documentation\n-\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@@ -30995,14 +30625,23 @@\n // EPSILON_COCIRCULAR of circule\n 00273\n // P = parent; C = child; O = Origin (center of circle)\n 00274\n Ctwovect OP(pcx - ve_list[i+1].eta, phi_in_range(pcy-ve_list[i+1].phi));\n 00275\n Ctwovect OC(v->eta - ve_list[i+1].eta,\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+307\n+\n+\f308\n+\n+File Documentation\n+\n 00276\n phi_in_range(v->phi-ve_list[i+1].phi));\n 00277\n 00278\n // two sources of error are (GPS CCN29-19) epsilon/(R sin theta)\n 00279\n // and sqrt(2*epsilon/(R (1-cos theta))) and the way things work\n@@ -31034,14 +30673,380 @@\n ve_list[i+1].cocircular_range = ve_list[i].cocircular_range;\n 00293\n }\n 00294 }\n 00295\n 00296 }\n \n+5.51\n+\n+vicinity.h\n+\n+00001 // -*- C++ -*00003 // File: vicinity.h\n+//\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+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:: 255\n+$//\n+00027 // $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+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+00059\n+00060\n+// centre variables\n+00061\n+CSph3vector centre;\n+00062\n+double angle;\n+00063\n+bool side;\n+00064\n+double cocircular_range;\n+00066\n+00069\n+std::list cocircular;\n+00070 };\n+00071\n+00073 bool ve_less(CSphvicinity_elm *ve1, CSphvicinity_elm *ve2);\n+00074\n+\n+//\n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+\f5.52 vicinity.h\n+\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+00092\n+~CSphvicinity();\n+00093\n+00098\n+void set_particle_list(std::vector &_particle_list);\n+00099\n+00105\n+void build(CSphmomentum *_parent, double _VR);\n+00106\n+00107\n+// cone kinematical information\n+00108\n+CSphmomentum *parent;\n+00109\n+double VR;\n+00110\n+double VR2;\n+00111\n+double cosVR;\n+00112\n+double R;\n+00113\n+double R2;\n+00114\n+double tan2R;\n+00115\n+double D2_R;\n+00116\n+double inv_R_EPS_COCIRC;\n+00117\n+double inv_R_2EPS_COCIRC;\n+00118\n+00119\n+// particle list information\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+00141\n+// internal variables\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.52\n+\n+vicinity.h\n+\n+00001 // -*- C++ -*00003 // File: vicinity.h\n+//\n+00004 // Description: header file for particle vicinity (Cvicinity 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+00007 //\n+//\n+00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n+//\n+00009 //\n+//\n+00010 // 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+//\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:: 123\n+$//\n+00025 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n+$//\n+00027\n+00028 #ifndef __VICINITY_H__\n+00029 #define __VICINITY_H__\n+00030\n+00031 #include \n+00032 #include \n+\n+Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n+\n+309\n+\n+\f310\n+\n+File Documentation\n+\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+00051\n+bool cone;\n+00052\n+bool cocirc;\n+00053 };\n+00054\n+00055\n+00063 class Cvicinity_elm{\n+00064 public:\n+00066\n+Cmomentum *v;\n+00067\n+00069\n+Cvicinity_inclusion *is_inside;\n+00070\n+00071\n+// centre variables\n+00072\n+double eta;\n+00073\n+double phi;\n+00074\n+double angle;\n+00075\n+bool side;\n+00076\n+double cocircular_range;\n+00078\n+00081\n+std::list cocircular;\n+00082 };\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+00104\n+~Cvicinity();\n+00105\n+00110\n+void set_particle_list(std::vector &_particle_list);\n+00111\n+00117\n+void build(Cmomentum *_parent, double _VR);\n+00118\n+00119\n+// cone kinematical information\n+00120\n+Cmomentum *parent;\n+00121\n+double VR;\n+00122\n+double VR2;\n+00123\n+double R;\n+00124\n+double R2;\n+00125\n+double inv_R_EPS_COCIRC;\n+00126\n+double inv_R_2EPS_COCIRC;\n+00127\n+00128\n+// particle list information\n+00129\n+int n_part;\n+00130\n+std::vector plist;\n+00131\n+std::vector pincluded;\n+00132\n+Cvicinity_elm *ve_list;\n+00133 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n+00134\n+Cquadtree *quadtree;\n+00135 #endif\n+00136\n+00137\n+// vicinity information\n+00138\n+std::vector vicinity;\n+00139\n+unsigned int vicinity_size;\n+00140\n+00141 protected:\n+00147\n+void append_to_vicinity(Cmomentum *v);\n+00148\n+00149\n+// internal variables\n+00150\n+double pcx;\n+00151\n+double pcy;\n+00152 };\n+00153\n+00154 }\n+00155\n+00156 #endif\n+\n Generated on Tue Jan 7 2025 11:57:28 for SISCone by Doxygen\n \n \fIndex\n _norm\n siscone::Cjet_area, 31\n siscone_spherical::CSph3vector, 71\n add\n@@ -31633,23 +31638,23 @@\n siscone_spherical::sph_hash_cones, 175\n randomize\n siscone::Creference, 53\n range\n siscone::Cjet, 27\n siscone_spherical::CSphjet, 77\n ranlux.h\n-ranlux_get, 243\n-ranlux_init, 243\n-ranlux_print_state, 243\n+ranlux_get, 220\n+ranlux_init, 220\n+ranlux_print_state, 220\n ranlux_get\n-ranlux.h, 243\n+ranlux.h, 220\n ranlux_init\n-ranlux.h, 243\n+ranlux.h, 220\n ranlux_print_state\n-ranlux.h, 243\n+ranlux.h, 220\n recompute_jets\n siscone::Csiscone, 61\n siscone_spherical::CSphsiscone, 92\n ref\n siscone::Cmomentum, 39\n siscone::Creference, 53\n siscone::hash_element, 170\n@@ -31689,50 +31694,50 @@\n \n siscone/area.cpp, 191\n siscone/area.h, 195\n siscone/circulator.h, 196\n siscone/config.h, 197\n siscone/config_raw.h, 198\n siscone/defines.h, 199, 201\n-siscone/geom_2d.cpp, 257\n-siscone/geom_2d.h, 202\n-siscone/hash.cpp, 204\n-siscone/hash.h, 210\n-siscone/momentum.cpp, 211\n-siscone/momentum.h, 261\n-siscone/protocones.cpp, 217\n-siscone/protocones.h, 264\n-siscone/quadtree.cpp, 236\n-siscone/quadtree.h, 240\n-siscone/ranlux.cpp, 240\n-siscone/ranlux.h, 243, 244\n-siscone/reference.cpp, 244\n-siscone/reference.h, 246\n-siscone/siscone.cpp, 247\n-siscone/siscone.h, 254\n-siscone/siscone_error.cpp, 256\n-siscone/siscone_error.h, 256\n-siscone/spherical/geom_2d.cpp, 259\n-siscone/spherical/geom_2d.h, 204\n-siscone/spherical/hash.cpp, 207\n-siscone/spherical/hash.h, 211\n-siscone/spherical/momentum.cpp, 213\n-siscone/spherical/momentum.h, 262\n-siscone/spherical/protocones.cpp, 226\n-siscone/spherical/protocones.h, 266\n-siscone/spherical/siscone.cpp, 250\n-siscone/spherical/siscone.h, 255\n+siscone/geom_2d.cpp, 202\n+siscone/geom_2d.h, 232\n+siscone/hash.cpp, 206\n+siscone/hash.h, 211\n+siscone/momentum.cpp, 234\n+siscone/momentum.h, 240\n+siscone/protocones.cpp, 243\n+siscone/protocones.h, 262\n+siscone/quadtree.cpp, 213\n+siscone/quadtree.h, 216\n+siscone/ranlux.cpp, 217\n+siscone/ranlux.h, 220, 221\n+siscone/reference.cpp, 221\n+siscone/reference.h, 223\n+siscone/siscone.cpp, 224\n+siscone/siscone.h, 266\n+siscone/siscone_error.cpp, 231\n+siscone/siscone_error.h, 231\n+siscone/spherical/geom_2d.cpp, 204\n+siscone/spherical/geom_2d.h, 233\n+siscone/spherical/hash.cpp, 209\n+siscone/spherical/hash.h, 212\n+siscone/spherical/momentum.cpp, 236\n+siscone/spherical/momentum.h, 241\n+siscone/spherical/protocones.cpp, 253\n+siscone/spherical/protocones.h, 264\n+siscone/spherical/siscone.cpp, 227\n+siscone/spherical/siscone.h, 267\n siscone/spherical/split_merge.cpp, 268\n-siscone/spherical/split_merge.h, 298\n-siscone/spherical/vicinity.cpp, 304\n-siscone/spherical/vicinity.h, 296\n+siscone/spherical/split_merge.h, 296\n+siscone/spherical/vicinity.cpp, 301\n+siscone/spherical/vicinity.h, 308\n siscone/split_merge.cpp, 282\n-siscone/split_merge.h, 301\n-siscone/vicinity.cpp, 307\n-siscone/vicinity.h, 297\n+siscone/split_merge.h, 298\n+siscone/vicinity.cpp, 304\n+siscone/vicinity.h, 309\n siscone::Carea, 7\n \u223cCarea, 13\n Carea, 13\n compute_active_areas, 13\n compute_areas, 13\n compute_passive_areas, 14\n grid_eta_max, 15\n"}]}]}]}]}]}]}