Fork me on GitHub

Changeset aafe927 in git


Ignore:
Timestamp:
Aug 28, 2020, 5:29:36 PM (4 years ago)
Author:
GitHub <noreply@…>
Branches:
master
Children:
f0f1443
Parents:
d192152 (diff), a643a7f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Aleksander Filip Żarnecki <zarnecki@…> (08/28/20 17:29:36)
git-committer:
GitHub <noreply@…> (08/28/20 17:29:36)
Message:

Merge pull request #1 from delphes/master

Updating my fork

Files:
10 added
8 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rd192152 raafe927  
    8989DISPLAYLIB = libDelphesDisplay.lib
    9090
    91 VERSION = $(shell cat VERSION)
     91VERSION = x.y.z
    9292DISTDIR = Delphes-$(VERSION)
    9393DISTTAR = $(DISTDIR).tar.gz
    … …  
    174174tmp/examples/Example1.$(ObjSuf): \
    175175        examples/Example1.cpp \
    176         classes/DelphesClasses.h \
    177         external/ExRootAnalysis/ExRootResult.h \
    178         external/ExRootAnalysis/ExRootTreeBranch.h \
    179         external/ExRootAnalysis/ExRootTreeReader.h \
    180         external/ExRootAnalysis/ExRootTreeWriter.h \
    181         external/ExRootAnalysis/ExRootUtilities.h
    182 DelphesValidation$(ExeSuf): \
    183         tmp/validation/DelphesValidation.$(ObjSuf)
    184 
    185 tmp/validation/DelphesValidation.$(ObjSuf): \
    186         validation/DelphesValidation.cpp \
    187176        classes/DelphesClasses.h \
    188177        external/ExRootAnalysis/ExRootResult.h \
    … …  
    199188        stdhep2pileup$(ExeSuf) \
    200189        CaloGrid$(ExeSuf) \
    201         Example1$(ExeSuf) \
    202         DelphesValidation$(ExeSuf)
     190        Example1$(ExeSuf)
    203191
    204192EXECUTABLE_OBJ +=  \
    … …  
    210198        tmp/converters/stdhep2pileup.$(ObjSuf) \
    211199        tmp/examples/CaloGrid.$(ObjSuf) \
    212         tmp/examples/Example1.$(ObjSuf) \
    213         tmp/validation/DelphesValidation.$(ObjSuf)
     200        tmp/examples/Example1.$(ObjSuf)
    214201
    215202DelphesHepMC$(ExeSuf): \
    … …  
    24342421        @echo ">> Building $(DISTTAR)"
    24352422        @mkdir -p $(DISTDIR)
    2436         @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
     2423        @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
    24372424        @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
    24382425        @tar -czf $(DISTTAR) $(DISTDIR)

  • doc/genMakefile.tcl

    rd192152 raafe927  
    282282DISPLAYLIB = libDelphesDisplay.lib
    283283
    284 VERSION = $(shell cat VERSION)
     284VERSION = x.y.z
    285285DISTDIR = Delphes-$(VERSION)
    286286DISTTAR = $(DISTDIR).tar.gz
    … …  
    290290}
    291291
    292 executableDeps {converters/*.cpp} {examples/*.cpp} {validation/*.cpp}
     292executableDeps {converters/*.cpp} {examples/*.cpp}
    293293
    294294executableDeps {readers/DelphesHepMC.cpp} {readers/DelphesLHEF.cpp} {readers/DelphesSTDHEP.cpp} {readers/DelphesROOT.cpp}
    … …  
    434434        @echo ">> Building $(DISTTAR)"
    435435        @mkdir -p $(DISTDIR)
    436         @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
     436        @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
    437437        @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
    438438        @tar -czf $(DISTTAR) $(DISTDIR)

  • modules/FastJetFinder.cc

    rd192152 raafe927  
    489489      fastjet::Filter trimmer(fastjet::JetDefinition(fastjet::kt_algorithm, fRTrim), fastjet::SelectorPtFractionMin(fPtFracTrim));
    490490      fastjet::PseudoJet trimmed_jet = trimmer(*itOutputList);
    491 
    492       trimmed_jet = join(trimmed_jet.constituents());
    493 
     491     
    494492      candidate->TrimmedP4[0].SetPtEtaPhiM(trimmed_jet.pt(), trimmed_jet.eta(), trimmed_jet.phi(), trimmed_jet.m());
    495493

  • readers/DelphesPythia8.cpp

    rd192152 raafe927  
    296296
    297297    // jet matching
     298#if PYTHIA_VERSION_INTEGER < 8300
    298299    matching = combined->getHook(*pythia);
    299300    if(!matching)
    … …  
    302303    }
    303304    pythia->setUserHooksPtr(matching);
     305#endif
    304306
    305307    if(pythia == NULL)

  • validation/DelphesValidation.cpp

    rd192152 raafe927  
    3232#include "TGraph.h"
    3333#include "TGraphErrors.h"
     34#include "TF1.h"
    3435#include "TH1.h"
    3536#include "TH2.h"

  • validation/validation.sh

    rd192152 raafe927  
    3838outputrootdir=report_${cardbase%.*}/root
    3939cardlabel=${cardbase%.*}
    40 version=$(cat VERSION)
     40version=x.y.z
    4141outpdf=$mainoutputdir/${output%.*}.pdf
    4242cardsdir=validation/cards
Note: See TracChangeset for help on using the changeset viewer.