Changeset b7b836a in git for external/fastjet/tools/MassDropTagger.cc

Timestamp:

Jun 6, 2018, 10:05:10 PM (6 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

17d0ab8

Parents:

95e6b7a

Message:

update FastJet library to 3.3.1 and FastJet Contrib library to 1.036

File:

• external/fastjet/tools/MassDropTagger.cc (modified) (4 diffs)

external/fastjet/tools/MassDropTagger.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: MassDropTagger.cc 3433 2014-07-23 08:17:03Z salam $
+// $Id: MassDropTagger.cc 4354 2018-04-22 07:12:37Z salam $
 //
-// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
@@ -36 +36 @@
 
 LimitedWarning MassDropTagger::_warnings_nonca;
+LimitedWarning MassDropTagger::_negative_mass_warning;
 
 using namespace std;
@@ -71 +72 @@
   // the case
   while ((had_parents = j.has_parents(j1,j2))) {
+    if (j.m2() <= 0) {
+      _negative_mass_warning.warn(
+           "MassDropTagger: parent (sub)jet has mass^2<=0; returning null jet");
+      return PseudoJet();
+    }
     // make parent1 the more massive jet
     if (j1.m2() < j2.m2()) std::swap(j1,j2);
@@ -91 +97 @@
   PseudoJet result_local = j;
   MassDropTaggerStructure * s = new MassDropTaggerStructure(result_local);
-//  s->_original_jet = jet;
-  s->_mu = (j.m2()!=0.0) ? sqrt(j1.m2()/j.m2()) : 0.0;
-  s->_y  = (j.m2()!=0.0) ? j1.kt_distance(j2)/j.m2() : 0.0;
+  s->_mu = j1.m() / j.m();
+  s->_y  = j1.kt_distance(j2)/j.m2();
 
   result_local.set_structure_shared_ptr(SharedPtr<PseudoJetStructureBase>(s));