Changeset 973b92a in git for external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.cc

Timestamp:

Oct 9, 2015, 2:47:38 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8713dee

Parents:

f118021

Message:

update FastJet library to 3.1.3 and Nsubjettiness library to 2.2.1

File:

• external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.cc (modified) (5 diffs)

external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.cc

@@ -5 +5 @@
 //  Jesse Thaler, Ken Van Tilburg, Christopher K. Vermilion, and TJ Wilkason
 //
-//  $Id: NjettinessPlugin.cc 663 2014-06-03 21:26:41Z jthaler $
+//  $Id: NjettinessPlugin.cc 821 2015-06-15 18:50:53Z jthaler $
 //----------------------------------------------------------------------
 // This file is part of FastJet contrib.
@@ -29 +29 @@
 namespace contrib{
 
-
+LimitedWarning NjettinessPlugin::_old_constructor_warning;
 
 std::string NjettinessPlugin::description() const {return "N-jettiness jet finder";}
@@ -48 +48 @@
    
    
-   _njettinessFinder.getTau(_N, particles);
-
-   std::vector<std::list<int> > partition = _njettinessFinder.getPartitionList(particles);
-
-   std::vector<fastjet::PseudoJet> jet_indices_for_extras;
+   TauComponents tau_components = _njettinessFinder.getTauComponents(_N, particles);
+   TauPartition tau_partition = _njettinessFinder.currentPartition();
+   std::vector<std::list<int> > partition = tau_partition.jets_list();
+   
+   std::vector<int> jet_indices_for_extras;
 
    // output clusterings for each jet
@@ -73 +73 @@
       int finalJet = indices.back();
       cs.plugin_record_iB_recombination(finalJet, fakeDib);
-      jet_indices_for_extras.push_back(cs.jets()[finalJet]);  // Get the four vector for the final jets to compare later.
+      jet_indices_for_extras.push_back(cs.jets()[finalJet].cluster_hist_index());  // Get the four vector for the final jets to compare later.
    }
 
@@ -79 +79 @@
    reverse(jet_indices_for_extras.begin(),jet_indices_for_extras.end());
 
-   NjettinessExtras * extras = new NjettinessExtras(_njettinessFinder.currentTauComponents(),jet_indices_for_extras,_njettinessFinder.currentAxes());
+   // Store extra information about jets 
+   NjettinessExtras * extras = new NjettinessExtras(tau_components,jet_indices_for_extras);
+
+#if FASTJET_VERSION_NUMBER>=30100
+   cs.plugin_associate_extras(extras);
+#else
+   // auto_ptr no longer supported, apparently
    cs.plugin_associate_extras(std::auto_ptr<ClusterSequence::Extras>(extras));
-   
+#endif
+  
 }