Fork me on GitHub

Changeset b7b836a in git for external/fastjet/tools


Ignore:
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

Location:
external/fastjet/tools
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/tools/BackgroundEstimatorBase.cc

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: BackgroundEstimatorBase.cc 3433 2014-07-23 08:17:03Z salam $
     2// $Id: BackgroundEstimatorBase.cc 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/BackgroundEstimatorBase.hh

    r95e6b7a rb7b836a  
    33
    44//FJSTARTHEADER
    5 // $Id: BackgroundEstimatorBase.hh 3516 2014-08-01 14:07:58Z salam $
    6 //
    7 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     5// $Id: BackgroundEstimatorBase.hh 4354 2018-04-22 07:12:37Z salam $
     6//
     7// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/tools/Boost.hh

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: Boost.hh 3433 2014-07-23 08:17:03Z salam $
     2// $Id: Boost.hh 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/CASubJetTagger.cc

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: CASubJetTagger.cc 3433 2014-07-23 08:17:03Z salam $
     2// $Id: CASubJetTagger.cc 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/CASubJetTagger.hh

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: CASubJetTagger.hh 3433 2014-07-23 08:17:03Z salam $
    3 //
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     2// $Id: CASubJetTagger.hh 4354 2018-04-22 07:12:37Z salam $
     3//
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/Filter.cc

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: Filter.cc 4080 2016-03-09 15:01:57Z soyez $
     2// $Id: Filter.cc 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/Filter.hh

    r95e6b7a rb7b836a  
    33
    44//FJSTARTHEADER
    5 // $Id: Filter.hh 3846 2015-03-08 08:35:43Z soyez $
    6 //
    7 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     5// $Id: Filter.hh 4354 2018-04-22 07:12:37Z salam $
     6//
     7// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/tools/GridMedianBackgroundEstimator.cc

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: GridMedianBackgroundEstimator.cc 3555 2014-08-11 09:56:35Z salam $
    3 //
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     2// $Id: GridMedianBackgroundEstimator.cc 4354 2018-04-22 07:12:37Z salam $
     3//
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/GridMedianBackgroundEstimator.hh

    r95e6b7a rb7b836a  
    33
    44//FJSTARTHEADER
    5 // $Id: GridMedianBackgroundEstimator.hh 3969 2015-09-21 08:57:59Z salam $
    6 //
    7 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     5// $Id: GridMedianBackgroundEstimator.hh 4354 2018-04-22 07:12:37Z salam $
     6//
     7// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/tools/JHTopTagger.cc

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: JHTopTagger.cc 3433 2014-07-23 08:17:03Z salam $
     2// $Id: JHTopTagger.cc 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/JHTopTagger.hh

    r95e6b7a rb7b836a  
    33
    44//FJSTARTHEADER
    5 // $Id: JHTopTagger.hh 3433 2014-07-23 08:17:03Z salam $
    6 //
    7 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     5// $Id: JHTopTagger.hh 4354 2018-04-22 07:12:37Z salam $
     6//
     7// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/tools/JetMedianBackgroundEstimator.cc

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: JetMedianBackgroundEstimator.cc 4047 2016-03-03 13:21:49Z soyez $
    3 //
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     2// $Id: JetMedianBackgroundEstimator.cc 4354 2018-04-22 07:12:37Z salam $
     3//
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/JetMedianBackgroundEstimator.hh

    r95e6b7a rb7b836a  
    33
    44//FJSTARTHEADER
    5 // $Id: JetMedianBackgroundEstimator.hh 3517 2014-08-01 14:23:13Z soyez $
     5// $Id: JetMedianBackgroundEstimator.hh 4354 2018-04-22 07:12:37Z salam $
    66//
    7 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     7// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/tools/MassDropTagger.cc

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: MassDropTagger.cc 3433 2014-07-23 08:17:03Z salam $
     2// $Id: MassDropTagger.cc 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------
    … …  
    3636
    3737LimitedWarning MassDropTagger::_warnings_nonca;
     38LimitedWarning MassDropTagger::_negative_mass_warning;
    3839
    3940using namespace std;
    … …  
    7172  // the case
    7273  while ((had_parents = j.has_parents(j1,j2))) {
     74    if (j.m2() <= 0) {
     75      _negative_mass_warning.warn(
     76           "MassDropTagger: parent (sub)jet has mass^2<=0; returning null jet");
     77      return PseudoJet();
     78    }
    7379    // make parent1 the more massive jet
    7480    if (j1.m2() < j2.m2()) std::swap(j1,j2);
    … …  
    9197  PseudoJet result_local = j;
    9298  MassDropTaggerStructure * s = new MassDropTaggerStructure(result_local);
    93 //  s->_original_jet = jet;
    94   s->_mu = (j.m2()!=0.0) ? sqrt(j1.m2()/j.m2()) : 0.0;
    95   s->_y  = (j.m2()!=0.0) ? j1.kt_distance(j2)/j.m2() : 0.0;
     99  s->_mu = j1.m() / j.m();
     100  s->_y  = j1.kt_distance(j2)/j.m2();
    96101
    97102  result_local.set_structure_shared_ptr(SharedPtr<PseudoJetStructureBase>(s));

  • external/fastjet/tools/MassDropTagger.hh

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: MassDropTagger.hh 3433 2014-07-23 08:17:03Z salam $
     2// $Id: MassDropTagger.hh 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------
    … …  
    110110  double _mu, _ycut;
    111111  static LimitedWarning _warnings_nonca;
     112  static LimitedWarning _negative_mass_warning;
    112113};
    113114

  • external/fastjet/tools/Pruner.cc

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: Pruner.cc 3481 2014-07-29 17:24:12Z soyez $
    3 //
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     2// $Id: Pruner.cc 4354 2018-04-22 07:12:37Z salam $
     3//
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/Pruner.hh

    r95e6b7a rb7b836a  
    33
    44//FJSTARTHEADER
    5 // $Id: Pruner.hh 3481 2014-07-29 17:24:12Z soyez $
    6 //
    7 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     5// $Id: Pruner.hh 4354 2018-04-22 07:12:37Z salam $
     6//
     7// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/tools/RestFrameNSubjettinessTagger.cc

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: RestFrameNSubjettinessTagger.cc 3433 2014-07-23 08:17:03Z salam $
     2// $Id: RestFrameNSubjettinessTagger.cc 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/RestFrameNSubjettinessTagger.hh

    r95e6b7a rb7b836a  
    33
    44//FJSTARTHEADER
    5 // $Id: RestFrameNSubjettinessTagger.hh 3433 2014-07-23 08:17:03Z salam $
     5// $Id: RestFrameNSubjettinessTagger.hh 4354 2018-04-22 07:12:37Z salam $
    66//
    7 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     7// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/tools/Subtractor.cc

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: Subtractor.cc 3970 2015-09-21 10:31:17Z salam $
    3 //
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     2// $Id: Subtractor.cc 4354 2018-04-22 07:12:37Z salam $
     3//
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/Subtractor.hh

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: Subtractor.hh 3970 2015-09-21 10:31:17Z salam $
    3 //
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     2// $Id: Subtractor.hh 4354 2018-04-22 07:12:37Z salam $
     3//
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/TopTaggerBase.cc

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: TopTaggerBase.cc 3433 2014-07-23 08:17:03Z salam $
     2// $Id: TopTaggerBase.cc 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/tools/TopTaggerBase.hh

    r95e6b7a rb7b836a  
    33
    44//FJSTARTHEADER
    5 // $Id: TopTaggerBase.hh 3433 2014-07-23 08:17:03Z salam $
     5// $Id: TopTaggerBase.hh 4354 2018-04-22 07:12:37Z salam $
    66//
    7 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     7// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/tools/Transformer.hh

    r95e6b7a rb7b836a  
    11//FJSTARTHEADER
    2 // $Id: Transformer.hh 3433 2014-07-23 08:17:03Z salam $
     2// $Id: Transformer.hh 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.