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

external/fastjet/PseudoJet.hh

@@ -1 +1 @@
 //STARTHEADER
-// $Id: PseudoJet.hh 2728 2011-11-20 14:18:59Z salam $
+// $Id: PseudoJet.hh 3111 2013-05-04 08:17:27Z salam $
 //
 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -52 +52 @@
 /// default value for phi, meaning it (and rapidity) have yet to be calculated) 
 const double pseudojet_invalid_phi = -100.0;
-
+const double pseudojet_invalid_rap = -1e200;
+
+#ifndef __FJCORE__
 // forward definition
 class ClusterSequenceAreaBase;
+#endif  // __FJCORE__
 
 /// @ingroup basic_classes
@@ -73 +76 @@
   // internal shared pointer: see PJtiming.cc and the notes therein)
   PseudoJet() : _px(0), _py(0), _pz(0), _E(0) {_finish_init(); _reset_indices();}
+  //PseudoJet() : _px(0), _py(0), _pz(0), _E(0), _phi(pseudojet_invalid_phi), _rap(pseudojet_invalid_rap), _kt2(0) {_reset_indices();}
   /// construct a pseudojet from explicit components
   PseudoJet(const double px, const double py, const double pz, const double E);
@@ -251 +255 @@
     // dynamic_cast, NULL is returned if L is not derived from
     // PseudoJet
-    const PseudoJet * pj = cast_if_derived<const PseudoJet>(&some_four_vector);
+    //
+    // Note the explicit request for fastjet::cast_if_derived; when
+    // combining fastjet and fjcore, this avoids ambiguity in which of
+    // the two cast_if_derived calls to use.
+    const PseudoJet * pj = fastjet::cast_if_derived<const PseudoJet>(&some_four_vector);
 
     if (pj){
@@ -504 +512 @@
   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
@@ -512 +521 @@
   /// shorthand for validated_cluster_sequence_area_base()
   const ClusterSequenceAreaBase * validated_csab() const;
+#endif  //  __FJCORE__
+
   //\}
 
@@ -718 +729 @@
   // parent ClusterSequence (See ClusterSequenceAreaBase for details)
   //------------------------------------------------------------------
+#ifndef __FJCORE__
 
   /// check if it has a defined area
@@ -739 +751 @@
   virtual bool is_pure_ghost() const;
 
+#endif  // __FJCORE__
   //\} --- end of jet structure -------------------------------------