Changeset 1d208a2 in git for external/fastjet/ClusterSequence.hh

Timestamp:

Aug 30, 2016, 12:36:00 AM (8 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6be4bc0

Parents:

d091310

Message:

update FastJet library to 3.2.1 and Nsubjettiness library to 2.2.4

File:

• external/fastjet/ClusterSequence.hh (modified) (6 diffs)

external/fastjet/ClusterSequence.hh

@@ -3 +3 @@
 
 //FJSTARTHEADER
-// $Id: ClusterSequence.hh 3911 2015-07-02 12:09:58Z salam $
+// $Id: ClusterSequence.hh 4154 2016-07-20 16:20:48Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -49 +49 @@
 #include "fastjet/ClusterSequenceStructure.hh"
 
+#include "fastjet/internal/deprecated.hh"
+
 FASTJET_BEGIN_NAMESPACE      // defined in fastjet/internal/base.hh
 
@@ -80 +82 @@
   }
 
+  /// explicit assignment operator for a ClusterSequence
+  ClusterSequence & operator=(const ClusterSequence & cs);
+  
   // virtual ClusterSequence destructor, in case any derived class
   // thinks of needing a destructor at some point
@@ -362 +367 @@
   /// As of FJ v3.1, this is deprecated, in line with the deprecation
   /// of auto_ptr in C++11
-  inline void plugin_associate_extras(std::auto_ptr<Extras> extras_in) {
+#ifdef FASTJET_HAVE_AUTO_PTR_INTERFACE
+  FASTJET_DEPRECATED_MSG("Please use ClusterSequence::plugin_associate_extras(Extras * extras_in)) instead")
+  inline void plugin_associate_extras(std::auto_ptr<Extras> extras_in){
     _extras.reset(extras_in.release());
   }
+#endif
 
   /// returns true when the plugin is allowed to run the show.
@@ -730 +738 @@
   void _fast_NsqrtN_cluster();
 
-  void _add_step_to_history(const int step_number, const int parent1, 
-                               const int parent2, const int jetp_index,
-                               const double dij);
+  void _add_step_to_history( //const int step_number,
+                            const int parent1, 
+                            const int parent2, const int jetp_index,
+                            const double dij);
 
   /// internal routine associated with the construction of the unique
@@ -1037 +1046 @@
 template <class J> inline double ClusterSequence::_bj_dist(
                 const J * const jetA, const J * const jetB) const {
+  //#define FASTJET_NEW_DELTA_PHI
+#ifndef FASTJET_NEW_DELTA_PHI
+  //GPS+MC old version of Delta phi calculation
   double dphi = std::abs(jetA->phi - jetB->phi);
   double deta = (jetA->eta - jetB->eta);
   if (dphi > pi) {dphi = twopi - dphi;}
+#else 
+  //GPS+MC testing for 2015-02-faster-deltaR2
+  double dphi = pi-std::abs(pi-std::abs(jetA->phi - jetB->phi));
+  double deta = (jetA->eta - jetB->eta);
+#endif 
   return dphi*dphi + deta*deta;
 }