Changeset d69dfe4 in git for external/fastjet/ClusterSequenceStructure.hh

Timestamp:

Nov 20, 2013, 9:52:59 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fc39685

Parents:

88a9b72

Message:

upgrade fastjet to 3.0.6

File:

• external/fastjet/ClusterSequenceStructure.hh (modified) (4 diffs)

external/fastjet/ClusterSequenceStructure.hh

@@ -1 +1 @@
 //STARTHEADER
-// $Id: ClusterSequenceStructure.hh 2577 2011-09-13 15:11:38Z salam $
+// $Id: ClusterSequenceStructure.hh 3071 2013-04-01 12:52:46Z cacciari $
 //
 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -96 +96 @@
   virtual const ClusterSequence * validated_cs() const;
 
+#ifndef __FJCORE__
   /// if the jet has valid area information then return a pointer to
   /// the associated ClusterSequenceAreaBase object; otherwise throw an error
   virtual const ClusterSequenceAreaBase * validated_csab() const;
+#endif  // __FJCORE__
 
   /// set the associated csw
@@ -237 +239 @@
   // parent ClusterSequence (See ClusterSequenceAreaBase for details)
   //------------------------------------------------------------------
+#ifndef __FJCORE__
 
   /// check if it has a defined area
@@ -258 +261 @@
   virtual bool is_pure_ghost(const PseudoJet &reference) const;
 
+#endif  // __FJCORE__
   //\} --- end of jet structure -------------------------------------