Changes in external/fastjet/Selector.cc [35cdc46:d69dfe4] in git

File:

• external/fastjet/Selector.cc (modified) (12 diffs)

external/fastjet/Selector.cc

@@ -1 @@
-//FJSTARTHEADER
-// $Id: Selector.cc 3504 2014-08-01 06:07:54Z soyez $
+//STARTHEADER
+// $Id$
 //
-// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
@@ -13 +13 @@
 //
 //  The algorithms that underlie FastJet have required considerable
-//  development. They are described in the original FastJet paper,
-//  hep-ph/0512210 and in the manual, arXiv:1111.6097. If you use
+//  development and are described in hep-ph/0512210. If you use
 //  FastJet as part of work towards a scientific publication, please
-//  quote the version you use and include a citation to the manual and
-//  optionally also to hep-ph/0512210.
+//  include a citation to the FastJet paper.
 //
 //  FastJet is distributed in the hope that it will be useful,
@@ -27 +25 @@
 //  along with FastJet. If not, see <http://www.gnu.org/licenses/>.
 //----------------------------------------------------------------------
-//FJENDHEADER
+//ENDHEADER
 
 
@@ -95 +93 @@
 
   return n;
-}
-
-//----------------------------------------------------------------------
-// sum the momenta of the jets that pass the cuts
-PseudoJet Selector::sum(const std::vector<PseudoJet> & jets) const {
-  PseudoJet this_sum(0,0,0,0);
-  const SelectorWorker * worker_local = validated_worker();
-  
-  // separate strategies according to whether the worker applies jet by jet
-  if (worker_local->applies_jet_by_jet()) {
-    for (unsigned i = 0; i < jets.size(); i++) {
-      if (worker_local->pass(jets[i])) this_sum += jets[i];
-    }
-  } else {
-    std::vector<const PseudoJet *> jetptrs(jets.size());
-    for (unsigned i = 0; i < jets.size(); i++) {
-      jetptrs[i] = & jets[i];
-    }
-    worker_local->terminator(jetptrs);
-    for (unsigned i = 0; i < jetptrs.size(); i++) {
-      if (jetptrs[i]) this_sum += jets[i];
-    }
-  }
-
-  return this_sum;
-}
-
-//----------------------------------------------------------------------
-// sum the (scalar) pt of the jets that pass the cuts
-double Selector::scalar_pt_sum(const std::vector<PseudoJet> & jets) const {
-  double this_sum = 0.0;
-  const SelectorWorker * worker_local = validated_worker();
-  
-  // separate strategies according to whether the worker applies jet by jet
-  if (worker_local->applies_jet_by_jet()) {
-    for (unsigned i = 0; i < jets.size(); i++) {
-      if (worker_local->pass(jets[i])) this_sum += jets[i].pt();
-    }
-  } else {
-    std::vector<const PseudoJet *> jetptrs(jets.size());
-    for (unsigned i = 0; i < jets.size(); i++) {
-      jetptrs[i] = & jets[i];
-    }
-    worker_local->terminator(jetptrs);
-    for (unsigned i = 0; i < jetptrs.size(); i++) {
-      if (jetptrs[i]) this_sum += jets[i].pt();
-    }
-  }
-
-  return this_sum;
 }
 
@@ -1107 +1055 @@
 class SW_Circle : public SW_WithReference {
 public:
-  SW_Circle(const double radius) : _radius2(radius*radius) {}
+  SW_Circle(const double &radius) : _radius2(radius*radius) {}
 
   /// return a copy of the current object
@@ -1152 +1100 @@
 
 // select on objets within a distance 'radius' of a variable location
-Selector SelectorCircle(const double radius) {
+Selector SelectorCircle(const double & radius) {
   return Selector(new SW_Circle(radius));
 }
@@ -1162 +1110 @@
 class SW_Doughnut : public SW_WithReference {
 public:
-  SW_Doughnut(const double radius_in, const double radius_out)
+  SW_Doughnut(const double &radius_in, const double &radius_out)
     : _radius_in2(radius_in*radius_in), _radius_out2(radius_out*radius_out) {}
 
@@ -1211 +1159 @@
 
 // select on objets with distance from the centre is between 'radius_in' and 'radius_out' 
-Selector SelectorDoughnut(const double radius_in, const double radius_out) {
+Selector SelectorDoughnut(const double & radius_in, const double & radius_out) {
   return Selector(new SW_Doughnut(radius_in, radius_out));
 }
@@ -1220 +1168 @@
 class SW_Strip : public SW_WithReference {
 public:
-  SW_Strip(const double delta) : _delta(delta) {}
+  SW_Strip(const double &delta) : _delta(delta) {}
 
   /// return a copy of the current object
@@ -1265 +1213 @@
 
 // select on objets within a distance 'radius' of a variable location
-Selector SelectorStrip(const double half_width) {
+Selector SelectorStrip(const double & half_width) {
   return Selector(new SW_Strip(half_width));
 }
@@ -1276 +1224 @@
 class SW_Rectangle : public SW_WithReference {
 public:
-  SW_Rectangle(const double delta_rap, const double delta_phi)
+  SW_Rectangle(const double &delta_rap, const double &delta_phi)
     : _delta_rap(delta_rap),  _delta_phi(delta_phi) {}
 
@@ -1322 +1270 @@
 
 // select on objets within a distance 'radius' of a variable location
-Selector SelectorRectangle(const double half_rap_width, const double half_phi_width) {
+Selector SelectorRectangle(const double & half_rap_width, const double & half_phi_width) {
   return Selector(new SW_Rectangle(half_rap_width, half_phi_width));
 }