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

external/fastjet/Selector.hh

@@ -1 @@
-#ifndef __SELECTOR_HH__
-#define __SELECTOR_HH__
+#ifndef __FASTJET_SELECTOR_HH__
+#define __FASTJET_SELECTOR_HH__
 
 //STARTHEADER
-// $Id: Selector.hh 2687 2011-11-14 11:17:51Z soyez $
+// $Id: Selector.hh 3203 2013-09-15 07:49:50Z salam $
 //
 // Copyright (c) 2009-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -31 +31 @@
 
 #include "fastjet/PseudoJet.hh"
+#ifndef __FJCORE__
 #include "fastjet/RangeDefinition.hh"  // for initialisation from a RangeDefinition
+#endif  // __FJCORE__
 #include <limits>
 #include <cmath>
@@ -150 +152 @@
 
 
+#ifndef __FJCORE__
   /// ctor from a RangeDefinition
   ///
@@ -160 +163 @@
   /// the direct use of this constructor.
   Selector(const RangeDefinition &range);
+#endif  // __FJCORE__
 
   /// dummy virtual dtor
@@ -229 +233 @@
   }
 
+#ifndef __FJCORE__
   /// returns the rapidity-phi area associated with the Selector
   /// (throws InvalidArea if the area does not make sense).
@@ -248 +253 @@
   ///
   double area(double ghost_area) const;
+#endif  // __FJCORE__
 
   /// returns a (reference to) the underlying worker's shared pointer
@@ -455 +461 @@
 Selector SelectorIsZero();
 
+#ifndef __FJCORE__
 /// select objects that are (or are only made of) ghosts.
 /// PseudoJets for which has_area() are considered non-pure-ghost.
 Selector SelectorIsPureGhost();
+#endif  // __FJCORE__
 
 /// @}
@@ -463 +471 @@
 FASTJET_END_NAMESPACE      // defined in fastjet/internal/base.hh
 
-#endif // __SELECTOR_HH__
-
+#endif // __FASTJET_SELECTOR_HH__
+