Fork me on GitHub

Changeset 9327245 in git


Ignore:
Timestamp:
Aug 23, 2016, 3:58:42 PM (8 years ago)
Author:
GitHub <noreply@…>
Parents:
98ce52a (diff), 20ca0cd (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:
AlexandreMertens <alexandre.mertens@…> (08/23/16 15:58:42)
git-committer:
GitHub <noreply@…> (08/23/16 15:58:42)
Message:

Merge 20ca0cd9f4c77e04149db66434b1a6f0bb59334c into 98ce52a7df661abe0f07360a4d82aba1f0496c6a

Files:
7 added
3 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r98ce52a r9327245  
    137137tmp/examples/Example1.$(ObjSuf): \
    138138        examples/Example1.cpp \
     139        classes/DelphesClasses.h \
     140        external/ExRootAnalysis/ExRootTreeReader.h \
     141        external/ExRootAnalysis/ExRootTreeWriter.h \
     142        external/ExRootAnalysis/ExRootTreeBranch.h \
     143        external/ExRootAnalysis/ExRootResult.h \
     144        external/ExRootAnalysis/ExRootUtilities.h
     145Validation$(ExeSuf): \
     146        tmp/examples/Validation.$(ObjSuf)
     147
     148tmp/examples/Validation.$(ObjSuf): \
     149        examples/Validation.cpp \
     150        classes/DelphesClasses.h \
     151        external/ExRootAnalysis/ExRootTreeReader.h \
     152        external/ExRootAnalysis/ExRootTreeWriter.h \
     153        external/ExRootAnalysis/ExRootTreeBranch.h \
     154        external/ExRootAnalysis/ExRootResult.h \
     155        external/ExRootAnalysis/ExRootUtilities.h
     156Validation_electron$(ExeSuf): \
     157        tmp/examples/Validation_electron.$(ObjSuf)
     158
     159tmp/examples/Validation_electron.$(ObjSuf): \
     160        examples/Validation_electron.cpp \
     161        classes/DelphesClasses.h \
     162        external/ExRootAnalysis/ExRootTreeReader.h \
     163        external/ExRootAnalysis/ExRootTreeWriter.h \
     164        external/ExRootAnalysis/ExRootTreeBranch.h \
     165        external/ExRootAnalysis/ExRootResult.h \
     166        external/ExRootAnalysis/ExRootUtilities.h
     167Validation_jet$(ExeSuf): \
     168        tmp/examples/Validation_jet.$(ObjSuf)
     169
     170tmp/examples/Validation_jet.$(ObjSuf): \
     171        examples/Validation_jet.cpp \
     172        classes/DelphesClasses.h \
     173        external/ExRootAnalysis/ExRootTreeReader.h \
     174        external/ExRootAnalysis/ExRootTreeWriter.h \
     175        external/ExRootAnalysis/ExRootTreeBranch.h \
     176        external/ExRootAnalysis/ExRootResult.h \
     177        external/ExRootAnalysis/ExRootUtilities.h
     178Validation_muon$(ExeSuf): \
     179        tmp/examples/Validation_muon.$(ObjSuf)
     180
     181tmp/examples/Validation_muon.$(ObjSuf): \
     182        examples/Validation_muon.cpp \
     183        classes/DelphesClasses.h \
     184        external/ExRootAnalysis/ExRootTreeReader.h \
     185        external/ExRootAnalysis/ExRootTreeWriter.h \
     186        external/ExRootAnalysis/ExRootTreeBranch.h \
     187        external/ExRootAnalysis/ExRootResult.h \
     188        external/ExRootAnalysis/ExRootUtilities.h
     189Validation_photon$(ExeSuf): \
     190        tmp/examples/Validation_photon.$(ObjSuf)
     191
     192tmp/examples/Validation_photon.$(ObjSuf): \
     193        examples/Validation_photon.cpp \
    139194        classes/DelphesClasses.h \
    140195        external/ExRootAnalysis/ExRootTreeReader.h \
     
    150205        root2pileup$(ExeSuf) \
    151206        stdhep2pileup$(ExeSuf) \
    152         Example1$(ExeSuf)
     207        Example1$(ExeSuf) \
     208        Validation$(ExeSuf) \
     209        Validation_electron$(ExeSuf) \
     210        Validation_jet$(ExeSuf) \
     211        Validation_muon$(ExeSuf) \
     212        Validation_photon$(ExeSuf)
    153213
    154214EXECUTABLE_OBJ +=  \
     
    159219        tmp/converters/root2pileup.$(ObjSuf) \
    160220        tmp/converters/stdhep2pileup.$(ObjSuf) \
    161         tmp/examples/Example1.$(ObjSuf)
     221        tmp/examples/Example1.$(ObjSuf) \
     222        tmp/examples/Validation.$(ObjSuf) \
     223        tmp/examples/Validation_electron.$(ObjSuf) \
     224        tmp/examples/Validation_jet.$(ObjSuf) \
     225        tmp/examples/Validation_muon.$(ObjSuf) \
     226        tmp/examples/Validation_photon.$(ObjSuf)
    162227
    163228DelphesHepMC$(ExeSuf): \
  • examples/Pythia8/configParticleGun.cmnd

    r98ce52a r9327245  
    66Main:timesAllowErrors = 3          ! how many aborts before run stops
    77Main:spareFlag1 = on                ! true means particle gun
    8 Main:spareMode1 = 11               ! 1-5 - di-quark, 21 - di-gluon, 11 - single electron, 13 - single muon, 22 - single photon
     8Main:spareMode1 = ID               ! 1-5 - di-quark, 21 - di-gluon, 11 - single electron, 13 - single muon, 22 - single photon
    99Main:spareParm1 = 10000           ! max pt
    1010
  • readers/DelphesPythia8.cpp

    r98ce52a r9327245  
    338338      if (pythia->flag("Main:spareFlag1"))
    339339      {
    340         if (pythia->mode("Main:spareMode1") == 11 || pythia->mode("Main:spareMode1") == 13 || pythia->mode("Main:spareMode1") == 22)
     340        if (pythia->mode("Main:spareMode1") == 11 || pythia->mode("Main:spareMode1") == 13 || pythia->mode("Main:spareMode1") == 15 || pythia->mode("Main:spareMode1") == 22)
    341341        {
    342342          fillParticle( pythia->mode("Main:spareMode1"), pythia->parm("Main:spareParm1"), -1., 0.,pythia->event, pythia->particleData, pythia->rndm, 0);
Note: See TracChangeset for help on using the changeset viewer.