{"diffoscope-json-version": 1, "source1": "/srv/reproducible-results/rbuild-debian/r-b-build.iq7dBmid/b1/siscone_3.0.5-2_armhf.changes", "source2": "/srv/reproducible-results/rbuild-debian/r-b-build.iq7dBmid/b2/siscone_3.0.5-2_armhf.changes", "unified_diff": null, "details": [{"source1": "Files", "source2": "Files", "unified_diff": "@@ -1,10 +1,10 @@\n \n f5aefe325044f442f0e1c21d8a868f9e 79408 libdevel optional libsiscone-dev_3.0.5-2_armhf.deb\n 507f29e5f2459ac5cb9cc245abe74203 71216 libdevel optional libsiscone-spherical-dev_3.0.5-2_armhf.deb\n 44e05b4de2a760a3f3430f5d9d87ad1e 418456 debug optional libsiscone-spherical0v5-dbgsym_3.0.5-2_armhf.deb\n e637043cdd8bc7cf65038b9cd298e6a0 53756 libs optional libsiscone-spherical0v5_3.0.5-2_armhf.deb\n 2e9786485fea47bfbfa28be9cdc121dc 490968 debug optional libsiscone0v5-dbgsym_3.0.5-2_armhf.deb\n 9ccc8c1bcf761a550412179292b8aae9 59212 libs optional libsiscone0v5_3.0.5-2_armhf.deb\n- 8fbcf6339ebdd215f9af29826a63a6f9 1187652 doc optional siscone-doc-html_3.0.5-2_all.deb\n- 2b290b8734a2e0232b7af7b305417d23 1589240 doc optional siscone-doc-pdf_3.0.5-2_all.deb\n+ 6e9df02ff9b8bd3c4db77a256db80a53 1187652 doc optional siscone-doc-html_3.0.5-2_all.deb\n+ 7f083018554e662d8e12a6cfcd0ff8fb 1593280 doc optional siscone-doc-pdf_3.0.5-2_all.deb\n ee8a36e6ed6ae32143424e71fcc9dc11 34968 devel optional siscone-examples_3.0.5-2_all.deb\n"}, {"source1": "siscone-doc-html_3.0.5-2_all.deb", "source2": "siscone-doc-html_3.0.5-2_all.deb", "unified_diff": null, "details": [{"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-2\n Architecture: all\n Maintainer: Debian Science Maintainers \n-Installed-Size: 5828\n+Installed-Size: 5829\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": "@@ -212,15 +212,15 @@\n -rw-r--r-- 0 root (0) root (0) 3191 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_t.html\n -rw-r--r-- 0 root (0) root (0) 2319 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_u.html\n -rw-r--r-- 0 root (0) root (0) 4264 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_v.html\n -rw-r--r-- 0 root (0) root (0) 30418 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_vars.html\n -rw-r--r-- 0 root (0) root (0) 2155 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_x.html\n -rw-r--r-- 0 root (0) root (0) 5352 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/functions_~.html\n -rw-r--r-- 0 root (0) root (0) 31816 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/geom__2d_8cpp_source.html\n--rw-r--r-- 0 root (0) root (0) 30773 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/geom__2d_8h_source.html\n+-rw-r--r-- 0 root (0) root (0) 31825 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/geom__2d_8h_source.html\n -rw-r--r-- 0 root (0) root (0) 2552 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/globals.html\n -rw-r--r-- 0 root (0) root (0) 2434 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/globals_defs.html\n -rw-r--r-- 0 root (0) root (0) 2059 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/globals_vars.html\n -rw-r--r-- 0 root (0) root (0) 6197 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/graph_legend.html\n -rw-r--r-- 0 root (0) root (0) 23370 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/graph_legend.png\n -rw-r--r-- 0 root (0) root (0) 52933 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/hash_8cpp_source.html\n -rw-r--r-- 0 root (0) root (0) 22548 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/hash_8h_source.html\n@@ -280,16 +280,16 @@\n -rw-r--r-- 0 root (0) root (0) 1670 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/inherit_graph_7.png\n -rw-r--r-- 0 root (0) root (0) 255 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/inherit_graph_8.map\n -rw-r--r-- 0 root (0) root (0) 1737 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/inherit_graph_8.png\n -rw-r--r-- 0 root (0) root (0) 1317 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/inherit_graph_9.map\n -rw-r--r-- 0 root (0) root (0) 10333 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/inherit_graph_9.png\n -rw-r--r-- 0 root (0) root (0) 14157 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/inherits.html\n -rw-r--r-- 0 root (0) root (0) 30265 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/main_8cpp_source.html\n--rw-r--r-- 0 root (0) root (0) 41791 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/momentum_8cpp_source.html\n--rw-r--r-- 0 root (0) root (0) 41439 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/momentum_8h_source.html\n+-rw-r--r-- 0 root (0) root (0) 43383 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/momentum_8cpp_source.html\n+-rw-r--r-- 0 root (0) root (0) 39163 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/momentum_8h_source.html\n -rw-r--r-- 0 root (0) root (0) 153 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/nav_f.png\n -rw-r--r-- 0 root (0) root (0) 169 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/nav_fd.png\n -rw-r--r-- 0 root (0) root (0) 95 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/nav_g.png\n -rw-r--r-- 0 root (0) root (0) 98 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/nav_h.png\n -rw-r--r-- 0 root (0) root (0) 114 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/nav_hd.png\n -rw-r--r-- 0 root (0) root (0) 123 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/open.png\n -rw-r--r-- 0 root (0) root (0) 52457 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-html/html/devel/options_8cpp_source.html\n"}, {"source1": "./usr/share/doc/siscone-doc-html/html/devel/geom__2d_8h_source.html", "source2": "./usr/share/doc/siscone-doc-html/html/devel/geom__2d_8h_source.html", "unified_diff": "@@ -109,21 +109,21 @@\n
67
\n
68
\n
\n
73class Ctwovect {
\n
74public:
\n
76 Ctwovect() : x(0.0), y(0.0) {}
\n
77
\n-
81 Ctwovect(double _x, double _y) : x(_x), y(_y) {}
\n+
81 Ctwovect(double _x, double _y) : x(_x), y(_y) {}
\n
82
\n
84 double x, y;
\n
85
\n
87 inline double mod2() const {return pow2(x)+pow2(y);}
\n
88
\n-
90 inline double modulus() const {return sqrt(mod2());}
\n+
90 inline double modulus() const {return sqrt(mod2());}
\n
91};
\n
\n
92
\n
93
\n
98inline double dot_product(const Ctwovect & a, const Ctwovect & b) {
\n
99 return a.x*b.x + a.y*b.y;
\n
100}
\n@@ -135,35 +135,35 @@\n
110
\n
111
\n
\n
120class Ceta_phi_range{
\n
121public:
\n
123 Ceta_phi_range();
\n
124
\n-
130 Ceta_phi_range(double c_eta, double c_phi, double R);
\n+
130 Ceta_phi_range(double c_eta, double c_phi, double R);
\n
131
\n-
134 Ceta_phi_range& operator = (const Ceta_phi_range &r);
\n+
134 Ceta_phi_range& operator = (const Ceta_phi_range &r);
\n
135
\n
140 int add_particle(const double eta, const double phi);
\n
141
\n
143 unsigned int eta_range;
\n
144
\n
146 unsigned int phi_range;
\n
147
\n
148 // extremal value for eta
\n
149 static double eta_min;
\n
150 static double eta_max;
\n
151
\n
152private:
\n
154 inline unsigned int get_eta_cell(double eta){
\n-
155 return (unsigned int) (1u << ((int) (32*((eta-eta_min)/(eta_max-eta_min)))));
\n+
155 return (unsigned int) (1u << ((int) (32*((eta-eta_min)/(eta_max-eta_min)))));
\n
156 }
\n
157
\n
159 inline unsigned int get_phi_cell(double phi){
\n-
160 return (unsigned int) (1u << ((int) (32*phi/twopi+16)%32));
\n+
160 return (unsigned int) (1u << ((int) (32*phi/twopi+16)%32));
\n
161 }
\n
162};
\n
\n
163
\n
168bool is_range_overlap(const Ceta_phi_range &r1, const Ceta_phi_range &r2);
\n
169
\n
175const Ceta_phi_range range_union(const Ceta_phi_range &r1, const Ceta_phi_range &r2);
\n@@ -181,14 +181,15 @@\n
siscone::Ceta_phi_range::phi_range
unsigned int phi_range
phi range as a binary coding of covered cells
Definition geom_2d.h:146
\n
siscone::Ctwovect
class for holding a two-vector
Definition geom_2d.h:73
\n
siscone::Ctwovect::mod2
double mod2() const
norm (modulud square) of the vector
Definition geom_2d.h:87
\n
siscone::Ctwovect::x
double x
vector coordinates
Definition geom_2d.h:84
\n
siscone::Ctwovect::Ctwovect
Ctwovect()
default ctor
Definition geom_2d.h:76
\n
siscone::Ctwovect::modulus
double modulus() const
modulus of the vector
Definition geom_2d.h:90
\n
siscone::Ctwovect::Ctwovect
Ctwovect(double _x, double _y)
ctor with initialisation
Definition geom_2d.h:81
\n+
siscone::circulator
a circulator that is foreseen to take as template member either a pointer or an iterator;
Definition circulator.h:36
\n
defines.h
\n
twopi
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 10 2023 17:32:40 for SISCone by \"doxygen\"/ 1.9.8\n
\n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -175,14 +175,18 @@\n double modulus() const\n modulus of the vector\n Definition geom_2d.h:90\n siscone::Ctwovect::Ctwovect\n Ctwovect(double _x, double _y)\n ctor with initialisation\n Definition geom_2d.h:81\n+siscone::circulator\n+a circulator that is foreseen to take as template member either a pointer or an\n+iterator;\n+Definition circulator.h:36\n defines.h\n twopi\n const double twopi\n definition of 2*M_PI which is useful a bit everyhere!\n Definition defines.h:114\n \n ===============================================================================\n"}]}, {"source1": "./usr/share/doc/siscone-doc-html/html/devel/momentum_8cpp_source.html", "source2": "./usr/share/doc/siscone-doc-html/html/devel/momentum_8cpp_source.html", "unified_diff": "@@ -100,34 +100,34 @@\n
47 index = -1;
\n
48}
\n \n
49
\n
50// ctor with initialisation
\n
51//--------------------------
\n
\n-
52Cmomentum::Cmomentum(double _px, double _py, double _pz, double _E){
\n-
53 px = _px;
\n-
54 py = _py;
\n-
55 pz = _pz;
\n-
56 E = _E;
\n+
52Cmomentum::Cmomentum(double _px, double _py, double _pz, double _E){
\n+
53 px = _px;
\n+
54 py = _py;
\n+
55 pz = _pz;
\n+
56 E = _E;
\n
57
\n
58 // compute eta and phi
\n
59 build_etaphi();
\n
60 ref = Creference();
\n
61}
\n
\n
62
\n
63// ctor with detailed initialisation
\n
64//-----------------------------------
\n
\n-
65Cmomentum::Cmomentum(double _eta, double _phi, Creference _ref){
\n-
66 eta = _eta;
\n+
65Cmomentum::Cmomentum(double _eta, double _phi, Creference _ref){
\n+
66 eta = _eta;
\n
67 phi = _phi;
\n
68
\n-
69 ref = _ref;
\n+
69 ref = _ref;
\n
70}
\n
\n
71
\n
72// default dtor
\n
73//--------------
\n
\n
74Cmomentum::~Cmomentum(){
\n@@ -153,16 +153,16 @@\n
\n
92
\n
93// addition of vectors
\n
94// !!! WARNING !!! no updating of eta and phi !!!
\n
95//------------------------------------------------
\n
\n
96const Cmomentum Cmomentum::operator + (const Cmomentum &v){
\n-
97 Cmomentum tmp = *this;
\n-
98 return tmp+=v;
\n+
97 Cmomentum tmp = *this;
\n+
98 return tmp+=v;
\n
99}
\n
\n
100
\n
101// incrementation of vectors
\n
102// !!! WARNING !!! no updating of eta and phi !!!
\n
103//------------------------------------------------
\n
\n@@ -198,25 +198,25 @@\n
130// !!! computing eta and phi is time-consuming !!!
\n
131// !!! use this whenever you need eta or phi !!!
\n
132// !!! automatically called for single-particle !!!
\n
133//--------------------------------------------------
\n
\n
134void Cmomentum::build_etaphi(){
\n
135 // note: the factor n (ref.nb) cancels in all expressions !!
\n-
136 eta = 0.5*log((E+pz)/(E-pz));
\n-
137 phi = atan2(py,px);
\n+
136 eta = 0.5*log((E+pz)/(E-pz));
\n+
137 phi = atan2(py,px);
\n
138}
\n
\n
139
\n
140
\n
141// ordering of two vectors
\n
142// the default ordering is w.r.t. their references
\n
143//-------------------------------------------------
\n-
144bool operator < (const Cmomentum &v1, const Cmomentum &v2){
\n-
145 return v1.ref < v2.ref;
\n+
144bool operator < (const Cmomentum &v1, const Cmomentum &v2){
\n+
145 return v1.ref < v2.ref;
\n
146}
\n
147
\n
148// ordering of vectors in eta (e.g. used in collinear tests)
\n
149//-----------------------------------------------------------
\n
150bool momentum_eta_less(const Cmomentum &v1, const Cmomentum &v2){
\n
151 return v1.eta < v2.eta;
\n
152}
\n@@ -242,14 +242,15 @@\n
siscone::Cmomentum::px
double px
x-momentum
Definition momentum.h:109
\n
siscone::Cmomentum::operator=
Cmomentum & operator=(const Cmomentum &v)
assignment of vectors
Definition momentum.cpp:80
\n
siscone::Cmomentum::E
double E
energy
Definition momentum.h:112
\n
siscone::Cmomentum::pz
double pz
z-momentum
Definition momentum.h:111
\n
siscone::Cmomentum::Cmomentum
Cmomentum()
default ctor
Definition momentum.cpp:42
\n
siscone::Cmomentum::phi
double phi
particle azimuthal angle
Definition momentum.h:115
\n
siscone::Creference
references used for checksums.
Definition reference.h:43
\n+
siscone::circulator
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 10 2023 17:32:40 for SISCone by \"doxygen\"/ 1.9.8\n
\n \n \n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -145,15 +145,15 @@\n 137 phi = atan2(py,px);\n 138}\n 139\n 140\n 141// ordering of two vectors\n 142// the default ordering is w.r.t. their references\n 143//-------------------------------------------------\n- 144bool operator < (const Cmomentum &v1, const Cmomentum &v2){\n+ 144bool operator_<(const Cmomentum &v1, const Cmomentum &v2){\n 145 return v1.ref < v2.ref;\n 146}\n 147\n 148// ordering of vectors in eta (e.g. used in collinear tests)\n 149//-----------------------------------------------------------\n 150bool momentum_eta_less(const Cmomentum &v1, const Cmomentum &v2){\n 151 return v1.eta < v2.eta;\n@@ -230,10 +230,14 @@\n siscone::Cmomentum::phi\n double phi\n particle azimuthal angle\n Definition momentum.h:115\n siscone::Creference\n references used for checksums.\n Definition reference.h:43\n+siscone::circulator\n+a circulator that is foreseen to take as template member either a pointer or an\n+iterator;\n+Definition circulator.h:36\n \n ===============================================================================\n Generated on Tue Jan 10 2023 17:32:40 for SISCone by\u00a0[doxygen] 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
49class Cmomentum{
\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
88 Cmomentum& operator = (const Cmomentum &v);
\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
122 Creference ref;
\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
siscone::Cmomentum
base class for dynamic coordinates management
Definition momentum.h:49
\n
siscone::Cmomentum::operator+=
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
siscone::Cmomentum::E
double E
energy
Definition momentum.h:112
\n
siscone::Cmomentum::pz
double pz
z-momentum
Definition momentum.h:111
\n
siscone::Cmomentum::perp
double perp() const
computes pT
Definition momentum.h:64
\n
siscone::Cmomentum::Cmomentum
Cmomentum()
default ctor
Definition momentum.cpp:42
\n
siscone::Cmomentum::phi
double phi
particle azimuthal angle
Definition momentum.h:115
\n
siscone::Cmomentum::perpmass
double perpmass() const
transverse mass, mt = sqrt(pt^2+m^2) = sqrt(E^2 - pz^2)
Definition momentum.h:76
\n
siscone::Creference
references used for checksums.
Definition reference.h:43
\n-
siscone::circulator
a circulator that is foreseen to take as template member either a pointer or an iterator;
Definition circulator.h:36
\n
defines.h
\n
twopi
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 10 2023 17:32:40 for SISCone by \"doxygen\"/ 1.9.8\n
\n", "details": [{"source1": "html2text {}", "source2": "html2text {}", "unified_diff": "@@ -89,15 +89,15 @@\n 116 int parent_index;\n 117 int index;\n 118\n 120 // the following part is used for checksums //\n 122 Creference ref;\n 123};\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 131\n 133bool momentum_pt_less(const Cmomentum &v1, const Cmomentum &v2);\n 134\n 135\n 137// some handy utilities //\n@@ -215,18 +215,14 @@\n siscone::Cmomentum::perpmass\n double perpmass() const\n transverse mass, mt = sqrt(pt^2+m^2) = sqrt(E^2 - pz^2)\n Definition momentum.h:76\n siscone::Creference\n references used for checksums.\n Definition reference.h:43\n-siscone::circulator\n-a circulator that is foreseen to take as template member either a pointer or an\n-iterator;\n-Definition circulator.h:36\n defines.h\n twopi\n const double twopi\n definition of 2*M_PI which is useful a bit everyhere!\n Definition defines.h:114\n \n ===============================================================================\n"}]}]}]}]}, {"source1": "siscone-doc-pdf_3.0.5-2_all.deb", "source2": "siscone-doc-pdf_3.0.5-2_all.deb", "unified_diff": null, "details": [{"source1": "file list", "source2": "file list", "unified_diff": "@@ -1,3 +1,3 @@\n -rw-r--r-- 0 0 0 4 2023-01-10 17:32:40.000000 debian-binary\n -rw-r--r-- 0 0 0 808 2023-01-10 17:32:40.000000 control.tar.xz\n--rw-r--r-- 0 0 0 1588240 2023-01-10 17:32:40.000000 data.tar.xz\n+-rw-r--r-- 0 0 0 1592280 2023-01-10 17:32:40.000000 data.tar.xz\n"}, {"source1": "control.tar.xz", "source2": "control.tar.xz", "unified_diff": null, "details": [{"source1": "control.tar", "source2": "control.tar", "unified_diff": null, "details": [{"source1": "./control", "source2": "./control", "unified_diff": "@@ -1,13 +1,13 @@\n Package: siscone-doc-pdf\n Source: siscone\n Version: 3.0.5-2\n Architecture: all\n Maintainer: Debian Science Maintainers \n-Installed-Size: 1567\n+Installed-Size: 1571\n Section: doc\n Priority: optional\n Multi-Arch: foreign\n Homepage: http://projects.hepforge.org/siscone/\n Description: Developer's reference manual of SISCone (PDF)\n SISCone implements a Seedless Infrared (IR) Safe Cone jet algorithm, it takes\n N^2*ln(N) time to find jets among N particles, comparing to N*2^N time of\n"}, {"source1": "./md5sums", "source2": "./md5sums", "unified_diff": null, "details": [{"source1": "./md5sums", "source2": "./md5sums", "comments": ["Files differ"], "unified_diff": null}]}]}]}, {"source1": "data.tar.xz", "source2": "data.tar.xz", "unified_diff": null, "details": [{"source1": "data.tar", "source2": "data.tar", "unified_diff": null, "details": [{"source1": "file list", "source2": "file list", "unified_diff": "@@ -3,10 +3,10 @@\n drwxr-xr-x 0 root (0) root (0) 0 2023-01-10 17:32:40.000000 ./usr/share/\n drwxr-xr-x 0 root (0) root (0) 0 2023-01-10 17:32:40.000000 ./usr/share/doc/\n drwxr-xr-x 0 root (0) root (0) 0 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/\n -rw-r--r-- 0 root (0) root (0) 1125 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/changelog.Debian.gz\n -rw-r--r-- 0 root (0) root (0) 16688 2020-04-24 08:56:01.000000 ./usr/share/doc/siscone-doc-pdf/changelog.gz\n -rw-r--r-- 0 root (0) root (0) 1151 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/copyright\n drwxr-xr-x 0 root (0) root (0) 0 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/pdf/\n--rw-r--r-- 0 root (0) root (0) 1573101 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/pdf/refman.pdf.gz\n+-rw-r--r-- 0 root (0) root (0) 1576968 2023-01-10 17:32:40.000000 ./usr/share/doc/siscone-doc-pdf/pdf/refman.pdf.gz\n drwxr-xr-x 0 root (0) root (0) 0 2023-01-10 17:32:40.000000 ./usr/share/doc-base/\n -rw-r--r-- 0 root (0) root (0) 240 2023-01-10 17:32:40.000000 ./usr/share/doc-base/siscone-doc-pdf.siscone-pdf\n"}, {"source1": "./usr/share/doc/siscone-doc-pdf/pdf/refman.pdf.gz", "source2": "./usr/share/doc/siscone-doc-pdf/pdf/refman.pdf.gz", "unified_diff": null, "details": [{"source1": "refman.pdf", "source2": "refman.pdf", "unified_diff": null, "details": [{"source1": "pdftotext {} -", "source2": "pdftotext {} -", "unified_diff": "@@ -1661,35 +1661,35 @@\n 4.37.2.1 centre . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 174\n 4.37.2.2 is_stable . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 174\n 4.37.2.3 next . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 174\n 5 File Documentation\n \n 175\n \n-5.1 main.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 175\n-5.2 options.cpp\n+5.1 area.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 175\n+5.2 area.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 176\n+5.3 main.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 180\n+5.4 options.cpp\n \n-. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 176\n+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 182\n \n-5.3 options.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 179\n-5.4 sample.cpp\n+5.5 options.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 185\n+5.6 sample.cpp\n \n-. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 180\n+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 185\n \n-5.5 spherical.cpp\n+5.7 spherical.cpp\n \n-. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 181\n+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 187\n \n-5.6 test.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 182\n-5.7 times.cpp\n+5.8 test.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 188\n+5.9 times.cpp\n \n-. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 184\n+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 189\n \n-5.8 area.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 185\n-5.9 area.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 187\n 5.10 area.h\n \n . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 191\n \n 5.11 circulator.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 192\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n@@ -1711,63 +1711,63 @@\n . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 197\n \n 5.14.2 Variable Documentation . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 197\n 5.14.2.1 twopi . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 197\n 5.15 defines.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 197\n 5.16 geom_2d.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 198\n 5.17 geom_2d.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 200\n-5.18 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 202\n-5.19 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 203\n-5.20 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 204\n-5.21 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 207\n-5.22 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 210\n-5.23 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 210\n-5.24 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 211\n-5.25 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 213\n-5.26 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 217\n-5.27 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 226\n+5.18 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 202\n+5.19 hash.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 205\n+5.20 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 207\n+5.21 hash.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 208\n+5.22 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 209\n+5.23 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 210\n+5.24 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 213\n+5.25 protocones.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 222\n+5.26 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 232\n+5.27 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 234\n 5.28 quadtree.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 236\n 5.29 quadtree.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 239\n 5.30 ranlux.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 240\n 5.31 siscone/ranlux.h File Reference . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 242\n-5.31.1 Function Documentation . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n-5.31.1.1 ranlux_get() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n+5.31.1 Function Documentation . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 242\n+5.31.1.1 ranlux_get() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 242\n 5.31.1.2 ranlux_init() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n 5.31.1.3 ranlux_print_state() . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n 5.32 ranlux.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 243\n 5.33 reference.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 244\n 5.34 reference.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 245\n 5.35 siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 246\n-5.36 siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 250\n-5.37 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 253\n-5.38 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 254\n-5.39 siscone_error.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 255\n-5.40 siscone_error.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 256\n-5.41 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 257\n-5.42 momentum.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 258\n+5.36 siscone.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 249\n+5.37 siscone_error.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 253\n+5.38 siscone_error.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 253\n+5.39 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 254\n+5.40 geom_2d.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 256\n+5.41 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 256\n+5.42 momentum.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 258\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n \fxvi\n \n-5.43 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 260\n-5.44 protocones.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 262\n+5.43 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 262\n+5.44 siscone.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 263\n 5.45 split_merge.cpp\n \n . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 264\n \n 5.46 split_merge.cpp\n \n . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 278\n \n 5.47 split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 291\n 5.48 split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 294\n 5.49 vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 297\n 5.50 vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 300\n-5.51 vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 304\n+5.51 vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 303\n 5.52 vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 305\n Index\n \n 307\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n@@ -2026,46 +2026,46 @@\n siscone/siscone_error.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/siscone_error.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/split_merge.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n-185\n 175\n-176\n-179\n 180\n-181\n 182\n-184\n+185\n+185\n 187\n+188\n+189\n+176\n 191\n 192\n 193\n 194\n 195\n 198\n+254\n 202\n-204\n-210\n-211\n-257\n-217\n-260\n+207\n+256\n+209\n+213\n+232\n 236\n 239\n 240\n 242\n 244\n 245\n 246\n+262\n+253\n 253\n-255\n-256\n 278\n 294\n 300\n \n \f6\n \n File Index\n@@ -2084,27 +2084,27 @@\n siscone/spherical/split_merge.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/spherical/split_merge.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/spherical/vicinity.cpp . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n siscone/spherical/vicinity.h . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .\n \n 305\n 200\n-203\n-207\n-210\n-213\n+256\n+205\n+208\n 258\n-226\n-262\n-250\n-254\n+210\n+222\n+234\n+249\n+263\n 264\n 291\n 297\n-304\n+303\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n \fChapter 4\n \n Class Documentation\n \n@@ -10978,15 +10978,15 @@\n \u2022 siscone/spherical/hash.h\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n \fChapter 5\n \n File Documentation\n-5.1 main.cpp\n+5.1 area.cpp\n 00001\n 00002 // File: main.cpp\n //\n 00003 // Description: main program that runs siscone from the command line\n //\n 00004 // This file is part of the SISCone project.\n //\n@@ -11021,14 +11021,846 @@\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 10:26:05 -0400 (Tue, 19 Jun 2007)\n+$//\n+00026\n+00027 #include \n+00028 #include \n+00029 #include \n+00030 #include \"siscone/momentum.h\"\n+00031 #include \"siscone/siscone.h\"\n+00032 #include \"siscone/area.h\"\n+00033 #include \"options.h\"\n+00034\n+00035 using namespace std;\n+00036 using namespace siscone;\n+00037\n+00038 int main(int argc, char *argv[]){\n+00039\n+vector particles;\n+00040\n+Carea siscone_with_area;\n+int i,N;\n+00041\n+00042\n+double px,py,pz,E;\n+00043\n+Coptions opts;\n+char fline[512];\n+00044\n+00045\n+if (opts.parse_options(argc, argv))\n+00046\n+00047\n+exit(1);\n+00048\n+00049\n+// deal with help message\n+00050\n+if (opts.help_flag){\n+00051\n+opts.print_help();\n+00052\n+exit(0);\n+00053\n+}\n+00054\n+00055\n+// deal with version flag\n+00056\n+if (opts.version_flag){\n+00057\n+opts.print_version();\n+00058\n+exit(0);\n+00059\n+}\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f176\n+\n+File Documentation\n+\n+00060\n+// various files used to read input data and store results\n+00061\n+00062\n+FILE *flux;\n+00063\n+FILE *fpart;\n+00064\n+00065\n+// read particles\n+00066\n+if (opts.verbose_flag) cout \u00ab \"reading particles\" \u00ab endl;\n+00067\n+flux = fopen(opts.ev_name, \"r\");\n+if (flux==NULL){\n+00068\n+00069\n+cerr \u00ab \"cannot read event\" \u00ab endl;\n+00070\n+return 1;\n+00071\n+}\n+00072\n+00073\n+N=0;\n+00074\n+fpart = fopen(\"particles.dat\", \"w+\");\n+00075\n+while ((opts.N_stop!=0) && (fgets(fline, 512, flux)!=NULL)){\n+if (fline[0]!=\u2019#\u2019){ // skip lines beginning with \u2019#\u2019\n+00076\n+00077\n+if (sscanf(fline, \"%le%le%le%le\", &px, &py, &pz, &E)==4){\n+00078\n+particles.push_back(Cmomentum(px, py, pz, E));\n+particles[N].eta, particles[N].phi);\n+00079\n+fprintf(fpart, \"%e\\t%e\\n\",\n+00080\n+N++;\n+00081\n+opts.N_stop--;\n+00082\n+} else {\n+00083\n+cout \u00ab \"error in reading event file Giving up.\" \u00ab endl;\n+00084\n+fclose(flux);\n+00085\n+fclose(fpart);\n+00086\n+exit(2);\n+00087\n+}\n+00088\n+}\n+00089\n+}\n+00090\n+fclose(flux);\n+00091\n+fclose(fpart);\n+if (opts.verbose_flag)\n+00092\n+00093\n+cout \u00ab \" working with \" \u00ab N \u00ab \" particles\" \u00ab endl;\n+00094\n+// compute jets\n+00095\n+00096\n+if (opts.verbose_flag) cout \u00ab \"computing jet contents\" \u00ab endl;\n+00097\n+i=siscone_with_area.compute_areas(particles, opts.R, opts.f, opts.npass, opts.SM_var);\n+if (opts.verbose_flag){\n+00098\n+unsigned int pass;\n+00099\n+00100\n+for (pass=0;pass::iterator ja;\n+for (ja=siscone_with_area.jet_areas.begin();ja!=siscone_with_area.jet_areas.end();ja++){\n+00111\n+00112\n+fprintf(flux, \"%e\\t%e\\t%e\\t%e\\t%e\\n\",\n+00113\n+ja->v.perp(), ja->v.eta, ja->v.phi,\n+00114\n+ja->active_area, ja->passive_area);\n+00115\n+}\n+00116\n+00117\n+fclose(flux);\n+00118\n+if (opts.verbose_flag)\n+00119\n+00120\n+cout \u00ab \"bye...\" \u00ab endl;\n+00121\n+return 0;\n+00122\n+00123 }\n+\n+5.2 area.cpp\n+00001 // -*- C++ -*00003 // File: area.h\n+00004 // Description: header file for the computation of jet area\n+00005 // This file is part of the SISCone project.\n+00006 // For more details, see http://projects.hepforge.org/siscone\n+00007 //\n+00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n+00009 //\n+00010 // This program is free software; you can redistribute it and/or modify\n+00011 // it under the terms of the GNU General Public License as published by\n+00012 // the Free Software Foundation; either version 2 of the License, or\n+00013 // (at your option) any later version.\n+00014 //\n+00015 // This program is distributed in the hope that it will be useful,\n+00016 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+00017 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.2 area.cpp\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:: 149\n+$//\n+00025 // $Date:: 2007-03-15 00:13:58 +0100 (Thu, 15 Mar 2007)\n+$//\n+00027\n+00028 #include \"area.h\"\n+00029 #include \"momentum.h\"\n+00030 #include \n+00031 #include \n+00032\n+00033 namespace siscone{\n+00034 using namespace std;\n+00035\n+00036 /*******************************************************\n+00037 * Cjet_area implementation\n+*\n+00038 * real Jet information, including its area(s)\n+*\n+00039 *\n+*\n+00040 * This class contains information for one single jet. *\n+00041 * That is, first, its momentum carrying information\n+*\n+00042 * about its centre and pT, and second, its particle\n+*\n+00043 * contents (from CJeT).\n+*\n+00044 * Compared to the Cjet class, it also includes the\n+*\n+00045 * passive and active areas of the jet computed using *\n+00046 * the Carea class.\n+*\n+00047 *******************************************************/\n+00048\n+00049 // default ctor\n+00050 //-------------00051 Cjet_area::Cjet_area(){\n+00052\n+active_area = passive_area = 0.0;\n+00053 }\n+00054\n+00055 // jet-initiated ctor\n+00056 //------------------00057 Cjet_area::Cjet_area(Cjet &j){\n+00058\n+v = j.v;\n+00059\n+n = j.n;\n+00060\n+contents = j.contents;\n+00061\n+00062\n+pass = j.pass;\n+00063\n+00064\n+pt_tilde = j.pt_tilde;\n+00065\n+sm_var2 = j.sm_var2;\n+00066\n+00067\n+active_area = passive_area = 0.0;\n+00068 }\n+00069\n+00070 // default dtor\n+00071 //-------------00072 Cjet_area::~Cjet_area(){\n+00073\n+00074 }\n+00075\n+00076\n+00077 /******************************************************************\n+00078 * Csiscone_area implementation\n+*\n+00079 * class for the computation of jet areas.\n+*\n+00080 *\n+*\n+00081 * This is the class user should use whenever you want to compute *\n+00082 * the jet area (passive and active).\n+*\n+00083 * It uses the SISCone algorithm to perform the jet analysis.\n+*\n+00084 ******************************************************************/\n+00085\n+00086 // default ctor\n+00087 //------------00088 Carea::Carea(){\n+// 3600 particles added\n+00089\n+grid_size = 60;\n+00090\n+grid_eta_max = 6.0; // maybe having twice more points in eta than in phi should be nice\n+00091\n+grid_shift = 0.5;\n+// 50% \"shacking\"\n+00092\n+00093\n+pt_soft = 1e-100;\n+00094\n+pt_shift = 0.05;\n+00095\n+pt_soft_min = 1e-90;\n+00096 }\n+00097\n+00098 // default dtor\n+00099 //------------00100 Carea::~Carea(){\n+00101\n+00102 }\n+00103\n+00104 /*\n+00105 * compute the jet areas from a given particle set.\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+177\n+\n+\f178\n+\n+File Documentation\n+\n+00106 * The parameters of this method are the ones which control the jet clustering alghorithm.\n+00107 * Note that the pt_min is not allowed here soince the jet-area determination involves soft\n+00108 * particles/jets and thus is used internally.\n+list of particles\n+00109 * - _particles\n+00110 * - _radius\n+cone radius\n+shared energy threshold for splitting&merging\n+00111 * - _f\n+00112 * - _n_pass_max maximum number of passes (0=full search, the default)\n+the scale choice for the split-merge procedure\n+00113 * - _split_merge_scale\n+00114 *\n+NOTE: SM_pt leads to IR unsafety for some events with momentum conservation.\n+00115 *\n+SM_Et is IR safe but not boost invariant and not implemented(!)\n+SM_mt is IR safe for hadronic events, but not for decays of two\n+00116 *\n+00117 *\n+back-to-back particles of identical mass\n+SM_pttilde\n+00118 *\n+00119 *\n+is always IR safe, and also boost invariant (default)\n+when this is set on, only hard jets are computed\n+00120 * - _hard_only\n+and not the purely ghosted jets (default: false)\n+00121 *\n+00122 * return the jets together with their areas\n+00123 * The return value is the number of jets (including pure-ghost ones if they are included)\n+00124 ********************************************************************************************/\n+00125 int Carea::compute_areas(std::vector &_particles, double _radius, double _f,\n+int _n_pass_max, Esplit_merge_scale _split_merge_scale,\n+00126\n+00127\n+bool _hard_only){\n+00128\n+00129\n+vector all_particles;\n+00130\n+// put \"hardest cut-off\" if needed\n+00131\n+00132\n+// this avoids computation of ghosted jets when not required and\n+00133\n+// significantly shortens the SM.\n+00134\n+if (_hard_only){\n+00135\n+SM_var2_hardest_cut_off = pt_soft_min*pt_soft_min;\n+00136\n+}\n+00137\n+// clear potential previous runs\n+00138\n+00139\n+jet_areas.clear();\n+00140\n+// put initial set of particles in the list\n+00141\n+00142\n+int n_hard = _particles.size();\n+00143\n+all_particles = _particles;\n+00144\n+// build the set of ghost particles and add them to the particle list\n+00145\n+00146\n+int i,j;\n+00147\n+double eta_g,phi_g,pt_g;\n+00148\n+for (i=0;i= n_hard\n+00167\n+// and deduce the number of ghosts in the jet, hence the area.\n+00168\n+double area_factor = (2.0*grid_eta_max/grid_size)*(twopi/grid_size);\n+00169\n+for (i=0;i<(int) jets.size();i++){\n+00170\n+00171\n+jet_areas.push_back(jets[i]);\n+00172\n+j=0;\n+00173\n+while ((j &_particles, double _radius, double _f,\n+00218\n+int _n_pass_max, Esplit_merge_scale _split_merge_scale){\n+00219\n+00220\n+vector all_particles;\n+00221\n+// in the case of passive area, we do not need\n+00222\n+00223\n+// to put the ghosts in the stable-cone search\n+00224\n+// (they do no influence the list of stable cones)\n+00225\n+// Here\u2019s how it goes...\n+00226\n+stable_cone_soft_pt2_cutoff = pt_soft_min*pt_soft_min;\n+00227\n+// clear potential previous runs\n+00228\n+00229\n+jet_areas.clear();\n+00230\n+// put initial set of particles in the list\n+00231\n+00232\n+int n_hard = _particles.size();\n+00233\n+all_particles = _particles;\n+00234\n+00235\n+// build the set of ghost particles and add them to the particle list\n+00236\n+int i,j;\n+00237\n+double eta_g,phi_g,pt_g;\n+00238\n+for (i=0;i= n_hard\n+00257\n+// and deduce the number of ghosts in the jet, hence the area.\n+00258\n+double area_factor = (2.0*grid_eta_max/grid_size)*(twopi/grid_size);\n+for (i=0;i<(int) jets.size();i++){\n+00259\n+00260\n+j=0;\n+while ((j &_particles, double _radius, double _f,\n+00292\n+int _n_pass_max, Esplit_merge_scale _split_merge_scale,\n+00293\n+bool _hard_only){\n+00294\n+00295\n+vector all_particles;\n+00296\n+// put \"hardest cut-off\" if needed\n+00297\n+00298\n+// this avoids computation of ghosted jets when not required and\n+00299\n+// significantly shortens the SM.\n+00300\n+if (_hard_only){\n+00301\n+SM_var2_hardest_cut_off = pt_soft_min*pt_soft_min;\n+00302\n+}\n+00303\n+// clear potential previous runs\n+00304\n+00305\n+jet_areas.clear();\n+00306\n+00307\n+// put initial set of particles in the list\n+00308\n+int n_hard = _particles.size();\n+00309\n+all_particles = _particles;\n+00310\n+00311\n+// build the set of ghost particles and add them to the particle list\n+00312\n+int i,j;\n+double eta_g,phi_g,pt_g;\n+00313\n+00314\n+for (i=0;i= n_hard\n+00333\n+// and deduce the number of ghosts in the jet, hence the area.\n+00334\n+double area_factor = (2.0*grid_eta_max/grid_size)*(twopi/grid_size);\n+00335\n+for (i=0;i<(int) jets.size();i++){\n+00336\n+00337\n+jet_areas.push_back(jets[i]);\n+00338\n+j=0;\n+00339\n+while ((j\n 00028 #include \n@@ -11041,57 +11873,50 @@\n 00035 using namespace siscone;\n 00036\n 00037 int main(int argc, char *argv[]){\n 00038\n vector particles;\n 00039\n Csiscone siscone;\n-00040\n int i,N;\n+00040\n 00041\n double px,py,pz,E;\n 00042\n Coptions opts;\n char fline[512];\n 00043\n 00044\n if (opts.parse_options(argc, argv))\n 00045\n 00046\n exit(1);\n 00047\n-00048\n // deal with help message\n+00048\n 00049\n if (opts.help_flag){\n 00050\n opts.print_help();\n 00051\n exit(0);\n 00052\n }\n 00053\n-// deal with version flag\n 00054\n+// deal with version flag\n 00055\n if (opts.version_flag){\n 00056\n opts.print_version();\n 00057\n exit(0);\n 00058\n }\n 00059\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f176\n-\n-File Documentation\n-\n 00060\n // various files used to read input data and store results\n 00061\n FILE *flux;\n 00062\n FILE *fpart;\n 00063\n@@ -11112,18 +11937,18 @@\n 00071\n }\n 00072\n 00073\n N=0;\n 00074\n fpart = fopen(\"particles.dat\", \"w+\");\n-00075\n while ((opts.N_stop!=0) && (fgets(fline, 512, flux)!=NULL)){\n-if (fline[0]!=\u2019#\u2019){ // skip lines beginning with \u2019#\u2019\n+00075\n 00076\n+if (fline[0]!=\u2019#\u2019){ // skip lines beginning with \u2019#\u2019\n 00077\n if (sscanf(fline, \"%le%le%le%le\", &px, &py, &pz, &E)==4){\n 00078\n particles.push_back(Cmomentum(px, py, pz, E));\n particles[N].eta, particles[N].phi);\n 00079\n fprintf(fpart, \"%e\\t%e\\n\",\n@@ -11147,43 +11972,52 @@\n }\n 00089\n }\n 00090\n fclose(flux);\n 00091\n fclose(fpart);\n-if (opts.verbose_flag)\n 00092\n+if (opts.verbose_flag)\n 00093\n cout \u00ab \" working with \" \u00ab N \u00ab \" particles\" \u00ab endl;\n 00094\n // compute jets\n 00095\n 00096\n if (opts.verbose_flag) cout \u00ab \"computing jet contents\" \u00ab endl;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+181\n+\n+\f182\n+\n+File Documentation\n+\n 00097\n i=siscone.compute_jets(particles, opts.R, opts.f, opts.npass, opts.ptmin, opts.SM_var);\n if (opts.verbose_flag){\n 00098\n-unsigned int pass;\n 00099\n+unsigned int pass;\n 00100\n for (pass=0;pass\n 00029 #include \n 00030 #include \n 00031\n 00032 using namespace std;\n@@ -11278,161 +12109,154 @@\n *\n 00045 * options for the \u2019cone\u2019 sample\n *\n 00046 *******************************************/\n 00047\n 00048 // default ctor\n 00049 //-------------00050 Coptions::Coptions(){\n-// set default flags values\n 00051\n+// set default flags values\n 00052\n help_flag=0;\n 00053\n version_flag=0;\n 00054\n verbose_flag=1;\n 00055\n-// set default options values\n 00056\n+// set default options values\n 00057\n N_stop = N_DEFAULT;\n 00058\n R = R_DEFAULT;\n 00059\n f = THRESHOLD_DEFAULT;\n 00060\n npass = NPASS_DEFAULT;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.4 options.cpp\n+\n+183\n+\n 00061\n ev_name = NULL;\n 00062\n SM_var = SM_DEFAULT;\n 00063 }\n 00064\n 00065\n 00066 // default dtor\n 00067 //-------------00068 Coptions::~Coptions(){\n-00069\n if (ev_name!=NULL)\n-delete[] ev_name;\n+00069\n 00070\n+delete[] ev_name;\n 00071 }\n 00072\n 00073\n 00074 // parse oprions\n 00075 // - argc number of arguments from the command line\n 00076 // - argv arguments from the command line\n 00077 // return 1 on error, 0 on success\n 00078 //--------------------------------00079 int Coptions::parse_options(int argc, char **argv){\n 00080\n int opt_param;\n-00081\n int option_index;\n-bool stop=false;\n+00081\n 00082\n+bool stop=false;\n 00083\n-00084\n // browse the command-line options{\n+00084\n 00085\n static struct option siscone_options[]={\n-00086\n // options that set a flag\n+00086\n 00087\n {\"verbose\", no_argument, &verbose_flag, 1},\n+no_argument, &verbose_flag, 0},\n 00088\n {\"quiet\",\n-no_argument, &verbose_flag, 0},\n-no_argument, &help_flag\n-, 1},\n 00089\n {\"help\",\n+no_argument, &help_flag\n+, 1},\n 00090\n {\"version\", no_argument, &version_flag, 1},\n-00091\n // options setting parameters\n+00091\n 00092\n {\"number\",\n required_argument, NULL, \u2019N\u2019},\n+required_argument, NULL, \u2019R\u2019},\n 00093\n {\"radius\",\n-required_argument, NULL, \u2019R\u2019},\n 00094\n {\"fraction\", required_argument, NULL, \u2019f\u2019},\n 00095\n {\"ptmin\",\n required_argument, NULL, \u2019p\u2019},\n required_argument, NULL, \u2019n\u2019},\n 00096\n {\"npass\",\n 00097\n {\"event\",\n required_argument, NULL, \u2019e\u2019},\n+required_argument, NULL, \u2019s\u2019},\n 00098\n {\"sm\",\n-required_argument, NULL, \u2019s\u2019},\n 00099\n {0,0,0,0}\n 00100\n };\n 00101\n 00102\n-do{\n 00103\n+do{\n 00104\n // getopt_long stores the option index here.\n 00105\n option_index=0;\n 00106\n // retreive options\n 00107\n 00108\n opt_param = getopt_long(argc, argv, \"hvqN:R:f:p:n:e:s:\",\n 00109\n siscone_options, &option_index);\n 00110\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-177\n-\n-$//\n-$//\n-\n-\f178\n-\n 00111\n+// Detect the end of the options.\n 00112\n+if (opt_param == -1)\n 00113\n+stop=true;\n 00114\n+// branch according to \u2019opt_param\u2019\n 00115\n 00116\n-00117\n-00118\n-00119\n-00120\n-00121\n-00122\n-00123\n-\n-File Documentation\n-\n-// Detect the end of the options.\n-if (opt_param == -1)\n-stop=true;\n-\n-// branch according to \u2019opt_param\u2019\n switch (opt_param){\n case \u2019h\u2019: help_flag = 1;\n break; // help\n+00117\n+00118\n case \u2019v\u2019: verbose_flag = 1;\n break; // verbose\n+00119\n case \u2019q\u2019: verbose_flag = 0;\n break; // quiet\n+00120\n case \u2019N\u2019: // max number of paprticles\n+00121\n sscanf(optarg, \"%d\", &N_stop);\n if (N_stop<=0){\n+00122\n+00123\n cout \u00ab \"Warning: the specified number of particles must be positive. Using default one\" \u00ab\n endl;\n 00124\n N_stop = N_DEFAULT;\n 00125\n }\n break;\n@@ -11460,57 +12284,65 @@\n 00137\n cout \u00ab \"Warning: the specified split/merge threshold must be in [0,1]. Using default one\" \u00ab\n endl;\n 00138\n f = THRESHOLD_DEFAULT;\n 00139\n }\n-break;\n 00140\n+break;\n case \u2019p\u2019:\n 00141\n 00142\n sscanf(optarg, \"%lf\", &ptmin);\n-00143\n if (ptmin<0){\n+00143\n 00144\n cout \u00ab \"Warning: the specified minimal pT must be non-negative. Using default one\" \u00ab endl;\n 00145\n ptmin = PTMIN_DEFAULT;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f184\n+\n+File Documentation\n+\n 00146\n-}\n-break;\n 00147\n-case \u2019n\u2019: // max number of paprticles\n 00148\n 00149\n-sscanf(optarg, \"%d\", &npass);\n 00150\n-if (npass<0){\n 00151\n+\n+}\n+break;\n+case \u2019n\u2019: // max number of paprticles\n+sscanf(optarg, \"%d\", &npass);\n+if (npass<0){\n cout \u00ab \"Warning: the specified number of passes must be non negative. Using default one\" \u00ab\n endl;\n 00152\n npass = NPASS_DEFAULT;\n 00153\n }\n break;\n 00154\n 00155\n case \u2019e\u2019:\n-00156\n if (ev_name==NULL){\n+00156\n 00157\n ev_name = new char[strlen(optarg)+1];\n 00158\n strcpy(ev_name, optarg);\n 00159\n }\n-break;\n 00160\n+break;\n case \u2019s\u2019:\n 00161\n 00162\n char tmp[512];\n 00163\n strcpy(tmp, optarg);\n if (strcmp(tmp, \"pttilde\")==0){\n@@ -11534,63 +12366,56 @@\n 00173\n cout \u00ab \"Warning: the specified varible for split--merge is not valid (should be pttilde, pt,\n mt or Et). Using pttilde as the default one.\" \u00ab endl;\n 00174\n SM_var = SM_pttilde;\n 00175\n }\n-00176\n break;\n-case 0:\n+00176\n 00177\n+case 0:\n 00178\n case -1:\n break;\n 00179\n 00180\n case \u2019?\u2019:\n 00181\n fprintf(stderr, \"Giving up.\\n\");\n-return 1;\n 00182\n-00183\n+return 1;\n break;\n-default:\n+00183\n 00184\n+default:\n 00185\n if (!help_flag){\n 00186\n fprintf(stderr, \"unrecognized option %c. Giving up.\\n\", opt_param);\n 00187\n return 1;\n 00188\n }\n 00189\n }\n 00190\n } while (!stop);\n 00191\n-if (ev_name==NULL){\n 00192\n+if (ev_name==NULL){\n 00193\n ev_name = new char[strlen(DEFAULT_EVENT)+1];\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.3 options.h\n-\n-179\n-\n 00194\n strcpy(ev_name, DEFAULT_EVENT);\n 00195\n }\n 00196\n-00197\n return 0;\n+00197\n 00198 }\n 00199\n 00200\n 00201 // print the help message\n 00202 //-----------------------00203 int Coptions::print_help(){\n 00204\n cout \u00ab siscone_package_name() \u00ab \" \" \u00ab siscone_version() \u00ab endl;\n@@ -11612,20 +12437,20 @@\n 00212\n cout \u00ab \" -p , --ptmin=\n endl;\n : set the maximal number of passes (0 for no limit) (\" \u00ab\n 00213\n cout \u00ab \" -n , --npass=\n NPASS_DEFAULT \u00ab \")\" \u00ab endl;\n+: set the event filename (\" \u00ab DEFAULT_EVENT \u00ab \")\" \u00ab endl;\n 00214\n cout \u00ab \" -e , --event=\n-: set the event filename (\" \u00ab DEFAULT_EVENT \u00ab \")\" \u00ab endl;\n-: variable for split--merge: pttilde, mt, pt or Et (pttilde)\" \u00ab\n 00215\n cout \u00ab \" -s , --sm=\n+: variable for split--merge: pttilde, mt, pt or Et (pttilde)\" \u00ab\n endl;\n 00216\n cout \u00ab endl;\n 00217\n cout \u00ab \"Output flags\" \u00ab endl;\n : show version information\" \u00ab endl;\n 00218\n@@ -11641,14 +12466,19 @@\n cout \u00ab endl;\n 00223\n 00224\n return 0;\n 00225 }\n 00226\n 00227\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.5 options.h\n+\n 00228 // print program version\n 00229 //----------------------00230 int Coptions::print_version(){\n 00231\n cout \u00ab siscone_package_name() \u00ab \" \" \u00ab siscone_version() \u00ab endl;\n 00232\n cout \u00ab \"Copyright (C) 2006.\" \u00ab endl;\n 00233\n@@ -11666,18 +12496,18 @@\n 00239\n cout \u00ab \"Please send bugs or comments to AUTHORS\" \u00ab endl;\n 00240\n return 0;\n 00241\n 00242 }\n \n-5.3 options.h\n+5.5 options.h\n 00001\n-//\n 00002 // File: options.h\n+//\n 00003 // Description: management of the cmdline options of the main program\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@@ -11717,72 +12547,74 @@\n $//\n 00024 // $Date:: 2007-10-03 19:21:19 +0200 (Wed, 03 Oct 2007)\n $//\n 00026\n 00027 #ifndef __OPTIONS_H__\n 00028 #define __OPTIONS_H__\n 00029\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f180\n-\n-File Documentation\n-\n 00030 #include \"siscone/siscone.h\"\n 00031\n 00037 class Coptions{\n 00038 public:\n 00040\n Coptions();\n 00041\n 00043\n ~Coptions();\n 00044\n 00049\n int parse_options(int argc, char **argv);\n 00050\n-00052\n int print_help();\n+00052\n 00053\n-int print_version();\n 00055\n+int print_version();\n 00056\n // flags\n 00057\n 00058\n int help_flag;\n-int version_flag;\n 00059\n-00060\n+int version_flag;\n int verbose_flag;\n+00060\n 00061\n-// options\n 00062\n+// options\n 00063\n int N_stop;\n 00064\n double R;\n-00065\n double f;\n-double ptmin;\n+00065\n 00066\n-00067\n+double ptmin;\n char *ev_name;\n-int npass;\n+00067\n 00068\n+int npass;\n 00069\n 00071\n siscone::Esplit_merge_scale SM_var;\n 00072 };\n 00073\n 00074 #endif\n \n-5.4 sample.cpp\n+5.6 sample.cpp\n 00001\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+185\n+\n+\f186\n+\n+File Documentation\n+\n 00002 // File: sample.cpp\n //\n 00003 // Description: example program for the Csiscone class (see documentation)\n //\n 00004 // This file is part of the SISCone project.\n //\n 00005 // For more details, see http://projects.hepforge.org/siscone\n@@ -11827,16 +12659,16 @@\n 00026\n 00027 #include \n 00028 #include \n 00029 #include \n 00030 #include \"siscone/momentum.h\"\n 00031 #include \"siscone/siscone.h\"\n 00032\n-00033 #define R\n 0.7\n+00033 #define R\n 00034 #define f\n 0.5\n 00035 #define f_alt 0.75\n 00036\n 00037 using namespace std;\n 00038 using namespace siscone;\n 00039\n@@ -11856,121 +12688,122 @@\n 00045\n double px,py,pz,E;\n // particles 4-momentum\n 00046\n char fline[512];\n // line to read from a file\n 00047\n-// read particles\n 00048\n+// read particles\n 00049\n FILE *flux;\n 00050\n flux = fopen(\"events/single-event.dat\", \"r\");\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.5 spherical.cpp\n-\n 00051\n+if (flux==NULL){\n 00052\n+cerr \u00ab \"cannot read event\" \u00ab endl;\n 00053\n+return 1;\n 00054\n+}\n 00055\n 00056\n+N=0;\n+while (fgets(fline, 512, flux)!=NULL){\n 00057\n 00058\n+if (fline[0]!=\u2019#\u2019){ // skip lines beginning with \u2019#\u2019\n 00059\n+if (sscanf(fline, \"%le%le%le%le\", &px, &py, &pz, &E)==4){\n 00060\n+particles.push_back(Cmomentum(px, py, pz, E));\n 00061\n+N++;\n 00062\n+} else {\n 00063\n+cout \u00ab \"error in reading event file Giving up.\" \u00ab endl;\n 00064\n+fclose(flux);\n+return 2;\n 00065\n 00066\n+}\n 00067\n+}\n 00068\n+}\n 00069\n+fclose(flux);\n 00070\n 00071\n+// compute jets\n 00072\n+// first compute with multiple passes (default)\n 00073\n+i=siscone.compute_jets(particles, R, f);\n 00074\n+cout \u00ab \" \" \u00ab i \u00ab \" jets found in multi-pass run\" \u00ab endl;\n 00075\n+// then, recompute it with a different f\n 00076\n 00077\n+i=siscone.recompute_jets(f_alt);\n 00078\n+cout \u00ab \" \" \u00ab i \u00ab \" jets found with alternative f\" \u00ab endl;\n 00079\n+// one pass\n 00080\n 00081\n+i=siscone.compute_jets(particles, R, f, 1);\n 00082\n+cout \u00ab \" \" \u00ab i \u00ab \" jets found in single-pass run\" \u00ab endl;\n 00083\n 00084\n-00085\n-00086\n-00087\n-\n-181\n-\n-if (flux==NULL){\n-cerr \u00ab \"cannot read event\" \u00ab endl;\n-return 1;\n-}\n-N=0;\n-while (fgets(fline, 512, flux)!=NULL){\n-if (fline[0]!=\u2019#\u2019){ // skip lines beginning with \u2019#\u2019\n-if (sscanf(fline, \"%le%le%le%le\", &px, &py, &pz, &E)==4){\n-particles.push_back(Cmomentum(px, py, pz, E));\n-N++;\n-} else {\n-cout \u00ab \"error in reading event file Giving up.\" \u00ab endl;\n-fclose(flux);\n-return 2;\n-}\n-}\n-}\n-fclose(flux);\n-// compute jets\n-// first compute with multiple passes (default)\n-i=siscone.compute_jets(particles, R, f);\n-cout \u00ab \" \" \u00ab i \u00ab \" jets found in multi-pass run\" \u00ab endl;\n-// then, recompute it with a different f\n-i=siscone.recompute_jets(f_alt);\n-cout \u00ab \" \" \u00ab i \u00ab \" jets found with alternative f\" \u00ab endl;\n-// one pass\n-i=siscone.compute_jets(particles, R, f, 1);\n-cout \u00ab \" \" \u00ab i \u00ab \" jets found in single-pass run\" \u00ab endl;\n-\n // show jets\n+00085\n vector::iterator it_j;\n+00086\n int i1;\n-fprintf(stdout, \"#\n pT\n eta\n phi\n px\n py\n+00087\n+fprintf(stdout, \"#\n \\n\");\n 00088\n for (it_j = siscone.jets.begin(), i1=0 ;\n+\n+pz\n+\n+E\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.7 spherical.cpp\n+\n 00089\n-it_j != siscone.jets.end() ; it_j++, i1++){\n 00090\n-fprintf(stdout, \"Jet %3d: %10.3f %8.3f %8.3f %10.3f %10.3f %10.3f %10.3f\\n\",\n 00091\n+\n+it_j != siscone.jets.end() ; it_j++, i1++){\n+fprintf(stdout, \"Jet %3d: %10.3f %8.3f %8.3f %10.3f %10.3f %10.3f %10.3f\\n\",\n i1, it_j->v.perp(), it_j->v.eta, it_j->v.phi, it_j->v.px, it_j->v.py,\n it_j->v.E);\n 00092\n }\n 00093\n-return 0;\n 00094\n+return 0;\n 00095 }\n \n-5.5 spherical.cpp\n+5.7 spherical.cpp\n 00001\n //\n 00002 // File: spherical.cpp\n 00003 // Description: example program for the CSphsiscone class (spherical SISCone)//\n 00004 // This file is part of the SISCone project.\n //\n 00005 // WARNING: this is not the main SISCone trunk but\n@@ -12020,27 +12853,14 @@\n 00028\n 00029 #include \n 00030 #include \n 00031 #include \n 00032 #include \"siscone/spherical/momentum.h\"\n 00033 #include \"siscone/spherical/siscone.h\"\n 00034\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-pz\n-\n-it_j->v.pz,\n-\n-E\n-\n-\f182\n-\n-File Documentation\n-\n 00035 #define R\n 0.7\n 00036 #define f\n 0.5\n 00037 #define f_alt 0.75\n 00038\n 00039 using namespace std;\n@@ -12061,16 +12881,16 @@\n 00047\n double px,py,pz,E;\n // particles 4-momentum\n 00048\n char fline[512];\n // line to read from a file\n 00049\n-00050\n // read particles\n+00050\n 00051\n FILE *flux;\n 00052\n flux = fopen(\"events/single-event.dat\", \"r\");\n if (flux==NULL){\n 00053\n 00054\n@@ -12078,16 +12898,16 @@\n return 1;\n 00055\n 00056\n }\n 00057\n 00058\n N=0;\n-while (fgets(fline, 512, flux)!=NULL){\n 00059\n+while (fgets(fline, 512, flux)!=NULL){\n if (fline[0]!=\u2019#\u2019){ // skip lines beginning with \u2019#\u2019\n 00060\n 00061\n if (sscanf(fline, \"%le%le%le%le\", &px, &py, &pz, &E)==4){\n 00062\n particles.push_back(CSphmomentum(px, py, pz, E));\n 00063\n@@ -12105,16 +12925,27 @@\n 00069\n }\n 00070\n }\n 00071\n fclose(flux);\n 00072\n-// compute jets\n 00073\n+// compute jets\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+187\n+\n+it_j->v.pz,\n+\n+\f188\n+\n+File Documentation\n+\n 00074\n // first compute with multiple passes (default)\n 00075\n i=siscone.compute_jets(particles, R, f);\n 00076\n cout \u00ab \" \" \u00ab i \u00ab \" jets found in multi-pass run\" \u00ab endl;\n 00077\n@@ -12132,25 +12963,25 @@\n 00084\n cout \u00ab \" \" \u00ab i \u00ab \" jets found in single-pass run\" \u00ab endl;\n 00085\n // show jets\n 00086\n 00087\n vector::iterator it_j;\n-int i1;\n 00088\n+int i1;\n 00089\n fprintf(stdout, \"#\n theta\n phi\n px\n py\n pz\n-00090\n for (it_j = siscone.jets.begin(), i1=0 ;\n+00090\n 00091\n it_j != siscone.jets.end() ; it_j++, i1++){\n 00092\n fprintf(stdout, \"Jet %3d: %8.3f %8.3f %10.3f %10.3f %10.3f %10.3f\\n\",\n 00093\n i1, it_j->v._theta, it_j->v._phi, it_j->v.px, it_j->v.py, it_j->v.pz,\n 00094\n@@ -12162,58 +12993,49 @@\n \n E\n \n \\n\");\n \n it_j->v.E);\n \n-5.6 test.cpp\n+5.8 test.cpp\n 00001\n+//\n 00002 // File: test.cpp\n-00003 // Description: example program that implements tests with random particles\n+00003 // Description: example program that implements tests with random particles //\n 00004 //\n and output various informations\n+//\n 00005 //\n+//\n 00006 // Note: for a usage example of SISCone, we advise looking at main.cpp\n+//\n 00007 //\n or http://projects.hepforge.org/siscone/usage.html\n-00008 //\n-00009 // This file is part of the SISCone project.\n-00010 // For more details, see http://projects.hepforge.org/siscone\n-00011 //\n-00012 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-00013 //\n-00014 // This program is free software; you can redistribute it and/or modify\n-00015 // it under the terms of the GNU General Public License as published by\n-00016 // the Free Software Foundation; either version 2 of the License, or\n-00017 // (at your option) any later version.\n-\n-//\n-//\n-//\n-//\n-//\n //\n+00008 //\n //\n+00009 // This file is part of the SISCone project.\n //\n+00010 // For more details, see http://projects.hepforge.org/siscone\n //\n+00011 //\n //\n+00012 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n //\n+00013 //\n //\n+00014 // This program is free software; you can redistribute it and/or modify\n //\n+00015 // it under the terms of the GNU General Public License as published by\n //\n+00016 // the Free Software Foundation; either version 2 of the License, or\n //\n+00017 // (at your option) any later version.\n //\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.6 test.cpp\n-\n-183\n-\n 00018 //\n //\n 00019 // This program is distributed in the hope that it will be useful,\n //\n 00020 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n //\n 00021 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n@@ -12256,56 +13078,63 @@\n 00049 int main(int argc, char* argv[]){\n 00050\n vector particles;\n 00051\n Cmomentum *v;\n double phi=0, eta=0, pt=1;\n 00052\n-00053\n unsigned int N;\n+00053\n 00054\n-unsigned int i;\n 00055\n+unsigned int i;\n 00056\n FILE *flux;\n 00057\n-if (argc==1){\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.9 times.cpp\n+\n+189\n+\n 00058\n-00059\n+if (argc==1){\n //cout \u00ab \"using default number of particles\" \u00ab endl;\n+00059\n 00060\n N = N_default;\n 00061\n } else {\n 00062\n sscanf(argv[1], \"%u\", &N);\n-//cout \u00ab \"using \" \u00ab N \u00ab \" particles\" \u00ab endl;\n 00063\n+//cout \u00ab \"using \" \u00ab N \u00ab \" particles\" \u00ab endl;\n 00064\n }\n 00065\n-// Initialise random number generator\n 00066\n+// Initialise random number generator\n 00067\n timeval timestamp;\n 00068\n gettimeofday(×tamp, NULL);\n 00069\n srand(timestamp.tv_usec);\n 00070\n // build particle list\n 00071\n 00072\n cout \u00ab \"build particle list\" \u00ab endl;\n 00073\n flux = fopen(\"particles.dat\", \"w+\");\n-00074\n for (i=0;ieta, v->phi, v->perp());\n 00112\n }\n 00113\n@@ -12385,48 +13207,56 @@\n 00116\n cout \u00ab \"bye...\" \u00ab endl;\n 00117\n return 0;\n 00118\n 00119 }\n \n-5.7 times.cpp\n+5.9 times.cpp\n 00001\n-//\n 00002 // File: times.cpp\n 00003 // Description: example program that computes execution times\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+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+//\n+//\n+//\n+//\n+//\n+//\n //\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+\n+\f190\n+\n+File Documentation\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@@ -12487,41 +13317,36 @@\n 00062\n 00063\n 00064 int main(){\n 00065\n vector particles;\n 00066\n Csiscone siscone;\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.8 area.cpp\n-\n 00067\n double eta,phi;\n 00068\n // number of events and particles\n 00069\n 00070\n int i, N;\n-int n_ev, part_inc;\n 00071\n+int n_ev, part_inc;\n 00072\n // time statistics variables\n 00073\n 00074\n int time_siscone;\n 00075\n // save files\n 00076\n 00077\n FILE *flux;\n 00078\n-// initialise random number generator\n 00079\n+// initialise random number generator\n 00080\n cout \u00ab \"initialise random number generator\" \u00ab endl;\n 00081\n timeval timestamp;\n 00082\n 00083\n gettimeofday(×tamp, NULL);\n@@ -12538,55 +13363,60 @@\n do{\n 00090\n 00091\n fprintf(stdout, \"\\r%5d particles\\n\", N);\n 00092\n time_siscone=0;\n 00093\n-for (n_ev=0;n_ev\n-00028 #include \n-00029 #include \n-00030 #include \"siscone/momentum.h\"\n-00031 #include \"siscone/siscone.h\"\n-00032 #include \"siscone/area.h\"\n-00033 #include \"options.h\"\n-00034\n-00035 using namespace std;\n-00036 using namespace siscone;\n-00037\n-00038 int main(int argc, char *argv[]){\n-00039\n-vector particles;\n-00040\n-Carea siscone_with_area;\n-int i,N;\n-00041\n-double px,py,pz,E;\n-00042\n-00043\n-Coptions opts;\n-char fline[512];\n-00044\n-00045\n-00046\n-if (opts.parse_options(argc, argv))\n-00047\n-exit(1);\n-00048\n-// deal with help message\n-00049\n-00050\n-if (opts.help_flag){\n-00051\n-opts.print_help();\n-00052\n-exit(0);\n-00053\n-}\n-00054\n-// deal with version flag\n-00055\n-00056\n-if (opts.version_flag){\n-00057\n-opts.print_version();\n-00058\n-exit(0);\n-00059\n-}\n-00060\n-00061\n-// various files used to read input data and store results\n-00062\n-FILE *flux;\n-00063\n-FILE *fpart;\n-00064\n-00065\n-// read particles\n-00066\n-if (opts.verbose_flag) cout \u00ab \"reading particles\" \u00ab endl;\n-00067\n-flux = fopen(opts.ev_name, \"r\");\n-if (flux==NULL){\n-00068\n-00069\n-cerr \u00ab \"cannot read event\" \u00ab endl;\n-return 1;\n-00070\n-00071\n-}\n-00072\n-00073\n-N=0;\n-00074\n-fpart = fopen(\"particles.dat\", \"w+\");\n-while ((opts.N_stop!=0) && (fgets(fline, 512, flux)!=NULL)){\n-00075\n-00076\n-if (fline[0]!=\u2019#\u2019){ // skip lines beginning with \u2019#\u2019\n-00077\n-if (sscanf(fline, \"%le%le%le%le\", &px, &py, &pz, &E)==4){\n-00078\n-particles.push_back(Cmomentum(px, py, pz, E));\n-00079\n-fprintf(fpart, \"%e\\t%e\\n\",\n-particles[N].eta, particles[N].phi);\n-00080\n-N++;\n-00081\n-opts.N_stop--;\n-00082\n-} else {\n-00083\n-cout \u00ab \"error in reading event file Giving up.\" \u00ab endl;\n-00084\n-fclose(flux);\n-00085\n-fclose(fpart);\n-00086\n-exit(2);\n-00087\n-}\n-00088\n-}\n-00089\n-}\n-00090\n-fclose(flux);\n-00091\n-fclose(fpart);\n-00092\n-if (opts.verbose_flag)\n-00093\n-cout \u00ab \" working with \" \u00ab N \u00ab \" particles\" \u00ab endl;\n-00094\n-// compute jets\n-00095\n-00096\n-if (opts.verbose_flag) cout \u00ab \"computing jet contents\" \u00ab endl;\n-00097\n-i=siscone_with_area.compute_areas(particles, opts.R, opts.f, opts.npass, opts.SM_var);\n-00098\n-if (opts.verbose_flag){\n-unsigned int pass;\n-00099\n-00100\n-for (pass=0;pass::iterator ja;\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.9 area.cpp\n-\n-00111\n-for (ja=siscone_with_area.jet_areas.begin();ja!=siscone_with_area.jet_areas.end();ja++){\n-00112\n-fprintf(flux, \"%e\\t%e\\t%e\\t%e\\t%e\\n\",\n-00113\n-ja->v.perp(), ja->v.eta, ja->v.phi,\n-00114\n-ja->active_area, ja->passive_area);\n-00115\n-}\n-00116\n-00117\n-fclose(flux);\n-00118\n-00119\n-if (opts.verbose_flag)\n-00120\n-cout \u00ab \"bye...\" \u00ab endl;\n-00121\n-return 0;\n-00122\n-00123 }\n-\n-5.9 area.cpp\n-00001 // -*- C++ -*00003 // File: area.h\n-//\n-00004 // Description: header file for the computation of jet area\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:: 149\n-$//\n-00025 // $Date:: 2007-03-15 00:13:58 +0100 (Thu, 15 Mar 2007)\n-$//\n-00027\n-00028 #include \"area.h\"\n-00029 #include \"momentum.h\"\n-00030 #include \n-00031 #include \n-00032\n-00033 namespace siscone{\n-00034 using namespace std;\n-00035\n-00036 /*******************************************************\n-00037 * Cjet_area implementation\n-*\n-00038 * real Jet information, including its area(s)\n-*\n-00039 *\n-*\n-00040 * This class contains information for one single jet. *\n-00041 * That is, first, its momentum carrying information\n-*\n-00042 * about its centre and pT, and second, its particle\n-*\n-00043 * contents (from CJeT).\n-*\n-00044 * Compared to the Cjet class, it also includes the\n-*\n-00045 * passive and active areas of the jet computed using *\n-00046 * the Carea class.\n-*\n-00047 *******************************************************/\n-00048\n-00049 // default ctor\n-00050 //-------------00051 Cjet_area::Cjet_area(){\n-00052\n-active_area = passive_area = 0.0;\n-00053 }\n-00054\n-00055 // jet-initiated ctor\n-00056 //------------------00057 Cjet_area::Cjet_area(Cjet &j){\n-00058\n-v = j.v;\n-00059\n-n = j.n;\n-00060\n-contents = j.contents;\n-00061\n-00062\n-pass = j.pass;\n-00063\n-00064\n-pt_tilde = j.pt_tilde;\n-00065\n-sm_var2 = j.sm_var2;\n-00066\n-00067\n-active_area = passive_area = 0.0;\n-00068 }\n-00069\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-187\n-\n-\f188\n-\n-File Documentation\n-\n-00070 // default dtor\n-00071 //-------------00072 Cjet_area::~Cjet_area(){\n-00073\n-00074 }\n-00075\n-00076\n-00077 /******************************************************************\n-00078 * Csiscone_area implementation\n-*\n-00079 * class for the computation of jet areas.\n-*\n-00080 *\n-*\n-00081 * This is the class user should use whenever you want to compute *\n-00082 * the jet area (passive and active).\n-*\n-00083 * It uses the SISCone algorithm to perform the jet analysis.\n-*\n-00084 ******************************************************************/\n-00085\n-00086 // default ctor\n-00087 //------------00088 Carea::Carea(){\n-00089\n-grid_size = 60;\n-// 3600 particles added\n-00090\n-grid_eta_max = 6.0; // maybe having twice more points in eta than in phi should be nice\n-00091\n-grid_shift = 0.5;\n-// 50% \"shacking\"\n-00092\n-00093\n-pt_soft = 1e-100;\n-00094\n-pt_shift = 0.05;\n-00095\n-pt_soft_min = 1e-90;\n-00096 }\n-00097\n-00098 // default dtor\n-00099 //------------00100 Carea::~Carea(){\n-00101\n-00102 }\n-00103\n-00104 /*\n-00105 * compute the jet areas from a given particle set.\n-00106 * The parameters of this method are the ones which control the jet clustering alghorithm.\n-00107 * Note that the pt_min is not allowed here soince the jet-area determination involves soft\n-00108 * particles/jets and thus is used internally.\n-00109 * - _particles\n-list of particles\n-00110 * - _radius\n-cone radius\n-shared energy threshold for splitting&merging\n-00111 * - _f\n-00112 * - _n_pass_max maximum number of passes (0=full search, the default)\n-the scale choice for the split-merge procedure\n-00113 * - _split_merge_scale\n-00114 *\n-NOTE: SM_pt leads to IR unsafety for some events with momentum conservation.\n-SM_Et is IR safe but not boost invariant and not implemented(!)\n-00115 *\n-00116 *\n-SM_mt is IR safe for hadronic events, but not for decays of two\n-00117 *\n-back-to-back particles of identical mass\n-SM_pttilde\n-00118 *\n-00119 *\n-is always IR safe, and also boost invariant (default)\n-when this is set on, only hard jets are computed\n-00120 * - _hard_only\n-00121 *\n-and not the purely ghosted jets (default: false)\n-00122 * return the jets together with their areas\n-00123 * The return value is the number of jets (including pure-ghost ones if they are included)\n-00124 ********************************************************************************************/\n-00125 int Carea::compute_areas(std::vector &_particles, double _radius, double _f,\n-int _n_pass_max, Esplit_merge_scale _split_merge_scale,\n-00126\n-00127\n-bool _hard_only){\n-00128\n-00129\n-vector all_particles;\n-00130\n-00131\n-// put \"hardest cut-off\" if needed\n-00132\n-// this avoids computation of ghosted jets when not required and\n-00133\n-// significantly shortens the SM.\n-00134\n-if (_hard_only){\n-00135\n-SM_var2_hardest_cut_off = pt_soft_min*pt_soft_min;\n-00136\n-}\n-00137\n-00138\n-// clear potential previous runs\n-00139\n-jet_areas.clear();\n-00140\n-// put initial set of particles in the list\n-00141\n-00142\n-int n_hard = _particles.size();\n-00143\n-all_particles = _particles;\n-00144\n-00145\n-// build the set of ghost particles and add them to the particle list\n-00146\n-int i,j;\n-double eta_g,phi_g,pt_g;\n-00147\n-00148\n-for (i=0;i= n_hard\n-00167\n-// and deduce the number of ghosts in the jet, hence the area.\n-00168\n-double area_factor = (2.0*grid_eta_max/grid_size)*(twopi/grid_size);\n-00169\n-for (i=0;i<(int) jets.size();i++){\n-00170\n-00171\n-jet_areas.push_back(jets[i]);\n-00172\n-j=0;\n-while ((j &_particles, double _radius, double _f,\n-00218\n-int _n_pass_max, Esplit_merge_scale _split_merge_scale){\n-00219\n-00220\n-vector all_particles;\n-00221\n-// in the case of passive area, we do not need\n-00222\n-00223\n-// to put the ghosts in the stable-cone search\n-00224\n-// (they do no influence the list of stable cones)\n-00225\n-// Here\u2019s how it goes...\n-00226\n-stable_cone_soft_pt2_cutoff = pt_soft_min*pt_soft_min;\n-00227\n-// clear potential previous runs\n-00228\n-00229\n-jet_areas.clear();\n-00230\n-00231\n-// put initial set of particles in the list\n-00232\n-int n_hard = _particles.size();\n-00233\n-all_particles = _particles;\n-00234\n-// build the set of ghost particles and add them to the particle list\n-00235\n-00236\n-int i,j;\n-00237\n-double eta_g,phi_g,pt_g;\n-00238\n-for (i=0;i= n_hard\n-00257\n-// and deduce the number of ghosts in the jet, hence the area.\n-00258\n-double area_factor = (2.0*grid_eta_max/grid_size)*(twopi/grid_size);\n-00259\n-for (i=0;i<(int) jets.size();i++){\n-00260\n-j=0;\n-while ((j &_particles, double _radius, double _f,\n-00292\n-int _n_pass_max, Esplit_merge_scale _split_merge_scale,\n-bool _hard_only){\n-00293\n-00294\n-00295\n-vector all_particles;\n-00296\n-00297\n-// put \"hardest cut-off\" if needed\n-00298\n-// this avoids computation of ghosted jets when not required and\n-00299\n-// significantly shortens the SM.\n-00300\n-if (_hard_only){\n-00301\n-SM_var2_hardest_cut_off = pt_soft_min*pt_soft_min;\n-00302\n-}\n-00303\n-00304\n-// clear potential previous runs\n-00305\n-jet_areas.clear();\n-00306\n-// put initial set of particles in the list\n-00307\n-00308\n-int n_hard = _particles.size();\n-00309\n-all_particles = _particles;\n-00310\n-00311\n-// build the set of ghost particles and add them to the particle list\n-00312\n-int i,j;\n-00313\n-double eta_g,phi_g,pt_g;\n-00314\n-for (i=0;i= n_hard\n-00333\n-// and deduce the number of ghosts in the jet, hence the area.\n-00334\n-double area_factor = (2.0*grid_eta_max/grid_size)*(twopi/grid_size);\n-00335\n-for (i=0;i<(int) jets.size();i++){\n-00336\n-00337\n-jet_areas.push_back(jets[i]);\n-00338\n-j=0;\n-00339\n-while ((j &_particles, double _radius, double _f,\n 00101\n int _n_pass_max=0, Esplit_merge_scale _split_merge_scale=SM_pttilde,\n bool _hard_only=false);\n 00102\n 00103\n-00112\n int compute_active_areas(std::vector &_particles, double _radius, double _f,\n-int _n_pass_max=0, Esplit_merge_scale _split_merge_scale=SM_pttilde,\n+00112\n 00113\n+int _n_pass_max=0, Esplit_merge_scale _split_merge_scale=SM_pttilde,\n bool _hard_only=false);\n 00114\n+00115\n+int compute_passive_areas(std::vector &_particles, double _radius, double _f,\n+00123\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n 191\n \n \f192\n \n File Documentation\n \n-00115\n-int compute_passive_areas(std::vector &_particles, double _radius, double _f,\n-00123\n 00124\n int _n_pass_max=0, Esplit_merge_scale _split_merge_scale=SM_pttilde);\n 00125\n int grid_size;\n 00126\n 00127\n double grid_eta_max;\n double grid_shift;\n 00128\n 00129\n double pt_soft;\n 00130\n 00131\n double pt_shift;\n-00132\n double pt_soft_min;\n+00132\n 00133\n 00135\n std::vector jet_areas;\n 00136 };\n 00137\n 00138 }\n 00139 #endif\n@@ -13649,36 +13643,36 @@\n 00066\n 00068\n inline circulator & operator--() {\n if (m_here == m_begin) m_here = m_end;\n 00069\n 00070\n --m_here;\n-00071\n return *this;\n+00071\n 00072\n }\n 00073\n 00077\n bool operator==(const circulator & other) const {return m_here == other.m_here;}\n 00078\n bool operator!=(const circulator & other) const {return m_here != other.m_here;}\n 00082\n 00083\n 00084 private:\n 00085\n T m_here, m_begin, m_end;\n 00086 };\n+00087\n+00088 }\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n \f5.12 config.h\n \n-00087\n-00088 }\n 00089\n 00090 #endif // __CIRCULATOR_H__\n \n 5.12 config.h\n 00001 #ifndef _SISCONE_CONFIG_H\n 00002 #define _SISCONE_CONFIG_H 1\n 00003\n@@ -13751,25 +13745,25 @@\n 00070 #define SISCONE_PACKAGE \"siscone\"\n 00071 #endif\n 00072\n 00073 /* Define to the address where bug reports for this package should be sent. */\n 00074 #ifndef SISCONE_PACKAGE_BUGREPORT\n 00075 #define SISCONE_PACKAGE_BUGREPORT \"\"\n 00076 #endif\n+00077\n+00078 /* Define to the full name of this package. */\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n 193\n \n \f194\n \n File Documentation\n \n-00077\n-00078 /* Define to the full name of this package. */\n 00079 #ifndef SISCONE_PACKAGE_NAME\n 00080 #define SISCONE_PACKAGE_NAME \"SISCone\"\n 00081 #endif\n 00082\n 00083 /* Define to the full name and version of this package. */\n 00084 #ifndef SISCONE_PACKAGE_STRING\n 00085 #define SISCONE_PACKAGE_STRING \"SISCone 3.0.5\"\n@@ -13809,15 +13803,15 @@\n 00117 #define SISCONE_VERSION \"3.0.5\"\n 00118 #endif\n 00119\n 00120 /* once: _SISCONE_CONFIG_H */\n 00121 #endif\n \n 5.13 config_raw.h\n-00001 /* siscone/config_raw.h. Generated from config.h.in by configure.\n+00001 /* siscone/config_raw.h. Generated from config.h.in by configure. */\n 00002 /* config.h.in. Generated from configure.ac by autoheader. */\n 00003\n 00004 /* Define to 1 if you have the header file. */\n 00005 #define HAVE_DLFCN_H 1\n 00006\n 00007 /* Define to 1 if you have the header file. */\n 00008 #define HAVE_INTTYPES_H 1\n@@ -13844,25 +13838,23 @@\n 00029 #define HAVE_SYS_STAT_H 1\n 00030\n 00031 /* Define to 1 if you have the header file. */\n 00032 #define HAVE_SYS_TYPES_H 1\n 00033\n 00034 /* Define to 1 if you have the header file. */\n 00035 #define HAVE_UNISTD_H 1\n-\n-*/\n+00036\n+00037 /* Define to the sub-directory where libtool stores uninstalled libraries. */\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n \f5.14 siscone/defines.h File Reference\n \n 195\n \n-00036\n-00037 /* Define to the sub-directory where libtool stores uninstalled libraries. */\n 00038 #define LT_OBJDIR \".libs/\"\n 00039\n 00040 /* Name of package */\n 00041 #define PACKAGE \"siscone\"\n 00042\n 00043 /* Define to the address where bug reports for this package should be sent. */\n 00044 #define PACKAGE_BUGREPORT \"\"\n@@ -14703,343 +14695,36 @@\n 00174\n return tmp;\n 00175\n 00176 }\n 00177\n 00178 }\n \n-5.18 geom_2d.h\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-else if (phi >\n-M_PI) phi -= twopi;\n-00045\n-return phi;\n-00046\n-00047 }\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.19 geom_2d.h\n-\n-203\n-\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-return delta > M_PI ? twopi-delta : delta;\n-00062\n-00063 }\n-00064\n-00066 inline double pow2(double x) {return x*x;}\n-00067\n-00068\n-00073 class Ctwovect {\n-00074 public:\n-00076\n-Ctwovect() : x(0.0), y(0.0) {}\n-00077\n-00081\n-Ctwovect(double _x, double _y) : x(_x), y(_y) {}\n-00082\n-double x, y;\n-00084\n-00085\n-00087\n-inline double mod2() const {return pow2(x)+pow2(y);}\n-00088\n-inline double modulus() const {return sqrt(mod2());}\n-00090\n-00091 };\n-00092\n-00093\n-00098 inline double dot_product(const Ctwovect & a, const Ctwovect & b) {\n-00099\n-return a.x*b.x + a.y*b.y;\n-00100 }\n-00101\n-00102\n-00107 inline double cross_product(const Ctwovect & a, const Ctwovect & b) {\n-00108\n-return a.x*b.y - a.y*b.x;\n-00109 }\n-00110\n-00111\n-00120 class Ceta_phi_range{\n-00121 public:\n-00123\n-Ceta_phi_range();\n-00124\n-00130\n-Ceta_phi_range(double c_eta, double c_phi, double R);\n-00131\n-00134\n-Ceta_phi_range& operator = (const Ceta_phi_range &r);\n-00135\n-int add_particle(const double eta, const double phi);\n-00140\n-00141\n-00143\n-unsigned int eta_range;\n-00144\n-unsigned int phi_range;\n-00146\n-00147\n-// extremal value for eta\n-00148\n-00149\n-static double eta_min;\n-00150\n-static double eta_max;\n-00151\n-00152 private:\n-00154\n-inline unsigned int get_eta_cell(double eta){\n-return (unsigned int) (1u \u00ab ((int) (32*((eta-eta_min)/(eta_max-eta_min)))));\n-00155\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.19 geom_2d.h\n-00001 // -*- C++ -*00003 // File: geom_2d.h\n-00004 // Description: header file for two-dimensional geometry tools\n-00005 // This file is part of the SISCone project.\n-00006 // WARNING: this is not the main SISCone trunk but\n-00007 //\n-an adaptation to spherical coordinates\n-00008 // For more details, see http://projects.hepforge.org/siscone\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-//\n-//\n-//\n-//\n-//\n-//\n-\n-\f204\n-\n-File Documentation\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:: 422\n-$//\n-00027 // $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)\n-$//\n-00029\n-00030 #ifndef __SPH_GEOM_2D_H__\n-00031 #define __SPH_GEOM_2D_H__\n-00032\n-00033 #include \n-00034 #include \n-00035 #include \n-00036 #include \n-00037\n-00038 #ifndef M_PI\n-00039 #define M_PI 3.141592653589793238462643383279502884197\n-00040 #endif\n-00041\n-00042 namespace siscone_spherical{\n-00043\n-00052 class CSphtheta_phi_range{\n-00053 public:\n-00055\n-CSphtheta_phi_range();\n-00056\n-00062\n-CSphtheta_phi_range(double c_theta, double c_phi, double R);\n-00063\n-00066\n-CSphtheta_phi_range& operator = (const CSphtheta_phi_range &r);\n-00067\n-int add_particle(const double theta, const double phi);\n-00072\n-00073\n-unsigned int theta_range;\n-00075\n-00076\n-unsigned int phi_range;\n-00078\n-00079\n-00081\n-static double theta_min;\n-static double theta_max;\n-00082\n-00083\n-00084 private:\n-00086\n-inline unsigned int get_theta_cell(double theta){\n-if (theta>=theta_max) return 1u\u00ab31;\n-00087\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-return (unsigned int) (1u \u00ab ((int) (32*phi/twopi+16)%32));\n-00093\n-00094\n-}\n-00095 };\n-00096\n-00101 bool is_range_overlap(const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2);\n-00102\n-00108 const CSphtheta_phi_range range_union(const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2);\n-00109\n-00110 }\n-00111\n-00112 #endif\n-\n-5.20 hash.cpp\n+5.18 hash.cpp\n 00001\n+//\n 00002 // File: hash.cpp\n 00003 // Description: source file for classes hash_element and hash_cones\n-00004 // This file is part of the SISCone project.\n-00005 // For more details, see http://projects.hepforge.org/siscone\n-00006 //\n-00007 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-00008 //\n-00009 // This program is free software; you can redistribute it and/or modify\n-00010 // it under the terms of the GNU General Public License as published by\n-00011 // the Free Software Foundation; either version 2 of the License, or\n-\n-//\n //\n+00004 // This file is part of the SISCone project.\n //\n+00005 // For more details, see http://projects.hepforge.org/siscone\n //\n+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-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.20 hash.cpp\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@@ -15080,43 +14765,48 @@\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 10 2023 17:32:40 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-int i;\n 00048\n+int i;\n 00049\n 00050\n n_cones = 0;\n 00051 #ifdef DEBUG_STABLE_CONES\n 00052\n n_occupied_cells = 0;\n 00053 #endif\n 00054\n-// determine hash size\n 00055\n+// determine hash size\n 00056\n // for a ymax=5 and R=0.7, we observed an occupancy around 1/8 N^2 ~ N2 R2/4\n 00057\n //mask = 1 \u00ab (int) (2*log(double(_Np))/log(2.0));\n 00058\n //if (mask<=1) mask=2;\n 00059\n int nbits = (int) (log(_Np*_R2*_Np/4.0)/log(2.0));\n 00060\n if (nbits<1) nbits=1;\n 00061\n mask = 1 \u00ab nbits;\n 00062\n-00063\n // create hash\n+00063\n 00064\n hash_array = new hash_element*[mask];\n 00065\n mask--;\n 00066\n 00067\n // set the array to 0\n@@ -15129,59 +14819,50 @@\n 00071\n 00072\n R2 = _R2;\n 00073 }\n 00074\n 00075 // destructor\n 00076 //-----------00077 hash_cones::~hash_cones(){\n-int i;\n 00078\n+int i;\n 00079\n hash_element *elm;\n 00080\n 00081\n for (i=0;inext;\n-delete elm;\n 00085\n+delete elm;\n 00086\n }\n 00087\n }\n 00088\n-00089\n delete[] hash_array;\n+00089\n 00090 }\n 00091\n 00092\n 00093 /*\n 00094 * insert a new candidate into the hash.\n-00095 * - v\n 4-momentum of the cone to add\n+00095 * - v\n 00096 * - parent parent particle defining the cone\n child particle defining the cone\n 00097 * - child\n 00098 * - p_io\n whether the parent has to belong to the cone or not\n-whether the child has to belong to the cone or not\n 00099 * - c_io\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-205\n-\n-\f206\n-\n-File Documentation\n-\n+whether the child has to belong to the cone or not\n 00100 * return 0 on success, 1 on error\n 00101 ***********************************************************************/\n 00102 int hash_cones::insert(Cmomentum *v, Cmomentum *parent, Cmomentum *child, bool p_io, bool c_io){\n 00103\n hash_element *elm;\n int index = (v->ref.ref[0]) & mask;\n 00104\n@@ -15196,20 +14877,20 @@\n if (elm==NULL)\n 00111\n n_occupied_cells++;\n 00112 #endif\n 00113\n 00114\n do{\n-00115\n // if it is not present, add it\n+00115\n 00116\n if (elm==NULL){\n-00117\n // create element\n+00117\n 00118\n elm = new hash_element;\n 00119\n // set its varibles\n 00120\n 00121\n // Note: at this level, eta and phi have already been computed\n@@ -15223,22 +14904,31 @@\n 00125\n 00126\n v->build_etaphi();\n 00127\n elm->eta = v->eta;\n 00128\n elm->phi = v->phi;\n-00129\n // if at least one of the two is_inside tests gives a result != from the expected,\n+00129\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-//cout \u00ab \"-- new status of \" \u00ab v->ref[0] \u00ab \":\" \u00ab elm->is_stable \u00ab endl;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+203\n+\n+\f204\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 00136\n hash_array[index] = elm;\n@@ -15250,16 +14940,16 @@\n 00140\n }\n 00141\n 00142\n // if the cone is already there, simply update stability status\n 00143\n if (v->ref == elm->ref){\n-// there is only an update to perform to see if the cone is still stable\n 00144\n+// there is only an update to perform to see if the cone is still stable\n 00145\n if (elm->is_stable){\n 00146\n v->build_etaphi();\n 00147\n elm->is_stable = !((is_inside(v, parent)^p_io)||(is_inside(v, child)^c_io));\n 00148\n@@ -15274,102 +14964,95 @@\n //cout \u00ab \"-- rep status of \" \u00ab v->ref[0] \u00ab \":\" \u00ab elm->is_stable \u00ab endl;\n 00152\n //cout \u00ab v->eta \u00ab \" \" \u00ab v->phi \u00ab endl;\n 00153\n //cout \u00ab (child->eta) \u00ab \" \" \u00ab child->phi \u00ab endl;\n 00154\n }\n-00155\n return 0;\n+00155\n 00156\n }\n 00157\n 00158\n elm = elm->next;\n 00159\n } while (1);\n 00160\n-return 1;\n 00161\n+return 1;\n 00162 }\n 00163\n 00164 /*\n 00165 * insert a new candidate into the hash.\n-00166 * - v\n 4-momentum of te cone to add\n+00166 * - v\n 00167 * Note, in this case, we assume stability. We also assume\n 00168 * that eta and phi are computed for v\n 00169 * return 0 on success, 1 on error\n 00170 ***********************************************************************/\n 00171 int hash_cones::insert(Cmomentum *v){\n 00172\n hash_element *elm;\n-int index = (v->ref.ref[0]) & mask;\n 00173\n-00174\n+int index = (v->ref.ref[0]) & mask;\n //cout \u00ab \"-- stable candidate: \" \u00ab v->ref[0] \u00ab \":\" \u00ab endl;\n+00174\n 00175\n-00176\n // check the array cell corresponding to our reference\n+00176\n 00177\n elm = hash_array[index];\n-00178\n do{\n-// if it is not present, add it\n+00178\n 00179\n+// if it is not present, add it\n 00180\n if (elm==NULL){\n-00181\n // create element\n+00181\n 00182\n elm = new hash_element;\n 00183\n-00184\n // set its varibles\n+00184\n 00185\n // Note: at this level, eta and phi have already been computed\n 00186\n //\n through Cmomentum::build_etaphi.\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.21 hash.cpp\n-\n-207\n-\n 00187\n elm->ref = v->ref;\n 00188\n elm->eta = v->eta;\n 00189\n elm->phi = v->phi;\n 00190\n elm->is_stable = true;\n 00191\n-// update hash\n 00192\n+// update hash\n 00193\n elm->next = hash_array[index];\n 00194\n hash_array[index] = elm;\n 00195\n 00196\n n_cones++;\n-00197\n return 0;\n+00197\n 00198\n }\n 00199\n-// if the cone is already there, we have nothing to do\n 00200\n+// if the cone is already there, we have nothing to do\n 00201\n if (v->ref == elm->ref){\n-00202\n return 0;\n+00202\n 00203\n }\n 00204\n 00205\n elm = elm->next;\n 00206\n } while (1);\n@@ -15378,43 +15061,50 @@\n 00208\n 00209 }\n 00210\n 00211 /*\n 00212 * test if a particle is inside a cone of given centre.\n 00213 * check if the particle of coordinates \u2019v\u2019 is inside the circle of radius R\n 00214 * centered at \u2019centre\u2019.\n-00215 * - centre\n centre of the circle\n+00215 * - centre\n particle to test\n 00216 * - v\n 00217 * return true if inside, false if outside\n 00218 ******************************************************************************/\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.19 hash.cpp\n+\n+205\n+\n 00219 inline bool hash_cones::is_inside(Cmomentum *centre, Cmomentum *v){\n-00220\n double dx, dy;\n+00220\n 00221\n 00222\n dx = centre->eta - v->eta;\n 00223\n dy = fabs(centre->phi - v->phi);\n-if (dy>M_PI)\n 00224\n+if (dy>M_PI)\n 00225\n dy -= 2.0*M_PI;\n 00226\n-00227\n return dx*dx+dy*dy\n 00033\n 00034 namespace siscone_spherical{\n 00035\n 00036 using namespace std;\n 00037\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-//\n-\n-\f208\n-\n-File Documentation\n-\n 00038 /**************************************************************\n 00039 * implementation of sph_hash_cones\n *\n 00040 * list of cones candidates.\n *\n 00041 * We store in this class all the sph_hash_element and give\n *\n@@ -15513,23 +15194,32 @@\n 00061\n int nbits = (int) (log(_Np*_radius*_radius*_Np/4.0)/log(2.0));\n 00062\n if (nbits<1) nbits=1;\n 00063\n mask = 1 \u00ab nbits;\n 00064\n-// create hash\n 00065\n+// create hash\n 00066\n hash_array = new sph_hash_element*[mask];\n 00067\n mask--;\n 00068\n // set the array to 0\n 00069\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+//\n+\n+\f206\n+\n+File Documentation\n+\n 00070\n //? needed ?\n 00071\n for (i=0;inext;\n-00088\n delete elm;\n+00088\n 00089\n }\n 00090\n }\n 00091\n-delete[] hash_array;\n 00092\n+delete[] hash_array;\n 00093 }\n 00094\n 00095\n 00096 /*\n 00097 * insert a new candidate into the hash.\n-4-momentum of the cone to add\n 00098 * - v\n+4-momentum of the cone to add\n 00099 * - parent parent particle defining the cone\n-child particle defining the cone\n 00100 * - child\n-00101 * - p_io\n+child particle defining the cone\n whether the parent has to belong to the cone or not\n-whether the child has to belong to the cone or not\n+00101 * - p_io\n 00102 * - c_io\n+whether the child has to belong to the cone or not\n 00103 * return 0 on success, 1 on error\n 00104 ***********************************************************************/\n 00105 int sph_hash_cones::insert(CSphmomentum *v, CSphmomentum *parent, CSphmomentum *child, bool p_io, bool\n c_io){\n 00106\n sph_hash_element *elm;\n int index = (v->ref.ref[0]) & mask;\n@@ -15596,30 +15286,25 @@\n if (elm==NULL)\n 00114\n n_occupied_cells++;\n 00115 #endif\n 00116\n 00117\n do{\n-00118\n // if it is not present, add it\n+00118\n 00119\n if (elm==NULL){\n-00120\n // create element\n+00120\n 00121\n elm = new sph_hash_element;\n 00122\n-00123\n // set its varibles\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.21 hash.cpp\n-\n+00123\n 00124\n // Note: at this level, eta and phi have already been computed\n 00125\n //\n through CSphmomentum::build_thetaphi.\n 00126\n elm->centre = *v;\n@@ -15638,87 +15323,92 @@\n 00134\n elm->next = hash_array[index];\n 00135\n hash_array[index] = elm;\n 00136\n 00137\n n_cones++;\n-return 0;\n 00138\n+return 0;\n 00139\n }\n 00140\n // if the cone is already there, simply update stability status\n 00141\n 00142\n if (v->ref == elm->centre.ref){\n 00143\n // there is only an update to perform to see if the cone is still stable\n 00144\n if (elm->is_stable){\n 00145\n elm->is_stable = !((is_closer(v, parent, tan2R)^p_io)||(is_closer(v, child, tan2R)^c_io));\n-00146\n //cout \u00ab \" parent/child: \"\n+00146\n 00147\n //\n \u00ab parent->ref[0] \u00ab \":\" \u00ab is_closer(v, parent) \u00ab \":\" \u00ab p_io \u00ab \" \"\n 00148\n //\n \u00ab child->ref[0] \u00ab \":\" \u00ab is_closer(v, child) \u00ab \":\" \u00ab c_io \u00ab endl;\n 00149\n //cout \u00ab \"-- rep status of \" \u00ab v->ref[0] \u00ab \":\" \u00ab elm->is_stable \u00ab endl;\n 00150\n //cout \u00ab v->eta \u00ab \" \" \u00ab v->phi \u00ab endl;\n 00151\n //cout \u00ab (child->eta) \u00ab \" \" \u00ab child->phi \u00ab endl;\n 00152\n }\n-00153\n return 0;\n+00153\n 00154\n }\n 00155\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.20 hash.h\n+\n 00156\n elm = elm->next;\n 00157\n } while (1);\n 00158\n-return 1;\n 00159\n+return 1;\n 00160 }\n 00161\n 00162 /*\n 00163 * insert a new candidate into the hash.\n 00164 * - v\n 4-momentum of te cone to add\n 00165 * Note, in this case, we assume stability. We also assume\n 00166 * that eta and phi are computed for v\n 00167 * return 0 on success, 1 on error\n 00168 ***********************************************************************/\n 00169 int sph_hash_cones::insert(CSphmomentum *v){\n 00170\n sph_hash_element *elm;\n-int index = (v->ref.ref[0]) & mask;\n 00171\n-00172\n+int index = (v->ref.ref[0]) & mask;\n //cout \u00ab \"-- stable candidate: \" \u00ab v->ref[0] \u00ab \":\" \u00ab endl;\n+00172\n 00173\n-00174\n // check the array cell corresponding to our reference\n+00174\n 00175\n elm = hash_array[index];\n-00176\n do{\n-// if it is not present, add it\n+00176\n 00177\n+// if it is not present, add it\n 00178\n if (elm==NULL){\n-00179\n // create element\n+00179\n 00180\n elm = new sph_hash_element;\n 00181\n // set its varibles\n 00182\n 00183\n // Note: at this level, eta and phi have already been computed\n@@ -15735,48 +15425,40 @@\n 00189\n elm->next = hash_array[index];\n 00190\n hash_array[index] = elm;\n 00191\n 00192\n n_cones++;\n-00193\n return 0;\n+00193\n 00194\n }\n 00195\n-// if the cone is already there, we have nothing to do\n 00196\n+// if the cone is already there, we have nothing to do\n 00197\n if (v->ref == elm->centre.ref){\n-00198\n return 0;\n+00198\n 00199\n }\n 00200\n 00201\n elm = elm->next;\n 00202\n } while (1);\n 00203\n-return 1;\n 00204\n+return 1;\n 00205 }\n 00206\n 00207 }\n \n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-209\n-\n-\f210\n-\n-File Documentation\n-\n-5.22 hash.h\n+5.20 hash.h\n 00001 // -*- C++ -*00003 // File: hash.h\n //\n 00004 // Description: header file for classes hash_element and hash_cones\n //\n 00005 // This file is part of the SISCone project.\n //\n 00006 // For more details, see http://projects.hepforge.org/siscone\n@@ -15818,44 +15500,53 @@\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 10 2023 17:32:40 for SISCone by Doxygen\n+\n+207\n+\n+\f208\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 00047\n Creference ref;\n double eta;\n 00048\n 00049\n double phi;\n-bool is_stable;\n 00050\n+bool is_stable;\n 00051\n 00052\n hash_element *next;\n 00053 };\n 00054\n 00062 class hash_cones{\n 00063 public:\n 00067\n hash_cones(int _Np, double _R2);\n 00068\n 00070\n ~hash_cones();\n 00071\n-00081\n int insert(Cmomentum *v, Cmomentum *parent, Cmomentum *child, bool p_io, bool c_io);\n+00081\n 00082\n int insert(Cmomentum *v);\n 00090\n 00091\n 00093\n hash_element **hash_array;\n 00094\n@@ -15876,40 +15567,31 @@\n inline bool is_inside(Cmomentum *centre, Cmomentum *v);\n 00118\n 00119 };\n 00120\n 00121 }\n 00122 #endif\n \n-5.23 hash.h\n+5.21 hash.h\n 00001 // -*- C++ -*00003 // File: hash.h\n+//\n 00004 // Description: header file for classes hash_element and hash_cones\n+//\n 00005 // This file is part of the SISCone project.\n+//\n 00006 // WARNING: this is not the main SISCone trunk but\n+//\n 00007 //\n an adaptation to spherical coordinates\n-00008 // For more details, see http://projects.hepforge.org/siscone\n-00009 //\n-\n-//\n-//\n-//\n-//\n //\n+00008 // For more details, see http://projects.hepforge.org/siscone\n //\n+00009 //\n //\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.24 momentum.cpp\n-\n-211\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@@ -15947,40 +15629,47 @@\n 00034\n 00035 namespace siscone_spherical{\n 00036\n 00046 class sph_hash_element{\n 00047 public:\n 00048\n CSph3vector centre;\n-00049\n bool is_stable;\n+00049\n+\n+//\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.22 momentum.h\n+\n 00050\n 00051\n sph_hash_element *next;\n 00052 };\n 00053\n 00061 class sph_hash_cones{\n 00062 public:\n 00065\n sph_hash_cones(int _Np, double _radius);\n 00066\n 00068\n ~sph_hash_cones();\n 00069\n-int insert(CSphmomentum *v, CSphmomentum *parent, CSphmomentum *child, bool p_io, bool c_io);\n 00079\n+int insert(CSphmomentum *v, CSphmomentum *parent, CSphmomentum *child, bool p_io, bool c_io);\n 00080\n int insert(CSphmomentum *v);\n 00088\n 00089\n 00091\n sph_hash_element **hash_array;\n 00092\n-int n_cones;\n 00094\n+int n_cones;\n 00095\n 00097 #ifdef DEBUG_STABLE_CONES\n 00098\n int n_occupied_cells;\n 00099 #endif\n 00100\n 00102\n@@ -15992,686 +15681,504 @@\n double tan2R;\n 00109\n 00110 };\n 00111\n 00112 }\n 00113 #endif\n \n-5.24 momentum.cpp\n-00001\n-00002 // File: momentum.cpp\n-00003 // Description: source file for 4-momentum class Cmomentum\n-00004 // This file is part of the SISCone project.\n-00005 // For more details, see http://projects.hepforge.org/siscone\n-00006 //\n-00007 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-00008 //\n-00009 // This program is free software; you can redistribute it and/or modify\n-00010 // it under the terms of the GNU General Public License as published by\n-00011 // the Free Software Foundation; either version 2 of the License, or\n-00012 // (at your option) any later version.\n-00013 //\n-00014 // This program is distributed in the hope that it will be useful,\n-00015 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n-00016 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n-00017 // GNU General Public License for more details.\n-00018 //\n-00019 // You should have received a copy of the GNU General Public License\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n+5.22 momentum.h\n+00001 // -*- C++ -*00003 // File: momentum.h\n //\n+00004 // Description: header file for 4-momentum class Cmomentum\n //\n+00005 // This file is part of the SISCone project.\n //\n+00006 // 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-\n-\f212\n-\n-File Documentation\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:: 123\n+00024 // $Revision:: 163\n $//\n-00024 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n+00025 // $Date:: 2007-04-26 22:31:02 +0200 (Thu, 26 Apr 2007)\n $//\n-00026\n-00027 #include \"momentum.h\"\n-00028 #include \n-00029 #include \n+00027\n+00028 #ifndef __VECTOR_H__\n+00029 #define __VECTOR_H__\n 00030\n-00031 namespace siscone{\n-00032\n-00033 /*************************************************************************\n-00034 * class Cmomentum\n-*\n-00035 * This class contains the information for particle or group of\n-*\n-00036 * particles management.\n-*\n-00037 * It includes all Lorentz properties as well as tools for summing them. *\n-00038 *************************************************************************/\n-00039\n-00040 // default ctor\n-00041 //-------------00042 Cmomentum::Cmomentum(){\n-00043\n-eta = 0.0;\n-00044\n-phi = 0.0;\n-00045\n-px = py = pz = E = 0.0;\n-00046\n-ref = Creference();\n-00047\n-index = -1;\n-00048 }\n-00049\n-00050 // ctor with initialisation\n-00051 //-------------------------00052 Cmomentum::Cmomentum(double _px, double _py, double _pz, double _E){\n+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-px = _px;\n-00054\n-py = _py;\n 00055\n-pz = _pz;\n+Cmomentum(double _px, double _py, double _pz, double _E);\n 00056\n-E = _E;\n-00057\n-// compute eta and phi\n 00058\n+Cmomentum(double _eta, double _phi, Creference _ref);\n 00059\n-build_etaphi();\n-00060\n-ref = Creference();\n-00061 }\n+00061\n+~Cmomentum();\n 00062\n-00063 // ctor with detailed initialisation\n-00064 //----------------------------------00065 Cmomentum::Cmomentum(double _eta, double _phi, Creference _ref){\n-00066\n-eta = _eta;\n+00064\n+inline double perp() const {return sqrt(perp2());}\n+00065\n+inline double perp2() const {return px*px+py*py;}\n 00067\n-phi = _phi;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+209\n+\n+\f210\n+\n+File Documentation\n+\n 00068\n-00069\n-ref = _ref;\n-00070 }\n+inline double mass() const {return sqrt(mass2());}\n+00070\n 00071\n-00072 // default dtor\n-00073 //-------------00074 Cmomentum::~Cmomentum(){\n-00075\n-00076 }\n+00073\n+inline double mass2() const {return perpmass2()-perp2();}\n+00074\n+inline double perpmass() const {return sqrt((E-pz)*(E+pz));}\n+00076\n 00077\n-00078 // assignment of vectors\n-00079 //----------------------00080 Cmomentum& Cmomentum::operator = (const Cmomentum &v){\n-00081\n-px = v.px;\n+inline double perpmass2() const {return (E-pz)*(E+pz);}\n+00079\n+00080\n+inline double Et() const {return E/sqrt(1.0+pz*pz/perp2());}\n 00082\n-py = v.py;\n 00083\n-pz = v.pz;\n-00084\n-E = v.E;\n+inline double Et2() const {return E*E/(1.0+pz*pz/perp2());}\n 00085\n 00086\n-eta = v.eta;\n-00087\n-phi = v.phi;\n 00088\n+Cmomentum& operator = (const Cmomentum &v);\n 00089\n-ref = v.ref;\n-00090\n-return *this;\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+const Cmomentum operator + (const Cmomentum &v);\n+00093\n+00096\n+Cmomentum& operator += (const Cmomentum &v);\n 00097\n-Cmomentum tmp = *this;\n-00098\n-return tmp+=v;\n-00099 }\n 00100\n-00101 // incrementation of vectors\n-00102 // !!! WARNING !!! no updating of eta and phi !!!\n-00103 //-----------------------------------------------00104 Cmomentum& Cmomentum::operator += (const Cmomentum &v){\n-00105\n-px+=v.px;\n-00106\n-py+=v.py;\n+Cmomentum& operator -= (const Cmomentum &v);\n+00101\n+void build_etaphi();\n 00107\n-pz+=v.pz;\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.25 momentum.cpp\n-\n-213\n-\n 00108\n-E +=v.E;\n+double px;\n 00109\n 00110\n-ref+=v.ref;\n+double py;\n+double pz;\n 00111\n-return *this;\n 00112\n-00113 }\n+double E;\n+00113\n+double eta;\n 00114\n-00115 // incrementation of vectors\n-00116 // !!! WARNING !!! no updating of eta and phi !!!\n-00117 //-----------------------------------------------00118 Cmomentum& Cmomentum::operator -= (const Cmomentum &v){\n-00119\n-px-=v.px;\n+00115\n+double phi;\n+int parent_index;\n+00116\n+00117\n+int index;\n+00118\n+// the following part is used for checksums //\n 00120\n-py-=v.py;\n-00121\n-pz-=v.pz;\n 00122\n-E -=v.E;\n-00123\n+Creference ref;\n+00123 };\n 00124\n-ref-=v.ref;\n-return *this;\n-00125\n-00126 }\n-00127\n-00128 // build eta-phi from 4-momentum info\n-00129 // !!!\n-WARNING\n-!!!\n-00130 // !!! computing eta and phi is time-consuming !!!\n-00131 // !!! use this whenever you need eta or phi\n-!!!\n-00132 // !!! automatically called for single-particle !!!\n-00133 //-------------------------------------------------00134 void Cmomentum::build_etaphi(){\n-// note: the factor n (ref.nb) cancels in all expressions !!\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-00136\n-eta = 0.5*log((E+pz)/(E-pz));\n-00137\n-phi = atan2(py,px);\n-00138 }\n+00137 // some handy utilities //\n 00139\n-00140\n-00141 // ordering of two vectors\n-00142 // the default ordering is w.r.t. their references\n-00143 //------------------------------------------------00144 bool operator < (const Cmomentum &v1, const Cmomentum &v2){\n-return v1.ref < v2.ref;\n+00144 inline double get_distance(double eta, double phi, Cmomentum *v){\n 00145\n-00146 }\n+double dx, dy;\n+00146\n 00147\n-00148 // ordering of vectors in eta (e.g. used in collinear tests)\n-00149 //----------------------------------------------------------00150 bool momentum_eta_less(const Cmomentum &v1, const Cmomentum &v2){\n+dx = eta - v->eta;\n+00148\n+dy = fabs(phi - v->phi);\n+if (dy>M_PI)\n+00149\n+00150\n+dy -= twopi;\n 00151\n-return v1.eta < v2.eta;\n-00152 }\n-00153\n-00154 // ordering of vectors in pt\n-00155 //--------------------------00156 bool momentum_pt_less(const Cmomentum &v1, const Cmomentum &v2){\n-return v1.perp2() < v2.perp2();\n-00157\n-00158 }\n-00159\n-00160 }\n-00161\n+00152\n+return dx*dx+dy*dy;\n+00153 }\n+00154\n+00155 }\n+00156\n+00157 #endif\n+\n+5.23 momentum.h\n+00001 // -*- C++ -*00003 // File: momentum.h\n+00004 // Description: header file for 4-momentum class Cmomentum\n+00005 // This file is part of the SISCone project.\n+00006 // WARNING: this is not the main SISCone trunk but\n+00007 //\n+an adaptation to spherical coordinates\n+00008 // For more details, see http://projects.hepforge.org/siscone\n+00009 //\n+00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n+00011 //\n+00012 // This program is free software; you can redistribute it and/or modify\n+00013 // it under the terms of the GNU General Public License as published by\n+00014 // the Free Software Foundation; either version 2 of the License, or\n+00015 // (at your option) any later version.\n+00016 //\n+00017 // This program is distributed in the hope that it will be useful,\n+00018 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+00019 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+00020 // GNU General Public License for more details.\n+00021 //\n \n-5.25 momentum.cpp\n-00001\n-//\n-00002 // File: momentum.cpp\n-00003 // Description: source file for 4-momentum class Cmomentum\n-//\n-00004 // This file is part of the SISCone project.\n //\n-00005 // WARNING: this is not the main SISCone trunk but\n //\n-00006 //\n-an adaptation to spherical coordinates\n //\n-00007 // For more details, see http://projects.hepforge.org/siscone\n //\n-00008 //\n //\n-00009 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n-00010 //\n //\n-00011 // This program is free software; you can redistribute it and/or modify\n //\n-00012 // it under the terms of the GNU General Public License as published by\n //\n-00013 // the Free Software Foundation; either version 2 of the License, or\n //\n-00014 // (at your option) any later version.\n //\n-00015 //\n //\n-00016 // This program is distributed in the hope that it will be useful,\n //\n-00017 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n //\n-00018 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n //\n-00019 // GNU General Public License for more details.\n //\n-00020 //\n //\n-00021 // You should have received a copy of the GNU General Public License\n //\n-00022 // along with this program; if not, write to the Free Software\n //\n-00023 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n-00024 //\n //\n-00025 // $Revision:: 255\n-$//\n-00026 // $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008)\n-$//\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n-//\n-\n-\f214\n-\n-File Documentation\n+\f5.23 momentum.h\n \n-00028\n-00029 #include \"momentum.h\"\n-00030 #include \n-00031 #include \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 namespace siscone_spherical{\n-00034\n-00035 /*************************************************************************\n-00036 * class CSph3vector\n-*\n-00037 * This class contains the information for particle or group of\n-*\n-00038 * particles management.\n-*\n-00039 *************************************************************************/\n+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-00041 // default ctor\n-00042 //-------------00043 CSph3vector::CSph3vector(){\n-00044\n-_theta = _phi = _norm = 0.0;\n-00045\n-px = py = pz = 0.0;\n-00046\n-ref = siscone::Creference();\n-00047 }\n-00048\n-00049 // ctor with initialisation\n-00050 //-------------------------00051 CSph3vector::CSph3vector(double _px, double _py, double _pz){\n-00052\n-px = _px;\n-00053\n-py = _py;\n-00054\n-pz = _pz;\n-00055\n-00056\n-// compute the norm\n+00054 class CSph3vector{\n+00055 public:\n 00057\n-build_norm();\n+CSph3vector();\n 00058\n-00059\n-ref = siscone::Creference();\n-00060 }\n+00060\n+CSph3vector(double _px, double _py, double _pz);\n 00061\n-00062 // default dtor\n-00063 //-------------00064 CSph3vector::~CSph3vector(){\n-00065\n-00066 }\n+00063\n+~CSph3vector();\n+00064\n+00066\n+CSph3vector& operator = (const CSph3vector &v);\n 00067\n-00068\n-00069 // assignment of vectors\n-00070 //----------------------00071 CSph3vector& CSph3vector::operator = (const CSph3vector &v){\n-00072\n-px = v.px;\n-00073\n-py = v.py;\n+const CSph3vector operator + (const CSph3vector &v);\n+00070\n+00071\n+const CSph3vector operator - (const CSph3vector &v);\n 00074\n-pz = v.pz;\n 00075\n-00076\n-_norm = v._norm;\n-00077\n-_theta = v._theta;\n+const CSph3vector operator / (const double &r);\n 00078\n-_phi\n-= v._phi;\n 00079\n-00080\n-ref = v.ref;\n-return *this;\n-00081\n-00082 }\n+00082\n+CSph3vector& operator += (const CSph3vector &v);\n 00083\n-00084 // addition of vectors\n-00085 //-----------------------------------------------00086 const CSph3vector CSph3vector::operator + (const CSph3vector &v){\n+00086\n+CSph3vector& operator -= (const CSph3vector &v);\n 00087\n-CSph3vector tmp = *this;\n-00088\n-return tmp+=v;\n-00089 }\n 00090\n-00091 // subtraction of vectors\n-00092 //-----------------------------------------------00093 const CSph3vector CSph3vector::operator - (const CSph3vector &v){\n+CSph3vector& operator *= (const double &r);\n+00091\n 00094\n-CSph3vector tmp = *this;\n+CSph3vector& operator /= (const double &r);\n 00095\n-return tmp-=v;\n-00096 }\n+inline double perp() const {return sqrt(perp2());}\n 00097\n-00098 // division by constant\n-00099 //-----------------------------------------------00100 const CSph3vector CSph3vector::operator / (const double &r){\n+00098\n+inline double perp2() const {return px*px+py*py;}\n+00100\n 00101\n-CSph3vector tmp = *this;\n-00102\n-return tmp/=r;\n-00103 }\n+inline double norm() const {return sqrt(px*px+py*py+pz*pz);}\n+00103\n 00104\n-00105 // incrementation\n-00106 //-----------------------------------------------00107 CSph3vector& CSph3vector::operator += (const CSph3vector &v){\n-00108\n-px+=v.px;\n+00106\n+inline double norm2() const {return px*px+py*py+pz*pz;}\n+00107\n+inline double phi() const {return atan2(py, px);}\n 00109\n-py+=v.py;\n 00110\n-pz+=v.pz;\n-00111\n+inline double theta() const {return atan2(perp(),pz);}\n 00112\n-return *this;\n-00113 }\n-00114\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.25 momentum.cpp\n-\n-00115 // decrementation\n-00116 //-----------------------------------------------00117 CSph3vector& CSph3vector::operator -= (const CSph3vector &v){\n-00118\n-px-=v.px;\n-00119\n-py-=v.py;\n+00113\n+void build_norm();\n 00120\n-pz-=v.pz;\n 00121\n-00122\n-return *this;\n-00123 }\n-00124\n-00125 // multiplication by a constant\n-00126 //-----------------------------------------------00127 CSph3vector& CSph3vector::operator *= (const double &r){\n-00128\n-px*=r;\n+void build_thetaphi();\n+00125\n+00126\n+void get_angular_directions(CSph3vector &angular_dir1, CSph3vector &angular_dir2);\n 00129\n-py*=r;\n 00130\n-pz*=r;\n 00131\n+double px;\n+double py;\n 00132\n-return *this;\n-00133 }\n+00133\n+double pz;\n 00134\n-00135 // division by a constant\n-00136 //-----------------------------------------------00137 CSph3vector& CSph3vector::operator /= (const double &r){\n+double _norm;\n+00135\n+double _theta;\n+00136\n+00137\n+double _phi;\n 00138\n-px/=r;\n-00139\n-py/=r;\n+// the following part is used for checksums //\n 00140\n-pz/=r;\n-00141\n 00142\n-_norm/=r;\n-00143\n-return *this;\n+siscone::Creference ref;\n+00143 };\n 00144\n-00145 }\n-00146\n-00147 // build norm from 3-momentum info\n-00148 void CSph3vector::build_norm(){\n-00149\n-_norm = norm();\n-00150 }\n-00151\n-00152 // build norm from 3-momentum info\n-00153 void CSph3vector::build_thetaphi(){\n-00154\n-_theta = theta();\n-00155\n-_phi = phi();\n-00156 }\n-00157\n-00158\n-00159 // for this direction, compute the two reference directions\n-00160 // used to measure angles\n-00161 void CSph3vector::get_angular_directions(CSph3vector &angular_dir1, CSph3vector &angular_dir2){\n+00158 class CSphmomentum : public CSph3vector{\n+00159 public:\n+00161\n+CSphmomentum();\n 00162\n-if (px < py){\n-00163\n-if (pz < px){\n-// z smallest\n 00164\n+CSphmomentum(CSph3vector &init, double E=0.0);\n 00165\n-angular_dir1 = CSph3vector(-py, px, 0.0);\n-00166\n-} else {\n 00167\n-// x smallest\n+CSphmomentum(double _px, double _py, double _pz, double _E);\n 00168\n-angular_dir1 = CSph3vector(0.0, -pz, py);\n-00169\n-}\n+//CSphmomentum(double _eta, double _phi, siscone::Creference _ref);\n 00170\n-} else {\n-if (pz < py){\n 00171\n-00172\n-// z smallest\n 00173\n-angular_dir1 = CSph3vector(-py, px, 0.0);\n+~CSphmomentum();\n 00174\n-} else {\n-00175\n-// y smallest\n+inline double mass() const {return sqrt(mass2());}\n 00176\n-angular_dir1 = CSph3vector(-pz, 0.0, px);\n 00177\n-}\n-00178\n-}\n 00179\n-angular_dir2 = cross_product3(*this, angular_dir1);\n-00180\n-// We\u2019ll simply take x & y so the reflection symmetry is not broken\n-00181\n-//angular_dir1 = CSph3vector(0.0, -pz, py);\n-00182\n-//angular_dir2 = CSph3vector(-pz, 0.0, -px);\n-00183 }\n-00184\n-00185 /*************************************************************************\n-00186 * class CSphmomentum\n-*\n-00187 * This class contains the information for particle or group of\n-*\n-00188 * particles management.\n-*\n-00189 * It includes all Lorentz properties as well as tools for summing them. *\n-00190 *************************************************************************/\n-00191\n-00192 // default ctor\n-00193 //-------------00194 CSphmomentum::CSphmomentum(){\n-00195\n-E=0.0;\n-00196\n-index = -1;\n-00197 }\n-00198\n-00199 // ctor with initialisation\n-00200 //-------------------------00201 CSphmomentum::CSphmomentum(double _px, double _py, double _pz, double _E)\n+inline double mass2() const {return perpmass2()-perp2();}\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n-215\n+211\n \n-\f216\n+\f212\n \n File Documentation\n \n+00180\n+inline double perpmass() const {return sqrt((E-pz)*(E+pz));}\n+00182\n+00183\n+00185\n+inline double perpmass2() const {return (E-pz)*(E+pz);}\n+00186\n+inline double Et() const {return E/sqrt(1.0+pz*pz/perp2());}\n+00188\n+00189\n+inline double Et2() const {return E*E/(1.0+pz*pz/perp2());}\n+00191\n+00192\n+00194\n+CSphmomentum& operator = (const CSphmomentum &v);\n+00195\n+const CSphmomentum operator + (const CSphmomentum &v);\n+00198\n+00199\n 00202\n-: CSph3vector(_px, _py, _pz) {\n+CSphmomentum& operator += (const CSphmomentum &v);\n 00203\n-E = _E;\n-00204\n-00205\n-// compute the angles\n 00206\n-build_thetaphi();\n-00207 }\n+CSphmomentum& operator -= (const CSphmomentum &v);\n+00207\n+double E;\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+00209\n+int parent_index;\n+00210\n+int index;\n+00211\n+00212 };\n 00213\n-E = _E;\n-00214 }\n-00215\n-00216 // default dtor\n-00217 //-------------00218 CSphmomentum::~CSphmomentum(){\n-00219\n-00220 }\n-00221\n-00222 // assignment of vectors\n-00223 //----------------------00224 CSphmomentum& CSphmomentum::operator = (const CSphmomentum &v){\n-00225\n-px = v.px;\n-00226\n-py = v.py;\n-00227\n-pz = v.pz;\n+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-E = v.E;\n-00229\n-00230\n-_norm = v._norm;\n+00230 inline double sqr(double x){return x*x;}\n 00231\n-_theta = v._theta;\n-00232\n-_phi\n-= v._phi;\n-00233\n-00234\n-ref = v.ref;\n-return *this;\n-00235\n-00236 }\n+00235 inline double dot_product3(const CSph3vector &v1, const CSph3vector &v2){\n+//double tmp = v1.px*v2.px + v1.py*v2.py + v1.pz*v2.pz;\n+00236\n 00237\n-00238 // addition of vectors\n-00239 // !!! WARNING !!! no updating of eta and phi !!!\n-00240 //-----------------------------------------------00241 const CSphmomentum CSphmomentum::operator + (const CSphmomentum &v){\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-CSphmomentum tmp = *this;\n+//}\n 00243\n-return tmp+=v;\n+return v1.px*v2.px + v1.py*v2.py + v1.pz*v2.pz;\n 00244 }\n 00245\n-00246 // incrementation of vectors\n-00247 // !!! WARNING !!! no updating of eta and phi !!!\n-00248 //-----------------------------------------------00249 CSphmomentum& CSphmomentum::operator += (const CSphmomentum &v){\n+00249 inline CSph3vector cross_product3(const CSph3vector &v1, const CSph3vector &v2){\n 00250\n-px+=v.px;\n+//CSph3vector tmp;\n 00251\n-py+=v.py;\n+//tmp.px = v1.py*v2.pz-v1.pz*v2.py;\n 00252\n-pz+=v.pz;\n+//tmp.py = v1.pz*v2.px-v1.px*v2.pz;\n 00253\n-E +=v.E;\n+//tmp.pz = v1.px*v2.py-v1.py*v2.px;\n 00254\n+//return tmp;\n 00255\n-ref+=v.ref;\n+return CSph3vector(v1.py*v2.pz-v1.pz*v2.py,\n 00256\n-return *this;\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-00260 // decrementation of vectors\n-00261 // !!! WARNING !!! no updating of eta and phi !!!\n-00262 //-----------------------------------------------00263 CSphmomentum& CSphmomentum::operator -= (const CSphmomentum &v){\n+00263 inline double norm2_cross_product3(const CSph3vector &v1, const CSph3vector &v2){\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 00264\n-px-=v.px;\n-00265\n-py-=v.py;\n+00265 }\n 00266\n-pz-=v.pz;\n-00267\n-E -=v.E;\n-00268\n-00269\n-ref-=v.ref;\n-00270\n-return *this;\n-00271 }\n-00272\n+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-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+00277 inline double get_distance(const CSph3vector *v1, const CSph3vector *v2){\n 00278\n-return v1.ref < v2.ref;\n+return atan2(sqrt(norm2_cross_product3(*v1,*v2)), dot_product3(*v1,*v2));\n 00279 }\n 00280\n-00281 // ordering of vectors in eta (e.g. used in collinear tests)\n-00282 //----------------------------------------------------------00283 bool momentum_theta_less(const CSphmomentum &v1, const CSphmomentum &v2){\n-return v1._theta < v2._theta;\n-00284\n-00285 }\n-00286\n-00287 // ordering of vectors in pt\n-00288 //---------------------------\n+00289 inline bool is_closer(const CSph3vector *v1, const CSph3vector *v2, const double tan2R){\n+double dot = dot_product3(*v1,*v2);\n+00290\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+return dot_product3(*v1,*v2)>=cosR*sqrt(v1->norm2()*v2->norm2());\n+00300\n+00301\n+//double dot = dot_product3(*v1,*v2);\n+00302\n+//return (dot>=0) && (norm2_cross_product3(*v1,*v2) &_particle_list){\n-// check already allocated mem\n 00115\n+// check already allocated mem\n 00116\n if (hc!=NULL){\n-delete hc;\n 00117\n+delete hc;\n 00118\n }\n-00119\n if (protocones.size()!=0)\n+00119\n 00120\n protocones.clear();\n 00121\n 00122\n multiple_centre_done.clear();\n 00123\n-// initialisation\n 00124\n+// initialisation\n 00125\n set_particle_list(_particle_list);\n 00126 }\n 00127\n 00128\n //\n 00130 // ALGORITHM MAIN ENTRY\n@@ -16881,16 +16389,16 @@\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+00142\n 00143\n // check if everything is correctly initialised\n 00144\n 00145\n if (n_part==0){\n 00146\n return 0;\n@@ -16907,60 +16415,60 @@\n 00153\n hc = new hash_cones(n_part, R2);\n 00154\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@@ -17049,16 +16557,16 @@\n 00239\n // all 4 possible cases (parent or child in or out the cone)\n 00240\n // are tested when taking the pair of particle parent+child\n 00241\n // and child+parent.\n 00242\n-00243\n // here are the tests entering the first series:\n+00243\n 00244\n // 1. check if the cone is already inserted\n 00245\n // 2. check cone stability for the parent and child particles\n 00246\n 00247\n if (centre->side){\n@@ -17066,51 +16574,51 @@\n 00248\n 00249\n // or when both are in.\n 00250\n // Note: for the totally exclusive case, test emptyness before\n 00251\n cone_candidate = cone;\n-00252\n if (cone.ref.not_empty()){\n+00252\n 00253\n hc->insert(&cone_candidate, parent, child, false, false);\n 00254\n }\n 00255\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-219\n-\n-\f220\n-\n-File Documentation\n-\n 00256\n cone_candidate = cone;\n 00257\n cone_candidate+= *parent + *child;\n 00258\n hc->insert(&cone_candidate, parent, child, true, true);\n 00259\n } else {\n-// test when 1! of the particles is in the cone\n 00260\n+// test when 1! of the particles is in the cone\n 00261\n cone_candidate = cone + *parent;\n 00262\n hc->insert(&cone_candidate, parent, child, true, false);\n 00263\n 00264\n cone_candidate = cone + *child;\n 00265\n hc->insert(&cone_candidate, parent, child, false, true);\n 00266\n }\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+215\n+\n+\f216\n+\n+File Documentation\n+\n 00267\n 00268\n nb_tot+=2;\n 00269\n 00270\n return 0;\n 00271 }\n@@ -17118,39 +16626,39 @@\n 00273\n 00274 /*\n 00275 * update the cone\n 00276 * go to the next child for that parent and update \u2019cone\u2019 appropriately\n 00277 * return 0 if update candidate found, 1 otherwise\n 00278 ***********************************************************************/\n 00279 int Cstable_cones::update_cone(){\n-00280\n // get the next child and centre\n+00280\n 00281\n centre_idx++;\n 00282\n if (centre_idx==vicinity_size)\n 00283\n centre_idx=0;\n if (centre_idx==first_cone)\n 00284\n-00285\n return 1;\n+00285\n 00286\n // update the cone w.r.t. the old child\n 00287\n 00288\n // only required if the old child is entering inside in which\n 00289\n // case we need to add it. We also know that the child is\n 00290\n // inside iff its side is -.\n 00291\n if (!centre->side){\n-00292\n // update cone\n+00292\n 00293\n cone += (*child);\n 00294\n // update info on particles inside\n 00295\n 00296\n centre->is_inside->cone = true;\n@@ -17158,66 +16666,66 @@\n // update stability check quantities\n 00298\n 00299\n dpt += fabs(child->px)+fabs(child->py);\n 00300\n }\n 00301\n-// update centre and child to correspond to the new position\n 00302\n+// update centre and child to correspond to the new position\n 00303\n centre = vicinity[centre_idx];\n 00304\n child = centre->v;\n 00305\n-00306\n // check cocircularity\n+00306\n 00307\n // note that if cocirculaity is detected (i.e. if we receive 1\n 00308\n // in the next test), we need to recall \u2019update_cone\u2019 directly\n 00309\n // since tests and remaining part of te update has been performed\n 00310\n //if (cocircular_check())\n 00311\n if (cocircular_check())\n-return update_cone();\n 00312\n+return update_cone();\n 00313\n 00314\n 00315\n // update the cone w.r.t. the new child\n 00316\n // only required if the new child was already inside in which\n 00317\n // case we need to remove it. We also know that the child is\n 00318\n // inside iff its side is +.\n 00319\n if ((centre->side) && (cone.ref.not_empty())){\n-00320\n // update cone\n+00320\n 00321\n cone -= (*child);\n 00322\n-00323\n // update info on particles inside\n+00323\n 00324\n centre->is_inside->cone = false;\n 00325\n // update stability check quantities\n 00326\n 00327\n dpt += fabs(child->px)+fabs(child->py); //child->perp2();\n 00328\n }\n 00329\n-00330\n // check that the addition and subtraction of vectors does\n+00330\n 00331\n // not lead to too much rounding error\n 00332\n // for that, we compute the sum of pt modifications and of |pt|\n 00333\n // since last recomputation and once the ratio overpasses a threshold\n 00334\n@@ -17233,54 +16741,54 @@\n 00339\n cone = Cmomentum();\n 00340\n dpt=0.0;\n 00341\n }\n 00342\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.26 protocones.cpp\n-\n 00343\n return 0;\n 00344 }\n 00345\n 00346\n 00347 /*\n 00348 * compute stability of all enumerated candidates.\n 00349 * For all candidate cones which are stable w.r.t. their border particles,\n 00350 * pass the last test: stability with quadtree intersection\n 00351 ************************************************************************/\n 00352 int Cstable_cones::proceed_with_stability(){\n 00353\n int i; // ,n;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.24 protocones.cpp\n+\n 00354\n hash_element *elm;\n 00355\n //n=0;\n 00356\n 00357\n for (i=0;i<=hc->mask;i++){\n-00358\n // test ith cell of the hash array\n+00358\n 00359\n elm = hc->hash_array[i];\n 00360\n // browse elements therein\n 00361\n 00362\n while (elm!=NULL){\n-// test stability\n 00363\n+// test stability\n 00364\n if (elm->is_stable){\n-00365\n // stability is not ensured by all pairs of \"edges\" already browsed\n+00365\n 00366 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00367\n // => testing stability with quadtree intersection\n 00368\n if (quadtree->circle_intersect(elm->eta, elm->phi, R2)==elm->ref){\n 00369 #else\n 00370\n@@ -17329,35 +16837,35 @@\n 00393 #endif\n 00394\n 00395\n delete hc;\n 00396\n hc=NULL;\n 00397\n-00398\n return protocones.size();\n+00398\n 00399 }\n 00400\n 00401\n-//\n 00403 // ALGORITHM MAIN STEPS FOR COCIRCULAR SITUATIONS\n+//\n 00404 // - cocircular_pt_less(v1, v2)\n //\n 00405 // - prepare_cocircular_list()\n //\n 00406 // - test_cone_cocircular()\n //\n 00407 // - test_stability(candidate, border_vect)\n //\n 00408 // - updat_cone_cocircular()\n //\n 00410\n 00412 bool cocircular_pt_less(Cmomentum *v1, Cmomentum *v2){\n-00413\n return v1->perp2() < v2->perp2();\n+00413\n 00414 }\n 00415\n 00416 /*\n 00417 * run through the vicinity of the current parent and for each child\n 00418 * establish which other members are cocircular... Note that the list\n 00419 * associated with each child contains references to vicinity\n 00420 * elements: thus two vicinity elements each associated with one given\n@@ -17371,27 +16879,18 @@\n vicinity.begin(),\n 00427\n vicinity.end());\n 00428\n 00429\n circulator::iterator > search(here);\n 00430\n-00431\n do {\n+00431\n 00432\n Cvicinity_elm* here_pntr = *here();\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-221\n-\n-\f222\n-\n-File Documentation\n-\n 00433\n search.set_position(here);\n 00434\n // search forwards for things that should have \"here\" included in\n 00435\n 00436\n // their cocircularity list\n@@ -17405,41 +16904,50 @@\n here_pntr->cocircular_range\n 00441\n && search() != here()) {\n 00442\n (*search())->cocircular.push_back(here_pntr);\n 00443\n } else {\n-break;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+217\n+\n+\f218\n+\n+File Documentation\n+\n 00444\n+break;\n 00445\n }\n 00446\n }\n 00447\n-00448\n // search backwards\n+00448\n 00449\n search.set_position(here);\n-00450\n while (true) {\n+00450\n 00451\n --search;\n if ( abs_dphi((*search())->angle, here_pntr->angle) <\n 00452\n 00453\n here_pntr->cocircular_range\n 00454\n && search() != here()) {\n 00455\n (*search())->cocircular.push_back(here_pntr);\n 00456\n } else {\n-00457\n break;\n+00457\n 00458\n }\n 00459\n }\n 00460\n 00461\n ++here;\n@@ -17459,71 +16967,71 @@\n 00474\n list & border_list) {\n 00475\n vector border_vect;\n 00476\n 00477\n border_vect.reserve(border_list.size());\n-for (list::iterator it = border_list.begin();\n 00478\n+for (list::iterator it = border_list.begin();\n 00479\n it != border_list.end(); it++) {\n 00480\n border_vect.push_back(Cborder_store(*it, centre->eta, centre->phi));\n 00481\n }\n 00482\n-00483\n // get them into order of angle\n+00483\n 00484\n sort(border_vect.begin(), border_vect.end());\n 00485\n // set up some circulators, since these will help us go around the\n 00486\n 00487\n // circle easily\n 00488\n circulator::iterator >\n 00489\n start(border_vect.begin(), border_vect.begin(),border_vect.end());\n 00490\n circulator::iterator > mid(start), end(start);\n 00491\n-// test the borderless cone\n 00492\n+// test the borderless cone\n 00493\n Cmomentum candidate = borderless_cone;\n 00494\n candidate.build_etaphi();\n if (candidate.ref.not_empty())\n 00495\n 00496\n test_stability(candidate, border_vect);\n 00497\n-do {\n 00498\n+do {\n 00499\n // reset status wrt inclusion in the cone\n 00500\n mid = start;\n-do {\n 00501\n+do {\n 00502\n mid()->is_in = false;\n 00503\n } while (++mid != start);\n 00504\n // now run over all inclusion possibilities with this starting point\n 00505\n 00506\n candidate = borderless_cone;\n-00507\n while (++mid != start) {\n-// will begin with start+1 and go up to start-1\n+00507\n 00508\n+// will begin with start+1 and go up to start-1\n 00509\n mid()->is_in = true;\n 00510\n candidate += *(mid()->mom);\n 00511\n test_stability(candidate, border_vect);\n 00512\n@@ -17536,21 +17044,14 @@\n 00516\n 00517\n // full cone\n 00518\n mid()->is_in = true;\n 00519\n candidate += *(mid()->mom);\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.26 protocones.cpp\n-\n-223\n-\n 00520\n test_stability(candidate, border_vect);\n 00521 }\n 00522\n 00523\n 00530 void Cstable_cones::test_stability(Cmomentum & candidate, const vector & border_vect) {\n 00531\n@@ -17559,20 +17060,25 @@\n 00533\n candidate.build_etaphi();\n 00534\n bool stable = true;\n 00535\n 00536\n for (unsigned i = 0; i < border_vect.size(); i++) {\n-if (is_inside(&candidate, border_vect[i].mom) ^ (border_vect[i].is_in)) {\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.24 protocones.cpp\n+\n 00537\n+if (is_inside(&candidate, border_vect[i].mom) ^ (border_vect[i].is_in)) {\n 00538\n stable = false;\n-break; // it\u2019s unstable so there\u2019s no point continuing\n 00539\n+break; // it\u2019s unstable so there\u2019s no point continuing\n 00540\n }\n 00541\n }\n 00542\n if (stable) hc->insert(&candidate);\n 00543\n@@ -17595,41 +17101,41 @@\n 00557\n // Note that those situation, being considered separately in\n 00558\n // test_cone_multiple, must only be considered here if all\n 00559\n // angles are on the same side (this avoid multiple counting)\n 00560\n-if (centre->cocircular.empty()) return false;\n 00561\n+if (centre->cocircular.empty()) return false;\n 00562\n // first get cone into status required at end...\n 00563\n 00564\n if ((centre->side) && (cone.ref.not_empty())){\n-// update cone\n 00565\n+// update cone\n 00566\n cone -= (*child);\n 00567\n // update info on particles inside\n 00568\n 00569\n centre->is_inside->cone = false;\n 00570\n-// update stability check quantities\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+00576\n 00577\n // first make sure parent and child are in!\n 00578\n 00579\n list removed_from_cone;\n 00580\n list put_in_border;\n@@ -17639,42 +17145,42 @@\n 00583\n Cmomentum cone_removal;\n 00584\n Cmomentum border = *parent;\n 00585\n border_list.push_back(parent);\n 00586\n-// make sure child appears in the border region\n 00587\n+// make sure child appears in the border region\n 00588\n centre->cocircular.push_back(centre);\n 00589\n // now establish the full contents of the cone minus the cocircular\n 00590\n 00591\n // region and of the cocircular region itself\n 00592\n for(list::iterator it = centre->cocircular.begin();\n 00593\n it != centre->cocircular.end(); it++) {\n 00594\n-00595\n if ((*it)->is_inside->cone) {\n+00595\n 00596\n cone_removal\n += *((*it)->v);\n 00597\n (*it)->is_inside->cone = false;\n 00598\n removed_from_cone.push_back((*it)->is_inside);\n 00599\n }\n 00600\n-00601\n // if a point appears twice (i.e. with + and - sign) in the list of\n+00601\n 00602\n // points on the border, we take care not to include it twice.\n 00603\n // Note that this situation may appear when a point is at a distance\n 00604\n // close to 2R from the parent\n 00605\n@@ -17688,24 +17194,17 @@\n 00609\n border_list.push_back((*it)->v);\n 00610\n }\n 00611\n }\n 00612\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f224\n-\n-File Documentation\n-\n 00613\n-// figure out whether this pairing has been observed before\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 bool consider = true;\n 00617\n 00618\n@@ -17715,38 +17214,47 @@\n 00620\n (multiple_centre_done[i].second==border.ref))\n 00621\n consider = false;\n 00622\n }\n 00623\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+219\n+\n+\f220\n+\n+File Documentation\n+\n 00624\n // now prepare the hard work\n 00625\n if (consider) {\n-// record the fact that we\u2019ve now seen this combination\n 00626\n+// record the fact that we\u2019ve now seen this combination\n 00627\n multiple_centre_done.push_back(pair(borderless_cone.ref,\n 00628\n border.ref));\n 00629\n // first figure out whether our cone momentum is good\n 00630\n 00631\n double local_dpt = fabs(cone_removal.px) + fabs(cone_removal.py);\n-00632\n double total_dpt = dpt + local_dpt;\n+00632\n 00633\n 00634\n recompute_cone_contents_if_needed(borderless_cone, total_dpt);\n 00635\n if (total_dpt == 0) {\n-// a recomputation has taken place -- so take advantage of this\n 00636\n+// a recomputation has taken place -- so take advantage of this\n 00637\n // and update the member cone momentum\n 00638\n cone = borderless_cone + cone_removal;\n 00639\n dpt = local_dpt;\n 00640\n@@ -17754,38 +17262,38 @@\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+00646\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-// relabel things that got put into the border\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 (*is_in)->cocirc = false;\n 00656\n }\n 00657\n-// we\u2019re done with everything -- return true to signal to user that we\u2019ve\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 00660\n return true;\n 00661 }\n 00662\n 00663\n@@ -17803,95 +17311,95 @@\n circulator::iterator >\n 00681\n start(vicinity.begin()+first_cone, vicinity.begin(), vicinity.end());\n 00682\n 00683\n circulator::iterator > here(start);\n 00684\n-00685\n // note that in the following algorithm, the cone contents never includes\n+00685\n 00686\n // the child. Indeed, if it has positive sign, then it will be set as\n 00687\n // outside at the last step in the loop. If it has negative sign, then the\n 00688\n // loop will at some point go to the corresponding situation with positive\n 00689\n // sign and set the inclusion status to 0.\n 00690\n-do {\n 00691\n-00692\n+do {\n // as we leave this position a particle enters if its side is\n+00692\n 00693\n // negative (i.e. the centre is the one at -ve angle wrt to the\n 00694\n // parent-child line\n 00695\n if (!(*here())->side) ((*here())->is_inside->cone) = 1;\n 00696\n-00697\n // move on to the next position\n+00697\n 00698\n ++here;\n 00699\n // as we arrive at this position a particle leaves if its side is positive\n 00700\n 00701\n if ((*here())->side) ((*here())->is_inside->cone) = 0;\n 00702\n } while (here != start);\n 00703\n-00704\n // once we\u2019ve reached the start the \u2019is_inside\u2019 information should be\n+00704\n 00705\n // 100% complete, so we can use it to calculate the cone contents\n 00706\n // and then exit\n 00707\n recompute_cone_contents();\n-return;\n 00708\n+return;\n 00709\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.26 protocones.cpp\n-\n 00710 }\n 00711\n 00712\n 00713 /*\n 00714 * compute the cone momentum from particle list.\n 00715 * in this version, we use the \u2019pincluded\u2019 information\n 00716 * from the Cvicinity class\n 00717 */\n 00718 void Cstable_cones::recompute_cone_contents(){\n-00719\n unsigned int i;\n+00719\n 00720\n-// set momentum to 0\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.24 protocones.cpp\n+\n 00721\n+// set momentum to 0\n 00722\n cone = Cmomentum();\n 00723\n-// Important note: we can browse only the particles\n 00724\n+// Important note: we can browse only the particles\n 00725\n // in vicinity since all particles in the cone are\n 00726\n // withing a distance 2R w.r.t. parent hence in vicinity.\n 00727\n // Among those, we only add the particles for which \u2019is_inside\u2019 is true !\n 00728\n // This methos rather than a direct comparison avoids rounding errors\n 00729\n for (i=0;iside) && (vicinity[i]->is_inside->cone))\n 00732\n cone += *vicinity[i]->v;\n 00733\n }\n 00734\n@@ -17905,27 +17413,27 @@\n 00740 /*\n 00741 * if we have gone beyond the acceptable threshold of change, compute\n 00742 * the cone momentum from particle list. in this version, we use the\n 00743 * \u2019pincluded\u2019 information from the Cvicinity class, but we don\u2019t\n 00744 * change the member cone, only the locally supplied one\n 00745 */\n 00746 void Cstable_cones::recompute_cone_contents_if_needed(Cmomentum & this_cone,\n-double & this_dpt){\n 00747\n+double & this_dpt){\n 00748\n if (this_dpt > PT_TSHOLD*(fabs(this_cone.px)+fabs(this_cone.py))) {\n 00749\n 00750\n if (cone.ref.is_empty()) {\n 00751\n this_cone = Cmomentum();\n 00752\n } else {\n-00753\n // set momentum to 0\n+00753\n 00754\n this_cone = Cmomentum();\n 00755\n // Important note: we can browse only the particles\n 00756\n 00757\n // in vicinity since all particles in the this_cone are\n@@ -17954,93 +17462,93 @@\n this_dpt = 0.0;\n 00770\n }\n 00771\n 00772 }\n 00773\n 00774\n-00776 // VARIOUS TOOLS\n //\n+00776 // VARIOUS TOOLS\n 00777 // - circle_intersect()\n //\n 00778 // - is_inside()\n //\n 00779 // - abs_dangle()\n //\n 00781\n 00782\n 00783 /*\n 00784 * circle intersection.\n 00785 * computes the intersection with a circle of given centre and radius.\n 00786 * The output takes the form of a checkxor of the intersection\u2019s particles\n-00787 * - cx\n circle centre x coordinate\n-circle centre y coordinate\n+00787 * - cx\n 00788 * - cy\n+circle centre y coordinate\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-double dx, dy;\n+00793\n 00794\n+double dx, dy;\n 00795\n-00796\n for (i=0;iM_PI)\n 00803\n dy -= twopi;\n 00804\n-// really check if the distance is less than VR\n 00805\n+// really check if the distance is less than VR\n 00806\n if (dx*dx+dy*dyeta - v->eta;\n 00825\n dy = fabs(centre_in->phi - v->phi);\n if (dy>M_PI)\n 00826\n@@ -18050,38 +17558,38 @@\n 00829\n return dx*dx+dy*dyM_PI)\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.27 protocones.cpp\n+5.25 protocones.cpp\n 00001\n //\n 00002 // File: protocones.cpp\n 00003 // Description: source file for stable cones determination (Cstable_cones)\n //\n 00004 // This file is part of the SISCone project.\n //\n@@ -18129,19 +17637,14 @@\n $//\n 00026 // $Date:: 2011-10-05 23:27:09 +0200 (Wed, 05 Oct 2011)\n $//\n 00028\n 00029 /*******************************************************\n 00030 * Introductory note:\n *\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.27 protocones.cpp\n-\n 00031 * Since this file has many member functions, we have *\n 00032 * structured them in categories:\n *\n 00033 * INITIALISATION FUNCTIONS\n *\n 00034 * - ctor()\n *\n@@ -18155,14 +17658,19 @@\n *\n 00039 * - get_stable_cone(radius)\n *\n 00040 * ALGORITHM MAIN STEPS\n *\n 00041 * - init_cone()\n *\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.25 protocones.cpp\n+\n 00042 * - test_cone()\n *\n 00043 * - update_cone()\n *\n 00044 * - proceed_with_stability()\n *\n 00045 * ALGORITHM MAIN STEPS FOR COCIRCULAR SITUATIONS\n@@ -18216,16 +17724,16 @@\n *\n 00077 * it is used to compute the list of stable cones given a list\n *\n 00078 * of particles.\n *\n 00079 **********************************************************************/\n 00080\n-00082 // INITIALISATION FUNCTIONS\n //\n+00082 // INITIALISATION FUNCTIONS\n 00083 // - ctor()\n //\n 00084 // - ctor(particle_list)\n //\n 00085 // - dtor()\n //\n 00086 // - init(particle_list)\n@@ -18248,40 +17756,31 @@\n nb_tot = 0;\n 00102\n hc = NULL;\n 00103 }\n 00104\n 00105 // default dtor\n 00106 //-------------00107 CSphstable_cones::~CSphstable_cones(){\n-if (hc!=NULL) delete hc;\n 00108\n+if (hc!=NULL) delete hc;\n 00109 }\n 00110\n 00111 /*\n 00112 * initialisation\n 00113 * - _particle_list list of particles\n-number of particles\n 00114 * - _n\n+number of particles\n 00115 *********************************************************************/\n 00116 void CSphstable_cones::init(vector &_particle_list){\n-// check already allocated mem\n 00117\n+// check already allocated mem\n 00118\n if (hc!=NULL){\n-00119\n delete hc;\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-227\n-\n-\f228\n-\n-File Documentation\n-\n+00119\n 00120\n }\n if (protocones.size()!=0)\n 00121\n 00122\n protocones.clear();\n 00123\n@@ -18291,29 +17790,38 @@\n 00126\n // initialisation\n 00127\n set_particle_list(_particle_list);\n 00128 }\n 00129\n 00130\n-//\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+223\n+\n+\f224\n+\n+File Documentation\n+\n 00132 // ALGORITHM MAIN ENTRY\n+//\n 00133 // - get_stable_cone(radius)\n //\n 00135\n 00136 /*\n 00137 * compute stable cones.\n 00138 * This function really does the job i.e. computes\n 00139 * the list of stable cones (in a seedless way)\n 00140 * - _radius: radius of the cones\n 00141 * The number of stable cones found is returned\n 00142 *********************************************************************/\n 00143 int CSphstable_cones::get_stable_cones(double _radius){\n-00144\n int p_idx;\n+00144\n 00145\n // check if everything is correctly initialised\n 00146\n 00147\n if (n_part==0){\n 00148\n return 0;\n@@ -18325,25 +17833,25 @@\n 00152\n R2 = R*R;\n 00153\n tan2R = tan(R);\n 00154\n tan2R *= tan2R;\n 00155\n-// allow hash for cones candidates\n 00156\n+// allow hash for cones candidates\n 00157\n hc = new sph_hash_cones(n_part, R);\n 00158\n // browse all particles\n 00159\n 00160\n for (p_idx=0;p_idx_phi \u00ab \", \" \u00ab parent->_theta \u00ab endl;\n 00177 #endif\n 00178\n-00179\n // step 1: initialise with the first cone candidate\n+00179\n 00180\n init_cone();\n 00181\n-00182\n do{\n-// step 2: test cone stability for that pair (P,C)\n+00182\n 00183\n+// step 2: test cone stability for that pair (P,C)\n 00184\n test_cone();\n 00185\n // step 3: go to the next cone child candidate C\n 00186\n 00187\n } while (!update_cone());\n@@ -18392,16 +17900,16 @@\n }\n 00189\n 00190\n return proceed_with_stability();\n 00191 }\n 00192\n 00193\n-//\n 00195 // ALGORITHM MAIN STEPS\n+//\n 00196 // - init_cone()\n //\n 00197 // - test_cone()\n //\n 00198 // - update_cone()\n //\n 00199 // - proceed_with_stability()\n@@ -18410,23 +17918,18 @@\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 00208 int CSphstable_cones::init_cone(){\n-// The previous version of the algorithm was starting the\n 00209\n+// The previous version of the algorithm was starting the\n 00210\n // loop around vicinity elements with the \"most isolated\" child.\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.27 protocones.cpp\n-\n 00211\n // given the nodist method to calculate the cone contents, we no\n 00212\n // longer need to worry about which cone comes first...\n 00213\n first_cone=0;\n 00214\n@@ -18439,17 +17942,22 @@\n 00218\n 00219\n // The only possibility seems a regular hexagon with a parent point\n 00220\n // in the centre. And this situation is by itself unclear.\n 00221\n // Hence, we do nothing here !\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.25 protocones.cpp\n+\n 00222\n-00223\n // init set child C\n+00223\n 00224\n centre = vicinity[first_cone];\n 00225\n child = centre->v;\n 00226\n centre_idx = first_cone;\n 00227\n@@ -18457,44 +17965,44 @@\n 00229\n // just deduces contents by circulating around all in/out operations)\n 00230\n // this function also sets the list of included particles\n 00231\n compute_cone_contents();\n 00232\n-00233\n return 0;\n+00233\n 00234 }\n 00235\n 00236\n 00237 /*\n 00238 * test cones.\n 00239 * We check if the cone(s) built with the present parent and child\n 00240 * are stable\n 00241 * return 0 on success 1 on error\n 00242 *********************************************************************/\n 00243 int CSphstable_cones::test_cone(){\n 00244\n siscone::Creference weighted_cone_ref;\n 00245\n-00246\n // depending on the side we are taking the child particle,\n+00246\n 00247\n // we test different configuration.\n 00248\n // Each time, two configurations are tested in such a way that\n 00249\n // all 4 possible cases (parent or child in or out the cone)\n 00250\n // are tested when taking the pair of particle parent+child\n 00251\n // and child+parent.\n 00252\n-// here are the tests entering the first series:\n 00253\n+// here are the tests entering the first series:\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 //UPDATED(see below): if (centre->side){\n 00257\n@@ -18552,58 +18060,49 @@\n 00276\n //UPDATED(see below): }\n 00277\n //UPDATED(see below):\n 00278\n //UPDATED(see below): nb_tot+=2;\n 00279\n-00280\n // instead of testing 2 inclusion/exclusion states for every pair, we test the 4 of them\n+00280\n 00281\n // when the parent has an energy bigger than the child\n 00282\n if (parent->E >= child->E){\n // test when both particles are not in the cone\n 00283\n 00284\n // Note: for the totally exclusive case, test emptiness before\n 00285\n cone_candidate = cone;\n-if (cone.ref.not_empty()){\n 00286\n+if (cone.ref.not_empty()){\n 00287\n hc->insert(&cone_candidate, parent, child, false, false);\n 00288\n }\n 00289\n-// test when 1! of the particles is in the cone\n 00290\n+// test when 1! of the particles is in the cone\n 00291\n cone_candidate += *parent;\n 00292\n hc->insert(&cone_candidate, parent, child, true, false);\n 00293\n 00294\n cone_candidate = cone;\n 00295\n cone_candidate += *child;\n 00296\n hc->insert(&cone_candidate, parent, child, false, true);\n 00297\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-229\n-\n-\f230\n-\n-File Documentation\n-\n-00298\n // test when both are in.\n+00298\n 00299\n cone_candidate += *parent;\n 00300\n hc->insert(&cone_candidate, parent, child, true, true);\n 00301\n 00302\n nb_tot += 4;\n@@ -18611,14 +18110,23 @@\n }\n 00304\n 00305\n 00306\n return 0;\n 00307 }\n 00308\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+225\n+\n+\f226\n+\n+File Documentation\n+\n 00309\n 00310 /*\n 00311 * update the cone\n 00312 * go to the next child for that parent and update \u2019cone\u2019 appropriately\n 00313 * return 0 if update candidate found, 1 otherwise\n 00314 ***********************************************************************/\n 00315 int CSphstable_cones::update_cone(){\n@@ -18627,26 +18135,26 @@\n cout \u00ab \"call \u2019circles_plot.gp\u2019 \u2019\" \u00ab centre->centre.px \u00ab \"\u2019 \u2019\"\n 00318\n \u00ab centre->centre.py \u00ab \"\u2019 \u2019\" \u00ab centre->centre.pz \u00ab \"\u2019\" \u00ab endl\n 00319\n \u00ab \"pause -1 \u2019(\" \u00ab centre->angle \u00ab \" \" \u00ab (centre->side ? \u2019+\u2019 : \u2019-\u2019) \u00ab \")\";\n 00320 #endif\n 00321\n-00322\n // get the next child and centre\n+00322\n 00323\n centre_idx++;\n 00324\n if (centre_idx==vicinity_size)\n 00325\n centre_idx=0;\n if (centre_idx==first_cone)\n 00326\n-00327\n return 1;\n+00327\n 00328\n // update the cone w.r.t. the old child\n 00329\n 00330\n // only required if the old child is entering inside in which\n 00331\n // case we need to add it. We also know that the child is\n@@ -18664,30 +18172,30 @@\n cone += (*child);\n 00339\n // update info on particles inside\n 00340\n 00341\n centre->is_inside->cone = true;\n 00342\n-// update stability check quantities\n 00343\n+// update stability check quantities\n 00344\n dpt += fabs(child->px)+fabs(child->py)+fabs(child->pz);\n 00345\n }\n 00346\n-00347\n // update centre and child to correspond to the new position\n+00347\n 00348\n centre = vicinity[centre_idx];\n 00349\n child = centre->v;\n 00350\n-// check cocircularity\n 00351\n+// check cocircularity\n 00352\n // note that if cocirculaity is detected (i.e. if we receive 1\n 00353\n // in the next test), we need to recall \u2019update_cone\u2019 directly\n 00354\n // since tests and remaining part of te update has been performed\n 00355\n@@ -18699,31 +18207,31 @@\n cout \u00ab \" Co-circular case detected\" \u00ab endl;\n 00359 #endif\n 00360\n return update_cone();\n 00361\n }\n 00362\n-// update the cone w.r.t. the new child\n 00363\n+// update the cone w.r.t. the new child\n 00364\n // only required if the new child was already inside in which\n 00365\n // case we need to remove it. We also know that the child is\n 00366\n // inside iff its side is +.\n 00367\n if ((centre->side) && (cone.ref.not_empty())){\n 00368 #ifdef DEBUG_STABLE_CONES\n 00369\n cout \u00ab \" new exit\";\n 00370 #endif\n 00371\n-00372\n // update cone\n+00372\n 00373\n cone -= (*child);\n 00374\n // update info on particles inside\n 00375\n 00376\n centre->is_inside->cone = false;\n@@ -18731,25 +18239,20 @@\n // update stability check quantities\n 00378\n 00379\n dpt += fabs(child->px)+fabs(child->py)+fabs(child->pz); //child->perp2();\n 00380\n }\n 00381\n-00382\n // check that the addition and subtraction of vectors does\n+00382\n 00383\n // not lead to too much rounding error\n 00384\n // for that, we compute the sum of pt modifications and of |pt|\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.27 protocones.cpp\n-\n 00385\n // since last recomputation and once the ratio overpasses a threshold\n 00386\n // we recompute vicinity.\n 00387\n if ((dpt>PT_TSHOLD*(fabs(cone.px)+fabs(cone.py)+fabs(cone.pz))) && (cone.ref.not_empty())){\n 00388\n@@ -18762,14 +18265,19 @@\n cone = CSphmomentum();\n 00392\n dpt=0.0;\n 00393\n }\n 00394\n 00395 #ifdef DEBUG_STABLE_CONES\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.25 protocones.cpp\n+\n 00396\n cout \u00ab \"\u2019\" \u00ab endl;\n 00397 #endif\n 00398\n 00399\n return 0;\n 00400 }\n@@ -18777,36 +18285,36 @@\n 00402\n 00403 /*\n 00404 * compute stability of all enumerated candidates.\n 00405 * For all candidate cones which are stable w.r.t. their border particles,\n 00406 * pass the last test: stability with quadtree intersection\n 00407 ************************************************************************/\n 00408 int CSphstable_cones::proceed_with_stability(){\n-00409\n int i;\n+00409\n 00410\n sph_hash_element *elm;\n 00411\n-for (i=0;i<=hc->mask;i++){\n 00412\n+for (i=0;i<=hc->mask;i++){\n 00413\n // test ith cell of the hash array\n 00414\n elm = hc->hash_array[i];\n 00415\n // browse elements therein\n 00416\n 00417\n while (elm!=NULL){\n 00418\n // test stability\n 00419\n if (elm->is_stable){\n-// stability is not ensured by all pairs of \"edges\" already browsed\n 00420\n+// stability is not ensured by all pairs of \"edges\" already browsed\n 00421 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00422\n // => testing stability with quadtree intersection\n 00423\n if (quadtree->circle_intersect(elm->eta, elm->phi, R2)==elm->ref)\n 00424 #else\n 00425\n@@ -18815,16 +18323,16 @@\n if (circle_intersect(elm->centre)==elm->centre.ref)\n 00427 #endif\n 00428\n protocones.push_back(CSphmomentum(elm->centre,1.0));\n 00429\n }\n 00430\n-// jump to the next one\n 00431\n+// jump to the next one\n 00432\n elm = elm->next;\n 00433\n }\n 00434\n }\n 00435\n@@ -18842,21 +18350,21 @@\n 00442 #endif\n 00443\n 00444\n delete hc;\n 00445\n hc=NULL;\n 00446\n-00447\n return protocones.size();\n+00447\n 00448 }\n 00449\n 00450\n-//\n 00452 // ALGORITHM MAIN STEPS FOR COCIRCULAR SITUATIONS\n+//\n 00453 // - cocircular_pt_less(v1, v2)\n //\n 00454 // - prepare_cocircular_list()\n //\n 00455 // - test_cone_cocircular()\n //\n 00456 // - test_stability(candidate, border_vect)\n@@ -18874,23 +18382,14 @@\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 00472 * later on...\n 00473 **********************************************************************/\n 00474 void CSphstable_cones::prepare_cocircular_lists() {\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-231\n-\n-\f232\n-\n-File Documentation\n-\n 00475\n siscone::circulator::iterator > here(vicinity.begin(),\n 00476\n vicinity.begin(),\n 00477\n vicinity.end());\n 00478\n@@ -18902,57 +18401,66 @@\n 00482\n CSphvicinity_elm* here_pntr = *here();\n 00483\n search.set_position(here);\n 00484\n 00485\n // search forwards for things that should have \"here\" included in\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+227\n+\n+\f228\n+\n+File Documentation\n+\n 00486\n // their cocircularity list\n 00487\n while (true) {\n 00488\n ++search;\n-if ( siscone::abs_dphi((*search())->angle, here_pntr->angle) <\n 00489\n+if ( siscone::abs_dphi((*search())->angle, here_pntr->angle) <\n 00490\n here_pntr->cocircular_range\n 00491\n && search() != here()) {\n 00492\n (*search())->cocircular.push_back(here_pntr);\n 00493\n } else {\n-00494\n break;\n+00494\n 00495\n }\n 00496\n }\n 00497\n-// search backwards\n 00498\n+// search backwards\n 00499\n search.set_position(here);\n-while (true) {\n 00500\n+while (true) {\n 00501\n --search;\n if ( siscone::abs_dphi((*search())->angle, here_pntr->angle) <\n 00502\n 00503\n here_pntr->cocircular_range\n 00504\n && search() != here()) {\n 00505\n (*search())->cocircular.push_back(here_pntr);\n 00506\n } else {\n-break;\n 00507\n+break;\n 00508\n }\n 00509\n }\n 00510\n 00511\n ++here;\n@@ -18987,90 +18495,90 @@\n 00531\n // now we have te reference axis, create the CSphborder_store structure\n 00532\n 00533\n vector border_vect;\n 00534\n border_vect.reserve(border_list.size());\n-00535\n for (list::iterator it = border_list.begin();\n+00535\n 00536\n it != border_list.end(); it++) {\n 00537\n border_vect.push_back(CSphborder_store(*it, centre->centre, angl_dir1, angl_dir2));\n 00538\n }\n 00539\n-// get them into order of angle\n 00540\n+// get them into order of angle\n 00541\n sort(border_vect.begin(), border_vect.end());\n 00542\n-00543\n // set up some circulators, since these will help us go around the\n+00543\n 00544\n // circle easily\n 00545\n siscone::circulator::iterator >\n 00546\n start(border_vect.begin(), border_vect.begin(),border_vect.end());\n 00547\n siscone::circulator::iterator > mid(start), end(start);\n 00548\n-00549\n // test the borderless cone\n+00549\n 00550\n CSphmomentum candidate = borderless_cone;\n-00551\n //candidate.build_etaphi();\n+00551\n 00552\n if (candidate.ref.not_empty())\n 00553\n test_stability(candidate, border_vect);\n 00554\n 00555\n do {\n-00556\n // reset status wrt inclusion in the cone\n+00556\n 00557\n mid = start;\n-00558\n do {\n+00558\n 00559\n mid()->is_in = false;\n 00560\n } while (++mid != start);\n 00561\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.27 protocones.cpp\n-\n-00562\n // now run over all inclusion possibilities with this starting point\n+00562\n 00563\n candidate = borderless_cone;\n 00564\n while (++mid != start) {\n-00565\n // will begin with start+1 and go up to start-1\n+00565\n 00566\n mid()->is_in = true;\n 00567\n candidate += *(mid()->mom);\n 00568\n test_stability(candidate, border_vect);\n 00569\n }\n 00570\n 00571\n } while (++start != end);\n 00572\n-// mid corresponds to momentum that we need to include to get the\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.25 protocones.cpp\n+\n 00573\n+// mid corresponds to momentum that we need to include to get the\n 00574\n // full cone\n 00575\n mid()->is_in = true;\n 00576\n candidate += *(mid()->mom);\n 00577\n@@ -19082,24 +18590,24 @@\n border_vect) {\n 00588\n 00589\n // this almost certainly has not been done...\n 00590\n //candidate.build_etaphi();\n 00591\n-bool stable = true;\n 00592\n+bool stable = true;\n 00593\n for (unsigned i = 0; i < border_vect.size(); i++) {\n if (is_closer(&candidate, border_vect[i].mom,tan2R) ^ (border_vect[i].is_in)) {\n 00594\n 00595\n stable = false;\n-00596\n break; // it\u2019s unstable so there\u2019s no point continuing\n+00596\n 00597\n }\n 00598\n }\n 00599\n 00600\n if (stable) hc->insert(&candidate);\n@@ -19109,36 +18617,36 @@\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 00610 bool CSphstable_cones::cocircular_check(){\n-// check if many configurations have the same centre.\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 00614\n // Note that those situation, being considered separately in\n 00615\n // test_cone_multiple, must only be considered here if all\n 00616\n // angles are on the same side (this avoid multiple counting)\n 00617\n-if (centre->cocircular.empty()) return false;\n 00618\n+if (centre->cocircular.empty()) return false;\n 00619\n // first get cone into status required at end...\n 00620\n 00621\n if ((centre->side) && (cone.ref.not_empty())){\n-00622\n // update cone\n+00622\n 00623\n cone -= (*child);\n 00624\n // update info on particles inside\n 00625\n 00626\n centre->is_inside->cone = false;\n@@ -19185,102 +18693,101 @@\n it != centre->cocircular.end(); it++) {\n 00651\n 00652\n if ((*it)->is_inside->cone) {\n 00653\n cone_removal\n += *((*it)->v);\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-233\n-\n-\f234\n-\n 00654\n+(*it)->is_inside->cone = false;\n 00655\n+removed_from_cone.push_back((*it)->is_inside);\n 00656\n+}\n 00657\n+// if a point appears twice (i.e. with + and - sign) in the list of\n 00658\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-00665\n-00666\n-00667\n+(*it)->is_inside->cocirc = true;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+229\n+\n+\f230\n \n File Documentation\n \n-(*it)->is_inside->cone = false;\n-removed_from_cone.push_back((*it)->is_inside);\n-}\n+00665\n+00666\n+00667\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 //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 00671\n-// figure out whether this pairing has been observed before\n 00672\n+// figure out whether this pairing has been observed before\n 00673\n CSphmomentum borderless_cone = cone;\n 00674\n borderless_cone -= cone_removal;\n-00675\n bool consider = true;\n-for (unsigned int i=0;i(borderless_cone.ref,\n 00686\n border.ref));\n 00687\n-00688\n // first figure out whether our cone momentum is good\n+00688\n 00689\n double local_dpt = fabs(cone_removal.px) + fabs(cone_removal.py);\n-double total_dpt = dpt + local_dpt;\n 00690\n+double total_dpt = dpt + local_dpt;\n 00691\n 00692\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+00694\n 00695\n // and update the member cone momentum\n 00696\n cone = borderless_cone + cone_removal;\n 00697\n dpt = local_dpt;\n 00698\n@@ -19288,27 +18795,27 @@\n 00699\n 00700\n test_cone_cocircular(borderless_cone, border_list);\n 00701\n }\n 00702\n 00703\n-// relabel things that were in the cone but got removed\n 00704\n+// relabel things that were in the cone but got removed\n 00705\n for(list::iterator is_in = removed_from_cone.begin();\n 00706\n is_in != removed_from_cone.end(); is_in++) {\n 00707\n (*is_in)->cone = true;\n 00708\n }\n 00709\n-00710\n // relabel things that got put into the border\n+00710\n 00711\n for(list::iterator is_in = put_in_border.begin();\n 00712\n is_in != put_in_border.end(); is_in++) {\n 00713\n (*is_in)->cocirc = false;\n 00714\n@@ -19319,16 +18826,16 @@\n 00717\n // been through the co-circularity rigmarole\n 00718\n return true;\n 00719 }\n 00720\n 00721\n-00723 // RECOMPUTATION OF CONE CONTENTS\n //\n+00723 // RECOMPUTATION OF CONE CONTENTS\n 00724 // - compute_cone_contents()\n //\n 00725 // - recompute_cone_contents()\n //\n 00726 // - recompute_cone_contents_if_needed()\n //\n 00728\n@@ -19337,78 +18844,78 @@\n siscone::circulator::iterator >\n 00739\n start(vicinity.begin()+first_cone, vicinity.begin(), vicinity.end());\n 00740\n 00741\n siscone::circulator::iterator > here(start);\n 00742\n-// note that in the following algorithm, the cone contents never includes\n 00743\n+// note that in the following algorithm, the cone contents never includes\n 00744\n // the child. Indeed, if it has positive sign, then it will be set as\n 00745\n // outside at the last step in the loop. If it has negative sign, then the\n 00746\n // loop will at some point go to the corresponding situation with positive\n 00747\n // sign and set the inclusion status to 0.\n 00748\n-00749\n do {\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.27 protocones.cpp\n-\n+00749\n 00750\n // as we leave this position a particle enters if its side is\n 00751\n // negative (i.e. the centre is the one at -ve angle wrt to the\n 00752\n // parent-child line\n 00753\n if (!(*here())->side) ((*here())->is_inside->cone) = 1;\n 00754\n-// move on to the next position\n 00755\n+// move on to the next position\n 00756\n ++here;\n 00757\n 00758\n // as we arrive at this position a particle leaves if its side is positive\n 00759\n if ((*here())->side) ((*here())->is_inside->cone) = 0;\n 00760\n } while (here != start);\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.25 protocones.cpp\n+\n 00761\n // once we\u2019ve reached the start the \u2019is_inside\u2019 information should be\n 00762\n 00763\n // 100% complete, so we can use it to calculate the cone contents\n 00764\n // and then exit\n 00765\n recompute_cone_contents();\n-return;\n 00766\n+return;\n 00767\n 00768 }\n 00769\n 00770\n 00771 /*\n 00772 * compute the cone momentum from particle list.\n 00773 * in this version, we use the \u2019pincluded\u2019 information\n 00774 * from the CSphvicinity class\n 00775 */\n 00776 void CSphstable_cones::recompute_cone_contents(){\n unsigned int i;\n 00777\n 00778\n-00779\n // set momentum to 0\n+00779\n 00780\n cone = CSphmomentum();\n 00781\n // Important note: we can browse only the particles\n 00782\n 00783\n // in vicinity since all particles in the cone are\n@@ -19416,50 +18923,50 @@\n // withing a distance 2R w.r.t. parent hence in vicinity.\n 00785\n // Among those, we only add the particles for which \u2019is_inside\u2019 is true !\n 00786\n // This methos rather than a direct comparison avoids rounding errors\n 00787\n for (i=0;iside) && (vicinity[i]->is_inside->cone))\n 00790\n cone += *vicinity[i]->v;\n 00791\n }\n 00792\n-00793\n // set check variables back to 0\n+00793\n 00794\n dpt = 0.0;\n 00795 }\n 00796\n 00797\n 00798 /*\n 00799 * if we have gone beyond the acceptable threshold of change, compute\n 00800 * the cone momentum from particle list. in this version, we use the\n 00801 * \u2019pincluded\u2019 information from the CSphvicinity class, but we don\u2019t\n 00802 * change the member cone, only the locally supplied one\n 00803 */\n 00804 void CSphstable_cones::recompute_cone_contents_if_needed(CSphmomentum & this_cone,\n-00805\n double & this_dpt){\n+00805\n 00806\n if (this_dpt > PT_TSHOLD*(fabs(this_cone.px)+fabs(this_cone.py))) {\n 00807\n-if (cone.ref.is_empty()) {\n 00808\n+if (cone.ref.is_empty()) {\n 00809\n this_cone = CSphmomentum();\n 00810\n } else {\n-// set momentum to 0\n 00811\n+// set momentum to 0\n 00812\n this_cone = CSphmomentum();\n 00813\n // Important note: we can browse only the particles\n 00814\n 00815\n // in vicinity since all particles in the this_cone are\n@@ -19467,27 +18974,27 @@\n // withing a distance 2R w.r.t. parent hence in vicinity.\n 00817\n // Among those, we only add the particles for which \u2019is_inside\u2019 is true !\n 00818\n // This methos rather than a direct comparison avoids rounding errors\n 00819\n for (unsigned int i=0;iside) && (vicinity[i]->is_inside->cone))\n 00822\n this_cone += *vicinity[i]->v;\n 00823\n }\n 00824\n 00825\n }\n-00826\n // set check variables back to 0\n+00826\n 00827\n this_dpt = 0.0;\n 00828\n }\n 00829\n 00830 }\n 00831\n@@ -19496,62 +19003,594 @@\n //\n 00835 // - circle_intersect()\n //\n 00836 // - is_inside()\n //\n 00837 // - abs_dangle()\n //\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-235\n-\n-\f236\n-\n-File Documentation\n-\n 00839\n 00840\n 00841 /*\n 00842 * circle intersection.\n 00843 * computes the intersection with a circle of given centre and radius.\n 00844 * The output takes the form of a checkxor of the intersection\u2019s particles\n 00845 * - cx\n circle centre x coordinate\n circle centre y coordinate\n 00846 * - cy\n 00847 * return the checkxor for the intersection\n 00848 ******************************************************************/\n 00849 siscone::Creference CSphstable_cones::circle_intersect(CSph3vector &cone_centre){\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+231\n+\n+\f232\n+\n+File Documentation\n+\n 00850\n siscone::Creference intersection;\n int i;\n 00851\n 00852\n-for (i=0;i\n+00034 #include \n+00035 #include \n+00036 #include \"hash.h\"\n+00037\n+00038 #include \"defines.h\"\n+00039\n+00040 namespace siscone{\n+00041\n+00053 class Cborder_store{\n+00054 public:\n+00056\n+Cborder_store(Cmomentum * momentum, double centre_eta, double centre_phi) :\n+00057\n+mom(momentum), is_in(false) {\n+00058\n+angle = atan2(mom->phi - centre_phi, mom->eta - centre_eta);\n+00059\n+}\n+00060\n+00061\n+Cmomentum * mom;\n+double angle;\n+00062\n+bool\n+is_in;\n+00063\n+00064 };\n+00065\n+00066\n+00069 inline bool operator<(const Cborder_store & a, const Cborder_store & b) {\n+return a.angle < b.angle;\n+00070\n+00071 }\n+00072\n+00073\n+00082 class Cstable_cones : public Cvicinity{\n+00083 public:\n+00085\n+Cstable_cones();\n+00086\n+00088\n+Cstable_cones(std::vector &_particle_list);\n+00089\n+00091\n+~Cstable_cones();\n+00092\n+void init(std::vector &_particle_list);\n+00097\n+00098\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.26 protocones.h\n+\n+00106\n+int get_stable_cones(double _radius);\n+00107\n+00109\n+std::vector protocones;\n+00110\n+00112\n+hash_cones *hc;\n+00113\n+int nb_tot;\n+00115\n+00116 #ifdef DEBUG_STABLE_CONES\n+00117\n+int nb_hash_cones, nb_hash_occupied;\n+00118 #endif\n+00119\n+00120 protected:\n+00122\n+double R;\n+00123\n+double R2;\n+00125\n+00126\n+00127 private:\n+00130\n+Cmomentum cone;\n+00131\n+00133\n+Cmomentum *child;\n+00134\n+00136\n+Cvicinity_elm *centre;\n+00137\n+00139\n+unsigned int centre_idx;\n+00140\n+unsigned int first_cone;\n+00142\n+00143\n+int init_cone();\n+00149\n+00150\n+00157\n+int test_cone();\n+00158\n+int update_cone();\n+00164\n+00165\n+/*\n+00166\n+00167\n+* run through the vicinity of the current parent and for each child\n+00168\n+* indicate which members are cocircular...\n+00169\n+*/\n+00170\n+void prepare_cocircular_lists();\n+00171\n+bool cocircular_check();\n+00179\n+00180\n+00185\n+void test_cone_cocircular(Cmomentum & borderless_cone,\n+00186\n+std::list & border_list);\n+00187\n+void test_stability(Cmomentum & candidate,\n+00194\n+00195\n+const std::vector & border_vect);\n+00196\n+void compute_cone_contents();\n+00203\n+00204\n+void recompute_cone_contents();\n+00210\n+00211\n+/*\n+00212\n+00213\n+* if we have gone beyond the acceptable threshold of change, compute\n+00214\n+* the cone momentum from particle list. in this version, we use the\n+00215\n+* \u2019pincluded\u2019 information from the Cvicinity class, but we don\u2019t\n+00216\n+* change the member cone, only the locally supplied one\n+00217\n+*/\n+00218\n+void recompute_cone_contents_if_needed(Cmomentum & this_cone, double & this_dpt);\n+00219\n+int proceed_with_stability();\n+00225\n+00226\n+/*\n+00227\n+00228\n+* circle intersection.\n+00229\n+* computes the intersection with a circle of given centre and radius.\n+00230\n+* The output takes the form of a checkxor of the intersection\u2019s particles\n+00231\n+circle centre x coordinate\n+* - cx\n+00232\n+circle centre y coordinate\n+* - cy\n+00233\n+* return the checkxor for the intersection\n+00234\n+******************************************************************/\n+00235\n+Creference circle_intersect(double cx, double cy);\n+00236\n+00238\n+Cmomentum cone_candidate;\n+00239\n+00241\n+std::vector child_list;\n+00242\n+00245\n+std::vector< std::pair > multiple_centre_done;\n+00246\n+// information for updating cone contents to avoid rounding errors\n+00247\n+00248\n+double dpt;\n+00249\n+inline bool is_inside(Cmomentum *centre, Cmomentum *v);\n+00258\n+00259 };\n+00260\n+00261 /*\n+00262 * compute the absolute value of the difference between 2 angles.\n+00263 * We take care of the 2pi periodicity\n+first angle\n+00264 * \\param angle1\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+233\n+\n+\f234\n+\n+File Documentation\n+\n+second angle\n+00265 * \\param angle2\n+00266 * \\return the absolute value of the difference between the angles\n+00267 *****************************************************************/\n+00268 inline double abs_dangle(double &angle1, double &angle2);\n+00269\n+00270 }\n+00271 #endif\n+\n+5.27 protocones.h\n+00001 // -*- C++ -*00003 // File: protocones.h\n+//\n+00004 // Description: header file for stable cones determination (Cstable_cones)\n+//\n+00005 // This file is part of the SISCone project.\n+//\n+00006 // WARNING: this is not the main SISCone trunk but\n+//\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:: 255\n+$//\n+00027 // $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008)\n+$//\n+00029\n+00030 #ifndef __SPH_PROTOCONES_H__\n+00031 #define __SPH_PROTOCONES_H__\n+00032\n+00033 #include \"momentum.h\"\n+00034 #include \"vicinity.h\"\n+00035 #include \n+00036 #include \n+00037 #include \n+00038 #include \"hash.h\"\n+00039\n+00040 #include \n+00041\n+00042 namespace siscone_spherical{\n+00043\n+00055 class CSphborder_store{\n+00056 public:\n+00058\n+CSphborder_store(CSphmomentum * momentum, CSph3vector ¢re, CSph3vector &angl_dir1, CSph3vector\n+&angl_dir2) :\n+00059\n+mom(momentum), is_in(false) {\n+00060\n+CSph3vector diff = (*momentum) - centre;\n+00061\n+angle = atan2(dot_product3(diff, angl_dir2), dot_product3(diff, angl_dir1));\n+00062 #ifdef DEBUG_STABLE_CONES\n+00063\n+std::cout \u00ab \" adding point \" \u00ab momentum->_theta \u00ab \", \" \u00ab momentum->_phi\n+00064\n+\u00ab \" at an angle of \" \u00ab angle \u00ab std::endl;\n+00065 #endif\n+00066\n+}\n+00067\n+00068\n+CSphmomentum * mom;\n+00069\n+double angle;\n+bool\n+is_in;\n+00070\n+00071 };\n+00072\n+00073\n+00076 inline bool operator<(const CSphborder_store & a, const CSphborder_store & b) {\n+return a.angle < b.angle;\n+00077\n+00078 }\n+00079\n+00080\n+00089 class CSphstable_cones : public CSphvicinity{\n+00090 public:\n+00092\n+CSphstable_cones();\n+00093\n+00095\n+CSphstable_cones(std::vector &_particle_list);\n+00096\n+00098\n+~CSphstable_cones();\n+00099\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.27 protocones.h\n+\n+00104\n+void init(std::vector &_particle_list);\n+00105\n+int get_stable_cones(double _radius);\n+00113\n+00114\n+00116\n+std::vector protocones;\n+00117\n+00119\n+sph_hash_cones *hc;\n+00120\n+int nb_tot;\n+00122\n+00123 #ifdef DEBUG_STABLE_CONES\n+00124\n+int nb_hash_cones, nb_hash_occupied;\n+00125 #endif\n+00126\n+00127 protected:\n+00129\n+double R;\n+00130\n+double R2;\n+00132\n+00133\n+double tan2R;\n+00135\n+00136\n+00137 private:\n+00140\n+CSphmomentum cone;\n+00141\n+00143\n+CSphmomentum *child;\n+00144\n+00146\n+CSphvicinity_elm *centre;\n+00147\n+unsigned int centre_idx;\n+00149\n+00150\n+00152\n+unsigned int first_cone;\n+00153\n+int init_cone();\n+00159\n+00160\n+int test_cone();\n+00167\n+00168\n+int update_cone();\n+00174\n+00175\n+/*\n+00176\n+00177\n+* run through the vicinity of the current parent and for each child\n+00178\n+* indicate which members are cocircular...\n+00179\n+*/\n+00180\n+void prepare_cocircular_lists();\n+00181\n+bool cocircular_check();\n+00189\n+00190\n+void test_cone_cocircular(CSphmomentum & borderless_cone,\n+00195\n+00196\n+std::list & border_list);\n+00197\n+00204\n+void test_stability(CSphmomentum & candidate,\n+const std::vector & border_vect);\n+00205\n+00206\n+void compute_cone_contents();\n+00213\n+00214\n+void recompute_cone_contents();\n+00220\n+00221\n+00222\n+/*\n+00223\n+* if we have gone beyond the acceptable threshold of change, compute\n+00224\n+* the cone momentum from particle list. in this version, we use the\n+00225\n+* \u2019pincluded\u2019 information from the CSphvicinity class, but we don\u2019t\n+00226\n+* change the member cone, only the locally supplied one\n+00227\n+*/\n+00228\n+void recompute_cone_contents_if_needed(CSphmomentum & this_cone, double & this_dpt);\n+00229\n+int proceed_with_stability();\n+00235\n+00236\n+/*\n+00237\n+00238\n+* circle intersection.\n+00239\n+* computes the intersection with a circle of given centre and radius.\n+00240\n+* The output takes the form of a checkxor of the intersection\u2019s particles\n+circle centre x coordinate\n+00241\n+* - cx\n+00242\n+circle centre y coordinate\n+* - cy\n+00243\n+* return the checkxor for the intersection\n+00244\n+******************************************************************/\n+00245\n+siscone::Creference circle_intersect(CSph3vector &cone_centre);\n+00246\n+00248\n+CSphmomentum cone_candidate;\n+00249\n+00251\n+std::vector child_list;\n+00252\n+00255\n+std::vector< std::pair > multiple_centre_done;\n+00256\n+// information for updating cone contents to avoid rounding errors\n+00257\n+00258\n+double dpt;\n+00259 };\n+00260\n+00261 }\n+00262 #endif\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+235\n+\n+\f236\n+\n+File Documentation\n+\n 5.28 quadtree.cpp\n 00001\n-00002 // File: quadtree.cpp\n //\n+00002 // File: quadtree.cpp\n 00003 // Description: source file for quadtree management (Cquadtree class)\n //\n 00004 // This file is part of the SISCone project.\n //\n 00005 // For more details, see http://projects.hepforge.org/siscone\n //\n 00006 //\n@@ -19624,19 +19663,14 @@\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-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.28 quadtree.cpp\n-\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@@ -19669,18 +19703,23 @@\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 x-position of the center\n 00084 * - _x\n 00085 * - _y\n y-position of the center\n 00086 * - half_size_x half x-size of the cell\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.28 quadtree.cpp\n+\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-is already filled, we return an error.\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 return 1;\n 00093\n 00094\n@@ -19698,21 +19737,21 @@\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-vector to add\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+00112\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@@ -19738,32 +19777,32 @@\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-return 0;\n 00128\n+return 0;\n 00129\n }\n 00130\n-00131\n // step 2: additional work if 1! particle already present\n+00131\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-double new_half_size_y = 0.5*half_size_y;\n 00135\n-00136\n+double new_half_size_y = 0.5*half_size_y;\n // create children\n+00136\n 00137\n children[0][0] = new Cquadtree(centre_x-new_half_size_x, centre_y-new_half_size_y,\n 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@@ -19772,45 +19811,36 @@\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-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-237\n-\n-\f238\n-\n-File Documentation\n-\n 00145\n 00146\n has_child = true;\n 00147\n-00148\n // forward to child\n+00148\n 00149\n //? The following line assumes \u2019true\u2019==1 and \u2019false\u2019==0\n 00150\n // Note: v being a single particle, eta and phi are correct\n 00151\n children[v->eta>centre_x][v->phi>centre_y]->add(v);\n 00152\n // copy physical params\n 00153\n 00154\n v = new Cmomentum(*v);\n 00155\n }\n 00156\n-00157\n // step 3: add new particle\n+00157\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@@ -19824,21 +19854,30 @@\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 circle centre x coordinate\n 00171 * - cx\n 00172 * - cy\n circle centre y coordinate\n-00173 * - cR2\n circle radius SQUARED\n+00173 * - cR2\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+237\n+\n+\f238\n+\n+File Documentation\n+\n 00174 * return the checksum for the intersection\n 00175 ******************************************************************/\n 00176 Creference Cquadtree::circle_intersect(double cx, double cy, double cR2){\n-// Description of the method:\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@@ -19853,101 +19892,94 @@\n 00185\n // 5. check intersections with children.\n 00186\n // step 1: if there is no particle inside te square, no reason to go further\n 00187\n 00188\n if (v==NULL)\n-return Creference();\n 00189\n+return Creference();\n 00190\n double dx, dy;\n 00191\n 00192\n-00193\n // step 2: if there is only one particle inside the square, test if it is in\n+00193\n 00194\n //\n the circle, in which case return associated reference\n 00195\n if (!has_child){\n-// compute the distance\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+00200\n 00201\n dy -= 2.0*M_PI;\n 00202\n-// test distance\n 00203\n+// test distance\n 00204\n if (dx*dx+dy*dyref;\n 00206\n }\n 00207\n-return Creference();\n 00208\n+return Creference();\n 00209\n }\n 00210\n-00211\n // step 3: check if there is an intersection\n+00211\n 00212\n //double ryp, rym;\n 00213\n double dx_c, dy_c;\n 00214\n-// store distance with the centre of the square\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 if (dy_c>M_PI) dy_c = 2.0*M_PI-dy_c;\n 00218\n 00219\n // compute (minimal) the distance (pay attention to the periodicity in phi).\n 00220\n 00221\n dx = dx_c-half_size_x;\n-if (dx<0) dx=0;\n 00222\n+if (dx<0) dx=0;\n 00223\n dy = dy_c-half_size_y;\n if (dy<0) dy=0;\n 00224\n 00225\n-00226\n // check the distance\n+00226\n 00227\n if (dx*dx+dy*dy>=cR2){\n 00228\n // no intersection\n 00229\n return Creference();\n 00230\n }\n 00231\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.29 quadtree.h\n-\n-239\n-\n-00232\n // step 4: check if included\n+00232\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@@ -19959,16 +19991,16 @@\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+00244\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@@ -19981,23 +20013,28 @@\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+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.29 quadtree.h\n+\n 00261 int Cquadtree::save(FILE *flux){\n 00262\n if (flux==NULL)\n 00263\n-return 1;\n 00264\n+return 1;\n 00265\n-00266\n if (has_child){\n+00266\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@@ -20021,27 +20058,27 @@\n 00284 * - flux opened stream to write to\n 00285 * return 0 on success, 1 on error\n 00286 ******************************************************************/\n 00287 int Cquadtree::save_leaves(FILE *flux){\n 00288\n if (flux==NULL)\n 00289\n-return 1;\n 00290\n+return 1;\n 00291\n-00292\n if (has_child){\n+00292\n if (children[0][0]!=NULL) children[0][0]->save_leaves(flux);\n 00293\n 00294\n if (children[0][1]!=NULL) children[0][1]->save_leaves(flux);\n-if (children[1][0]!=NULL) children[1][0]->save_leaves(flux);\n 00295\n-00296\n+if (children[1][0]!=NULL) children[1][0]->save_leaves(flux);\n if (children[1][1]!=NULL) children[1][1]->save_leaves(flux);\n+00296\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@@ -20049,33 +20086,25 @@\n return 0;\n 00302 }\n 00303\n 00304 }\n \n 5.29 quadtree.h\n 00001 // -*- C++ -*00003 // File: quadtree.h\n-00004 // Description: header file for quadtree management (Cquadtree class)\n-00005 // This file is part of the SISCone project.\n-00006 // For more details, see http://projects.hepforge.org/siscone\n-00007 //\n-00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\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-\n-\f240\n-\n-File Documentation\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@@ -20114,14 +20143,23 @@\n 00033\n 00034 namespace siscone{\n 00035\n 00043 class Cquadtree{\n 00044 public:\n 00046\n Cquadtree();\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+239\n+\n+\f240\n+\n+File Documentation\n+\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@@ -20136,30 +20174,30 @@\n 00089\n int save(FILE *flux);\n 00099\n 00100\n int save_leaves(FILE *flux);\n 00110\n 00111\n-double centre_x;\n 00112\n-00113\n+double centre_x;\n double centre_y;\n-double half_size_x;\n+00113\n 00114\n-00115\n+double half_size_x;\n double half_size_y;\n+00115\n 00116\n 00117\n Cmomentum *v;\n 00118\n 00119\n Cquadtree* children[2][2];\n-00120\n bool has_child;\n+00120\n 00121 };\n 00122\n 00123 }\n 00124 #endif\n \n 5.30 ranlux.cpp\n 00001 // file: ranlux.xpp\n@@ -20181,94 +20219,94 @@\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-The period of the generator is around 10^171.\n 00017\n+The period of the generator is around 10^171.\n 00018\n-From: M. Luescher, \"A portable high-quality random number generator\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-Available on the net as hep-lat/9309020 at http://xxx.lanl.gov/\n 00023\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.30 ranlux.cpp\n-\n+Available on the net as hep-lat/9309020 at http://xxx.lanl.gov/\n 00024\n See also,\n 00025\n 00026\n-00027\n F. James, \"RANLUX: A Fortran implementation of the high-quality\n+00027\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+00034\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+00041 static const unsigned long int two24 = 16777216;\n 00042\n 00043\n 00044 // internal generator structure\n 00045 //-----------------------------00046 typedef struct {\n-unsigned int i;\n 00047\n-00048\n+unsigned int i;\n unsigned int j;\n-unsigned int n;\n+00048\n 00049\n-00050\n+unsigned int n;\n unsigned int skip;\n+00050\n unsigned int carry;\n 00051\n-00052\n unsigned long int u[24];\n+00052\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.30 ranlux.cpp\n+\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+00064\n 00065\n unsigned int j = local_ranlux_state.j;\n long int delta = local_ranlux_state.u[j] - local_ranlux_state.u[i]\n 00066\n 00067\n - local_ranlux_state.carry;\n 00068\n-if (delta & mask_hi){\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@@ -20287,69 +20325,60 @@\n 00080\n 00081\n i--;\n 00082\n 00083\n local_ranlux_state.i = i;\n 00084\n-00085\n if (j == 0)\n+00085\n 00086\n j = 23;\n-else\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+00092\n 00093 }\n 00094\n 00095\n 00096 // set generator state\n 00097 //--------------------00098 static void ranlux_set(unsigned long int s){\n int i;\n 00099\n 00100\n long int seed;\n 00101\n if (s==0)\n 00102\n-/* default seed is 314159265 */\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-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-241\n-\n-\f242\n-\n-File Documentation\n-\n-00111\n unsigned long int k = seed/53668;\n+00111\n 00112\n seed = 40014*(seed-k*53668)-k*12211;\n-if (seed<0){\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@@ -20360,69 +20389,78 @@\n 00120\n local_ranlux_state.j = 9;\n 00121\n local_ranlux_state.n = 0;\n 00122\n local_ranlux_state.skip = 389-24; // 389 => best decorrelation\n 00123\n-if (local_ranlux_state.u[23]&mask_hi){\n 00124\n+if (local_ranlux_state.u[23]&mask_hi){\n 00125\n local_ranlux_state.carry = 1;\n 00126\n } else {\n 00127\n local_ranlux_state.carry = 0;\n 00128\n }\n 00129 }\n 00130\n 00131\n 00132 // generator initialization\n 00133 //-------------------------00134 void ranlux_init(){\n-00135\n // seed the generator\n+00135\n 00136\n ranlux_set(0);\n 00137 }\n 00138\n 00139\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+241\n+\n+\f242\n+\n+File Documentation\n+\n 00140 // get random number\n 00141 //------------------00142 unsigned long int ranlux_get(){\n-const unsigned int skip = local_ranlux_state.skip;\n 00143\n-00144\n+const unsigned int skip = local_ranlux_state.skip;\n unsigned long int r = increment_state();\n+00144\n 00145\n 00146\n local_ranlux_state.n++;\n 00147\n-if (local_ranlux_state.n == 24){\n 00148\n+if (local_ranlux_state.n == 24){\n 00149\n unsigned int i;\n 00150\n local_ranlux_state.n = 0;\n for (i = 0; i < skip; i++)\n 00151\n 00152\n increment_state();\n 00153\n }\n 00154\n-return r;\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-unsigned char *p = (unsigned char *) (&local_ranlux_state);\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 for (i=0;i &_particles, double _radius, double _f,\n 00080\n int _n_pass_max, double _ptmin,\n 00081\n Esplit_merge_scale _split_merge_scale){\n@@ -21011,29 +21045,20 @@\n 00092\n 00093\n 00094\n ptcomparison.split_merge_scale = _split_merge_scale;\n 00095\n partial_clear(); // make sure some things are initialised properly\n 00096\n-// init the split_merge algorithm with the initial list of particles\n 00097\n+// init the split_merge algorithm with the initial list of particles\n 00098\n // this initialises particle list p_left of remaining particles to deal with\n 00099\n init_particles(_particles);\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-247\n-\n-\f248\n-\n-File Documentation\n-\n 00100\n bool finished = false;\n 00101\n 00102\n 00103\n rerun_allowed = false;\n 00104\n@@ -21042,31 +21067,31 @@\n 00106 #ifdef DEBUG_STABLE_CONES\n 00107\n nb_hash_cones_total = 0;\n 00108\n nb_hash_occupied_total = 0;\n 00109 #endif\n 00110\n-do{\n 00111\n-00112\n+do{\n // initialise stable_cone finder\n+00112\n 00113\n // here we use the list of remaining particles\n 00114\n // AFTER COLLINEAR CLUSTERING !!!!!!\n 00115\n Cstable_cones::init(p_uncol_hard);\n 00116\n-// get stable cones\n 00117\n+// get stable cones\n 00118\n if (get_stable_cones(_radius)){\n-00119\n // we have some new protocones; add them to candidates\n+00119\n 00120\n // Note that add_protocones has to be called first\n 00121\n // if we want the 4-vect components to be available\n 00122\n // on top of eta and phi.\n 00123\n@@ -21075,14 +21100,23 @@\n protocones_list.push_back(protocones);\n 00125 #ifdef DEBUG_STABLE_CONES\n 00126\n nb_hash_cones_total += nb_hash_cones;\n 00127\n nb_hash_occupied_total += nb_hash_occupied;\n 00128 #endif\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+247\n+\n+\f248\n+\n+File Documentation\n+\n 00129\n } else {\n // no new protocone: leave\n 00130\n 00131\n finished=true;\n 00132\n@@ -21092,100 +21126,93 @@\n _n_pass_max--;\n 00135\n } while ((!finished) && (n_left>0) && (_n_pass_max!=0));\n 00136\n 00137\n rerun_allowed = true;\n 00138\n-// split & merge\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 list of particles\n 00148 * - _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-the ordering scale to decide which stable\n+00151 * - _ptmin\n 00152 * - _ordering_scale\n-00153 *\n+the ordering scale to decide which stable\n cone is removed\n+00153 *\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 00160\n-00161\n // run some general safety tests (NB: f will be checked in split-merge)\n+00161\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 0flags());\n 00250\n 00251\n (*_banner_ostr) \u00ab \"#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\" \u00ab endl;\n-SISCone\n-version \" \u00ab setw(28) \u00ab left \u00ab siscone_version()\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 o\" \u00ab endl;\n 00254\n (*_banner_ostr) \u00ab \"#\n 00255\n (*_banner_ostr) \u00ab \"# This is SISCone: the Seedless Infrared Safe Cone Jet Algorithm\n o\" \u00ab endl;\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-o\" \u00ab endl;\n 00258\n (*_banner_ostr) \u00ab \"#\n+o\" \u00ab endl;\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 o\" \u00ab endl;\n 00261\n (*_banner_ostr) \u00ab \"# Please cite it if you use SISCone.\n 00262\n@@ -21330,23 +21364,15 @@\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 //---------------------------------------------\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f250\n-\n-File Documentation\n-\n-00273\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@@ -21354,28 +21380,35 @@\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-(alpha, beta, devel) to mention stability status\n 00288 *\n+(alpha, beta, devel) to mention stability status\n 00289 */\n 00290 string siscone_version(){\n-return SISCONE_VERSION;\n 00291\n+return SISCONE_VERSION;\n 00292 }\n 00293\n 00294 }\n \n 5.36 siscone.cpp\n 00001\n-//\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f250\n+\n+File Documentation\n+\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@@ -21451,19 +21484,14 @@\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-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.36 siscone.cpp\n-\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@@ -21476,46 +21504,53 @@\n 00071 * - _radius\n cone radius\n shared energy threshold for splitting&merging\n 00072 * - _f\n 00073 * - _n_pass_max maximum number of runs\n minimum energy of the protojets\n 00074 * - _Emin\n-the scale choice for the split-merge procedure\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 conservation. So we strongly advise not to change the default\n 00077 *\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+00082\n 00083\n Esplit_merge_scale _split_merge_scale){\n-// make sure things are initialised\n 00084\n+// make sure things are initialised\n 00085\n _initialise_if_needed();\n 00086\n-// run some general safety tests (NB: f will be checked in split-merge)\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+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.36 siscone.cpp\n+\n+251\n+\n 00090\n message \u00ab \"Illegal value for cone radius, R = \" \u00ab _radius\n 00091\n \u00ab \" (legal values are 0= 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@@ -21656,47 +21682,54 @@\n // init the split_merge algorithm with the initial list of particles\n 00174\n // this initialises particle list p_left of remaining particles to deal with\n 00175\n //\n 00176\n // this stores the \"processed\" particles in p_uncol_hard\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f252\n+\n+File Documentation\n+\n 00177\n init_particles(_particles);\n 00178\n jets.clear();\n 00179\n 00180\n bool unclustered_left;\n 00181\n rerun_allowed = false;\n 00182\n protocones_list.clear();\n 00183\n-do{\n 00184\n-00185\n+do{\n //cout \u00ab n_left \u00ab \" particle left\" \u00ab endl;\n+00185\n 00186\n 00187\n // initialise stable_cone finder\n 00188\n // here we use the list of remaining particles\n 00189\n // AFTER COLLINEAR CLUSTERING !!!!!!\n 00190\n CSphstable_cones::init(p_uncol_hard);\n 00191\n-// get stable cones (stored in \u2019protocones\u2019)\n 00192\n+// get stable cones (stored in \u2019protocones\u2019)\n 00193\n unclustered_left = get_stable_cones(_radius);\n 00194\n-00195\n // add the hardest stable cone to the list of jets\n+00195\n 00196\n if (add_hardest_protocone_to_jets(&protocones, R2, _Emin)) break;\n 00197\n 00198\n _n_pass_max--;\n 00199\n } while ((unclustered_left) && (n_left>0) && (_n_pass_max!=0));\n@@ -21705,22 +21738,22 @@\n 00201\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-shared energy threshold for splitting&merging\n 00207 * - _f\n-00208 * - _Emin\n+shared energy threshold for splitting&merging\n minimum Energy of the protojets\n-the scale choice for the split-merge procedure\n+00208 * - _Emin\n 00209 * - _split_merge_scale\n-00210 *\n+the scale choice for the split-merge procedure\n NOTE: using pt leads to IR unsafety for some events with momentum\n+00210 *\n conservation. So we strongly advise not to change the default\n 00211 *\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@@ -21737,35 +21770,28 @@\n // restore particle list\n 00222\n 00223\n partial_clear();\n 00224\n init_pleft();\n 00225\n-// initialise split/merge algorithm\n 00226\n+// initialise split/merge algorithm\n 00227\n unsigned int i;\n-00228\n for (i=0;iflush();\n@@ -21866,313 +21899,38 @@\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 00293 string siscone_version(){\n-return SISCONE_VERSION;\n 00294\n+return SISCONE_VERSION;\n 00295 }\n 00296\n 00297 }\n \n-5.37 siscone.h\n-00001 // -*- C++ -*00003 // File: siscone.h\n-00004 // Description: header file for the main SISCone class\n-00005 // This file is part of the SISCone project.\n-00006 // For more details, see http://projects.hepforge.org/siscone\n-00007 //\n-00008 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-00009 //\n-00010 // This program is free software; you can redistribute it and/or modify\n-00011 // it under the terms of the GNU General Public License as published by\n-00012 // the Free Software Foundation; either version 2 of the License, or\n-00013 // (at your option) any later version.\n-00014 //\n-00015 // This program is distributed in the hope that it will be useful,\n-00016 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-\n-\f254\n-\n-File Documentation\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-int compute_jets(std::vector &_particles, double _radius, double _f,\n-00076\n-int _n_pass_max=0, double _ptmin=0.0,\n-00077\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-int recompute_jets(double _f, double _ptmin = 0.0,\n-00113\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-static void set_banner_stream(std::ostream * ostr) {_banner_ostr = ostr;}\n-00137\n-00138\n-static std::ostream * banner_stream() {return _banner_ostr;}\n-00143\n-00144\n-00145 private:\n-bool rerun_allowed;\n-00146\n-00147\n-static std::ostream * _banner_ostr;\n-00148\n-void _initialise_if_needed();\n-00150\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.38 siscone.h\n-00001 // -*- C++ -*00003 // File: siscone.h\n-00004 // Description: header file for the main SISCone class\n-00005 // This file is part of the SISCone project.\n-00006 // WARNING: this is not the main SISCone trunk but\n-00007 //\n-an adaptation to spherical coordinates\n-00008 // For more details, see http://projects.hepforge.org/siscone\n-00009 //\n-00010 // Copyright (c) 2006-2008 Gavin Salam and Gregory Soyez\n-00011 //\n-00012 // This program is free software; you can redistribute it and/or modify\n-00013 // it under the terms of the GNU General Public License as published by\n-00014 // the Free Software Foundation; either version 2 of the License, or\n-\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.39 siscone_error.cpp\n-\n-255\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-int compute_jets_progressive_removal(std::vector &_particles, double _radius,\n-00094\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-// random number initialisation\n-00116\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-static std::ostream * banner_stream() {return _banner_ostr;}\n-00140\n-00141\n-00142 private:\n-bool rerun_allowed;\n-00143\n-00144\n-static std::ostream * _banner_ostr;\n-00145\n-void _initialise_if_needed();\n-00147\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.39 siscone_error.cpp\n+5.37 siscone_error.cpp\n 00001\n+//\n 00002 // File: siscone_error.cpp\n 00003 // Description: source file for SISCone error messages (Csiscone_error)\n-00004 // This file is part of the SISCone project.\n-00005 // For more details, see http://projects.hepforge.org/siscone\n-00006 //\n-00007 // Copyright (c) 2006 Gavin Salam and Gregory Soyez\n-00008 //\n-00009 // This program is free software; you can redistribute it and/or modify\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-//\n //\n+00004 // This file is part of the SISCone project.\n //\n+00005 // For more details, see http://projects.hepforge.org/siscone\n //\n+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-\n-\f256\n-\n-File Documentation\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@@ -22203,25 +21961,33 @@\n 00028\n 00029 namespace siscone{\n 00030\n 00031 bool Csiscone_error::m_print_errors = true;\n 00032\n 00033 }\n \n-5.40 siscone_error.h\n+5.38 siscone_error.h\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+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n //\n+//\n+//\n+//\n+//\n+\n+\f254\n+\n+File Documentation\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@@ -22290,22 +22056,18 @@\n static bool m_print_errors;\n 00060\n 00061 };\n 00062\n 00063 }\n 00064 #endif\n \n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.41 momentum.h\n-\n-5.41 momentum.h\n-00001 // -*- C++ -*00003 // File: momentum.h\n+5.39 geom_2d.h\n+00001 // -*- C++ -*00003 // File: geom_2d.h\n //\n-00004 // Description: header file for 4-momentum class Cmomentum\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@@ -22336,150 +22098,158 @@\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+00024 // $Revision:: 422\n $//\n-00025 // $Date:: 2007-04-26 22:31:02 +0200 (Thu, 26 Apr 2007)\n+00025 // $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)\n $//\n 00027\n-00028 #ifndef __VECTOR_H__\n-00029 #define __VECTOR_H__\n+00028 #ifndef __GEOM_2D_H__\n+00029 #define __GEOM_2D_H__\n 00030\n-00031 #include \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+00033 #include \"defines.h\"\n+00034\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.39 geom_2d.h\n+\n+00035 #ifndef M_PI\n+00036 #define M_PI 3.141592653589793238462643383279502884197\n+00037 #endif\n 00038\n-00049 class Cmomentum{\n-00050 public:\n-00052\n-Cmomentum();\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+else if (phi >\n+M_PI) phi -= twopi;\n+00045\n+00046\n+return phi;\n+00047 }\n+00048\n+00052 inline double dphi(double phi1, double phi2) {\n+return phi_in_range(phi1-phi2);\n 00053\n+00054 }\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+00060 inline double abs_dphi(double phi1, double phi2) {\n+double delta = fabs(phi1-phi2);\n 00061\n-~Cmomentum();\n 00062\n-inline double perp() const {return sqrt(perp2());}\n+return delta > M_PI ? twopi-delta : delta;\n+00063 }\n 00064\n-00065\n-inline double perp2() const {return px*px+py*py;}\n+00066 inline double pow2(double x) {return x*x;}\n 00067\n 00068\n-inline double mass() const {return sqrt(mass2());}\n-00070\n-00071\n-00073\n-inline double mass2() const {return perpmass2()-perp2();}\n-00074\n-inline double perpmass() const {return sqrt((E-pz)*(E+pz));}\n+00073 class Ctwovect {\n+00074 public:\n 00076\n+Ctwovect() : x(0.0), y(0.0) {}\n 00077\n-inline double perpmass2() const {return (E-pz)*(E+pz);}\n-00079\n-00080\n-inline double Et() const {return E/sqrt(1.0+pz*pz/perp2());}\n+00081\n+Ctwovect(double _x, double _y) : x(_x), y(_y) {}\n 00082\n-00083\n-inline double Et2() const {return E*E/(1.0+pz*pz/perp2());}\n+double x, y;\n+00084\n 00085\n-00086\n+inline double mod2() const {return pow2(x)+pow2(y);}\n+00087\n 00088\n-Cmomentum& operator = (const Cmomentum &v);\n-00089\n-const Cmomentum operator + (const Cmomentum &v);\n+inline double modulus() const {return sqrt(mod2());}\n+00090\n+00091 };\n 00092\n 00093\n-00096\n-Cmomentum& operator += (const Cmomentum &v);\n-00097\n-00100\n-Cmomentum& operator -= (const Cmomentum &v);\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-void build_etaphi();\n-00107\n+00102\n+00107 inline double cross_product(const Ctwovect & a, const Ctwovect & b) {\n 00108\n-double px;\n-00109\n+return a.x*b.y - a.y*b.x;\n+00109 }\n 00110\n-double py;\n-double pz;\n 00111\n-00112\n-double E;\n-00113\n-double eta;\n-00114\n-00115\n-double phi;\n-int parent_index;\n-00116\n-00117\n-int index;\n-00118\n-// the following part is used for checksums //\n-00120\n-00122\n-Creference ref;\n-00123 };\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-257\n-\n-\f258\n-\n-File Documentation\n-\n+00120 class Ceta_phi_range{\n+00121 public:\n+00123\n+Ceta_phi_range();\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+00130\n+Ceta_phi_range(double c_eta, double c_phi, double R);\n 00131\n-00133 bool momentum_pt_less(const Cmomentum &v1, const Cmomentum &v2);\n 00134\n+Ceta_phi_range& operator = (const Ceta_phi_range &r);\n 00135\n-00137 // some handy utilities //\n-00139\n-00144 inline double get_distance(double eta, double phi, Cmomentum *v){\n-double dx, dy;\n-00145\n+int add_particle(const double eta, const double phi);\n+00140\n+00141\n+unsigned int eta_range;\n+00143\n+00144\n+unsigned int phi_range;\n 00146\n 00147\n-dx = eta - v->eta;\n+// extremal value for eta\n 00148\n-dy = fabs(phi - v->phi);\n 00149\n-if (dy>M_PI)\n+static double eta_min;\n+static double eta_max;\n 00150\n-dy -= twopi;\n 00151\n-return dx*dx+dy*dy;\n-00152\n-00153 }\n+00152 private:\n+inline unsigned int get_eta_cell(double eta){\n 00154\n-00155 }\n+00155\n+return (unsigned int) (1u \u00ab ((int) (32*((eta-eta_min)/(eta_max-eta_min)))));\n 00156\n-00157 #endif\n+}\n+00157\n+inline unsigned int get_phi_cell(double phi){\n+00159\n+00160\n+return (unsigned int) (1u \u00ab ((int) (32*phi/twopi+16)%32));\n+00161\n+}\n+00162 };\n+00163\n+00168 bool is_range_overlap(const Ceta_phi_range &r1, const Ceta_phi_range &r2);\n+00169\n+00175 const Ceta_phi_range range_union(const Ceta_phi_range &r1, const Ceta_phi_range &r2);\n+00176\n+00177 }\n+00178\n+00179 #endif\n \n-5.42 momentum.h\n-00001 // -*- C++ -*00003 // File: momentum.h\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+255\n+\n+\f256\n+\n+File Documentation\n+\n+5.40 geom_2d.h\n+00001 // -*- C++ -*00003 // File: geom_2d.h\n //\n-00004 // Description: header file for 4-momentum class Cmomentum\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@@ -22515,279 +22285,757 @@\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+00026 // $Revision:: 422\n $//\n-00027 // $Date:: 2008-07-14 13:52:16 +0200 (Mon, 14 Jul 2008)\n+00027 // $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)\n $//\n 00029\n-00030 #ifndef __SPH_VECTOR_H__\n-00031 #define __SPH_VECTOR_H__\n+00030 #ifndef __SPH_GEOM_2D_H__\n+00031 #define __SPH_GEOM_2D_H__\n 00032\n-00033 #include \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+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-~CSph3vector();\n-00064\n 00066\n-CSph3vector& operator = (const CSph3vector &v);\n+CSphtheta_phi_range& operator = (const CSphtheta_phi_range &r);\n 00067\n-const CSph3vector operator + (const CSph3vector &v);\n-00070\n-00071\n-const CSph3vector operator - (const CSph3vector &v);\n-00074\n+int add_particle(const double theta, const double phi);\n+00072\n+00073\n+unsigned int theta_range;\n 00075\n-const CSph3vector operator / (const double &r);\n+00076\n+unsigned int phi_range;\n 00078\n 00079\n+static double theta_min;\n+00081\n 00082\n-CSph3vector& operator += (const CSph3vector &v);\n+static double theta_max;\n 00083\n+00084 private:\n+00086\n+inline unsigned int get_theta_cell(double theta){\n+if (theta>=theta_max) return 1u\u00ab31;\n+00087\n+00088\n+return (unsigned int) (1u \u00ab ((int) (32*((theta-theta_min)/(theta_max-theta_min)))));\n+00089\n+}\n+00090\n+inline unsigned int get_phi_cell(double phi){\n+00092\n+00093\n+return (unsigned int) (1u \u00ab ((int) (32*phi/twopi+16)%32));\n+00094\n+}\n+00095 };\n+00096\n+00101 bool is_range_overlap(const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2);\n+00102\n+00108 const CSphtheta_phi_range range_union(const CSphtheta_phi_range &r1, const CSphtheta_phi_range &r2);\n+00109\n+00110 }\n+00111\n+00112 #endif\n+\n+5.41 momentum.cpp\n+00001\n+00002 // File: momentum.cpp\n+\n+//\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n-\f5.42 momentum.h\n+\f5.41 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+//\n+00014 // This program is distributed in the hope that it will be useful,\n+//\n+00015 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n+//\n+00016 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+//\n+00017 // GNU General Public License for more details.\n+//\n+00018 //\n+//\n+00019 // You should have received a copy of the GNU General Public License\n+//\n+00020 // along with this program; if not, write to the Free Software\n+//\n+00021 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n+00022 //\n+//\n+00023 // $Revision:: 123\n+$//\n+00024 // $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007)\n+$//\n+00026\n+00027 #include \"momentum.h\"\n+00028 #include \n+00029 #include \n+00030\n+00031 namespace siscone{\n+00032\n+00033 /*************************************************************************\n+00034 * class Cmomentum\n+*\n+00035 * This class contains the information for particle or group of\n+*\n+00036 * particles management.\n+*\n+00037 * It includes all Lorentz properties as well as tools for summing them. *\n+00038 *************************************************************************/\n+00039\n+00040 // default ctor\n+00041 //-------------00042 Cmomentum::Cmomentum(){\n+00043\n+eta = 0.0;\n+00044\n+phi = 0.0;\n+00045\n+px = py = pz = E = 0.0;\n+00046\n+ref = Creference();\n+00047\n+index = -1;\n+00048 }\n+00049\n+00050 // ctor with initialisation\n+00051 //-------------------------00052 Cmomentum::Cmomentum(double _px, double _py, double _pz, double _E){\n+00053\n+px = _px;\n+00054\n+py = _py;\n+00055\n+pz = _pz;\n+00056\n+E = _E;\n+00057\n+// compute eta and phi\n+00058\n+00059\n+build_etaphi();\n+00060\n+ref = Creference();\n+00061 }\n+00062\n+00063 // ctor with detailed initialisation\n+00064 //----------------------------------00065 Cmomentum::Cmomentum(double _eta, double _phi, Creference _ref){\n+00066\n+eta = _eta;\n+00067\n+phi = _phi;\n+00068\n+00069\n+ref = _ref;\n+00070 }\n+00071\n+00072 // default dtor\n+00073 //-------------00074 Cmomentum::~Cmomentum(){\n+00075\n+00076 }\n+00077\n+00078 // assignment of vectors\n+00079 //----------------------00080 Cmomentum& Cmomentum::operator = (const Cmomentum &v){\n+00081\n+px = v.px;\n+00082\n+py = v.py;\n+00083\n+pz = v.pz;\n+00084\n+E = v.E;\n+00085\n 00086\n-CSph3vector& operator -= (const CSph3vector &v);\n+eta = v.eta;\n 00087\n+phi = v.phi;\n+00088\n+00089\n+ref = v.ref;\n 00090\n-CSph3vector& operator *= (const double &r);\n-00091\n-00094\n-CSph3vector& operator /= (const double &r);\n-00095\n-inline double perp() const {return sqrt(perp2());}\n+return *this;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+257\n+\n+\f258\n+\n+File Documentation\n+\n+00091 }\n+00092\n+00093 // addition of vectors\n+00094 // !!! WARNING !!! no updating of eta and phi !!!\n+00095 //-----------------------------------------------00096 const Cmomentum Cmomentum::operator + (const Cmomentum &v){\n 00097\n+Cmomentum tmp = *this;\n 00098\n-inline double perp2() const {return px*px+py*py;}\n+return tmp+=v;\n+00099 }\n 00100\n-00101\n-00103\n-inline double norm() const {return sqrt(px*px+py*py+pz*pz);}\n-00104\n-inline double norm2() const {return px*px+py*py+pz*pz;}\n+00101 // incrementation of vectors\n+00102 // !!! WARNING !!! no updating of eta and phi !!!\n+00103 //-----------------------------------------------00104 Cmomentum& Cmomentum::operator += (const Cmomentum &v){\n+00105\n+px+=v.px;\n 00106\n+py+=v.py;\n 00107\n-inline double phi() const {return atan2(py, px);}\n+pz+=v.pz;\n+00108\n+E +=v.E;\n 00109\n 00110\n-inline double theta() const {return atan2(perp(),pz);}\n+ref+=v.ref;\n+00111\n+return *this;\n 00112\n-00113\n-void build_norm();\n+00113 }\n+00114\n+00115 // incrementation of vectors\n+00116 // !!! WARNING !!! no updating of eta and phi !!!\n+00117 //-----------------------------------------------00118 Cmomentum& Cmomentum::operator -= (const Cmomentum &v){\n+00119\n+px-=v.px;\n 00120\n+py-=v.py;\n 00121\n-void build_thetaphi();\n+pz-=v.pz;\n+00122\n+E -=v.E;\n+00123\n+00124\n+ref-=v.ref;\n+return *this;\n 00125\n-00126\n+00126 }\n+00127\n+00128 // build eta-phi from 4-momentum info\n+00129 // !!!\n+WARNING\n+!!!\n+00130 // !!! computing eta and phi is time-consuming !!!\n+00131 // !!! use this whenever you need eta or phi\n+!!!\n+00132 // !!! automatically called for single-particle !!!\n+00133 //-------------------------------------------------00134 void Cmomentum::build_etaphi(){\n+// note: the factor n (ref.nb) cancels in all expressions !!\n+00135\n+00136\n+eta = 0.5*log((E+pz)/(E-pz));\n+00137\n+phi = atan2(py,px);\n+00138 }\n+00139\n+00140\n+00141 // ordering of two vectors\n+00142 // the default ordering is w.r.t. their references\n+00143 //------------------------------------------------00144 bool operator < (const Cmomentum &v1, const Cmomentum &v2){\n+00145\n+return v1.ref < v2.ref;\n+00146 }\n+00147\n+00148 // ordering of vectors in eta (e.g. used in collinear tests)\n+00149 //----------------------------------------------------------00150 bool momentum_eta_less(const Cmomentum &v1, const Cmomentum &v2){\n+00151\n+return v1.eta < v2.eta;\n+00152 }\n+00153\n+00154 // ordering of vectors in pt\n+00155 //--------------------------00156 bool momentum_pt_less(const Cmomentum &v1, const Cmomentum &v2){\n+00157\n+return v1.perp2() < v2.perp2();\n+00158 }\n+00159\n+00160 }\n+00161\n+\n+5.42 momentum.cpp\n+00001\n+00002 // File: momentum.cpp\n+00003 // Description: source file for 4-momentum class Cmomentum\n+00004 // This file is part of the SISCone project.\n+00005 // WARNING: this is not the main SISCone trunk but\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+\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+//\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.42 momentum.cpp\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:: 255\n+$//\n+00026 // $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008)\n+$//\n+00028\n+00029 #include \"momentum.h\"\n+00030 #include \n+00031 #include \n+00032\n+00033 namespace siscone_spherical{\n+00034\n+00035 /*************************************************************************\n+00036 * class CSph3vector\n+*\n+00037 * This class contains the information for particle or group of\n+*\n+00038 * particles management.\n+*\n+00039 *************************************************************************/\n+00040\n+00041 // default ctor\n+00042 //-------------00043 CSph3vector::CSph3vector(){\n+00044\n+_theta = _phi = _norm = 0.0;\n+00045\n+px = py = pz = 0.0;\n+00046\n+ref = siscone::Creference();\n+00047 }\n+00048\n+00049 // ctor with initialisation\n+00050 //-------------------------00051 CSph3vector::CSph3vector(double _px, double _py, double _pz){\n+00052\n+px = _px;\n+00053\n+py = _py;\n+00054\n+pz = _pz;\n+00055\n+// compute the norm\n+00056\n+00057\n+build_norm();\n+00058\n+00059\n+ref = siscone::Creference();\n+00060 }\n+00061\n+00062 // default dtor\n+00063 //-------------00064 CSph3vector::~CSph3vector(){\n+00065\n+00066 }\n+00067\n+00068\n+00069 // assignment of vectors\n+00070 //----------------------00071 CSph3vector& CSph3vector::operator = (const CSph3vector &v){\n+00072\n+px = v.px;\n+00073\n+py = v.py;\n+00074\n+pz = v.pz;\n+00075\n+00076\n+_norm = v._norm;\n+00077\n+_theta = v._theta;\n+00078\n+_phi\n+= v._phi;\n+00079\n+00080\n+ref = v.ref;\n+00081\n+return *this;\n+00082 }\n+00083\n+00084 // addition of vectors\n+00085 //-----------------------------------------------00086 const CSph3vector CSph3vector::operator + (const CSph3vector &v){\n+00087\n+CSph3vector tmp = *this;\n+00088\n+return tmp+=v;\n+00089 }\n+00090\n+00091 // subtraction of vectors\n+00092 //-----------------------------------------------00093 const CSph3vector CSph3vector::operator - (const CSph3vector &v){\n+00094\n+CSph3vector tmp = *this;\n+return tmp-=v;\n+00095\n+00096 }\n+00097\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+259\n+\n+\f260\n+\n+File Documentation\n+\n+00098 // division by constant\n+00099 //-----------------------------------------------00100 const CSph3vector CSph3vector::operator / (const double &r){\n+00101\n+CSph3vector tmp = *this;\n+00102\n+return tmp/=r;\n+00103 }\n+00104\n+00105 // incrementation\n+00106 //-----------------------------------------------00107 CSph3vector& CSph3vector::operator += (const CSph3vector &v){\n+00108\n+px+=v.px;\n+00109\n+py+=v.py;\n+00110\n+pz+=v.pz;\n+00111\n+00112\n+return *this;\n+00113 }\n+00114\n+00115 // decrementation\n+00116 //-----------------------------------------------00117 CSph3vector& CSph3vector::operator -= (const CSph3vector &v){\n+00118\n+px-=v.px;\n+00119\n+py-=v.py;\n+00120\n+pz-=v.pz;\n+00121\n+return *this;\n+00122\n+00123 }\n+00124\n+00125 // multiplication by a constant\n+00126 //-----------------------------------------------00127 CSph3vector& CSph3vector::operator *= (const double &r){\n+00128\n+px*=r;\n 00129\n-void get_angular_directions(CSph3vector &angular_dir1, CSph3vector &angular_dir2);\n+py*=r;\n 00130\n-double px;\n+pz*=r;\n 00131\n-double py;\n 00132\n-00133\n-double pz;\n+return *this;\n+00133 }\n 00134\n-double _norm;\n-00135\n-00136\n-double _theta;\n-double _phi;\n-00137\n+00135 // division by a constant\n+00136 //-----------------------------------------------00137 CSph3vector& CSph3vector::operator /= (const double &r){\n 00138\n-// the following part is used for checksums //\n+px/=r;\n+00139\n+py/=r;\n 00140\n+pz/=r;\n+00141\n 00142\n-siscone::Creference ref;\n-00143 };\n+_norm/=r;\n+00143\n+return *this;\n 00144\n-00158 class CSphmomentum : public CSph3vector{\n-00159 public:\n-00161\n-CSphmomentum();\n+00145 }\n+00146\n+00147 // build norm from 3-momentum info\n+00148 void CSph3vector::build_norm(){\n+00149\n+_norm = norm();\n+00150 }\n+00151\n+00152 // build norm from 3-momentum info\n+00153 void CSph3vector::build_thetaphi(){\n+00154\n+_theta = theta();\n+00155\n+_phi = phi();\n+00156 }\n+00157\n+00158\n+00159 // for this direction, compute the two reference directions\n+00160 // used to measure angles\n+00161 void CSph3vector::get_angular_directions(CSph3vector &angular_dir1, CSph3vector &angular_dir2){\n 00162\n+if (px < py){\n+if (pz < px){\n+00163\n 00164\n-CSphmomentum(CSph3vector &init, double E=0.0);\n+// z smallest\n 00165\n+angular_dir1 = CSph3vector(-py, px, 0.0);\n+00166\n+} else {\n 00167\n-CSphmomentum(double _px, double _py, double _pz, double _E);\n+// x smallest\n 00168\n-//CSphmomentum(double _eta, double _phi, siscone::Creference _ref);\n+angular_dir1 = CSph3vector(0.0, -pz, py);\n+00169\n+}\n 00170\n+} else {\n 00171\n+if (pz < py){\n+00172\n+// z smallest\n 00173\n-~CSphmomentum();\n+angular_dir1 = CSph3vector(-py, px, 0.0);\n 00174\n+} else {\n+// y smallest\n+00175\n 00176\n-inline double mass() const {return sqrt(mass2());}\n+angular_dir1 = CSph3vector(-pz, 0.0, px);\n 00177\n-inline double mass2() const {return perpmass2()-perp2();}\n+}\n+00178\n+}\n 00179\n+angular_dir2 = cross_product3(*this, angular_dir1);\n 00180\n-inline double perpmass() const {return sqrt((E-pz)*(E+pz));}\n+// We\u2019ll simply take x & y so the reflection symmetry is not broken\n+00181\n+//angular_dir1 = CSph3vector(0.0, -pz, py);\n 00182\n-00183\n-inline double perpmass2() const {return (E-pz)*(E+pz);}\n-00185\n-00186\n-inline double Et() const {return E/sqrt(1.0+pz*pz/perp2());}\n-00188\n-00189\n-inline double Et2() const {return E*E/(1.0+pz*pz/perp2());}\n+//angular_dir2 = CSph3vector(-pz, 0.0, -px);\n+00183 }\n+00184\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.42 momentum.cpp\n+\n+00185 /*************************************************************************\n+00186 * class CSphmomentum\n+*\n+00187 * This class contains the information for particle or group of\n+*\n+00188 * particles management.\n+*\n+00189 * It includes all Lorentz properties as well as tools for summing them. *\n+00190 *************************************************************************/\n 00191\n-00192\n-00194\n-CSphmomentum& operator = (const CSphmomentum &v);\n+00192 // default ctor\n+00193 //-------------00194 CSphmomentum::CSphmomentum(){\n 00195\n-const CSphmomentum operator + (const CSphmomentum &v);\n+E=0.0;\n+00196\n+index = -1;\n+00197 }\n 00198\n-00199\n+00199 // ctor with initialisation\n+00200 //-------------------------00201 CSphmomentum::CSphmomentum(double _px, double _py, double _pz, double _E)\n 00202\n-CSphmomentum& operator += (const CSphmomentum &v);\n+: CSph3vector(_px, _py, _pz) {\n 00203\n+E = _E;\n+00204\n+// compute the angles\n+00205\n 00206\n-CSphmomentum& operator -= (const CSphmomentum &v);\n-00207\n-double E;\n+build_thetaphi();\n+00207 }\n 00208\n-00209\n-int parent_index;\n-00210\n-00211\n-int index;\n-00212 };\n+00209 // ctor with initialisation\n+00210 //-------------------------00211 CSphmomentum::CSphmomentum(CSph3vector &_v, double _E)\n+00212\n+: CSph3vector(_v.px, _v.py, _v.pz) {\n 00213\n-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+E = _E;\n+00214 }\n+00215\n+00216 // default dtor\n+00217 //-------------00218 CSphmomentum::~CSphmomentum(){\n+00219\n+00220 }\n+00221\n+00222 // assignment of vectors\n+00223 //----------------------00224 CSphmomentum& CSphmomentum::operator = (const CSphmomentum &v){\n+00225\n+px = v.px;\n+00226\n+py = v.py;\n+00227\n+pz = v.pz;\n 00228\n-00230 inline double sqr(double x){return x*x;}\n+E = v.E;\n+00229\n+00230\n+_norm = v._norm;\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 10 2023 17:32:40 for SISCone by Doxygen\n-\n-259\n-\n-\f260\n-\n-File Documentation\n-\n+_theta = v._theta;\n+00232\n+_phi\n+= v._phi;\n+00233\n+00234\n+ref = v.ref;\n+return *this;\n+00235\n+00236 }\n 00237\n-00238\n-00239\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+00238 // addition of vectors\n+00239 // !!! WARNING !!! no updating of eta and phi !!!\n+00240 //-----------------------------------------------00241 const CSphmomentum CSphmomentum::operator + (const CSphmomentum &v){\n 00242\n-//}\n+CSphmomentum tmp = *this;\n 00243\n-return v1.px*v2.px + v1.py*v2.py + v1.pz*v2.pz;\n+return tmp+=v;\n 00244 }\n 00245\n-00249 inline CSph3vector cross_product3(const CSph3vector &v1, const CSph3vector &v2){\n-//CSph3vector tmp;\n+00246 // incrementation of vectors\n+00247 // !!! WARNING !!! no updating of eta and phi !!!\n+00248 //-----------------------------------------------00249 CSphmomentum& CSphmomentum::operator += (const CSphmomentum &v){\n 00250\n+px+=v.px;\n 00251\n-//tmp.px = v1.py*v2.pz-v1.pz*v2.py;\n+py+=v.py;\n 00252\n-//tmp.py = v1.pz*v2.px-v1.px*v2.pz;\n+pz+=v.pz;\n 00253\n-//tmp.pz = v1.px*v2.py-v1.py*v2.px;\n+E +=v.E;\n 00254\n-//return tmp;\n 00255\n-return CSph3vector(v1.py*v2.pz-v1.pz*v2.py,\n+ref+=v.ref;\n 00256\n-v1.pz*v2.px-v1.px*v2.pz,\n 00257\n-v1.px*v2.py-v1.py*v2.px);\n+return *this;\n 00258 }\n 00259\n-00263 inline double norm2_cross_product3(const CSph3vector &v1, const CSph3vector &v2){\n+00260 // decrementation of vectors\n+00261 // !!! WARNING !!! no updating of eta and phi !!!\n+00262 //-----------------------------------------------00263 CSphmomentum& CSphmomentum::operator -= (const CSphmomentum &v){\n 00264\n-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+px-=v.px;\n+00265\n+py-=v.py;\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+pz-=v.pz;\n+00267\n+E -=v.E;\n+00268\n+00269\n+ref-=v.ref;\n+00270\n+return *this;\n+00271 }\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+261\n+\n+\f262\n+\n+File Documentation\n+\n+00272\n 00273\n-00277 inline double get_distance(const CSph3vector *v1, const CSph3vector *v2){\n-return atan2(sqrt(norm2_cross_product3(*v1,*v2)), dot_product3(*v1,*v2));\n+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+return v1.ref < v2.ref;\n 00278\n 00279 }\n 00280\n-00289 inline bool is_closer(const CSph3vector *v1, const CSph3vector *v2, const double tan2R){\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+00286\n+00287 // ordering of vectors in pt\n+00288 //--------------------------00289 bool momentum_pt_less(const CSphmomentum &v1, const CSphmomentum &v2){\n+return v1.perp2() < v2.perp2();\n 00290\n-double dot = dot_product3(*v1,*v2);\n-return (dot>=0) && (norm2_cross_product3(*v1,*v2)<=tan2R*dot*dot);\n-00291\n-00292 }\n-00293\n-00299 inline bool is_closer_safer(const CSph3vector *v1, const CSph3vector *v2, const double cosR){\n-return dot_product3(*v1,*v2)>=cosR*sqrt(v1->norm2()*v2->norm2());\n-00300\n-00301\n-//double dot = dot_product3(*v1,*v2);\n-00302\n-//return (dot>=0) && (norm2_cross_product3(*v1,*v2)\n-00034 #include \n-00035 #include \n-00036 #include \"hash.h\"\n-00037\n-00038 #include \"defines.h\"\n-00039\n-00040 namespace siscone{\n-00041\n-00053 class Cborder_store{\n-00054 public:\n-00056\n-Cborder_store(Cmomentum * momentum, double centre_eta, double centre_phi) :\n-00057\n-mom(momentum), is_in(false) {\n-00058\n-angle = atan2(mom->phi - centre_phi, mom->eta - centre_eta);\n-00059\n-}\n-00060\n-00061\n-Cmomentum * mom;\n-double angle;\n-00062\n-bool\n-is_in;\n-00063\n-00064 };\n-00065\n-00066\n-00069 inline bool operator<(const Cborder_store & a, const Cborder_store & b) {\n-return a.angle < b.angle;\n-00070\n-00071 }\n-00072\n-00073\n-00082 class Cstable_cones : public Cvicinity{\n-00083 public:\n-00085\n-Cstable_cones();\n-00086\n-00088\n-Cstable_cones(std::vector &_particle_list);\n-00089\n-00091\n-~Cstable_cones();\n-00092\n-void init(std::vector &_particle_list);\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+int _n_pass_max=0, double _ptmin=0.0,\n+00077\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 get_stable_cones(double _radius);\n-00106\n-00107\n-00109\n-std::vector protocones;\n-00110\n-00112\n-hash_cones *hc;\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-int nb_tot;\n-00116 #ifdef DEBUG_STABLE_CONES\n 00117\n-int nb_hash_cones, nb_hash_occupied;\n-00118 #endif\n+std::vector > protocones_list;\n+00118\n+// random number initialisation\n 00119\n-00120 protected:\n-double R;\n-00122\n+00120\n+static bool init_done;\n+00121\n+00122 #ifdef DEBUG_STABLE_CONES\n 00123\n-double R2;\n+int nb_hash_cones_total, nb_hash_occupied_total;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.44 siscone.h\n+\n+00124 #endif\n 00125\n-00126\n-00127 private:\n-00130\n-Cmomentum cone;\n-00131\n-00133\n-Cmomentum *child;\n-00134\n-00136\n-Cvicinity_elm *centre;\n 00137\n-unsigned int centre_idx;\n-00139\n-00140\n-unsigned int first_cone;\n-00142\n+static void set_banner_stream(std::ostream * ostr) {_banner_ostr = ostr;}\n+00138\n+static std::ostream * banner_stream() {return _banner_ostr;}\n 00143\n-int init_cone();\n-00149\n+00144\n+00145 private:\n+00146\n+bool rerun_allowed;\n+static std::ostream * _banner_ostr;\n+00147\n+00148\n 00150\n-int test_cone();\n-00157\n-00158\n-int update_cone();\n-00164\n-00165\n-/*\n-00166\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-* run through the vicinity of the current parent and for each child\n-00168\n-* indicate which members are cocircular...\n-00169\n-*/\n-00170\n-void prepare_cocircular_lists();\n-00171\n-bool cocircular_check();\n-00179\n-00180\n-void test_cone_cocircular(Cmomentum & borderless_cone,\n-00185\n-00186\n-std::list & border_list);\n-00187\n-00194\n-void test_stability(Cmomentum & candidate,\n-const std::vector & border_vect);\n-00195\n-00196\n-00203\n-void compute_cone_contents();\n-00204\n-00210\n-void recompute_cone_contents();\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-261\n-\n-\f262\n-\n-File Documentation\n-\n-00211\n-/*\n-00212\n-00213\n-* if we have gone beyond the acceptable threshold of change, compute\n-00214\n-* the cone momentum from particle list. in this version, we use the\n-00215\n-* \u2019pincluded\u2019 information from the Cvicinity class, but we don\u2019t\n-00216\n-* change the member cone, only the locally supplied one\n-00217\n-*/\n-00218\n-void recompute_cone_contents_if_needed(Cmomentum & this_cone, double & this_dpt);\n-00219\n-int proceed_with_stability();\n-00225\n-00226\n-/*\n-00227\n-00228\n-* circle intersection.\n-00229\n-* computes the intersection with a circle of given centre and radius.\n-00230\n-* The output takes the form of a checkxor of the intersection\u2019s particles\n-circle centre x coordinate\n-00231\n-* - cx\n-00232\n-circle centre y coordinate\n-* - cy\n-00233\n-* return the checkxor for the intersection\n-00234\n-******************************************************************/\n-00235\n-Creference circle_intersect(double cx, double cy);\n-00236\n-00238\n-Cmomentum cone_candidate;\n-00239\n-00241\n-std::vector child_list;\n-00242\n-00245\n-std::vector< std::pair > multiple_centre_done;\n-00246\n-// information for updating cone contents to avoid rounding errors\n-00247\n-00248\n-double dpt;\n-00249\n-inline bool is_inside(Cmomentum *centre, Cmomentum *v);\n-00258\n-00259 };\n-00260\n-00261 /*\n-00262 * compute the absolute value of the difference between 2 angles.\n-00263 * We take care of the 2pi periodicity\n-first angle\n-00264 * \\param angle1\n-00265 * \\param angle2\n-second angle\n-00266 * \\return the absolute value of the difference between the angles\n-00267 *****************************************************************/\n-00268 inline double abs_dangle(double &angle1, double &angle2);\n-00269\n-00270 }\n-00271 #endif\n+00173 std::string siscone_version();\n+00174\n+00175 }\n+00176 #endif\n \n-5.44 protocones.h\n-00001 // -*- C++ -*00003 // File: protocones.h\n+5.44 siscone.h\n+00001 // -*- C++ -*00003 // File: siscone.h\n //\n-00004 // Description: header file for stable cones determination (Cstable_cones)\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@@ -23087,236 +23199,103 @@\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+00026 // $Revision:: 401\n $//\n-00027 // $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008)\n+00027 // $Date:: 2016-05-19 16:44:37 +0200 (Thu, 19 May 2016)\n $//\n 00029\n-00030 #ifndef __SPH_PROTOCONES_H__\n-00031 #define __SPH_PROTOCONES_H__\n+00030 #ifndef __SPH_SISCONE_H__\n+00031 #define __SPH_SISCONE_H__\n 00032\n-00033 #include \"momentum.h\"\n-00034 #include \"vicinity.h\"\n-00035 #include \n-00036 #include \n-00037 #include \n-00038 #include \"hash.h\"\n-\n-//\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.44 protocones.h\n-\n-263\n-\n-00039\n-00040 #include \n-00041\n-00042 namespace siscone_spherical{\n-00043\n-00055 class CSphborder_store{\n-00056 public:\n-00058\n-CSphborder_store(CSphmomentum * momentum, CSph3vector ¢re, CSph3vector &angl_dir1, CSph3vector\n-&angl_dir2) :\n-00059\n-mom(momentum), is_in(false) {\n-00060\n-CSph3vector diff = (*momentum) - centre;\n-00061\n-angle = atan2(dot_product3(diff, angl_dir2), dot_product3(diff, angl_dir1));\n-00062 #ifdef DEBUG_STABLE_CONES\n-00063\n-std::cout \u00ab \" adding point \" \u00ab momentum->_theta \u00ab \", \" \u00ab momentum->_phi\n-00064\n-\u00ab \" at an angle of \" \u00ab angle \u00ab std::endl;\n-00065 #endif\n-00066\n-}\n-00067\n-00068\n-CSphmomentum * mom;\n-00069\n-double angle;\n-bool\n-is_in;\n-00070\n-00071 };\n-00072\n-00073\n-00076 inline bool operator<(const CSphborder_store & a, const CSphborder_store & b) {\n-return a.angle < b.angle;\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-00078 }\n+int _n_pass_max=0, double _Emin=0.0,\n+00078\n+Esplit_merge_scale _split_merge_scale=SM_Etilde);\n 00079\n-00080\n-00089 class CSphstable_cones : public CSphvicinity{\n-00090 public:\n-00092\n-CSphstable_cones();\n-00093\n+00094\n+int compute_jets_progressive_removal(std::vector &_particles, double _radius,\n+int _n_pass_max=0, double _Emin=0.0,\n 00095\n-CSphstable_cones(std::vector &_particle_list);\n 00096\n-00098\n-~CSphstable_cones();\n-00099\n-00104\n-void init(std::vector &_particle_list);\n-00105\n-int get_stable_cones(double _radius);\n-00113\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+// random number initialisation\n 00116\n-std::vector protocones;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+263\n+\n+\f264\n+\n+File Documentation\n+\n 00117\n-00119\n-sph_hash_cones *hc;\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-int nb_tot;\n-00123 #ifdef DEBUG_STABLE_CONES\n-00124\n-int nb_hash_cones, nb_hash_occupied;\n-00125 #endif\n-00126\n-00127 protected:\n-double R;\n-00129\n-00130\n-double R2;\n-00132\n-00133\n+static void set_banner_stream(std::ostream * ostr) {_banner_ostr = ostr;}\n+00134\n 00135\n-double tan2R;\n-00136\n-00137 private:\n+static std::ostream * banner_stream() {return _banner_ostr;}\n 00140\n-CSphmomentum cone;\n 00141\n+00142 private:\n+bool rerun_allowed;\n 00143\n-CSphmomentum *child;\n 00144\n-00146\n-CSphvicinity_elm *centre;\n+static std::ostream * _banner_ostr;\n+00145\n+void _initialise_if_needed();\n 00147\n-unsigned int centre_idx;\n-00149\n+00148\n+00149 };\n 00150\n-unsigned int first_cone;\n-00152\n-00153\n-int init_cone();\n-00159\n-00160\n-int test_cone();\n-00167\n-00168\n-int update_cone();\n-00174\n-00175\n-00176\n-/*\n-00177\n-* run through the vicinity of the current parent and for each child\n-00178\n-* indicate which members are cocircular...\n-00179\n-*/\n-00180\n-void prepare_cocircular_lists();\n-00181\n-bool cocircular_check();\n-00189\n-00190\n-void test_cone_cocircular(CSphmomentum & borderless_cone,\n-00195\n-00196\n-std::list & border_list);\n-00197\n-00204\n-void test_stability(CSphmomentum & candidate,\n-00205\n-const std::vector & border_vect);\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f264\n-\n-File Documentation\n-\n-00206\n-void compute_cone_contents();\n-00213\n-00214\n-00220\n-void recompute_cone_contents();\n-00221\n-/*\n-00222\n-00223\n-* if we have gone beyond the acceptable threshold of change, compute\n-00224\n-* the cone momentum from particle list. in this version, we use the\n-00225\n-* \u2019pincluded\u2019 information from the CSphvicinity class, but we don\u2019t\n-00226\n-* change the member cone, only the locally supplied one\n-00227\n-*/\n-00228\n-void recompute_cone_contents_if_needed(CSphmomentum & this_cone, double & this_dpt);\n-00229\n-int proceed_with_stability();\n-00235\n-00236\n-00237\n-/*\n-00238\n-* circle intersection.\n-00239\n-* computes the intersection with a circle of given centre and radius.\n-00240\n-* The output takes the form of a checkxor of the intersection\u2019s particles\n-circle centre x coordinate\n-00241\n-* - cx\n-00242\n-circle centre y coordinate\n-* - cy\n-00243\n-* return the checkxor for the intersection\n-00244\n-******************************************************************/\n-00245\n-siscone::Creference circle_intersect(CSph3vector &cone_centre);\n-00246\n-00248\n-CSphmomentum cone_candidate;\n-00249\n-00251\n-std::vector child_list;\n-00252\n-00255\n-std::vector< std::pair > multiple_centre_done;\n-00256\n-// information for updating cone contents to avoid rounding errors\n-00257\n-00258\n-double dpt;\n-00259 };\n-00260\n-00261 }\n-00262 #endif\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 split_merge.cpp\n 00001\n //\n 00002 // File: split_merge.cpp\n 00003 // Description: source file for splitting/merging (contains the CJet class) //\n 00004 // This file is part of the SISCone project.\n@@ -23380,31 +23359,32 @@\n 00039 namespace siscone_spherical{\n 00040\n 00041 using namespace std;\n 00042\n 00043 /********************************************************\n 00044 * class CSphjet implementation\n *\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.45 split_merge.cpp\n-\n 00045 * real Jet information.\n *\n 00046 * This class contains information for one single jet. *\n 00047 * That is, first, its momentum carrying information\n *\n 00048 * about its centre and pT, and second, its particle\n *\n 00049 * contents\n *\n 00050 ********************************************************/\n 00051 // default ctor\n-00052 //-------------00053 CSphjet::CSphjet(){\n+00052 //--------------\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.45 split_merge.cpp\n+\n+00053 CSphjet::CSphjet(){\n 00054\n n = 0;\n 00055\n v = CSphmomentum();\n 00056\n E_tilde = 0.0;\n 00057\n@@ -23418,16 +23398,16 @@\n 00062 // default dtor\n 00063 //-------------00064 CSphjet::~CSphjet(){\n 00065\n 00066 }\n 00067\n 00068 // ordering of jets in E (e.g. used in final jets ordering)\n 00069 //---------------------------------------------------------00070 bool jets_E_less(const CSphjet &j1, const CSphjet &j2){\n-00071\n return j1.v.E > j2.v.E;\n+00071\n 00072 }\n 00073\n 00074\n 00075 /********************************************************\n 00076 * CSphsplit_merge_ptcomparison implementation\n *\n 00077 * This deals with the ordering of the jets candidates *\n@@ -23445,28 +23425,28 @@\n 00089 //\n 00090 // NB: there is a potential issue in momentum-conserving events,\n 00091 // whereby the harder of two jets becomes ill-defined when a soft\n 00092 // particle is emitted --- this may have a knock-on effect on\n 00093 // subsequent split-merge steps in cases with sufficiently large R\n 00094 // (but we don\u2019t know what the limit is...)\n 00095 //-----------------------------------------------------------------00096 bool CSphsplit_merge_ptcomparison::operator ()(const CSphjet &jet1, const CSphjet &jet2) const{\n-00097\n double q1, q2;\n+00097\n 00098\n // compute the value for comparison for both jets\n 00099\n 00100\n // This depends on the choice of variable (mt is the default)\n 00101\n q1 = jet1.sm_var2;\n 00102\n q2 = jet2.sm_var2;\n 00103\n-00104\n bool res = q1 > q2;\n+00104\n 00105\n // if we enable the refined version of the comparison (see defines.h),\n 00106\n 00107\n // we compute the difference more precisely when the two jets are very\n 00108\n // close in the ordering variable.\n@@ -23479,89 +23459,89 @@\n 00113\n cout \u00ab \"Using high-precision ordering tests\" \u00ab endl;\n 00114 #endif\n 00115\n // get the momentum of the difference\n 00116\n CSphmomentum difference;\n-double E_tilde_difference;\n 00117\n+double E_tilde_difference;\n 00118\n get_difference(jet1,jet2,&difference,&E_tilde_difference);\n 00119\n 00120\n // use the following relation: pt1^2 - pt2^2 = (pt1+pt2)*(pt1-pt2)\n 00121\n double qdiff;\n 00122\n CSphmomentum sum = jet1.v ;\n 00123\n sum += jet2.v;\n-double E_tilde_sum = jet1.E_tilde + jet2.E_tilde;\n 00124\n+double E_tilde_sum = jet1.E_tilde + jet2.E_tilde;\n 00125\n-00126\n // depending on the choice of ordering variable, set the result\n+00126\n 00127\n switch (split_merge_scale){\n-00128\n case SM_Etilde:\n+00128\n 00129\n qdiff = E_tilde_sum*E_tilde_difference;\n break;\n 00130\n 00131\n case SM_E:\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-265\n-\n-\f266\n-\n-File Documentation\n-\n 00132\n qdiff = sum.E*difference.E;\n break;\n 00133\n 00134\n default:\n-00135\n throw siscone::Csiscone_error(\"Unsupported split-merge scale choice: \"\n+00135\n 00136\n + SM_scale_name());\n 00137\n }\n 00138\n res = qdiff > 0;\n 00139\n }\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+265\n+\n+\f266\n+\n+File Documentation\n+\n 00140 #endif // EPSILON_SPLITMERGE\n 00141\n 00142\n return res;\n 00143 }\n 00144\n 00145\n 00148 std::string split_merge_scale_name(Esplit_merge_scale sms) {\n 00149\n switch(sms) {\n case SM_E:\n 00150\n 00151\n return \"E (IR unsafe for pairs of identical decayed heavy particles)\";\n-case SM_Etilde:\n 00152\n-00153\n+case SM_Etilde:\n return \"Etilde (sum of E.[1+sin^2(theta_{i,jet})])\";\n-default:\n+00153\n 00154\n-00155\n+default:\n return \"[SM scale without a name]\";\n+00155\n 00156\n }\n 00157 }\n 00158\n 00159\n 00160 // get the difference between 2 jets\n 00161 // - j1\n@@ -23575,16 +23555,16 @@\n 00165 // return true if overlapping, false if disjoint\n 00166 //----------------------------------------------00167 void CSphsplit_merge_ptcomparison::get_difference(const CSphjet &j1, const CSphjet &j2,\n 00168\n CSphmomentum *v, double *E_tilde) const {\n int i1,i2;\n 00169\n 00170\n-// initialise\n 00171\n+// initialise\n 00172\n i1=i2=0;\n 00173\n *v = CSphmomentum();\n 00174\n *E_tilde = 0.0;\n 00175\n@@ -23597,26 +23577,26 @@\n 00179\n CSph3vector jet2_axis = j2.v;\n //jet2_axis /= j2.v._norm;\n 00180\n 00181\n jet2_axis /= j2.v.E;\n 00182\n-// compute overlap\n 00183\n+// compute overlap\n 00184\n // at the same time, we store union in indices\n 00185\n // note tat for Etilde, we\u2019ll add the direct energy contributino at the end\n 00186\n do{\n-if (j1.contents[i1]==j2.contents[i2]) {\n 00187\n-00188\n+if (j1.contents[i1]==j2.contents[i2]) {\n const CSphmomentum & p = (*particles)[j1.contents[i1]];\n+00188\n 00189\n (*E_tilde) +=\n p.E*((norm2_cross_product3(p,jet1_axis)-norm2_cross_product3(p,jet2_axis))/(*particles_norm2)[j1.contents[i1]]);\n 00190\n i1++;\n 00191\n i2++;\n@@ -23628,73 +23608,73 @@\n (*v) += p;\n 00195\n (*E_tilde) += p.E*norm2_cross_product3(p,jet1_axis)/(*particles_norm2)[j1.contents[i1]];\n 00196\n i1++;\n 00197\n } else if (j1.contents[i1]>j2.contents[i2]){\n-const CSphmomentum &p = (*particles)[j2.contents[i2]];\n 00198\n+const CSphmomentum &p = (*particles)[j2.contents[i2]];\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 } else {\n-throw siscone::Csiscone_error(\"get_non_overlap reached part it should never have seen...\");\n 00203\n+throw siscone::Csiscone_error(\"get_non_overlap reached part it should never have seen...\");\n 00204\n }\n 00205\n } while ((i1E;\n 00223 }\n 00224\n 00225\n 00226 /********************************************************\n 00227 * class CSphsplit_merge implementation\n *\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.45 split_merge.cpp\n+\n 00228 * Class used to split and merge jets.\n *\n 00229 ********************************************************/\n 00230 // default ctor\n 00231 //-------------00232 CSphsplit_merge::CSphsplit_merge(){\n 00233\n merge_identical_protocones = false;\n@@ -23719,16 +23699,16 @@\n candidates.reset(new multiset(ptcomparison));\n 00246\n // no hardest cut (col-unsafe)\n 00247\n 00248\n SM_var2_hardest_cut_off = -numeric_limits::max();\n 00249\n-// no energy cutoff for the particles to put in p_uncol_hard\n 00250\n+// no energy cutoff for the particles to put in p_uncol_hard\n 00251\n stable_cone_soft_E2_cutoff = -1.0;\n 00252\n // no pt-weighted splitting\n 00253\n 00254\n use_E_weighted_splitting = false;\n@@ -23747,16 +23727,16 @@\n 00267 // - protocones list of protocones (initial jet candidates)\n 00268 // - R2\n cone radius (squared)\n 00269 // - Emin\n minimal energy allowed for jets\n 00270 //------------------------------------------------------------00271 int CSphsplit_merge::init(vector & /*_particles*/, vector *protocones,\n double R2, double Emin){\n-// browse protocones\n 00272\n+// browse protocones\n 00273\n return add_protocones(protocones, R2, Emin);\n 00274 }\n 00275\n 00276\n 00277 // initialisation function for particle list\n 00278 // - _particles list of particles\n@@ -23771,62 +23751,62 @@\n 00285\n // with infinite rapidity (colinear with the beam)\n 00286\n particles = _particles;\n 00287\n n = particles.size();\n 00288\n-// store the particle norm^2\n 00289\n+// store the particle norm^2\n 00290\n particles_norm2.resize(n);\n-for (int i=0;i(ptcomparison));\n 00368\n-// start off with huge number\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@@ -23952,186 +23932,186 @@\n // clear previously allocated memory\n 00390\n if (indices != NULL){\n delete[] indices;\n 00391\n 00392\n }\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.45 split_merge.cpp\n-\n-269\n-\n 00393\n particles.clear();\n 00394\n-return 0;\n 00395\n+return 0;\n 00396 }\n 00397\n 00398\n 00399 // build the list \u2019p_uncol_hard\u2019 from p_remain by clustering collinear particles\n 00400 // note that thins in only used for stable-cone detection\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.45 split_merge.cpp\n+\n+269\n+\n 00401 // so the parent_index field is unnecessary\n 00402 //------------------------------------------------------------------------00403 int CSphsplit_merge::merge_collinear_and_remove_soft(){\n-int i,j;\n 00404\n+int i,j;\n 00405\n vector p_sorted;\n bool collinear;\n 00406\n-00407\n double dphi;\n+00407\n 00408\n 00409\n p_uncol_hard.clear();\n 00410\n-// we first sort the particles according to their theta angle\n 00411\n+// we first sort the particles according to their theta angle\n 00412\n for (i=0;iM_PI) dphi = twopi-dphi;\n-if (dphi *protocones, double R2, double Emin){\n-00463\n int i;\n+00463\n 00464\n CSphmomentum *c;\n 00465\n CSphmomentum *v;\n 00466\n double tan2R;\n 00467\n CSphjet jet;\n 00468\n-if (protocones->size()==0)\n 00469\n-00470\n+if (protocones->size()==0)\n return 1;\n+00470\n 00471\n 00472\n E_min = Emin;\n 00473\n double R = sqrt(R2);\n 00474\n tan2R = tan(R);\n 00475\n tan2R *= tan2R;\n 00476\n 00477 #ifdef DEBUG_SPLIT_MERGE\n 00478\n cout \u00ab \"particle list: \";\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f270\n-\n-File Documentation\n-\n-00479\n for (int i2=0;i2::iterator p_it = protocones->begin();p_it != protocones->end();p_it++){\n 00489\n // initialise variables\n 00490\n@@ -24160,16 +24140,16 @@\n 00502\n }\n 00503\n }\n 00504\n jet.n=jet.contents.size();\n 00505\n-00506\n // compute Etilde for that jet.\n+00506\n 00507\n // we can\u2019t do that before as it requires knowledge of the jet axis\n 00508\n // which has just been computed.\n 00509\n compute_Etilde(jet);\n 00510\n@@ -24178,33 +24158,33 @@\n 00512\n // (it was only known through its spatial coordinates up to now)\n 00513\n *c = jet.v;\n 00514\n c->build_thetaphi();\n 00515\n-// set the jet range\n 00516\n+// set the jet range\n 00517\n jet.range=CSphtheta_phi_range(c->_theta,c->_phi,R);\n 00518\n 00519 #ifdef DEBUG_SPLIT_MERGE\n 00520\n cout \u00ab \"adding protojet: \";\n 00521\n unsigned int phirange=jet.range.phi_range;\n 00522\n-for (unsigned int i2=0;i2<32;i2++) fprintf(stdout, \"%d\", (phirange&(1\u00abi2)) \u00bb i2 );\n 00523\n+for (unsigned int i2=0;i2<32;i2++) fprintf(stdout, \"%d\", (phirange&(1\u00abi2)) \u00bb i2 );\n 00524\n fprintf(stdout, \"\\t\");\n-unsigned int thetarange=jet.range.theta_range;\n 00525\n-00526\n+unsigned int thetarange=jet.range.theta_range;\n for (unsigned int i2=0;i2<32;i2++) fprintf(stdout, \"%d\", (thetarange&(1\u00abi2)) \u00bb i2);\n+00526\n 00527\n fprintf(stdout, \"\\t\");\n 00528\n for (int i2=0;i2size()==0)\n 00589\n-return 1;\n 00590\n+return 1;\n 00591\n 00592\n E_min = Emin;\n 00593\n R = sqrt(R2);\n 00594\n tan2R = tan(R);\n@@ -24336,16 +24316,16 @@\n 00603\n 00604\n // note that jet is always initialised with default values at this level\n 00605\n jet_candidate.v = CSphmomentum();\n 00606\n jet_candidate.contents.clear();\n-for (i=0;iparent_index);\n 00611\n@@ -24389,16 +24369,16 @@\n 00632\n continue;\n 00633\n // assign the split-merge (or progressive-removal) squared scale variable\n 00634\n 00635\n if (_user_scale) {\n-00636\n // sm_var2 is the signed square of the user scale returned\n+00636\n 00637\n // for the jet candidate\n 00638\n jet_candidate.sm_var2 = (*_user_scale)(jet_candidate);\n 00639\n jet_candidate.sm_var2 *= abs(jet_candidate.sm_var2);\n 00640\n@@ -24420,53 +24400,53 @@\n jet = jet_candidate;\n 00649\n found_jet = true;\n 00650\n }\n 00651\n }\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f272\n-\n-File Documentation\n-\n 00652\n // make sure at least one of the jets has passed the selection\n 00653\n 00654\n if (!found_jet) return 1;\n 00655\n // add the jet to the list of jets\n 00656\n 00657\n jets.push_back(jet);\n 00658\n jets[jets.size()-1].v.build_thetaphi();\n 00659\n jets[jets.size()-1].v.build_norm();\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f272\n+\n+File Documentation\n+\n 00660\n 00661 #ifdef DEBUG_SPLIT_MERGE\n 00662\n cout \u00ab \"PR-Jet \" \u00ab jets.size() \u00ab \" [size \" \u00ab jet.contents.size() \u00ab \"]:\";\n 00663 #endif\n 00664\n-// update the list of what particles are left\n 00665\n+// update the list of what particles are left\n 00666\n int p_remain_index = 0;\n 00667\n int contents_index = 0;\n //sort(next_jet.contents.begin(),next_jet.contents.end());\n 00668\n 00669\n for (int index=0;indexsize()==0)\n-00723\n return 0;\n+00723\n 00724\n if (overlap_tshold>=1.0 || overlap_tshold <= 0) {\n 00725\n 00726\n ostringstream message;\n 00727\n message \u00ab \"Illegal value for overlap_tshold, f = \" \u00ab overlap_tshold;\n 00728\n message \u00ab \" (legal values are 0size()>0){\n-00742\n // browse for the first jet\n+00742\n 00743\n j1 = candidates->begin();\n 00744\n // if hardest jet does not pass threshold then nothing else will\n 00745\n 00746\n // either so one stops the split merge.\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.45 split_merge.cpp\n+\n 00747\n //if (j1->sm_var2sm_var2v.E \u00ab endl\u00abendl;\n@@ -24640,16 +24620,16 @@\n cout \u00ab \" --> split\" \u00ab endl\u00abendl;\n 00772 #endif\n 00773\n // split jets\n 00774\n split(j1, j2);\n 00775\n-// update iterators\n 00776\n+// update iterators\n 00777\n j2 = j1 = candidates->begin();\n 00778\n j2_relindex = 0;\n 00779\n } else {\n 00780 #ifdef DEBUG_SPLIT_MERGE\n@@ -24677,16 +24657,16 @@\n // Emin to disappear, so the total number of jets may\n 00793\n // have changed by more than expected and j2 might already by\n 00794\n // the end of the candidates list...\n 00795\n j2_relindex++;\n-00796\n if (j2 != candidates->end()) j2++;\n+00796\n 00797\n } // end of loop on the second jet\n 00798\n 00799\n if (j1 != candidates->end()) {\n // all \"second jet\" passed without overlapping\n 00800\n@@ -24729,75 +24709,75 @@\n 00821\n show();\n 00822 #endif\n 00823\n return jets.size();\n 00824\n 00825 }\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-273\n-\n-\f274\n-\n-File Documentation\n-\n 00826\n 00827\n 00828\n 00829 // save the event on disk\n 00830 // - flux\n stream used to save jet contents\n 00831 //-------------------------------------------00832 int CSphsplit_merge::save_contents(FILE *flux){\n 00833\n jet_iterator it_j;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+273\n+\n+\f274\n+\n+File Documentation\n+\n 00834\n CSphjet *j1;\n-00835\n int i1, i2;\n+00835\n 00836\n 00837\n fprintf(flux, \"# %d jets found\\n\", (int) jets.size());\n 00838\n fprintf(flux, \"# columns are: px, py, pz, E and number of particles for each jet\\n\");\n-for (it_j = jets.begin(), i1=0 ; it_j != jets.end() ; it_j++, i1++){\n 00839\n+for (it_j = jets.begin(), i1=0 ; it_j != jets.end() ; it_j++, i1++){\n 00840\n j1 = &(*it_j);\n 00841\n fprintf(flux, \"%e\\t%e\\t%e\\t%e\\t%d\\n\",\n 00842\n j1->v.px, j1->v.py, j1->v.pz, j1->v.E, j1->n);\n 00843\n }\n 00844\n 00845\n fprintf(flux, \"# jet contents\\n\");\n 00846\n fprintf(flux, \"# columns are: px, py, pz, E, particle index and jet number\\n\");\n-00847\n for (it_j = jets.begin(), i1=0 ; it_j != jets.end() ; it_j++, i1++){\n+00847\n 00848\n j1 = &(*it_j);\n-for (i2=0;i2n;i2++)\n 00849\n+for (i2=0;i2n;i2++)\n 00850\n fprintf(flux, \"%e\\t%e\\t%e\\t%e\\t%d\\t%d\\n\",\n 00851\n particles[j1->contents[i2]].px, particles[j1->contents[i2]].py,\n 00852\n particles[j1->contents[i2]].pz, particles[j1->contents[i2]].E,\n 00853\n j1->contents[i2], i1);\n 00854\n }\n 00855\n-return 0;\n 00856\n+return 0;\n 00857 }\n 00858\n 00859\n 00860 // show current jets/candidate status\n 00861 //-----------------------------------00862 int CSphsplit_merge::show(){\n 00863\n jet_iterator it_j;\n@@ -24817,108 +24797,108 @@\n 00871\n fprintf(stdout, \"jet %2d: %e\\t%e\\t%e\\t%e\\t\", i1+1,\n 00872\n j->v.px, j->v.py, j->v.pz, j->v.E);\n 00873\n 00874\n unsigned int phirange=j->range.phi_range;\n-for (i2=0;i2<32;i2++) fprintf(stdout, \"%d\", (phirange&(1\u00abi2)) \u00bb i2 );\n 00875\n+for (i2=0;i2<32;i2++) fprintf(stdout, \"%d\", (phirange&(1\u00abi2)) \u00bb i2 );\n 00876\n fprintf(stdout, \"\\t\");\n-unsigned int thetarange=j->range.theta_range;\n 00877\n-00878\n+unsigned int thetarange=j->range.theta_range;\n for (i2=0;i2<32;i2++) fprintf(stdout, \"%d\", (thetarange&(1\u00abi2)) \u00bb i2);\n+00878\n 00879\n fprintf(stdout, \"\\t\");\n 00880\n-00881\n for (i2=0;i2n;i2++)\n+00881\n 00882\n fprintf(stdout, \"%d \", j->contents[i2]);\n 00883\n fprintf(stdout, \"\\n\");\n 00884\n }\n 00885\n-00886\n for (it_c = candidates->begin(), i1=0 ; it_c != candidates->end() ; it_c++, i1++){\n+00886\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-unsigned int phirange=c->range.phi_range;\n 00891\n-00892\n+unsigned int phirange=c->range.phi_range;\n for (i2=0;i2<32;i2++) fprintf(stdout, \"%d\", (phirange&(1\u00abi2)) \u00bb i2 );\n+00892\n 00893\n fprintf(stdout, \"\\t\");\n-unsigned int thetarange=c->range.theta_range;\n 00894\n-00895\n+unsigned int thetarange=c->range.theta_range;\n for (i2=0;i2<32;i2++) fprintf(stdout, \"%d\", (thetarange&(1\u00abi2)) \u00bb i2);\n+00895\n 00896\n fprintf(stdout, \"\\t\");\n 00897\n for (i2=0;i2n;i2++)\n 00898\n 00899\n fprintf(stdout, \"%d \", c->contents[i2]);\n 00900\n fprintf(stdout, \"\\n\");\n 00901\n }\n 00902\n 00903\n fprintf(stdout, \"\\n\");\n-00904\n return 0;\n+00904\n 00905 }\n 00906\n 00907\n 00908 // get the overlap between 2 jets\n 00909 // - j1\n first jet\n 00910 // - j2\n second jet\n 00911 // - overlap2 returned overlap^2 (determined by the choice of SM variable)\n 00912 // return true if overlapping, false if disjoint\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.45 split_merge.cpp\n-\n 00913 //--------------------------------------------------------------------00914 bool CSphsplit_merge::get_overlap(const CSphjet &j1, const CSphjet &j2, double *overlap2){\n-// check if ranges overlap\n 00915\n+// check if ranges overlap\n 00916\n if (!is_range_overlap(j1.range,j2.range))\n-return false;\n 00917\n+return false;\n 00918\n int i1,i2;\n 00919\n 00920\n bool is_overlap;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.45 split_merge.cpp\n+\n 00921\n // initialise\n 00922\n 00923\n i1=i2=idx_size=0;\n 00924\n is_overlap = false;\n 00925\n CSphmomentum v;\n 00926\n-00927\n // compute overlap\n+00927\n 00928\n // at the same time, we store union in indices\n 00929\n do{\n 00930\n if (j1.contents[i1]\" all over the place\n 00986\n@@ -25021,62 +25001,62 @@\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-// compute centroids\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-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-275\n-\n-\f276\n-\n-File Documentation\n-\n-01001\n // compute jet splitting\n+01001\n 01002\n do{\n 01003\n if (j1.contents[i1]_theta,v->_phi);\n 01011\n } else if (j1.contents[i1]>j2.contents[i2]){\n-// particle i2 belong only to jet 2\n 01012\n+// 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@@ -25088,31 +25068,31 @@\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+01023\n 01024\n-01025\n //? what when == ?\n+01025\n 01026\n // When use_E_weighted_splitting is activated, the\n 01027\n // \"geometrical\" distance is weighted by the inverse\n 01028\n // of the E of the protojet\n 01029\n double d1 = get_distance(&(j1.v), v)*E1_weight;\n 01030\n double d2 = get_distance(&(j2.v), v)*E2_weight;\n-// do bookkeeping on most ambiguous split\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 01061\n }\n-01062\n while (i2_theta,v->_phi);\n 01069\n }\n 01070\n@@ -25193,45 +25173,47 @@\n 01075\n // now the jet axis is known, we can compute Etilde\n 01076\n compute_Etilde(jet1);\n 01077\n compute_Etilde(jet2);\n 01078\n-01079\n // remove previous jets\n+01079\n 01080 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 01081\n cand_refs.erase(j1.v.ref);\n 01082\n cand_refs.erase(j2.v.ref);\n 01083 #endif\n 01084\n candidates->erase(it_j1);\n 01085\n candidates->erase(it_j2);\n 01086\n 01087\n // reinsert new ones\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.45 split_merge.cpp\n-\n 01088\n insert(jet1);\n 01089\n insert(jet2);\n 01090\n 01091\n return true;\n 01092 }\n 01093\n 01094 // merge the two given jet.\n 01095 // during this procedure, the jets j1 & j2 are replaced\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.45 split_merge.cpp\n+\n+277\n+\n 01096 // by 1 single jets containing both of them.\n 01097 // - it_j1 iterator of the first jet in \u2019candidates\u2019\n 01098 // - it_j2 iterator of the second jet in \u2019candidates\u2019\n 01099 // return true on success, false on error\n 01101 bool CSphsplit_merge::merge(cjet_iterator &it_j1, cjet_iterator &it_j2){\n 01102\n CSphjet jet;\n@@ -25244,31 +25226,31 @@\n // note: particles within j1 & j2 have already been stored in indices\n 01107\n for (i=0;irange, it_j2->range);\n 01118\n-// remove old candidates\n 01119\n+// remove old candidates\n 01120 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 01121\n if (merge_identical_protocones){\n 01122\n cand_refs.erase(it_j1->v.ref);\n 01123\n cand_refs.erase(it_j2->v.ref);\n@@ -25276,128 +25258,126 @@\n }\n 01125 #endif\n 01126\n candidates->erase(it_j1);\n 01127\n candidates->erase(it_j2);\n 01128\n-01129\n // reinsert new candidate\n+01129\n 01130\n insert(jet);\n 01131\n return true;\n 01132\n 01133 }\n 01134\n 01140 bool CSphsplit_merge::insert(CSphjet &jet){\n 01141\n-01142\n // eventually check that no other candidate are present with the\n+01142\n 01143\n // same cone contents. We recall that this automatic merging of\n 01144\n // identical protocones can lead to infrared-unsafe situations.\n 01145 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 01146\n if ((merge_identical_protocones) && (!cand_refs.insert(jet.v.ref).second))\n-return false;\n 01147\n+return false;\n 01148 #endif\n 01149\n-// check that the protojet has large enough energy\n 01150\n+// check that the protojet has large enough energy\n 01151\n if (jet.v.Einsert(jet);\n 01159\n return true;\n 01160\n 01161 }\n 01162\n 01169 double CSphsplit_merge::get_sm_var2(CSphmomentum &v, double &E_tilde){\n-switch(ptcomparison.split_merge_scale) {\n 01170\n-01171\n+switch(ptcomparison.split_merge_scale) {\n case SM_E:\n return v.E*v.E;\n-case SM_Etilde: return E_tilde*E_tilde;\n+01171\n 01172\n-01173\n+case SM_Etilde: return E_tilde*E_tilde;\n default:\n+01173\n 01174\n throw siscone::Csiscone_error(\"Unsupported split-merge scale choice: \"\n 01175\n + ptcomparison.SM_scale_name());\n 01176\n }\n 01177\n-01178\n //return 0.0;\n+01178\n 01179 }\n 01180\n 01181\n 01182\n 01184 void CSphsplit_merge::compute_Etilde(CSphjet &jet){\n 01185\n jet.v.build_norm();\n 01186\n jet.E_tilde=0.0;\n 01187\n CSph3vector jet_axis = jet.v;\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-277\n-\n-\f278\n-\n-File Documentation\n-\n-01188\n //if (jet.v._norm==0){\n+01188\n 01189\n // jet_axis = CSph3vector(0.0,0.0,0.0);\n 01190\n //} else {\n 01191\n jet_axis/=jet.v.E;\n-//}\n 01192\n+//}\n 01193\n //cout \u00ab \"~~~ Axis: \" \u00ab jet.v.px \u00ab \" \" \u00ab jet.v.py \u00ab \" \" \u00ab jet.v.pz \u00ab \" \" \u00ab jet.v._norm \u00ab endl;\n 01194\n //cout \u00ab \"~~~ Axis: \" \u00ab jet_axis.px \u00ab \" \" \u00ab jet_axis.py \u00ab \" \" \u00ab jet_axis.pz \u00ab endl;\n 01195\n for (vector::iterator cont_it=jet.contents.begin(); cont_it!=jet.contents.end(); cont_it++){\n-const CSphmomentum &p = particles[*cont_it];\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f278\n+\n+File Documentation\n+\n 01196\n+const CSphmomentum &p = particles[*cont_it];\n 01197\n jet.E_tilde+=p.E*(1.0+norm2_cross_product3(p,jet_axis)/particles_norm2[*cont_it]);\n 01198\n }\n 01199 }\n 01200\n 01201 }\n \n 5.46 split_merge.cpp\n 00001\n-00002 // File: split_merge.cpp\n //\n+00002 // File: split_merge.cpp\n 00003 // Description: source file for splitting/merging (contains the CJet class) //\n 00004 // This file is part of the SISCone project.\n //\n 00005 // For more details, see http://projects.hepforge.org/siscone\n //\n 00006 //\n //\n@@ -25483,30 +25463,29 @@\n 00059\n 00060 // default dtor\n 00061 //-------------00062 Cjet::~Cjet(){\n 00063\n 00064 }\n 00065\n 00066 // ordering of jets in pt (e.g. used in final jets ordering)\n-00067 //-----------------------------------------------------------\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.46 split_merge.cpp\n-\n-00068 bool jets_pt_less(const Cjet &j1, const Cjet &j2){\n+00067 //----------------------------------------------------------00068 bool jets_pt_less(const Cjet &j1, const Cjet &j2){\n return j1.v.perp2() > j2.v.perp2();\n 00069\n 00070 }\n 00071\n 00072\n 00073 /********************************************************\n 00074 * Csplit_merge_ptcomparison implementation\n *\n 00075 * This deals with the ordering of the jets candidates *\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.46 split_merge.cpp\n+\n 00076 ********************************************************/\n 00077\n 00078 // odering of two jets\n 00079 // The variable of the ordering is pt or mt\n 00080 // depending on \u2019split_merge_scale\u2019 choice\n 00081 //\n 00082 // with EPSILON_SPLITMERGE defined, this attempts to identify\n@@ -25517,19 +25496,19 @@\n 00087 //\n 00088 // NB: there is a potential issue in momentum-conserving events,\n 00089 // whereby the harder of two jets becomes ill-defined when a soft\n 00090 // particle is emitted --- this may have a knock-on effect on\n 00091 // subsequent split-merge steps in cases with sufficiently large R\n 00092 // (but we don\u2019t know what the limit is...)\n 00093 //-----------------------------------------------------------------00094 bool Csplit_merge_ptcomparison::operator ()(const Cjet &jet1, const Cjet &jet2) const{\n-double q1, q2;\n 00095\n+double q1, q2;\n 00096\n-00097\n // compute the value for comparison for both jets\n+00097\n 00098\n // This depends on the choice of variable (mt is the default)\n 00099\n q1 = jet1.sm_var2;\n 00100\n q2 = jet2.sm_var2;\n 00101\n@@ -25543,60 +25522,60 @@\n 00106\n // close in the ordering variable.\n 00107 #ifdef EPSILON_SPLITMERGE\n 00108\n if ( (fabs(q1-q2) < EPSILON_SPLITMERGE*max(q1,q2)) &&\n 00109\n (jet1.v.ref != jet2.v.ref) ) {\n-// get the momentum of the difference\n 00110\n+// get the momentum of the difference\n 00111\n Cmomentum difference;\n-double pt_tilde_difference;\n 00112\n+double pt_tilde_difference;\n 00113\n get_difference(jet1,jet2,&difference,&pt_tilde_difference);\n 00114\n-00115\n // use the following relation: pt1^2 - pt2^2 = (pt1+pt2)*(pt1-pt2)\n+00115\n 00116\n double qdiff;\n 00117\n Cmomentum sum = jet1.v ;\n 00118\n sum += jet2.v;\n-double pt_tilde_sum = jet1.pt_tilde + jet2.pt_tilde;\n 00119\n+double pt_tilde_sum = jet1.pt_tilde + jet2.pt_tilde;\n 00120\n // depending on the choice of ordering variable, set the result\n 00121\n 00122\n switch (split_merge_scale){\n 00123\n case SM_mt:\n 00124\n qdiff = sum.E*difference.E - sum.pz*difference.pz;\n break;\n 00125\n-case SM_pt:\n 00126\n+case SM_pt:\n 00127\n qdiff = sum.px*difference.px + sum.py*difference.py;\n-00128\n break;\n+00128\n case SM_pttilde:\n 00129\n 00130\n qdiff = pt_tilde_sum*pt_tilde_difference;\n-break;\n 00131\n-00132\n+break;\n case SM_Et:\n-// diff = E^2 (dpt^2 pz^2- pt^2 dpz^2)\n+00132\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@@ -25608,61 +25587,61 @@\n -jet1.v.perp2()*sum.pz*difference.pz)\n 00140\n +sum.E*difference.E*(jet1.v.perp2()+jet1.v.pz*jet1.v.pz)*jet2.v.perp2();\n break;\n 00141\n 00142\n default:\n-throw Csiscone_error(\"Unsupported split-merge scale choice: \"\n 00143\n+throw Csiscone_error(\"Unsupported split-merge scale choice: \"\n 00144\n + SM_scale_name());\n 00145\n }\n 00146\n res = qdiff > 0;\n 00147\n }\n 00148 #endif // EPSILON_SPLITMERGE\n 00149\n-return res;\n 00150\n+return res;\n 00151 }\n 00152\n 00153\n 00156 std::string split_merge_scale_name(Esplit_merge_scale sms) {\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-279\n-\n-\f280\n-\n-File Documentation\n-\n-00157\n switch(sms) {\n-case SM_pt:\n+00157\n 00158\n+case SM_pt:\n 00159\n return \"pt (IR unsafe)\";\n-00160\n case SM_Et:\n-return \"Et (boost dep.)\";\n+00160\n 00161\n-00162\n+return \"Et (boost dep.)\";\n case SM_mt:\n+00162\n return \"mt (IR safe except for pairs of identical decayed heavy particles)\";\n 00163\n 00164\n case SM_pttilde:\n-return \"pttilde (scalar sum of pt\u2019s)\";\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+279\n+\n+\f280\n+\n+File Documentation\n+\n 00165\n-00166\n+return \"pttilde (scalar sum of pt\u2019s)\";\n default:\n+00166\n 00167\n return \"[SM scale without a name]\";\n 00168\n }\n 00169 }\n 00170\n 00171\n@@ -25674,28 +25653,28 @@\n 00175 // - v\n jet1-jet2\n 00176 // - pt_tilde\n jet1-jet2 pt_tilde\n 00177 // return true if overlapping, false if disjoint\n 00178 //----------------------------------------------00179 void Csplit_merge_ptcomparison::get_difference(const Cjet &j1, const Cjet &j2, Cmomentum *v, double\n *pt_tilde) const {\n-00180\n int i1,i2;\n+00180\n 00181\n // initialise\n 00182\n 00183\n i1=i2=0;\n 00184\n *v = Cmomentum();\n 00185\n *pt_tilde = 0.0;\n 00186\n-00187\n // compute overlap\n+00187\n 00188\n // at the same time, we store union in indices\n 00189\n do{\n 00190\n if (j1.contents[i1]==j2.contents[i2]) {\n 00191\n@@ -25716,16 +25695,16 @@\n (*v) -= (*particles)[j2.contents[i2]];\n 00199\n (*pt_tilde) -= (*pt)[j2.contents[i2]];\n 00200\n i2++;\n 00201\n } else {\n-throw Csiscone_error(\"get_non_overlap reached part it should never have seen...\");\n 00202\n+throw Csiscone_error(\"get_non_overlap reached part it should never have seen...\");\n 00203\n }\n 00204\n } while ((i1(ptcomparison));\n 00240\n // no hardest cut (col-unsafe)\n 00241\n 00242\n SM_var2_hardest_cut_off = -numeric_limits::max();\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.46 split_merge.cpp\n-\n-281\n-\n 00243\n // no pt cutoff for the particles to put in p_uncol_hard\n 00244\n 00245\n stable_cone_soft_pt2_cutoff = -1.0;\n 00246\n // no pt-weighted splitting\n 00247\n 00248\n use_pt_weighted_splitting = false;\n 00249 }\n 00250\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.46 split_merge.cpp\n+\n+281\n+\n 00251\n 00252 // default dtor\n 00253 //-------------00254 Csplit_merge::~Csplit_merge(){\n 00255\n full_clear();\n 00256 }\n 00257\n@@ -25818,44 +25797,44 @@\n 00261 // - protocones list of protocones (initial jet candidates)\n 00262 // - R2\n cone radius (squared)\n 00263 // - ptmin\n minimal pT allowed for jets\n 00264 //------------------------------------------------------------00265 int Csplit_merge::init(vector & /*_particles*/, vector *protocones, double R2,\n double ptmin){\n-00266\n // browse protocones\n+00266\n 00267\n return add_protocones(protocones, R2, ptmin);\n 00268 }\n 00269\n 00270\n 00271 // initialisation function for particle list\n 00272 // - _particles list of particles\n 00273 //------------------------------------------------------------00274 int Csplit_merge::init_particles(vector &_particles){\n 00275\n full_clear();\n 00276\n-00277\n // compute the list of particles\n+00277\n 00278\n // here, we do not need to throw away particles\n 00279\n // with infinite rapidity (colinear with the beam)\n 00280\n particles = _particles;\n 00281\n n = particles.size();\n 00282\n 00283\n // build the vector of particles\u2019 pt\n 00284\n pt.resize(n);\n-00285\n for (int i=0;i(ptcomparison));\n 00371\n@@ -26019,67 +25998,60 @@\n 00378\n cand_refs.clear();\n 00379 #endif\n 00380\n 00381\n p_remain.clear();\n 00382\n-00383\n return 0;\n+00383\n 00384 }\n 00385\n 00386\n 00387 // full clearance\n 00388 //---------------00389 int Csplit_merge::full_clear(){\n 00390\n partial_clear();\n 00391\n-// clear previously allocated memory\n 00392\n+// clear previously allocated memory\n 00393\n if (indices != NULL){\n-delete[] indices;\n 00394\n+delete[] indices;\n 00395\n }\n 00396\n particles.clear();\n 00397\n 00398\n return 0;\n 00399 }\n 00400\n 00401\n 00402 // build the list \u2019p_uncol_hard\u2019 from p_remain by clustering collinear particles\n 00403 // note that thins in only used for stable-cone detection\n 00404 // so the parent_index field is unnecessary\n 00405 //------------------------------------------------------------------------00406 int Csplit_merge::merge_collinear_and_remove_soft(){\n-00407\n int i,j;\n+00407\n 00408\n vector p_sorted;\n bool collinear;\n 00409\n 00410\n double dphi;\n 00411\n 00412\n p_uncol_hard.clear();\n 00413\n // we first sort the particles according to their rapidity\n 00414\n 00415\n for (i=0;iM_PI) dphi = twopi-dphi;\n 00436\n-00437\n if (dphi *protocones, double R2, double ptmin){\n-00461\n int i;\n+00461\n 00462\n Cmomentum *c;\n 00463\n Cmomentum *v;\n 00464\n double eta, phi;\n-double dx, dy;\n 00465\n-00466\n+double dx, dy;\n double R;\n+00466\n 00467\n Cjet jet;\n 00468\n if (protocones->size()==0)\n 00469\n-00470\n return 1;\n+00470\n 00471\n 00472\n pt_min2 = ptmin*ptmin;\n 00473\n R = sqrt(R2);\n 00474\n 00475\n@@ -26218,33 +26197,26 @@\n // NO NEEDED ANYMORE SINCE REMOVED FROM p_remain FROM THE BEGINNING\n 00494\n //if (fabs(v->pz)!=v->E){\n 00495\n dx = eta - v->eta;\n 00496\n dy = fabs(phi - v->phi);\n-00497\n if (dy>M_PI)\n+00497\n 00498\n dy -= twopi;\n if (dx*dx+dy*dyparent_index);\n 00501\n jet.v+= *v;\n 00502\n jet.pt_tilde+= pt[v->parent_index];\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f284\n-\n-File Documentation\n-\n 00503\n v->index=0;\n 00504\n }\n 00505\n }\n 00506\n@@ -26252,37 +26224,44 @@\n 00507\n 00508\n // set the momentum in protocones\n 00509\n // (it was only known through eta and phi up to now)\n 00510\n *c = jet.v;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f284\n+\n+File Documentation\n+\n 00511\n c->eta = eta; // restore exact original coords\n 00512\n c->phi = phi; // to avoid rounding error inconsistencies\n 00513\n-// set the jet range\n 00514\n+// set the jet range\n 00515\n jet.range=Ceta_phi_range(eta,phi,R);\n 00516\n 00517 #ifdef DEBUG_SPLIT_MERGE\n 00518\n cout \u00ab \"adding jet: \";\n for (int i2=0;i2 *protocones, double R2, double\n ptmin){\n@@ -26357,18 +26336,18 @@\n 00573\n 00574\n Cmomentum *c;\n 00575\n Cmomentum *v;\n 00576\n double eta, phi;\n-double dx, dy;\n 00577\n-00578\n+double dx, dy;\n double R;\n+00578\n 00579\n Cjet jet, jet_candidate;\n bool found_jet = false;\n 00580\n 00581\n if (protocones->size()==0)\n 00582\n@@ -26376,39 +26355,39 @@\n return 1;\n 00584\n 00585\n pt_min2 = ptmin*ptmin;\n 00586\n R = sqrt(R2);\n 00587\n-// browse protocones\n 00588\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.46 split_merge.cpp\n-\n+// browse protocones\n 00589\n // for each of them, build the list of particles in them\n 00590\n for (vector::iterator p_it = protocones->begin();p_it != protocones->end();p_it++){\n 00591\n // initialise variables\n 00592\n c = &(*p_it);\n 00593\n-// note: cones have been tested => their (eta,phi) coordinates are computed\n 00594\n+// note: cones have been tested => their (eta,phi) coordinates are computed\n 00595\n eta = c->eta;\n 00596\n phi = c->phi;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.46 split_merge.cpp\n+\n 00597\n-00598\n // NOTE: this is common to this method and add_protocones, so it\n+00598\n 00599\n // could be moved into a \u2019build_jet_from_protocone\u2019 method\n 00600\n //\n 00601\n // browse particles to create cone contents\n 00602\n@@ -26417,26 +26396,26 @@\n jet_candidate.pt_tilde=0;\n 00604\n jet_candidate.contents.clear();\n 00605\n for (i=0;ipz)!=v->E){\n 00610\n dx = eta - v->eta;\n 00611\n dy = fabs(phi - v->phi);\n-if (dy>M_PI)\n 00612\n+if (dy>M_PI)\n 00613\n dy -= twopi;\n if (dx*dx+dy*dyparent_index);\n 00616\n@@ -26459,47 +26438,47 @@\n 00625\n *c = jet_candidate.v;\n 00626\n c->eta = eta; // restore exact original coords\n 00627\n c->phi = phi; // to avoid rounding error inconsistencies\n 00628\n-00629\n // set the jet range\n+00629\n 00630\n jet_candidate.range=Ceta_phi_range(eta,phi,R);\n 00631\n // check that the protojet has large enough pt\n 00632\n 00633\n if (jet_candidate.v.perp2()is_larger(jet_candidate, jet)\n 00649\n : ptcomparison(jet_candidate, jet))){\n 00650\n@@ -26524,57 +26503,57 @@\n jets[jets.size()-1].v.build_etaphi();\n 00661\n 00662 #ifdef DEBUG_SPLIT_MERGE\n 00663\n cout \u00ab \"PR-Jet \" \u00ab jets.size() \u00ab \" [size \" \u00ab jet.contents.size() \u00ab \"]:\";\n 00664 #endif\n 00665\n-// update the list of what particles are left\n 00666\n+// update the list of what particles are left\n 00667\n int p_remain_index = 0;\n-int contents_index = 0;\n 00668\n-00669\n+int contents_index = 0;\n //sort(next_jet.contents.begin(),next_jet.contents.end());\n+00669\n 00670\n for (int index=0;indexsize()>0){\n+00742\n 00743\n // browse for the first jet\n 00744\n j1 = candidates->begin();\n 00745\n // if hardest jet does not pass threshold then nothing else will\n 00746\n 00747\n // either so one stops the split merge.\n 00748\n if (j1->sm_var2end()){\n 00755\n+while (j2 != candidates->end()){\n 00756 #ifdef DEBUG_SPLIT_MERGE\n 00757\n show();\n 00758 #endif\n 00759\n // check overlapping\n 00760\n if (get_overlap(*j1, *j2, &overlap2)){\n // check if overlapping energy passes threshold\n 00761\n 00762\n // Note that this depends on the ordering variable\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.46 split_merge.cpp\n-\n 00763 #ifdef DEBUG_SPLIT_MERGE\n 00764\n cout \u00ab \"overlap between cdt 1 and cdt \" \u00ab j2_relindex+1 \u00ab \" with overlap \"\n 00765\n \u00ab sqrt(overlap2/j2->sm_var2) \u00ab endl\u00abendl;\n 00766 #endif\n 00767\n if (overlap2sm_var2){\n-00768\n // split jets\n+00768\n 00769\n split(j1, j2);\n 00770\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.46 split_merge.cpp\n+\n 00771\n // update iterators\n 00772\n j2 = j1 = candidates->begin();\n 00773\n j2_relindex = 0;\n 00774\n } else {\n-00775\n // merge jets\n+00775\n 00776\n merge(j1, j2);\n 00777\n-00778\n // update iterators\n+00778\n 00779\n j2 = j1 = candidates->begin();\n 00780\n j2_relindex = 0;\n 00781\n }\n 00782\n }\n-// watch out: split/merge might have caused new jets with pt <\n 00783\n+// watch out: split/merge might have caused new jets with pt <\n 00784\n // ptmin to disappear, so the total number of jets may\n 00785\n // have changed by more than expected and j2 might already by\n 00786\n // the end of the candidates list...\n 00787\n j2_relindex++;\n-if (j2 != candidates->end()) j2++;\n 00788\n+if (j2 != candidates->end()) j2++;\n 00789\n } // end of loop on the second jet\n 00790\n-00791\n if (j1 != candidates->end()) {\n+00791\n 00792\n // all \"second jet\" passed without overlapping\n 00793\n // (otherwise we won\u2019t leave the j2 loop)\n 00794\n // => store jet 1 as real jet\n 00795\n jets.push_back(*j1);\n 00796\n jets[jets.size()-1].v.build_etaphi();\n-00797\n // a bug where the contents has non-zero size has been cropping\n+00797\n 00798\n // up in many contexts -- so catch it!\n 00799\n assert(j1->contents.size() > 0);\n 00800\n jets[jets.size()-1].pass = particles[j1->contents[0]].index;\n 00801 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n@@ -26806,16 +26785,16 @@\n 00816\n sort(jets.begin(), jets.end(), jets_pt_less);\n 00817 #ifdef DEBUG_SPLIT_MERGE\n 00818\n show();\n 00819 #endif\n 00820\n-00821\n return jets.size();\n+00821\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@@ -26827,16 +26806,16 @@\n 00832\n int i1, i2;\n 00833\n 00834\n fprintf(flux, \"# %d jets found\\n\", (int) jets.size());\n 00835\n fprintf(flux, \"# columns are: eta, phi, pt and number of particles for each jet\\n\");\n-for (it_j = jets.begin(), i1=0 ; it_j != jets.end() ; it_j++, i1++){\n 00836\n+for (it_j = jets.begin(), i1=0 ; it_j != jets.end() ; it_j++, i1++){\n 00837\n j1 = &(*it_j);\n 00838\n j1->v.build_etaphi();\n 00839\n fprintf(flux, \"%f\\t%f\\t%e\\t%d\\n\",\n 00840\n@@ -26856,46 +26835,47 @@\n 00847\n 00848\n fprintf(flux, \"%f\\t%f\\t%e\\t%d\\t%d\\n\",\n 00849\n particles[j1->contents[i2]].eta, particles[j1->contents[i2]].phi,\n 00850\n particles[j1->contents[i2]].perp(), j1->contents[i2], i1);\n+00851\n+}\n+00852\n+00853\n+return 0;\n+00854 }\n+00855\n+00856\n+00857 // show current jets/candidate status\n+00858 //------------------------------------\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n 287\n \n \f288\n \n File Documentation\n \n-00851\n-}\n-00852\n-return 0;\n-00853\n-00854 }\n-00855\n-00856\n-00857 // show current jets/candidate status\n-00858 //-----------------------------------00859 int Csplit_merge::show(){\n+00859 int Csplit_merge::show(){\n 00860\n jet_iterator it_j;\n 00861\n cjet_iterator it_c;\n 00862\n Cjet *j;\n-00863\n const Cjet *c;\n-int i1, i2;\n+00863\n 00864\n+int i1, i2;\n 00865\n-00866\n for (it_j = jets.begin(), i1=0 ; it_j != jets.end() ; it_j++, i1++){\n+00866\n 00867\n j = &(*it_j);\n 00868\n fprintf(stdout, \"jet %2d: %e\\t%e\\t%e\\t%e\\t\", i1+1,\n 00869\n j->v.px, j->v.py, j->v.pz, j->v.E);\n for (i2=0;i2n;i2++)\n@@ -26903,16 +26883,16 @@\n 00871\n fprintf(stdout, \"%d \", j->contents[i2]);\n 00872\n fprintf(stdout, \"\\n\");\n 00873\n }\n 00874\n-for (it_c = candidates->begin(), i1=0 ; it_c != candidates->end() ; it_c++, i1++){\n 00875\n+for (it_c = candidates->begin(), i1=0 ; it_c != candidates->end() ; it_c++, i1++){\n 00876\n c = &(*it_c);\n 00877\n fprintf(stdout, \"cdt %2d: %e\\t%e\\t%e\\t%e\\t%e\\t\", i1+1,\n 00878\n c->v.px, c->v.py, c->v.pz, c->v.E, sqrt(c->sm_var2));\n for (i2=0;i2n;i2++)\n@@ -26935,36 +26915,36 @@\n 00890 // - j1\n first jet\n 00891 // - j2\n second jet\n 00892 // - overlap2 returned overlap^2 (determined by the choice of SM variable)\n 00893 // return true if overlapping, false if disjoint\n 00894 //--------------------------------------------------------------------00895 bool Csplit_merge::get_overlap(const Cjet &j1, const Cjet &j2, double *overlap2){\n-00896\n // check if ranges overlap\n+00896\n 00897\n if (!is_range_overlap(j1.range,j2.range))\n-00898\n return false;\n+00898\n 00899\n-int i1,i2;\n 00900\n-00901\n+int i1,i2;\n bool is_overlap;\n+00901\n 00902\n // initialise\n 00903\n 00904\n i1=i2=idx_size=0;\n 00905\n is_overlap = false;\n 00906\n Cmomentum v;\n-double pt_tilde=0.0;\n 00907\n+double pt_tilde=0.0;\n 00908\n // compute overlap\n 00909\n 00910\n // at the same time, we store union in indices\n 00911\n do{\n@@ -27013,36 +26993,36 @@\n indices[idx_size] = j1.contents[i1];\n 00934\n i1++;\n 00935\n idx_size++;\n 00936\n }\n-while (i2\" all over the place\n 00971\n const Cjet & j1 = * it_j1;\n-00972\n const Cjet & j2 = * it_j2;\n+00972\n 00973\n 00974\n i1=i2=0;\n 00975\n jet2.v = jet1.v = Cmomentum();\n 00976\n jet2.pt_tilde = jet1.pt_tilde = 0.0;\n@@ -27138,16 +27118,16 @@\n jet1.pt_tilde += pt[j1.contents[i1]];\n 01005\n i1++;\n 01006\n jet1.range.add_particle(v->eta,v->phi);\n 01007\n } else if (j1.contents[i1]>j2.contents[i2]){\n-01008\n // particle i2 belong only to jet 2\n+01008\n 01009\n v = &(particles[j2.contents[i2]]);\n 01010\n jet2.contents.push_back(j2.contents[i2]);\n 01011\n jet2.v += *v;\n 01012\n@@ -27165,53 +27145,53 @@\n 01018\n // distance w.r.t. centroid 1\n 01019\n 01020\n dx1 = eta1 - v->eta;\n 01021\n dy1 = fabs(phi1 - v->phi);\n-if (dy1>M_PI)\n 01022\n+if (dy1>M_PI)\n 01023\n dy1 -= twopi;\n 01024\n 01025\n // distance w.r.t. centroid 2\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-289\n-\n-\f290\n-\n-File Documentation\n-\n 01026\n dx2 = eta2 - v->eta;\n 01027\n dy2 = fabs(phi2 - v->phi);\n-if (dy2>M_PI)\n 01028\n+if (dy2>M_PI)\n 01029\n dy2 -= twopi;\n 01030\n-01031\n //? what when == ?\n+01031\n 01032\n // When use_pt_weighted_splitting is activated, the\n 01033\n // \"geometrical\" distance is weighted by the inverse\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+289\n+\n+\f290\n+\n+File Documentation\n+\n 01034\n // of the pt of the protojet\n 01035\n double d1sq = (dx1*dx1+dy1*dy1)*pt1_weight;\n 01036\n double d2sq = (dx2*dx2+dy2*dy2)*pt2_weight;\n-// do bookkeeping on most ambiguous split\n 01037\n+// do bookkeeping on most ambiguous split\n 01038\n if (fabs(d1sq-d2sq) < most_ambiguous_split)\n 01039\n most_ambiguous_split = fabs(d1sq-d2sq);\n 01040\n 01041\n if (d1sqeta,v->phi);\n 01067\n }\n-while (i2erase(it_j1);\n 01090\n candidates->erase(it_j2);\n 01091\n-01092\n // reinsert new ones\n+01092\n 01093\n insert(jet1);\n 01094\n insert(jet2);\n 01095\n-return true;\n 01096\n+return true;\n 01097 }\n 01098\n 01099 // merge the two given jet.\n 01100 // during this procedure, the jets j1 & j2 are replaced\n 01101 // by 1 single jets containing both of them.\n 01102 // - it_j1 iterator of the first jet in \u2019candidates\u2019\n 01103 // - it_j2 iterator of the second jet in \u2019candidates\u2019\n 01104 // return true on success, false on error\n 01106 bool Csplit_merge::merge(cjet_iterator &it_j1, cjet_iterator &it_j2){\n 01107\n Cjet jet;\n-01108\n int i;\n+01108\n 01109\n // build new jet\n 01110\n 01111\n // note: particles within j1 & j2 have already been stored in indices\n 01112\n for (i=0;irange, it_j2->range);\n 01121\n-// remove old candidates\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.47 split_merge.h\n+\n+291\n+\n 01122\n+// remove old candidates\n 01123 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 01124\n if (merge_identical_protocones){\n 01125\n cand_refs.erase(it_j1->v.ref);\n 01126\n cand_refs.erase(it_j2->v.ref);\n@@ -27372,16 +27352,16 @@\n }\n 01128 #endif\n 01129\n candidates->erase(it_j1);\n 01130\n candidates->erase(it_j2);\n 01131\n-// reinsert new candidate\n 01132\n+// reinsert new candidate\n 01133\n insert(jet);\n 01134\n return true;\n 01135\n 01136 }\n 01137\n@@ -27392,112 +27372,102 @@\n 01146\n // same cone contents. We recall that this automatic merging of\n 01147\n // identical protocones can lead to infrared-unsafe situations.\n 01148 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 01149\n if ((merge_identical_protocones) && (!cand_refs.insert(jet.v.ref).second))\n-01150\n return false;\n+01150\n 01151 #endif\n 01152\n 01153\n // check that the protojet has large enough pt\n 01154\n if (jet.v.perp2()insert(jet);\n 01162\n return true;\n 01163\n 01164 }\n 01165\n 01172 double Csplit_merge::get_sm_var2(Cmomentum &v, double &pt_tilde){\n 01173\n switch(ptcomparison.split_merge_scale) {\n+01174\n case SM_pt:\n return v.perp2();\n-01174\n-01175\n case SM_mt:\n return v.perpmass2();\n-case SM_pttilde: return pt_tilde*pt_tilde;\n+01175\n 01176\n-01177\n+case SM_pttilde: return pt_tilde*pt_tilde;\n case SM_Et:\n return v.Et2();\n-default:\n+01177\n 01178\n-01179\n+default:\n throw Csiscone_error(\"Unsupported split-merge scale choice: \"\n+01179\n 01180\n + ptcomparison.SM_scale_name());\n 01181\n }\n 01182\n-//return 0.0;\n 01183\n+//return 0.0;\n 01184 }\n 01185\n 01186 }\n \n 5.47 split_merge.h\n 00001 // -*- C++ -*00003 // File: split_merge.h\n-00004 // Description: header file for splitting/merging (contains the CJet class)\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 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-00012 // This program is free software; you can redistribute it and/or modify\n-00013 // it under the terms of the GNU General Public License as published by\n-00014 // the Free Software Foundation; either version 2 of the License, or\n-00015 // (at your option) any later version.\n-00016 //\n-00017 // This program is distributed in the hope that it will be useful,\n-00018 // but WITHOUT ANY WARRANTY; without even the implied warranty of\n-00019 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-//\n-//\n-//\n-//\n-//\n-//\n-//\n-//\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-\n-\f292\n-\n-File Documentation\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@@ -27505,14 +27475,23 @@\n 00024 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //\n 00025 //\n //\n 00026 // $Revision:: 404\n $//\n 00027 // $Date:: 2016-05-22 12:14:42 +0200 (Sun, 22 May 2016)\n $//\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+//\n+\n+\f292\n+\n+File Documentation\n+\n 00029\n 00030 #ifndef __SPH_SPLIT_MERGE_H__\n 00031 #define __SPH_SPLIT_MERGE_H__\n 00032\n 00033 #include \n 00034 #include \n 00035 #include \"geom_2d.h\"\n@@ -27540,22 +27519,22 @@\n double E_tilde;\n 00065\n 00066\n int n;\n 00067\n std::vector contents;\n 00068\n-double sm_var2;\n 00080\n+double sm_var2;\n 00081\n 00083\n CSphtheta_phi_range range;\n 00084\n-00089\n int pass;\n+00089\n 00090 };\n 00091\n 00094\n 00096 bool jets_E_less(const CSphjet &j1, const CSphjet &j2);\n 00097\n 00098\n 00106 enum Esplit_merge_scale {\n@@ -27583,16 +27562,16 @@\n std::vector * particles;\n 00130\n std::vector * particles_norm2;\n 00131\n 00133\n bool operator()(const CSphjet &jet1, const CSphjet &jet2) const;\n 00134\n-void get_difference(const CSphjet &j1, const CSphjet &j2, CSphmomentum *v, double *E_tilde) const;\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 00160\n 00161\n 00162 // iterator types\n@@ -27606,26 +27585,30 @@\n 00175 class CSphsplit_merge{\n 00176 public:\n 00178\n CSphsplit_merge();\n 00179\n 00181\n ~CSphsplit_merge();\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.47 split_merge.h\n-\n 00182\n 00183\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 00203\n+int init_particles(std::vector &_particles);\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.47 split_merge.h\n+\n 00204\n 00208\n 00209\n 00221\n 00222\n 00223\n 00224\n@@ -27696,21 +27679,23 @@\n 00374\n 00375\n 00382\n 00383\n 00391\n 00392\n 00393\n+00401\n+00402\n+00403\n+00415\n+00416\n+00425\n+00426\n+00433\n \n-293\n-\n-// initialisation functions //\n-int init(std::vector &_particles, std::vector *protocones, double R2,\n-double Emin=0.0);\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@@ -27753,55 +27738,49 @@\n int *indices;\n int idx_size;\n bool merge_identical_protocones;\n CSphsplit_merge_ptcomparison ptcomparison;\n double SM_var2_hardest_cut_off;\n double stable_cone_soft_E2_cutoff;\n private:\n+bool get_overlap(const CSphjet &j1, const CSphjet &j2, double *v);\n+bool split(cjet_iterator &it_j1, cjet_iterator &it_j2);\n+bool merge(cjet_iterator &it_j1, cjet_iterator &it_j2);\n+bool insert(CSphjet &jet);\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n+293\n+\n \f294\n \n File Documentation\n \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-bool merge(cjet_iterator &it_j1, cjet_iterator &it_j2);\n-00425\n-00426\n-bool insert(CSphjet &jet);\n-00433\n 00434\n double get_sm_var2(CSphmomentum &v, double &E_tilde);\n 00441\n 00442\n-void compute_Etilde(CSphjet &j);\n 00444\n+void compute_Etilde(CSphjet &j);\n 00445\n // jet information\n 00446\n 00448 #ifdef SISCONE_USES_UNIQUE_PTR_AS_AUTO_PTR\n 00449\n std::unique_ptr > candidates;\n 00450 #else\n 00451\n std::auto_ptr > candidates;\n 00452 #endif\n 00453\n-double E_min;\n 00455\n+double E_min;\n 00456\n-00462\n bool use_E_weighted_splitting;\n+00462\n 00463\n const Cuser_scale_base *_user_scale;\n 00466\n 00467\n 00468 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 00470\n std::set cand_refs;\n@@ -27876,42 +27855,42 @@\n 00042\n 00043 const int CJET_INEXISTENT_PASS = -2;\n 00044\n 00054 class Cjet{\n 00055 public:\n 00057\n Cjet();\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.48 split_merge.h\n-\n-295\n-\n 00058\n 00060\n ~Cjet();\n 00061\n 00062\n Cmomentum v;\n-double pt_tilde;\n 00063\n-00064\n+double pt_tilde;\n int n;\n+00064\n 00065\n std::vector contents;\n 00066\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.48 split_merge.h\n+\n+295\n+\n 00073\n double sm_var2;\n 00074\n 00076\n Ceta_phi_range range;\n 00077\n-00082\n int pass;\n+00082\n 00083 };\n 00084\n 00086 bool jets_pt_less(const Cjet &j1, const Cjet &j2);\n 00087\n 00088\n 00096 enum Esplit_merge_scale {\n 00097\n@@ -27931,24 +27910,24 @@\n 00119\n Csplit_merge_ptcomparison() :\n 00120\n particles(0), split_merge_scale(SM_pttilde){};\n 00121\n 00123\n std::string SM_scale_name() const {\n-00124\n return split_merge_scale_name(split_merge_scale);}\n+00124\n 00125\n 00126\n std::vector * particles;\n 00127\n std::vector * pt;\n 00128\n-bool operator()(const Cjet &jet1, const Cjet &jet2) const;\n 00130\n+bool operator()(const Cjet &jet1, const Cjet &jet2) const;\n 00131\n void get_difference(const Cjet &j1, const Cjet &j2, Cmomentum *v, double *pt_tilde) const;\n 00143\n 00144\n 00163\n Esplit_merge_scale split_merge_scale;\n 00164 };\n@@ -27966,208 +27945,207 @@\n 00183\n Csplit_merge();\n 00184\n 00186\n ~Csplit_merge();\n 00187\n 00188\n-00190\n // initialisation functions //\n+00190\n 00192\n 00201\n int init(std::vector &_particles, std::vector *protocones, double R2, double\n ptmin=0.0);\n 00202\n int init_particles(std::vector &_particles);\n 00208\n 00209\n-00213\n int init_pleft();\n+00213\n 00214\n inline int set_pt_weighted_splitting(bool _use_pt_weighted_splitting){\n 00226\n 00227\n use_pt_weighted_splitting = _use_pt_weighted_splitting;\n return 0;\n 00228\n 00229\n }\n 00230\n 00232\n // cleaning functions //\n 00234\n-00236\n int partial_clear();\n+00236\n 00237\n int full_clear();\n 00239\n 00240\n // user-defined stable-cone ordering //\n 00242\n 00244\n-class Cuser_scale_base{\n 00250\n-00251\n+class Cuser_scale_base{\n public:\n-virtual ~Cuser_scale_base(){}\n+00251\n 00253\n+virtual ~Cuser_scale_base(){}\n 00254\n-00259\n virtual double operator()(const Cjet & jet) const = 0;\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f296\n-\n-File Documentation\n-\n+00259\n 00260\n virtual bool is_larger(const Cjet & a, const Cjet & b) const{\n 00271\n 00272\n return (a.sm_var2 > b.sm_var2);\n 00273\n }\n 00274\n };\n 00275\n void set_user_scale(const Cuser_scale_base * user_scale_in){\n 00280\n 00281\n _user_scale = user_scale_in;\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f296\n+\n+File Documentation\n+\n 00282\n }\n 00283\n-00285\n const Cuser_scale_base * user_scale() const { return _user_scale; }\n+00285\n 00286\n 00287\n-// main parts of the algorithm //\n 00289\n+// main parts of the algorithm //\n 00291\n 00299\n int merge_collinear_and_remove_soft();\n 00300\n int add_protocones(std::vector *protocones, double R2, double ptmin=0.0);\n 00308\n 00309\n int add_hardest_protocone_to_jets(std::vector *protocones, double R2, double ptmin=0.0);\n 00320\n 00321\n int perform(double overlap_tshold, double ptmin=0.0);\n 00331\n 00332\n 00333\n-// save and debug functions //\n 00335\n+// save and debug functions //\n 00337\n-00340\n int save_contents(FILE *flux);\n+00340\n 00341\n int show();\n 00343\n 00344\n-// particle information\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-int n_pass;\n 00352\n+int n_pass;\n 00353\n double most_ambiguous_split;\n 00357\n 00358\n-00359\n // jets information\n+00359\n 00360\n std::vector jets;\n 00361\n // working entries\n 00362\n 00363\n int *indices;\n-int idx_size;\n 00364\n+int idx_size;\n 00365\n-00374\n bool merge_identical_protocones;\n+00374\n 00375\n 00377\n Csplit_merge_ptcomparison ptcomparison;\n 00378\n double SM_var2_hardest_cut_off;\n 00385\n 00386\n double stable_cone_soft_pt2_cutoff;\n 00394\n 00395\n 00396 private:\n-00404\n bool get_overlap(const Cjet &j1, const Cjet &j2, double *v);\n+00404\n 00405\n 00406\n-00418\n bool split(cjet_iterator &it_j1, cjet_iterator &it_j2);\n+00418\n 00419\n bool merge(cjet_iterator &it_j1, cjet_iterator &it_j2);\n 00428\n 00429\n bool insert(Cjet &jet);\n 00436\n 00437\n double get_sm_var2(Cmomentum &v, double &pt_tilde);\n 00444\n 00445\n-// jet information\n 00446\n+// jet information\n 00448 #ifdef SISCONE_USES_UNIQUE_PTR_AS_AUTO_PTR\n 00449\n std::unique_ptr > candidates;\n 00450 #else\n 00451\n std::auto_ptr > candidates;\n 00452 #endif\n 00453\n-double pt_min2;\n 00455\n+double pt_min2;\n 00456\n bool use_pt_weighted_splitting;\n 00462\n 00463\n const Cuser_scale_base *_user_scale;\n 00466\n 00467\n 00468 #ifdef ALLOW_MERGE_IDENTICAL_PROTOCONES\n 00470\n std::set cand_refs;\n 00471 #endif\n 00472 };\n 00473\n 00474 }\n+00475\n+00476\n+00477 #endif\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n \f5.49 vicinity.cpp\n \n 297\n \n-00475\n-00476\n-00477 #endif\n-\n 5.49 vicinity.cpp\n 00001\n //\n 00002 // File: vicinity.cpp\n 00003 // Description: source file for particle vicinity (Cvicinity class)\n //\n 00004 // This file is part of the SISCone project.\n@@ -28234,16 +28212,16 @@\n *\n 00042 * of a parent point.\n *\n 00043 *************************************************************/\n 00044\n 00045 // ordering pointers to CSphvicinity_elm\n 00046 //--------------------------------------00047 bool ve_less(CSphvicinity_elm *ve1, CSphvicinity_elm *ve2){\n-return ve1->angle < ve2->angle;\n 00048\n+return ve1->angle < ve2->angle;\n 00049 }\n 00050\n 00051\n 00052 /*************************************************************\n 00053 * CSphvicinity implementation\n *\n 00054 * list of element in the vicinity of a parent.\n@@ -28274,100 +28252,100 @@\n 00072\n 00073 }\n 00074\n 00075 // constructor with initialisation\n 00076 //--------------------------------00077 CSphvicinity::CSphvicinity(vector &_particle_list){\n 00078\n parent = NULL;\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-//\n-\n-\f298\n-\n-File Documentation\n-\n 00079\n ve_list = NULL;\n 00080 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00081\n quadtree = NULL;\n 00082 #endif\n 00083\n cosVR = VR2 = tan2R = VR = 0.0;\n 00084\n 00085\n set_particle_list(_particle_list);\n 00086 }\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+//\n+\n+\f298\n+\n+File Documentation\n+\n 00087\n 00088 // default destructor\n 00089 //-------------------00090 CSphvicinity::~CSphvicinity(){\n-00091\n if (ve_list!=NULL)\n-delete[] ve_list;\n+00091\n 00092\n+delete[] ve_list;\n 00093\n 00094 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00095\n if (quadtree!=NULL)\n 00096\n delete quadtree;\n 00097 #endif\n 00098 }\n 00099\n 00100 /*\n 00101 * set the particle_list\n-00102 * - particle_list\n list of particles (type CSphmomentum)\n-number of particles in the list\n+00102 * - particle_list\n 00103 * - n\n+number of particles in the list\n 00104 ************************************************************/\n 00105 void CSphvicinity::set_particle_list(vector &_particle_list){\n-int i,j;\n 00106\n+int i,j;\n 00107 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00108\n double eta_max=0.0;\n 00109 #endif\n 00110\n-// if the particle list is not empty, destroy it !\n 00111\n+// if the particle list is not empty, destroy it !\n 00112\n if (ve_list!=NULL){\n 00113\n delete[] ve_list;\n 00114\n }\n 00115\n vicinity.clear();\n 00116 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00117\n if (quadtree!=NULL)\n-delete quadtree;\n 00118\n+delete quadtree;\n 00119 #endif\n 00120\n-// allocate memory array for particles\n 00121\n+// allocate memory array for particles\n 00122\n // Note: - we compute max for |eta|\n 00123\n //\n - we allocate indices to particles\n 00124\n n_part = 0;\n 00125\n plist.clear();\n 00126\n pincluded.clear();\n 00127\n for (i=0;i<(int) _particle_list.size();i++){\n-// if a particle is colinear with the beam (infinite rapidity)\n 00128\n+// if a particle is colinear with the beam (infinite rapidity)\n 00129\n // we do not take it into account\n 00130\n //if (fabs(_particle_list[i].pz)!=_particle_list[i].E){\n 00131\n plist.push_back(_particle_list[i]);\n 00132\n@@ -28380,27 +28358,27 @@\n 00136\n // Hence, it is not required here any longer.\n 00137\n // plist[n_part].parent_index = i;\n 00138\n plist[n_part].index = n_part;\n 00139\n-00140\n // make sure the reference is randomly created\n+00140\n 00141\n plist[n_part].ref.randomize();\n 00142\n 00143 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00144\n if (fabs(plist[n_part].eta)>eta_max) eta_max=fabs(plist[n_part].eta);\n 00145 #endif\n 00146\n n_part++;\n-//}\n 00147\n+//}\n 00148\n }\n 00149\n // allocate quadtree and vicinity_elm list\n 00150\n 00151\n // note: we set phi in [-pi:pi] as it is the natural range for atan2!\n@@ -28409,51 +28387,51 @@\n 00153 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00154\n eta_max+=0.1;\n 00155\n quadtree = new siscone::Cquadtree(0.0, 0.0, eta_max, M_PI);\n 00156 #endif\n 00157\n-// append particle to the vicinity_elm list\n 00158\n+// append particle to the vicinity_elm list\n 00159\n j = 0;\n 00160\n for (i=0;iadd(&plist[i]);\n 00163 #endif\n 00164\n ve_list[j].v = ve_list[j+1].v = &plist[i];\n 00165\n ve_list[j].is_inside = ve_list[j+1].is_inside = &(pincluded[i]);\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.49 vicinity.cpp\n-\n 00166\n j+=2;\n 00167\n }\n 00168\n 00169 }\n 00170\n 00171\n 00172 /*\n 00173 * build the vicinity list from a list of points.\n-00174 * - _parent\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.49 vicinity.cpp\n+\n reference particle\n+00174 * - _parent\n 00175 * - _VR\n vicinity radius\n 00176 ************************************************************/\n 00177 void CSphvicinity::build(CSphmomentum *_parent, double _VR){\n-00178\n int i;\n+00178\n 00179\n // set parent and radius\n 00180\n 00181\n parent = _parent;\n 00182\n 00183\n@@ -28520,100 +28498,100 @@\n 00216\n vicinity_size = vicinity.size();\n 00217 }\n 00218\n 00219\n 00221 //TODO//\n 00222 inline double sort_angle(double s, double c){\n-if (s==0) return (c>0) ? 0.0 : 2.0;\n 00223\n-00224\n+if (s==0) return (c>0) ? 0.0 : 2.0;\n double t=c/s;\n-return (s>0) ? 1-t/(1+fabs(t)) : 3-t/(1+fabs(t));\n+00224\n 00225\n+return (s>0) ? 1-t/(1+fabs(t)) : 3-t/(1+fabs(t));\n 00226 }\n 00227\n 00228\n 00229 /*\n 00230 * append a particle to the \u2019vicinity\u2019 list after\n 00231 * having computed the angular-ordering quantities\n-00232 * - v\n vector to test\n+00232 * - v\n 00233 **********************************************************/\n 00234 void CSphvicinity::append_to_vicinity(CSphmomentum *v){\n-// skip the particle itself)\n 00235\n+// skip the particle itself)\n 00236\n if (v==parent)\n-return;\n 00237\n+return;\n 00238\n int i=2*(v->index);\n 00239\n 00240\n-00241\n // compute the distance of the i-th particle with the parent\n+00241\n 00242\n double dot = dot_product3(parent_centre,*v);\n 00243\n CSph3vector vnormal = *v;\n 00244\n vnormal/=v->_norm;\n 00245\n dot/=v->_norm;\n 00246\n-00247\n // really check if the distance is less than VR\n+00247\n 00248\n if (dot>cosVR){\n 00249\n CSph3vector cross = cross_product3(parent_centre,vnormal);\n 00250\n-// for the centres\n 00251\n+// for the centres\n 00252\n CSph3vector median = (parent_centre+vnormal);\n 00253\n double amplT = sqrt((tan2R*(1+dot)+(dot-1))*(1+dot));\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-299\n-\n-\f300\n-\n 00254\n+CSph3vector transverse = amplT*cross/cross._norm;\n 00255\n 00256\n+// first angle (+)\n 00257\n+ve_list[i].centre = median + transverse;\n 00258\n+ve_list[i].centre.build_norm();\n 00259\n+ve_list[i].centre/=ve_list[i].centre._norm;\n 00260\n+CSph3vector diff = ve_list[i].centre - parent_centre;\n 00261\n+//ve_list[i].angle = atan2(dot_product3(angular_dir2, diff),dot_product3(angular_dir1, diff));\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+299\n+\n+\f300\n+\n 00262\n 00263\n 00264\n 00265\n 00266\n 00267\n 00268\n 00269\n 00270\n 00271\n 00272\n \n File Documentation\n \n-CSph3vector transverse = amplT*cross/cross._norm;\n-// first angle (+)\n-ve_list[i].centre = median + transverse;\n-ve_list[i].centre.build_norm();\n-ve_list[i].centre/=ve_list[i].centre._norm;\n-CSph3vector diff = ve_list[i].centre - parent_centre;\n-//ve_list[i].angle = atan2(dot_product3(angular_dir2, diff),dot_product3(angular_dir1, diff));\n ve_list[i].angle = sort_angle(dot_product3(angular_dir2, diff),dot_product3(angular_dir1, diff));\n ve_list[i].side = true;\n ve_list[i].cocircular.clear();\n vicinity.push_back(&(ve_list[i]));\n \n // second angle (-)\n ve_list[i+1].centre = median - transverse;\n@@ -28638,32 +28616,32 @@\n 00280\n // P = parent; C = child; O = Origin (center of circle)\n 00281\n CSph3vector OP = parent_centre - ve_list[i+1].centre;\n 00282\n CSph3vector OC = vnormal - ve_list[i+1].centre;\n 00283\n-// two sources of error are (GPS CCN29-19) epsilon/(R sin theta)\n 00284\n+// two sources of error are (GPS CCN29-19) epsilon/(R sin theta)\n 00285\n // and sqrt(2*epsilon/(R (1-cos theta))) and the way things work\n 00286\n // out, it is the _smaller_ of the two that is relevant [NB have\n 00287\n // changed definition of theta here relative to that used in\n 00288\n // CCN29] [NB2: write things so as to avoid zero denominators and\n 00289\n // to minimize the multiplications, divisions and above all sqrts\n 00290\n // -- that means that c & s are defined including a factor of VR2]\n 00291\n double inv_err1 = cross_product3(OP,OC)._norm * inv_R_EPS_COCIRC;\n-double inv_err2_sq = (D2_R-dot_product3(OP,OC)) * inv_R_2EPS_COCIRC;\n 00292\n+double inv_err2_sq = (D2_R-dot_product3(OP,OC)) * inv_R_2EPS_COCIRC;\n 00293\n ve_list[i].cocircular_range = siscone::pow2(inv_err1) > inv_err2_sq ?\n 00294\n 1.0/inv_err1 :\n 00295\n sqrt(1.0/inv_err2_sq);\n 00296\n@@ -28725,36 +28703,36 @@\n 00027 #include \"vicinity.h\"\n 00028 #include \n 00029 #include \n 00030 #include \n 00031\n 00032 namespace siscone{\n 00033\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.50 vicinity.cpp\n-\n 00034 using namespace std;\n 00035\n 00036 /*************************************************************\n 00037 * Cvicinity_elm implementation\n *\n 00038 * element in the vicinity of a parent.\n *\n 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 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.50 vicinity.cpp\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+00046\n 00047 }\n 00048\n 00049\n 00050 /*************************************************************\n 00051 * Cvicinity implementation\n *\n 00052 * list of element in the vicinity of a parent.\n@@ -28802,94 +28780,94 @@\n set_particle_list(_particle_list);\n 00084 }\n 00085\n 00086 // default destructor\n 00087 //-------------------00088 Cvicinity::~Cvicinity(){\n 00089\n if (ve_list!=NULL)\n-delete[] ve_list;\n 00090\n+delete[] ve_list;\n 00091\n 00092 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00093\n if (quadtree!=NULL)\n 00094\n delete quadtree;\n 00095 #endif\n 00096 }\n 00097\n 00098 /*\n 00099 * set the particle_list\n 00100 * - particle_list\n list of particles (type Cmomentum)\n-number of particles in the list\n 00101 * - n\n+number of particles in the list\n 00102 ************************************************************/\n 00103 void Cvicinity::set_particle_list(vector &_particle_list){\n-int i,j;\n 00104\n+int i,j;\n 00105 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00106\n double eta_max=0.0;\n 00107 #endif\n 00108\n-// if the particle list is not empty, destroy it !\n 00109\n+// if the particle list is not empty, destroy it !\n 00110\n if (ve_list!=NULL){\n-delete[] ve_list;\n 00111\n+delete[] ve_list;\n 00112\n }\n 00113\n vicinity.clear();\n 00114 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00115\n if (quadtree!=NULL)\n-delete quadtree;\n 00116\n+delete quadtree;\n 00117 #endif\n 00118\n // allocate memory array for particles\n 00119\n 00120\n // Note: - we compute max for |eta|\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-301\n-\n-\f302\n-\n-File Documentation\n-\n 00121\n //\n - we allocate indices to particles\n 00122\n n_part = 0;\n 00123\n plist.clear();\n 00124\n pincluded.clear();\n 00125\n for (i=0;i<(int) _particle_list.size();i++){\n-00126\n // if a particle is colinear with the beam (infinite rapidity)\n+00126\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 10 2023 17:32:40 for SISCone by Doxygen\n+\n+301\n+\n+\f302\n+\n+File Documentation\n+\n 00129\n plist.push_back(_particle_list[i]);\n 00130\n pincluded.push_back(Cvicinity_inclusion()); // zero inclusion status\n 00131\n-// the parent_index is handled in the split_merge because\n 00132\n+// the parent_index is handled in the split_merge because\n 00133\n // of our multiple-pass procedure.\n 00134\n // Hence, it is not required here any longer.\n 00135\n // plist[n_part].parent_index = i;\n 00136\n@@ -28908,16 +28886,16 @@\n 00145\n n_part++;\n 00146\n }\n 00147\n }\n 00148\n-00149\n // allocate quadtree and vicinity_elm list\n+00149\n 00150\n // note: we set phi in [-pi:pi] as it is the natural range for atan2!\n 00151\n ve_list = new Cvicinity_elm[2*n_part];\n 00152 #ifdef USE_QUADTREE_FOR_STABILITY_TEST\n 00153\n eta_max+=0.1;\n@@ -28925,16 +28903,16 @@\n quadtree = new Cquadtree(0.0, 0.0, eta_max, M_PI);\n 00155 #endif\n 00156\n 00157\n // append particle to the vicinity_elm list\n 00158\n j = 0;\n-00159\n for (i=0;iadd(&plist[i]);\n 00162 #endif\n 00163\n ve_list[j].v = ve_list[j+1].v = &plist[i];\n 00164\n@@ -28945,22 +28923,22 @@\n }\n 00167\n 00168 }\n 00169\n 00170\n 00171 /*\n 00172 * build the vicinity list from a list of points.\n-reference particle\n 00173 * - _parent\n-00174 * - _VR\n+reference particle\n vicinity radius\n+00174 * - _VR\n 00175 ************************************************************/\n 00176 void Cvicinity::build(Cmomentum *_parent, double _VR){\n-int i;\n 00177\n+int i;\n 00178\n // set parent and radius\n 00179\n 00180\n parent = _parent;\n 00181\n VR = _VR;\n@@ -28972,16 +28950,16 @@\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-00188\n // clear vicinity\n+00188\n 00189\n vicinity.clear();\n 00190\n // init parent variables\n 00191\n 00192\n pcx = parent->eta;\n@@ -29004,57 +28982,57 @@\n 00202\n 00203\n vicinity_size = vicinity.size();\n 00204 }\n 00205\n 00206\n 00208 inline double sort_angle(double s, double c){\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.50 vicinity.cpp\n-\n-00209\n if (s==0) return (c>0) ? 0.0 : 2.0;\n-double t=c/s;\n+00209\n 00210\n+double t=c/s;\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 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.51 vicinity.h\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+00221\n 00222\n // skip the particle itself)\n 00223\n 00224\n if (v==parent)\n return;\n 00225\n 00226\n-int i=2*(v->index);\n 00227\n+int i=2*(v->index);\n 00228\n // compute the distance of the i-th particle with the parent\n 00229\n 00230\n dx = v->eta - pcx;\n 00231\n dy = v->phi - pcy;\n 00232\n-// pay attention to the periodicity in phi !\n 00233\n+// pay attention to the periodicity in phi !\n 00234\n if (dy>M_PI)\n 00235\n dy -= twopi;\n else if (dy<-M_PI)\n 00236\n 00237\n@@ -29076,16 +29054,16 @@\n // - build temporary variables used for the computation\n 00247\n //d\n = sqrt(d2);\n 00248\n tmp = sqrt(VR2/d2-1);\n 00249\n-00250\n // first angle (+)\n+00250\n 00251\n c = 0.5*(dx-dy*tmp); // cosine of (parent,child) pair w.r.t. horizontal\n 00252\n s = 0.5*(dy+dx*tmp); // sine\n of (parent,child) pair w.r.t. horizontal\n 00253\n ve_list[i].angle = sort_angle(s,c);\n@@ -29096,16 +29074,16 @@\n 00256\n ve_list[i].side = true;\n 00257\n ve_list[i].cocircular.clear();\n 00258\n vicinity.push_back(&(ve_list[i]));\n 00259\n-// second angle (-)\n 00260\n+// second angle (-)\n 00261\n c = 0.5*(dx+dy*tmp); // cosine of (parent,child) pair w.r.t. horizontal\n 00262\n s = 0.5*(dy-dx*tmp); // sine\n of (parent,child) pair w.r.t. horizontal\n 00263\n ve_list[i+1].angle = sort_angle(s,c);\n@@ -29116,16 +29094,16 @@\n 00266\n ve_list[i+1].side = false;\n 00267\n ve_list[i+1].cocircular.clear();\n 00268\n vicinity.push_back(&(ve_list[i+1]));\n 00269\n-00270\n // now work out the cocircularity range for the two points (range\n+00270\n 00271\n // of angle within which the points stay within a distance\n 00272\n // EPSILON_COCIRCULAR of circule\n 00273\n // P = parent; C = child; O = Origin (center of circle)\n 00274\n@@ -29151,41 +29129,42 @@\n // -- that means that c & s are defined including a factor of VR2]\n 00285\n c = dot_product(OP,OC);\n 00286\n s = fabs(cross_product(OP,OC));\n double inv_err1 = s * inv_R_EPS_COCIRC;\n 00287\n-double inv_err2_sq = (R2-c) * inv_R_2EPS_COCIRC;\n 00288\n+double inv_err2_sq = (R2-c) * inv_R_2EPS_COCIRC;\n 00289\n ve_list[i].cocircular_range = pow2(inv_err1) > inv_err2_sq ?\n 00290\n 1.0/inv_err1 :\n 00291\n sqrt(1.0/inv_err2_sq);\n 00292\n ve_list[i+1].cocircular_range = ve_list[i].cocircular_range;\n 00293\n }\n 00294 }\n 00295\n+00296 }\n+\n+5.51 vicinity.h\n+00001 // -*- C++ -*-\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n \n 303\n \n \f304\n \n File Documentation\n \n-00296 }\n-\n-5.51 vicinity.h\n-00001 // -*- C++ -*00003 // File: vicinity.h\n+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@@ -29250,24 +29229,24 @@\n 00053 public:\n 00055\n CSphmomentum *v;\n 00056\n 00058\n siscone::Cvicinity_inclusion *is_inside;\n 00059\n-// centre variables\n 00060\n+// centre variables\n 00061\n CSph3vector centre;\n-00062\n double angle;\n-bool side;\n+00062\n 00063\n-00064\n+bool side;\n double cocircular_range;\n+00064\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@@ -29279,41 +29258,34 @@\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+00098\n 00099\n void build(CSphmomentum *_parent, double _VR);\n 00105\n 00106\n // cone kinematical information\n 00107\n 00108\n CSphmomentum *parent;\n-double VR;\n 00109\n+double VR;\n 00110\n double VR2;\n double cosVR;\n 00111\n-double R;\n 00112\n+double R;\n double R2;\n 00113\n-\n-//\n-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-\f5.52 vicinity.h\n-\n 00114\n double tan2R;\n double D2_R;\n 00115\n 00116\n double inv_R_EPS_COCIRC;\n 00117\n@@ -29323,27 +29295,34 @@\n 00119\n 00120\n int n_part;\n 00121\n std::vector plist;\n 00123\n std::vector pincluded;\n+\n+//\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+\f5.52 vicinity.h\n+\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-unsigned int vicinity_size;\n 00131\n+unsigned int vicinity_size;\n 00132\n 00133 protected:\n 00139\n void append_to_vicinity(CSphmomentum *v);\n 00140\n // internal variables\n 00141\n@@ -29420,50 +29399,50 @@\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-bool cocirc;\n+00051\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-\n-Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n-\n-305\n-\n-\f306\n-\n-File Documentation\n-\n 00067\n 00069\n Cvicinity_inclusion *is_inside;\n 00070\n-// centre variables\n 00071\n+// centre variables\n 00072\n double eta;\n 00073\n double phi;\n double angle;\n 00074\n-00075\n bool side;\n+00075\n double cocircular_range;\n 00076\n+\n+Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n+\n+305\n+\n+\f306\n+\n+File Documentation\n+\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@@ -29475,36 +29454,36 @@\n 00099\n 00101\n Cvicinity(std::vector &_particle_list);\n 00102\n 00104\n ~Cvicinity();\n 00105\n-void set_particle_list(std::vector &_particle_list);\n 00110\n+void set_particle_list(std::vector &_particle_list);\n 00111\n void build(Cmomentum *_parent, double _VR);\n 00117\n 00118\n // cone kinematical information\n 00119\n 00120\n Cmomentum *parent;\n-double VR;\n 00121\n+double VR;\n 00122\n double VR2;\n double R;\n 00123\n 00124\n double R2;\n-00125\n double inv_R_EPS_COCIRC;\n-double inv_R_2EPS_COCIRC;\n+00125\n 00126\n+double inv_R_2EPS_COCIRC;\n 00127\n // particle list information\n 00128\n 00129\n int n_part;\n 00130\n std::vector plist;\n@@ -29517,27 +29496,27 @@\n Cquadtree *quadtree;\n 00135 #endif\n 00136\n // vicinity information\n 00137\n 00138\n std::vector vicinity;\n-00139\n unsigned int vicinity_size;\n+00139\n 00140\n 00141 protected:\n void append_to_vicinity(Cmomentum *v);\n 00147\n 00148\n // internal variables\n 00149\n 00150\n double pcx;\n-00151\n double pcy;\n+00151\n 00152 };\n 00153\n 00154 }\n 00155\n 00156 #endif\n \n Generated on Tue Jan 10 2023 17:32:40 for SISCone by Doxygen\n@@ -29786,22 +29765,22 @@\n siscone::Ceta_phi_range, 20\n eta_min\n siscone::Ceta_phi_range, 20\n eta_range\n siscone::Ceta_phi_range, 21\n ev_name\n Coptions, 41\n-examples/area.cpp, 185\n-examples/main.cpp, 175\n-examples/options.cpp, 176\n-examples/options.h, 179\n-examples/sample.cpp, 180\n-examples/spherical.cpp, 181\n-examples/test.cpp, 182\n-examples/times.cpp, 184\n+examples/area.cpp, 175\n+examples/main.cpp, 180\n+examples/options.cpp, 182\n+examples/options.h, 185\n+examples/sample.cpp, 185\n+examples/spherical.cpp, 187\n+examples/test.cpp, 188\n+examples/times.cpp, 189\n \n 309\n \n siscone::hash_cones, 165\n siscone_spherical::sph_hash_cones, 172\n hash_cones\n siscone::hash_cones, 163\n@@ -30138,21 +30117,21 @@\n siscone_spherical::sph_hash_cones, 172\n randomize\n siscone::Creference, 51\n range\n siscone::Cjet, 27\n siscone_spherical::CSphjet, 75\n ranlux.h\n-ranlux_get, 243\n-ranlux_init, 243\n+ranlux_get, 242\n+ranlux_init, 242\n ranlux_print_state, 243\n ranlux_get\n-ranlux.h, 243\n+ranlux.h, 242\n ranlux_init\n-ranlux.h, 243\n+ranlux.h, 242\n ranlux_print_state\n ranlux.h, 243\n recompute_jets\n siscone::Csiscone, 59\n siscone_spherical::CSphsiscone, 90\n ref\n siscone::Cmomentum, 38\n@@ -30188,52 +30167,52 @@\n siscone_spherical::CSphsplit_merge, 99\n side\n siscone::Cvicinity_elm, 160\n siscone_spherical::CSphvicinity_elm, 125\n \n INDEX\n \n-siscone/area.cpp, 187\n+siscone/area.cpp, 176\n siscone/area.h, 191\n siscone/circulator.h, 192\n siscone/config.h, 193\n siscone/config_raw.h, 194\n siscone/defines.h, 195, 197\n siscone/geom_2d.cpp, 198\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, 257\n-siscone/protocones.cpp, 217\n-siscone/protocones.h, 260\n+siscone/geom_2d.h, 254\n+siscone/hash.cpp, 202\n+siscone/hash.h, 207\n+siscone/momentum.cpp, 256\n+siscone/momentum.h, 209\n+siscone/protocones.cpp, 213\n+siscone/protocones.h, 232\n siscone/quadtree.cpp, 236\n siscone/quadtree.h, 239\n siscone/ranlux.cpp, 240\n siscone/ranlux.h, 242, 243\n siscone/reference.cpp, 244\n siscone/reference.h, 245\n siscone/siscone.cpp, 246\n-siscone/siscone.h, 253\n-siscone/siscone_error.cpp, 255\n-siscone/siscone_error.h, 256\n+siscone/siscone.h, 262\n+siscone/siscone_error.cpp, 253\n+siscone/siscone_error.h, 253\n siscone/spherical/geom_2d.cpp, 200\n-siscone/spherical/geom_2d.h, 203\n-siscone/spherical/hash.cpp, 207\n-siscone/spherical/hash.h, 210\n-siscone/spherical/momentum.cpp, 213\n-siscone/spherical/momentum.h, 258\n-siscone/spherical/protocones.cpp, 226\n-siscone/spherical/protocones.h, 262\n-siscone/spherical/siscone.cpp, 250\n-siscone/spherical/siscone.h, 254\n+siscone/spherical/geom_2d.h, 256\n+siscone/spherical/hash.cpp, 205\n+siscone/spherical/hash.h, 208\n+siscone/spherical/momentum.cpp, 258\n+siscone/spherical/momentum.h, 210\n+siscone/spherical/protocones.cpp, 222\n+siscone/spherical/protocones.h, 234\n+siscone/spherical/siscone.cpp, 249\n+siscone/spherical/siscone.h, 263\n siscone/spherical/split_merge.cpp, 264\n siscone/spherical/split_merge.h, 291\n siscone/spherical/vicinity.cpp, 297\n-siscone/spherical/vicinity.h, 304\n+siscone/spherical/vicinity.h, 303\n siscone/split_merge.cpp, 278\n siscone/split_merge.h, 294\n siscone/vicinity.cpp, 300\n siscone/vicinity.h, 305\n siscone::Carea, 7\n \u223cCarea, 13\n Carea, 13\n"}]}]}]}]}]}]}