Changeset d69dfe4 in git for external/fastjet/PseudoJetStructureBase.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/PseudoJetStructureBase.hh (modified) (6 diffs)

external/fastjet/PseudoJetStructureBase.hh

@@ +1 @@
+#ifndef __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__
+#define __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__
+
 //STARTHEADER
-// $Id: PseudoJetStructureBase.hh 2670 2011-11-11 17:01:06Z salam $
+// $Id: PseudoJetStructureBase.hh 3071 2013-04-01 12:52:46Z cacciari $
 //
 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -28 +31 @@
 
 
-#ifndef __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__
-#define __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__
-
 #include "fastjet/internal/base.hh"
 
@@ -40 +40 @@
 class PseudoJet;
 class ClusterSequence;
+#ifndef __FJCORE__
 class ClusterSequenceAreaBase;
+#endif  // __FJCORE__
 
 /// @ingroup extra_info
@@ -85 +87 @@
   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
 
   //\}
@@ -203 +207 @@
   // parent ClusterSequence (See ClusterSequenceAreaBase for details)
   //------------------------------------------------------------------
+#ifndef __FJCORE__
 
   /// check if it has a defined area
@@ -230 +235 @@
   virtual bool is_pure_ghost(const PseudoJet &reference) const;
 
+#endif  // __FJCORE__
   //\} --- end of jet structure -------------------------------------
 };