Changeset b9ae4c3 in git for external/fastjet/plugins/SISCone/split_merge.h

Timestamp:

Sep 2, 2016, 3:46:14 PM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fa068d3

Parents:

ec5e04b (diff), 23389ff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Pavel Demin <pavel-demin@…> (09/02/16 15:46:14)

git-committer:

GitHub <noreply@…> (09/02/16 15:46:14)

Message:

Merge pull request #32 from delphes/dev_01

Dev 01

File:

• external/fastjet/plugins/SISCone/split_merge.h (modified) (5 diffs)

external/fastjet/plugins/SISCone/split_merge.h

@@ -22 +22 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //
 //                                                                           //
-// $Revision:: 367                                                          $//
-// $Date:: 2014-09-04 15:57:37 +0200 (Thu, 04 Sep 2014)                     $//
+// $Revision:: 405                                                          $//
+// $Date:: 2016-05-23 20:15:02 +0200 (Mon, 23 May 2016)                     $//
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -29 +29 @@
 #define __SPLIT_MERGE_H__
 
+#include "config.h"
 #include "defines.h"
 #include "geom_2d.h"
@@ -39 +40 @@
 
 namespace siscone{
+
+const int CJET_INEXISTENT_PASS = -2;
 
 /**
@@ -75 +78 @@
   /// pass at which the jet has been found
   /// It starts at 0 (first pass), -1 means infinite rapidity
+  /// (it will be initialised to "CJET_INEXISTENT_PASS" which should
+  /// never appear after clustering)
   int pass;
 };
@@ -441 +446 @@
   // jet information
   /// list of jet candidates
+#ifdef SISCONE_USES_UNIQUE_PTR_AS_AUTO_PTR
+  std::unique_ptr<std::multiset<Cjet,Csplit_merge_ptcomparison> > candidates;
+#else
   std::auto_ptr<std::multiset<Cjet,Csplit_merge_ptcomparison> > candidates;
-
+#endif
+  
   /// minimal pt2
   double pt_min2;