Fork me on GitHub

Changeset 35cdc46 in git for Makefile


Ignore:
Timestamp:
Sep 3, 2014, 3:18:54 PM (10 years ago)
Author:
Pavel Demin <demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
be2222c
Parents:
5b5a56b
Message:

upgrade FastJet to version 3.1.0-beta.1, upgrade Nsubjettiness to version 2.1.0, add SoftKiller version 1.0.0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r5b5a56b r35cdc46  
    767767        external/ExRootAnalysis/ExRootUtilities.$(SrcSuf) \
    768768        external/ExRootAnalysis/ExRootUtilities.h
     769tmp/external/fastjet/LazyTiling9SeparateGhosts.$(ObjSuf): \
     770        external/fastjet/LazyTiling9SeparateGhosts.$(SrcSuf) \
     771        external/fastjet/internal/LazyTiling9SeparateGhosts.hh \
     772        external/fastjet/internal/TilingExtent.hh
     773tmp/external/fastjet/TilingExtent.$(ObjSuf): \
     774        external/fastjet/TilingExtent.$(SrcSuf) \
     775        external/fastjet/internal/TilingExtent.hh
    769776tmp/external/fastjet/Dnn2piCylinder.$(ObjSuf): \
    770777        external/fastjet/Dnn2piCylinder.$(SrcSuf) \
    … …  
    780787        external/fastjet/ClusterSequenceActiveArea.hh \
    781788        external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
     789tmp/external/fastjet/LazyTiling9.$(ObjSuf): \
     790        external/fastjet/LazyTiling9.$(SrcSuf) \
     791        external/fastjet/internal/LazyTiling9.hh \
     792        external/fastjet/internal/TilingExtent.hh
    782793tmp/external/fastjet/ClusterSequence_Delaunay.$(ObjSuf): \
    783794        external/fastjet/ClusterSequence_Delaunay.$(SrcSuf) \
    … …  
    792803        external/fastjet/ClusterSequenceArea.$(SrcSuf) \
    793804        external/fastjet/ClusterSequenceArea.hh
     805tmp/external/fastjet/LazyTiling25.$(ObjSuf): \
     806        external/fastjet/LazyTiling25.$(SrcSuf) \
     807        external/fastjet/internal/LazyTiling25.hh \
     808        external/fastjet/internal/TilingExtent.hh
    794809tmp/external/fastjet/Voronoi.$(ObjSuf): \
    795810        external/fastjet/Voronoi.$(SrcSuf) \
    … …  
    803818        external/fastjet/PseudoJet.hh \
    804819        external/fastjet/ClusterSequence.hh \
    805         external/fastjet/internal/MinHeap.hh
     820        external/fastjet/internal/MinHeap.hh \
     821        external/fastjet/internal/TilingExtent.hh
    806822tmp/external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf): \
    807823        external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.$(SrcSuf) \
    … …  
    815831        external/fastjet/DnnPlane.$(SrcSuf) \
    816832        external/fastjet/internal/DnnPlane.hh
     833tmp/external/fastjet/RectangularGrid.$(ObjSuf): \
     834        external/fastjet/RectangularGrid.$(SrcSuf) \
     835        external/fastjet/RectangularGrid.hh
    817836tmp/external/fastjet/ClusterSequence_DumbN3.$(ObjSuf): \
    818837        external/fastjet/ClusterSequence_DumbN3.$(SrcSuf) \
    … …  
    823842        external/fastjet/ClusterSequencePassiveArea.hh \
    824843        external/fastjet/ClusterSequenceVoronoiArea.hh
     844tmp/external/fastjet/LazyTiling9Alt.$(ObjSuf): \
     845        external/fastjet/LazyTiling9Alt.$(SrcSuf) \
     846        external/fastjet/internal/LazyTiling9Alt.hh \
     847        external/fastjet/internal/TilingExtent.hh
    825848tmp/external/fastjet/BasicRandom.$(ObjSuf): \
    826849        external/fastjet/BasicRandom.$(SrcSuf) \
    … …  
    842865        external/fastjet/ClusterSequence.hh \
    843866        external/fastjet/ClusterSequenceStructure.hh \
    844         external/fastjet/version.hh
     867        external/fastjet/version.hh \
     868        external/fastjet/internal/LazyTiling9Alt.hh \
     869        external/fastjet/internal/LazyTiling9.hh \
     870        external/fastjet/internal/LazyTiling25.hh \
     871        external/fastjet/internal/LazyTiling9SeparateGhosts.hh
    845872tmp/external/fastjet/JetDefinition.$(ObjSuf): \
    846873        external/fastjet/JetDefinition.$(SrcSuf) \
    … …  
    914941        external/fastjet/tools/JetMedianBackgroundEstimator.$(SrcSuf) \
    915942        external/fastjet/tools/JetMedianBackgroundEstimator.hh
     943tmp/external/fastjet/tools/Recluster.$(ObjSuf): \
     944        external/fastjet/tools/Recluster.$(SrcSuf) \
     945        external/fastjet/tools/Recluster.hh \
     946        external/fastjet/CompositeJetStructure.hh
    916947tmp/external/fastjet/tools/MassDropTagger.$(ObjSuf): \
    917948        external/fastjet/tools/MassDropTagger.$(SrcSuf)
    … …  
    923954tmp/external/fastjet/tools/Filter.$(ObjSuf): \
    924955        external/fastjet/tools/Filter.$(SrcSuf) \
    925         external/fastjet/tools/Filter.hh
     956        external/fastjet/tools/Filter.hh \
     957        external/fastjet/tools/Recluster.hh
    926958tmp/external/fastjet/tools/Pruner.$(ObjSuf): \
    927959        external/fastjet/tools/Pruner.$(SrcSuf) \
    … …  
    10041036        external/fastjet/ClusterSequence.hh \
    10051037        external/fastjet/NNH.hh
     1038tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf): \
     1039        external/fastjet/contribs/SoftKiller/SoftKiller.$(SrcSuf)
    10061040tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf): \
    10071041        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(SrcSuf)
    … …  
    10101044tmp/external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(ObjSuf): \
    10111045        external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(SrcSuf)
     1046tmp/external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(ObjSuf): \
     1047        external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(SrcSuf)
    10121048tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf): \
    10131049        external/fastjet/contribs/Nsubjettiness/Njettiness.$(SrcSuf)
    … …  
    11201156        tmp/external/ExRootAnalysis/ExRootProgressBar.$(ObjSuf) \
    11211157        tmp/external/ExRootAnalysis/ExRootUtilities.$(ObjSuf) \
     1158        tmp/external/fastjet/LazyTiling9SeparateGhosts.$(ObjSuf) \
     1159        tmp/external/fastjet/TilingExtent.$(ObjSuf) \
    11221160        tmp/external/fastjet/Dnn2piCylinder.$(ObjSuf) \
    11231161        tmp/external/fastjet/GhostedAreaSpec.$(ObjSuf) \
    11241162        tmp/external/fastjet/ClusterSequenceActiveArea.$(ObjSuf) \
     1163        tmp/external/fastjet/LazyTiling9.$(ObjSuf) \
    11251164        tmp/external/fastjet/ClusterSequence_Delaunay.$(ObjSuf) \
    11261165        tmp/external/fastjet/ClusterSequenceArea.$(ObjSuf) \
     1166        tmp/external/fastjet/LazyTiling25.$(ObjSuf) \
    11271167        tmp/external/fastjet/Voronoi.$(ObjSuf) \
    11281168        tmp/external/fastjet/Selector.$(ObjSuf) \
    … …  
    11321172        tmp/external/fastjet/CompositeJetStructure.$(ObjSuf) \
    11331173        tmp/external/fastjet/DnnPlane.$(ObjSuf) \
     1174        tmp/external/fastjet/RectangularGrid.$(ObjSuf) \
    11341175        tmp/external/fastjet/ClusterSequence_DumbN3.$(ObjSuf) \
    11351176        tmp/external/fastjet/ClusterSequencePassiveArea.$(ObjSuf) \
     1177        tmp/external/fastjet/LazyTiling9Alt.$(ObjSuf) \
    11361178        tmp/external/fastjet/BasicRandom.$(ObjSuf) \
    11371179        tmp/external/fastjet/ClusterSequenceAreaBase.$(ObjSuf) \
    … …  
    11591201        tmp/external/fastjet/tools/RestFrameNSubjettinessTagger.$(ObjSuf) \
    11601202        tmp/external/fastjet/tools/JetMedianBackgroundEstimator.$(ObjSuf) \
     1203        tmp/external/fastjet/tools/Recluster.$(ObjSuf) \
    11611204        tmp/external/fastjet/tools/MassDropTagger.$(ObjSuf) \
    11621205        tmp/external/fastjet/tools/JHTopTagger.$(ObjSuf) \
    … …  
    11931236        tmp/external/fastjet/plugins/Jade/JadePlugin.$(ObjSuf) \
    11941237        tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf) \
     1238        tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf) \
    11951239        tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf) \
    11961240        tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf) \
    11971241        tmp/external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(ObjSuf) \
     1242        tmp/external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(ObjSuf) \
    11981243        tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf) \
    11991244        tmp/external/fastjet/contribs/Nsubjettiness/AxesFinder.$(ObjSuf) \
    … …  
    13711416external/fastjet/JetDefinition.hh: \
    13721417        external/fastjet/internal/numconsts.hh \
    1373         external/fastjet/PseudoJet.hh
     1418        external/fastjet/PseudoJet.hh \
     1419        external/fastjet/ClusterSequence.hh
    13741420        @touch $@
    13751421
    … …  
    14171463        @touch $@
    14181464
     1465external/fastjet/internal/LazyTiling25.hh: \
     1466        external/fastjet/internal/MinHeap.hh \
     1467        external/fastjet/ClusterSequence.hh \
     1468        external/fastjet/internal/LazyTiling9Alt.hh \
     1469        external/fastjet/internal/LazyTiling9.hh
     1470        @touch $@
     1471
    14191472external/fastjet/Error.hh: \
    14201473        external/fastjet/internal/base.hh
    … …  
    14221475
    14231476external/fastjet/contribs/Nsubjettiness/Njettiness.hh: \
    1424         external/fastjet/PseudoJet.hh
     1477        external/fastjet/PseudoJet.hh \
     1478        external/fastjet/SharedPtr.hh
     1479        @touch $@
     1480
     1481external/fastjet/internal/TilingExtent.hh: \
     1482        external/fastjet/ClusterSequence.hh
    14251483        @touch $@
    14261484
    … …  
    14341492
    14351493external/fastjet/tools/GridMedianBackgroundEstimator.hh: \
    1436         external/fastjet/tools/BackgroundEstimatorBase.hh
     1494        external/fastjet/tools/BackgroundEstimatorBase.hh \
     1495        external/fastjet/RectangularGrid.hh
    14371496        @touch $@
    14381497
    … …  
    14571516        @touch $@
    14581517
     1518external/fastjet/internal/LazyTiling9Alt.hh: \
     1519        external/fastjet/internal/MinHeap.hh \
     1520        external/fastjet/ClusterSequence.hh
     1521        @touch $@
     1522
     1523external/fastjet/RectangularGrid.hh: \
     1524        external/fastjet/PseudoJet.hh \
     1525        external/fastjet/Selector.hh
     1526        @touch $@
     1527
    14591528modules/PileUpMerger.h: \
    14601529        classes/DelphesModule.h
    … …  
    14621531
    14631532external/fastjet/internal/DynamicNearestNeighbours.hh: \
    1464         external/fastjet/internal/numconsts.hh
     1533        external/fastjet/internal/numconsts.hh \
     1534        external/fastjet/Error.hh
    14651535        @touch $@
    14661536
    … …  
    14881558        @touch $@
    14891559
     1560external/fastjet/internal/LazyTiling9.hh: \
     1561        external/fastjet/internal/MinHeap.hh \
     1562        external/fastjet/ClusterSequence.hh \
     1563        external/fastjet/internal/LazyTiling9Alt.hh
     1564        @touch $@
     1565
    14901566modules/PileUpJetID.h: \
    14911567        classes/DelphesModule.h
    … …  
    16101686        external/fastjet/tools/Transformer.hh \
    16111687        external/fastjet/tools/BackgroundEstimatorBase.hh
     1688        @touch $@
     1689
     1690external/fastjet/internal/LazyTiling9SeparateGhosts.hh: \
     1691        external/fastjet/internal/MinHeap.hh \
     1692        external/fastjet/ClusterSequence.hh \
     1693        external/fastjet/internal/LazyTiling9Alt.hh
    16121694        @touch $@
    16131695
Note: See TracChangeset for help on using the changeset viewer.