Fork me on GitHub

Changeset 973b92a in git for Makefile


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

Legend:

Unmodified
Added
Removed
  • Makefile

    rf118021 r973b92a  
    11051105        external/fastjet/Voronoi.$(SrcSuf) \
    11061106        external/fastjet/internal/Voronoi.hh
    1107 tmp/external/fastjet/contribs/Nsubjettiness/AxesFinder.$(ObjSuf): \
    1108         external/fastjet/contribs/Nsubjettiness/AxesFinder.$(SrcSuf)
    1109 tmp/external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(ObjSuf): \
    1110         external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(SrcSuf)
     1107tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf): \
     1108        external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(SrcSuf)
     1109tmp/external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(ObjSuf): \
     1110        external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(SrcSuf)
     1111tmp/external/fastjet/contribs/Nsubjettiness/MeasureDefinition.$(ObjSuf): \
     1112        external/fastjet/contribs/Nsubjettiness/MeasureDefinition.$(SrcSuf)
    11111113tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf): \
    11121114        external/fastjet/contribs/Nsubjettiness/Njettiness.$(SrcSuf)
    1113 tmp/external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(ObjSuf): \
    1114         external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(SrcSuf)
    11151115tmp/external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(ObjSuf): \
    11161116        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(SrcSuf)
    11171117tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf): \
    11181118        external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(SrcSuf)
    1119 tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf): \
    1120         external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(SrcSuf)
     1119tmp/external/fastjet/contribs/Nsubjettiness/TauComponents.$(ObjSuf): \
     1120        external/fastjet/contribs/Nsubjettiness/TauComponents.$(SrcSuf)
     1121tmp/external/fastjet/contribs/Nsubjettiness/XConePlugin.$(ObjSuf): \
     1122        external/fastjet/contribs/Nsubjettiness/XConePlugin.$(SrcSuf)
    11211123tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf): \
    11221124        external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(SrcSuf) \
     
    12641266        external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
    12651267        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
    1266         external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh \
     1268        external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh \
    12671269        external/fastjet/tools/Filter.hh \
    12681270        external/fastjet/tools/Pruner.hh \
     
    12901292        external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh \
    12911293        external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
    1292         external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
    1293         external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
     1294        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh
    12941295tmp/modules/RunPUPPI.$(ObjSuf): \
    12951296        modules/RunPUPPI.$(SrcSuf) \
     
    13431344        tmp/external/fastjet/TilingExtent.$(ObjSuf) \
    13441345        tmp/external/fastjet/Voronoi.$(ObjSuf) \
    1345         tmp/external/fastjet/contribs/Nsubjettiness/AxesFinder.$(ObjSuf) \
    1346         tmp/external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(ObjSuf) \
     1346        tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf) \
     1347        tmp/external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(ObjSuf) \
     1348        tmp/external/fastjet/contribs/Nsubjettiness/MeasureDefinition.$(ObjSuf) \
    13471349        tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf) \
    1348         tmp/external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(ObjSuf) \
    13491350        tmp/external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(ObjSuf) \
    13501351        tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf) \
    1351         tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf) \
     1352        tmp/external/fastjet/contribs/Nsubjettiness/TauComponents.$(ObjSuf) \
     1353        tmp/external/fastjet/contribs/Nsubjettiness/XConePlugin.$(ObjSuf) \
    13521354        tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf) \
    13531355        tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf) \
     
    17031705        @touch $@
    17041706
     1707external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh: \
     1708        external/fastjet/PseudoJet.hh \
     1709        external/fastjet/JetDefinition.hh
     1710        @touch $@
     1711
    17051712display/DelphesBranchElement.h: \
    17061713        display/DelphesCaloData.h
     
    18521859modules/BTagging.h: \
    18531860        classes/DelphesModule.h
    1854         @touch $@
    1855 
    1856 external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh: \
    1857         external/fastjet/PseudoJet.hh \
    1858         external/fastjet/JetDefinition.hh
    18591861        @touch $@
    18601862
Note: See TracChangeset for help on using the changeset viewer.