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

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.cc (modified) (4 diffs)

external/fastjet/plugins/SISCone/split_merge.cc

@@ -21 +21 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //
 //                                                                           //
-// $Revision:: 370                                                          $//
-// $Date:: 2014-09-04 17:03:15 +0200 (Thu, 04 Sep 2014)                     $//
+// $Revision:: 390                                                          $//
+// $Date:: 2016-03-03 11:06:52 +0100 (Thu, 03 Mar 2016)                     $//
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -54 +54 @@
   pt_tilde = 0.0;
   sm_var2 = 0.0;
+  pass = CJET_INEXISTENT_PASS; // initialised to a value that should
+                               // notappear in the end (after clustering)
 }
 
@@ -659 +661 @@
 
 #ifdef DEBUG_SPLIT_MERGE
-  cout << "PR-Jet " << jets.size() << " [size " << next_jet.contents.size() << "]:";
+  cout << "PR-Jet " << jets.size() << " [size " << jet.contents.size() << "]:";
 #endif
     
@@ -1179 +1181 @@
   }
 
-  return 0.0;
-}
-
-}
+  //return 0.0;
+}
+
+}