Fork me on GitHub

Changeset d69dfe4 in git for external/fastjet/plugins


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

Location:
external/fastjet/plugins
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/plugins/CDFCones/JetCluAlgorithm.cc

    r88a9b72 rd69dfe4  
    2828#include <algorithm>
    2929#include <cmath>
     30#include <cstdlib>
    3031
    3132#include <fastjet/internal/base.hh>
    … …  
    7980          if ((iEtaPreClusterTower >= 8 && iEtaPreClusterTower < 14) || (iEtaPreClusterTower >= 38 && iEtaPreClusterTower < 44))
    8081            iPhiPreClusterTower = iPhiPreClusterTower/2;
    81           int dIEta = abs(iEtaSeedTower - iEtaPreClusterTower);
    82           int dIPhi = abs(iPhiSeedTower - iPhiPreClusterTower);
     82          int dIEta = std::abs(iEtaSeedTower - iEtaPreClusterTower);
     83          int dIPhi = std::abs(iPhiSeedTower - iPhiPreClusterTower);
    8384          if(dIPhi > 12)
    8485            dIPhi = 24 - dIPhi;

  • external/fastjet/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh

    r88a9b72 rd69dfe4  
    3030//ENDHEADER
    3131
    32 #include "D0RunIBaseConePlugin.hh"
     32#include "fastjet/D0RunIBaseConePlugin.hh"
    3333
    3434// questionable whether this should be in fastjet namespace or not...

  • external/fastjet/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh

    r88a9b72 rd69dfe4  
    3030//ENDHEADER
    3131
    32 #include "D0RunIBaseConePlugin.hh"
     32#include "fastjet/D0RunIBaseConePlugin.hh"
    3333
    3434// questionable whether this should be in fastjet namespace or not...

  • external/fastjet/plugins/D0RunIICone/ConeSplitMerge.hpp

    r88a9b72 rd69dfe4  
    7575{
    7676public:
    77   bool operator()(const ProtoJet<Item> & first, const ProtoJet<Item> & second)
     77  bool operator()(const ProtoJet<Item> & first, const ProtoJet<Item> & second) const
    7878  {
    7979    if ( first.pT() > second.pT() ) return true;

  • external/fastjet/plugins/GridJet/fastjet/GridJetPlugin.hh

    r88a9b72 rd69dfe4  
    7575  virtual double R() const;
    7676
     77  /// returns the actual rapidity spacing of the grid
     78  double drap()   const {return _dy;}
     79  /// returns the actual phi spacing of the grid
     80  double dphi() const {return _dphi;}
     81  /// returns the minimum rapidity of the grid
     82  double rapmin() const {return _ymin;}
     83  /// returns the maximum rapidity of the grid
     84  double rapmax() const {return _ymax;}
     85
    7786private:
    7887

  • external/fastjet/plugins/SISCone/AUTHORS

    r88a9b72 rd69dfe4  
    77
    88         (2) PH-TH, CERN, CH-1211 Geneva 23, Switzerland;
    9              Physics Department, Princeton University, Princeton NJ 08544, USA;
    109             LPTHE, UPMC (Univ. Paris 6), 75252 Paris cedex 05, France.
    1110
    … …  
    1413
    1514email  : soyez@fastjet.fr
    16          salam@lpthe.jussieu.fr
     15         gavin.salam@cern.ch

  • external/fastjet/plugins/SISCone/SISConePlugin.cc

    r88a9b72 rd69dfe4  
    55
    66// sisocne stuff
    7 #include "momentum.h"
    8 #include "siscone.h"
     7#include "siscone/momentum.h"
     8#include "siscone/siscone.h"
    99
    1010// other stuff

  • external/fastjet/plugins/SISCone/config.h

    r88a9b72 rd69dfe4  
    4949
    5050/* Define to the full name and version of this package. */
    51 #define PACKAGE_STRING "SISCone 2.0.5"
     51#define PACKAGE_STRING "SISCone 2.0.6"
    5252
    5353/* Define to the one symbol short name of this package. */
    … …  
    5555
    5656/* Define to the home page for this package. */
    57 #define PACKAGE_URL ""
     57/* #undef PACKAGE_URL */
    5858
    5959/* Define to the version of this package. */
    60 #define PACKAGE_VERSION "2.0.5"
     60#define PACKAGE_VERSION "2.0.6"
    6161
    6262/* Define to 1 if you have the ANSI C header files. */
    … …  
    6464
    6565/* Version number of package */
    66 #define VERSION "2.0.5"
     66#define VERSION "2.0.6"

  • external/fastjet/plugins/SISCone/siscone.cc

    r88a9b72 rd69dfe4  
    2929//#else
    3030//#define PACKAGE_NAME "SISCone"
    31 //#define VERSION "1.4.0-devel"
     31//#define VERSION "2.0.6"
    3232//#warning "No config.h file available, using preset values"
    3333//#endif
Note: See TracChangeset for help on using the changeset viewer.