Fork me on GitHub

Changes in / [f6b6ee7:c3c9ac5] in git


Ignore:
Files:
10 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    rf6b6ee7 rc3c9ac5  
    77
    88# Declare ROOT dependency
    9 find_package(ROOT COMPONENTS EG Eve Geom Gui GuiHtml GenVector Hist Physics Matrix Graf RIO Tree Gpad RGL MathCore)
     9find_package(ROOT COMPONENTS EG Eve GenVector Hist Physics Matrix Graf RIO Tree Gpad RGL MathCore)
    1010include(${ROOT_USE_FILE})
    1111

  • Makefile

    rf6b6ee7 rc3c9ac5  
    1717CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
    1818DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS)
    19 DISPLAY_LIBS = $(shell $(RC) --evelibs) -lGuiHtml  $(SYSLIBS)
     19DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
    2020
    2121ifneq ($(CMSSW_FWLITE_INCLUDE_PATH),)
    2222HAS_CMSSW = true
    2323CXXFLAGS += -std=c++0x -I$(subst :, -I,$(CMSSW_FWLITE_INCLUDE_PATH))
    24 OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
     24DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
    2525ifneq ($(CMSSW_RELEASE_BASE),)
    2626CXXFLAGS += -I$(CMSSW_RELEASE_BASE)/src
    2727endif
    2828ifneq ($(LD_LIBRARY_PATH),)
    29 OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
    30 endif
    31 OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
     29DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
     30endif
     31DELPHES_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
    3232endif
    3333
    3434ifneq ($(PROMC),)
    3535HAS_PROMC = true
    36 CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
    37 OPT_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
     36CXXFLAGS += -I$(PROMC)/include
     37DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
    3838endif
    3939
    … …  
    4141HAS_PYTHIA8 = true
    4242CXXFLAGS += -I$(PYTHIA8)/include
    43 OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
     43DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
    4444else
    4545ifneq ($(PYTHIA8DATA),)
    4646HAS_PYTHIA8 = true
    4747CXXFLAGS += -I$(PYTHIA8DATA)/../include
    48 OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
    49 endif
    50 endif
    51 
    52 DELPHES_LIBS += $(OPT_LIBS)
    53 DISPLAY_LIBS += $(OPT_LIBS)
     48DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
     49endif
     50endif
    5451
    5552###
    … …  
    241238        external/ExRootAnalysis/ExRootTreeWriter.h \
    242239        external/ExRootAnalysis/ExRootTreeBranch.h \
    243         external/ExRootAnalysis/ExRootProgressBar.h
     240        external/ExRootAnalysis/ExRootProgressBar.h \
     241        external/ProMC/ProMCBook.h
    244242EXECUTABLE +=  \
    245243        DelphesProMC$(ExeSuf)
    … …  
    247245EXECUTABLE_OBJ +=  \
    248246        tmp/readers/DelphesProMC.$(ObjSuf)
     247
     248tmp/external/ProMC/ProMCBook.$(ObjSuf): \
     249        external/ProMC/ProMCBook.$(SrcSuf)
     250tmp/external/ProMC/ProMC.pb.$(ObjSuf): \
     251        external/ProMC/ProMC.pb.$(SrcSuf)
     252tmp/external/ProMC/ProMCStat.pb.$(ObjSuf): \
     253        external/ProMC/ProMCStat.pb.$(SrcSuf)
     254tmp/external/ProMC/ProMCHeader.pb.$(ObjSuf): \
     255        external/ProMC/ProMCHeader.pb.$(SrcSuf)
     256tmp/external/ProMC/ProMCDescription.pb.$(ObjSuf): \
     257        external/ProMC/ProMCDescription.pb.$(SrcSuf)
     258DELPHES_OBJ +=  \
     259        tmp/external/ProMC/ProMCBook.$(ObjSuf) \
     260        tmp/external/ProMC/ProMC.pb.$(ObjSuf) \
     261        tmp/external/ProMC/ProMCStat.pb.$(ObjSuf) \
     262        tmp/external/ProMC/ProMCHeader.pb.$(ObjSuf) \
     263        tmp/external/ProMC/ProMCDescription.pb.$(ObjSuf)
     264
     265ifeq ($(HAS_PYTHIA8),true)
     266DELPHES_OBJ +=  \
     267       
     268endif
    249269
    250270endif
    … …  
    361381        display/DisplayLinkDef.h \
    362382        display/DelphesDisplay.h \
    363         display/DelphesCaloData.h \
    364         display/DelphesBranchElement.h \
    365         display/Delphes3DGeometry.h \
    366         display/DelphesEventDisplay.h \
    367         display/DelphesHtmlSummary.h \
    368         display/DelphesPlotSummary.h
     383        display/DelphesCaloData.h
    369384DisplayDict$(PcmSuf): \
    370385        tmp/display/DisplayDict$(PcmSuf) \
    … …  
    12201235        display/DelphesDisplay.$(SrcSuf) \
    12211236        display/DelphesDisplay.h
    1222 tmp/display/DelphesPlotSummary.$(ObjSuf): \
    1223         display/DelphesPlotSummary.$(SrcSuf) \
    1224         display/DelphesPlotSummary.h
    1225 tmp/display/DelphesBranchElement.$(ObjSuf): \
    1226         display/DelphesBranchElement.$(SrcSuf) \
    1227         display/DelphesBranchElement.h \
    1228         classes/DelphesClasses.h
    1229 tmp/display/DelphesEventDisplay.$(ObjSuf): \
    1230         display/DelphesEventDisplay.$(SrcSuf) \
    1231         external/ExRootAnalysis/ExRootConfReader.h \
    1232         external/ExRootAnalysis/ExRootTreeReader.h \
    1233         display/DelphesCaloData.h \
    1234         display/DelphesBranchElement.h \
    1235         display/Delphes3DGeometry.h \
    1236         display/DelphesEventDisplay.h \
    1237         classes/DelphesClasses.h
    1238 tmp/display/DelphesHtmlSummary.$(ObjSuf): \
    1239         display/DelphesHtmlSummary.$(SrcSuf) \
    1240         display/DelphesHtmlSummary.h
    1241 tmp/display/Delphes3DGeometry.$(ObjSuf): \
    1242         display/Delphes3DGeometry.$(SrcSuf) \
    1243         display/Delphes3DGeometry.h \
    1244         external/ExRootAnalysis/ExRootConfReader.h \
    1245         classes/DelphesClasses.h
    12461237tmp/display/DelphesCaloData.$(ObjSuf): \
    12471238        display/DelphesCaloData.$(SrcSuf) \
    … …  
    12491240DISPLAY_OBJ +=  \
    12501241        tmp/display/DelphesDisplay.$(ObjSuf) \
    1251         tmp/display/DelphesPlotSummary.$(ObjSuf) \
    1252         tmp/display/DelphesBranchElement.$(ObjSuf) \
    1253         tmp/display/DelphesEventDisplay.$(ObjSuf) \
    1254         tmp/display/DelphesHtmlSummary.$(ObjSuf) \
    1255         tmp/display/Delphes3DGeometry.$(ObjSuf) \
    12561242        tmp/display/DelphesCaloData.$(ObjSuf)
    12571243
    … …  
    14751461        @touch $@
    14761462
    1477 display/DelphesBranchElement.h: \
    1478         display/DelphesCaloData.h
    1479         @touch $@
    1480 
    14811463external/fastjet/internal/DynamicNearestNeighbours.hh: \
    14821464        external/fastjet/internal/numconsts.hh
    … …  
    15181500        @touch $@
    15191501
    1520 display/DelphesEventDisplay.h: \
    1521         external/ExRootAnalysis/ExRootTreeReader.h \
    1522         display/DelphesDisplay.h \
    1523         display/Delphes3DGeometry.h \
    1524         display/DelphesHtmlSummary.h \
    1525         display/DelphesPlotSummary.h
    1526         @touch $@
    1527 
    15281502modules/TauTagging.h: \
    15291503        classes/DelphesModule.h
    … …  
    16101584modules/Hector.h: \
    16111585        classes/DelphesModule.h
    1612         @touch $@
    1613 
    1614 display/DelphesPlotSummary.h: \
    1615         external/ExRootAnalysis/ExRootTreeReader.h
    16161586        @touch $@
    16171587

  • doc/genMakefile.tcl

    rf6b6ee7 rc3c9ac5  
    208208CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
    209209DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS)
    210 DISPLAY_LIBS = $(shell $(RC) --evelibs) -lGuiHtml  $(SYSLIBS)
     210DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
    211211
    212212ifneq ($(CMSSW_FWLITE_INCLUDE_PATH),)
    213213HAS_CMSSW = true
    214214CXXFLAGS += -std=c++0x -I$(subst :, -I,$(CMSSW_FWLITE_INCLUDE_PATH))
    215 OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
     215DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
    216216ifneq ($(CMSSW_RELEASE_BASE),)
    217217CXXFLAGS += -I$(CMSSW_RELEASE_BASE)/src
    218218endif
    219219ifneq ($(LD_LIBRARY_PATH),)
    220 OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
    221 endif
    222 OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
     220DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
     221endif
     222DELPHES_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
    223223endif
    224224
    225225ifneq ($(PROMC),)
    226226HAS_PROMC = true
    227 CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
    228 OPT_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
     227CXXFLAGS += -I$(PROMC)/include
     228DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
    229229endif
    230230
    … …  
    232232HAS_PYTHIA8 = true
    233233CXXFLAGS += -I$(PYTHIA8)/include
    234 OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
     234DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
    235235else
    236236ifneq ($(PYTHIA8DATA),)
    237237HAS_PYTHIA8 = true
    238238CXXFLAGS += -I$(PYTHIA8DATA)/../include
    239 OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
    240 endif
    241 endif
    242 
    243 DELPHES_LIBS += $(OPT_LIBS)
    244 DISPLAY_LIBS += $(OPT_LIBS)
     239DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
     240endif
     241endif
    245242
    246243###
    … …  
    271268puts {ifeq ($(HAS_PROMC),true)}
    272269executableDeps {readers/DelphesProMC.cpp}
     270sourceDeps {DELPHES} {external/ProMC/*.cc}
    273271puts {endif}
    274272puts {}

  • modules/ParticlePropagator.cc

    rf6b6ee7 rc3c9ac5  
    158158    if(TMath::Abs(q) < 1.0E-9 || TMath::Abs(fBz) < 1.0E-9)
    159159    {
    160       // solve pt2*t^2 + 2*(px*x + py*y)*t - (fRadius2 - x*x - y*y) = 0
     160      // solve pt2*t^2 + 2*(px*x + py*y)*t + (fRadius2 - x*x - y*y) = 0
    161161      tmp = px*y - py*x;
    162162      discr2 = pt2*fRadius2 - tmp*tmp;

  • modules/PileUpMergerPythia8.cc

    rf6b6ee7 rc3c9ac5  
    132132    dphi = gRandom->Uniform(-TMath::Pi(), TMath::Pi());
    133133
    134     for(i = 1; i < fPythia->event.size(); ++i)
     134    for(i = 0; i < fPythia->event.size(); ++i)
    135135    {
    136136      Pythia8::Particle &particle = fPythia->event[i];

  • readers/DelphesProMC.cpp

    rf6b6ee7 rc3c9ac5  
    4747#include "ExRootAnalysis/ExRootProgressBar.h"
    4848
    49 #include "ProMC.pb.h"
    50 #include "ProMCBook.h"
    51 #include "ProMCHeader.pb.h"
     49#include "ProMC/ProMC.pb.h"
     50#include "ProMC/ProMCBook.h"
     51#include "ProMC/ProMCHeader.pb.h"
    5252
    5353using namespace std;
    … …  
    5555//---------------------------------------------------------------------------
    5656
    57 void ConvertInput(ProMCEvent &event, double momentumUnit, double positionUnit,
    58   ExRootTreeBranch *branch, DelphesFactory *factory,
    59   TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray,
    60   TObjArray *partonOutputArray, TStopwatch *readStopWatch, TStopwatch *procStopWatch)
     57void ConvertInput(ProMCEvent &event, ExRootTreeBranch *branch, DelphesFactory *factory,
     58  TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray,
     59  TStopwatch *readStopWatch, TStopwatch *procStopWatch)
    6160{
    6261  Int_t i;
    … …  
    108107    pid = mutableParticles->pdg_id(i);
    109108    status = mutableParticles->status(i);
    110 
    111     px = mutableParticles->px(i)/momentumUnit;
    112     py = mutableParticles->py(i)/momentumUnit;
    113     pz = mutableParticles->pz(i)/momentumUnit;
    114     mass = mutableParticles->mass(i)/momentumUnit;
    115     x = mutableParticles->x(i)/positionUnit;
    116     y = mutableParticles->y(i)/positionUnit;
    117     z = mutableParticles->z(i)/positionUnit;
    118     t = mutableParticles->t(i)/positionUnit;
     109    px = mutableParticles->px(i); py = mutableParticles->py(i); pz = mutableParticles->pz(i); mass = mutableParticles->mass(i);
     110    x = mutableParticles->x(i); y = mutableParticles->y(i); z = mutableParticles->z(i); t = mutableParticles->t(i);
    119111
    120112    candidate = factory->NewCandidate();
    … …  
    180172  Int_t i;
    181173  Long64_t eventCounter, numberOfEvents;
    182   double momentumUnit = 1.0, positionUnit = 1.0;
    183174
    184175  if(argc < 4)
    … …  
    232223
    233224      inputFile = new ProMCBook(argv[i], "r");
    234 
    235       ProMCHeader header = inputFile->getHeader();
    236 
    237       momentumUnit = static_cast<double>(header.momentumunit());
    238       positionUnit = static_cast<double>(header.lengthunit());
    239 
    240 
    241225
    242226      if(inputFile == NULL)
    … …  
    264248
    265249        procStopWatch.Start();
    266         ConvertInput(event, momentumUnit, positionUnit,
    267           branchEvent, factory,
    268           allParticleOutputArray, stableParticleOutputArray,
    269           partonOutputArray, &readStopWatch, &procStopWatch);
     250        ConvertInput(event, branchEvent, factory,
     251          allParticleOutputArray, stableParticleOutputArray, partonOutputArray,
     252          &readStopWatch, &procStopWatch);
    270253        modularDelphes->ProcessTask();
    271254        procStopWatch.Stop();

  • readers/DelphesProMC.py

    rf6b6ee7 rc3c9ac5  
    134134################################################################################
    135135
    136 if len(sys.argv) < 4:
     136if len(sys.argv) < 2:
    137137  print " Usage: DelphesProMC.py config_file output_file input_file(s)"
    138138  sys.exit(1)

  • readers/DelphesPythia8.cpp

    rf6b6ee7 rc3c9ac5  
    8989  pdg = TDatabasePDG::Instance();
    9090
    91   for(i = 1; i < pythia->event.size(); ++i)
     91  for(i = 0; i < pythia->event.size(); ++i)
    9292  {
    9393    Pythia8::Particle &particle = pythia->event[i];
Note: See TracChangeset for help on using the changeset viewer.