Changeset 273e668 in git for external/fastjet/ClusterSequence.cc

Timestamp:

Oct 15, 2014, 10:55:55 AM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

35b9204, b25d4cf

Parents:

f14bd6a

git-author:

Pavel Demin <pavel.demin@…> (10/10/14 08:56:40)

git-committer:

Pavel Demin <pavel.demin@…> (10/15/14 10:55:55)

Message:

upgrade FastJet to version 3.1.0

File:

• external/fastjet/ClusterSequence.cc (modified) (4 diffs)

external/fastjet/ClusterSequence.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: ClusterSequence.cc 3619 2014-08-13 14:17:19Z salam $
+// $Id: ClusterSequence.cc 3685 2014-09-11 20:15:00Z salam $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -37 +37 @@
 #include "fastjet/internal/LazyTiling9.hh"
 #include "fastjet/internal/LazyTiling25.hh"
+#ifndef __FJCORE__
 #include "fastjet/internal/LazyTiling9SeparateGhosts.hh"
+#endif  // __FJCORE__
 #include<iostream>
 #include<sstream>
@@ -370 +372 @@
     _plugin_activated = false;
 
+#ifndef __FJCORE__
   } else if (_strategy == N2MHTLazy9AntiKtSeparateGhosts) {
     // attempt to use an external tiling routine -- it manipulates
@@ -377 +380 @@
     tiling.run();
     _plugin_activated = false;
+#else 
+    throw Error("N2MHTLazy9AntiKtSeparateGhosts strategy not supported with FJCORE");
+#endif  // __FJCORE__
 
   } else if (_strategy == NlnN) {