Changeset 1d208a2 in git for external/fastjet/tools

Timestamp:

Aug 30, 2016, 12:36:00 AM (8 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6be4bc0

Parents:

d091310

Message:

update FastJet library to 3.2.1 and Nsubjettiness library to 2.2.4

Location:

external/fastjet/tools

Files:

• Filter.cc (modified) (3 diffs)
• Filter.hh (modified) (2 diffs)
• GridMedianBackgroundEstimator.hh (modified) (2 diffs)
• JetMedianBackgroundEstimator.cc (modified) (5 diffs)
• Recluster.hh (modified) (1 diff)
• Subtractor.cc (modified) (2 diffs)
• Subtractor.hh (modified) (2 diffs)

external/fastjet/tools/Filter.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: Filter.cc 3760 2014-12-19 10:05:10Z soyez $
+// $Id: Filter.cc 4080 2016-03-09 15:01:57Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -31 +31 @@
 #include "fastjet/tools/Filter.hh"
 #include "fastjet/tools/Recluster.hh"
+#include "fastjet/tools/Subtractor.hh"
 #include <fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh>
 #include <cassert>
@@ -98 +99 @@
   } else if (_rho!=0){
     if (subjets.size()>0){
-      const ClusterSequenceAreaBase *csab = subjets[0].validated_csab();
+      //const ClusterSequenceAreaBase *csab = subjets[0].validated_csab();
       for (unsigned int i=0;i<subjets.size();i++){
-        subjets[i]=csab->subtracted_jet(subjets[i], _rho);
+        //subjets[i]=csab->subtracted_jet(subjets[i], _rho);
+        subjets[i]=Subtractor(_rho)(subjets[i]);
       }
     }

external/fastjet/tools/Filter.hh

@@ -3 +3 @@
 
 //FJSTARTHEADER
-// $Id: Filter.hh 3845 2015-03-08 08:35:36Z soyez $
+// $Id: Filter.hh 3846 2015-03-08 08:35:43Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -143 +143 @@
   /// deciding which ones to keep. It takes precedence over a non-zero rho.
   void set_subtractor(const FunctionOfPseudoJet<PseudoJet> * subtractor_in) {_subtractor = subtractor_in;}
+
+  /// Set a subtractor that is applied to all individual subjets before
+  /// deciding which ones to keep. It takes precedence over a non-zero rho.
+  const FunctionOfPseudoJet<PseudoJet> * subtractor() const{ return _subtractor;}
 
   /// runs the filtering and sets kept and rejected to be the jets of interest

external/fastjet/tools/GridMedianBackgroundEstimator.hh

@@ -3 +3 @@
 
 //FJSTARTHEADER
-// $Id: GridMedianBackgroundEstimator.hh 3778 2014-12-24 09:28:09Z salam $
+// $Id: GridMedianBackgroundEstimator.hh 3969 2015-09-21 08:57:59Z salam $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -194 +194 @@
   /// determination of rho_m.
   ///
-  /// Note that support for sigma_m is automatic is one has sigma and
+  /// Note that support for sigma_m is automatic if one has sigma and
   /// rho_m support.
   bool has_rho_m() const {return _enable_rho_m;}

external/fastjet/tools/JetMedianBackgroundEstimator.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: JetMedianBackgroundEstimator.cc 3517 2014-08-01 14:23:13Z soyez $
+// $Id: JetMedianBackgroundEstimator.cc 4047 2016-03-03 13:21:49Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -194 +194 @@
 
   _csi = jets[0].structure_shared_ptr();
-  ClusterSequenceStructure * csi = dynamic_cast<ClusterSequenceStructure*>(_csi());
+  ClusterSequenceStructure * csi = dynamic_cast<ClusterSequenceStructure*>(_csi.get());
   const ClusterSequenceAreaBase * csab = csi->validated_csab();
 
@@ -467 +467 @@
 
   // determine the number of empty jets
-  const ClusterSequenceAreaBase * csab = (dynamic_cast<ClusterSequenceStructure*>(_csi()))->validated_csab();
+  const ClusterSequenceAreaBase * csab = (dynamic_cast<ClusterSequenceStructure*>(_csi.get()))->validated_csab();
   if (csab->has_explicit_ghosts()) {
     _empty_area = 0.0;
@@ -503 +503 @@
 // throw an error otherwise
 void JetMedianBackgroundEstimator::_check_csa_alive() const{
-  ClusterSequenceStructure* csa = dynamic_cast<ClusterSequenceStructure*>(_csi());
+  ClusterSequenceStructure* csa = dynamic_cast<ClusterSequenceStructure*>(_csi.get());
   if (csa == 0) {
     throw Error("JetMedianBackgroundEstimator: there is no cluster sequence associated with the JetMedianBackgroundEstimator");
   }
-  if (! dynamic_cast<ClusterSequenceStructure*>(_csi())->has_associated_cluster_sequence())
+  if (! dynamic_cast<ClusterSequenceStructure*>(_csi.get())->has_associated_cluster_sequence())
     throw Error("JetMedianBackgroundEstimator: modifications are no longer possible as the underlying ClusterSequence has gone out of scope");
 }
@@ -521 +521 @@
   // cluster sequence
   if (_jet_def.jet_algorithm() == undefined_jet_algorithm){
-    const ClusterSequence * cs = dynamic_cast<ClusterSequenceStructure*>(_csi())->validated_cs();
+    const ClusterSequence * cs = dynamic_cast<ClusterSequenceStructure*>(_csi.get())->validated_cs();
     jet_def = &(cs->jet_def());
   }

external/fastjet/tools/Recluster.hh

@@ -2 +2 @@
 #define __FASTJET_TOOLS_RECLUSTER_HH__
 
-// $Id: Recluster.hh 3760 2014-12-19 10:05:10Z soyez $
+// $Id: Recluster.hh 3753 2014-12-17 15:19:55Z salam $
 //
 // Copyright (c) 2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez

external/fastjet/tools/Subtractor.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: Subtractor.cc 3670 2014-09-08 14:17:59Z soyez $
+// $Id: Subtractor.cc 3970 2015-09-21 10:31:17Z salam $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -39 +39 @@
 const double Subtractor::_invalid_rho = -numeric_limits<double>::infinity();
 
+LimitedWarning Subtractor::_unused_rho_m_warning;
 
 //----------------------------------------------------------------------

external/fastjet/tools/Subtractor.hh

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: Subtractor.hh 3670 2014-09-08 14:17:59Z soyez $
+// $Id: Subtractor.hh 3970 2015-09-21 10:31:17Z salam $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -203 +203 @@
   static const double _invalid_rho;
 
-  mutable LimitedWarning _unused_rho_m_warning;
+  static LimitedWarning _unused_rho_m_warning;
 };