Fork me on GitHub

Changes in / [c3c9ac5:f6b6ee7] in git


Ignore:
Files:
1 added
10 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

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

  • Makefile

    rc3c9ac5 rf6b6ee7  
    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) $(SYSLIBS)
     19DISPLAY_LIBS = $(shell $(RC) --evelibs) -lGuiHtml  $(SYSLIBS)
    2020
    2121ifneq ($(CMSSW_FWLITE_INCLUDE_PATH),)
    2222HAS_CMSSW = true
    2323CXXFLAGS += -std=c++0x -I$(subst :, -I,$(CMSSW_FWLITE_INCLUDE_PATH))
    24 DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
     24OPT_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 DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
    30 endif
    31 DELPHES_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
     29OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
     30endif
     31OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
    3232endif
    3333
    3434ifneq ($(PROMC),)
    3535HAS_PROMC = true
    36 CXXFLAGS += -I$(PROMC)/include
    37 DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
     36CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
     37OPT_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
    3838endif
    3939
    … …  
    4141HAS_PYTHIA8 = true
    4242CXXFLAGS += -I$(PYTHIA8)/include
    43 DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
     43OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
    4444else
    4545ifneq ($(PYTHIA8DATA),)
    4646HAS_PYTHIA8 = true
    4747CXXFLAGS += -I$(PYTHIA8DATA)/../include
    48 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
    49 endif
    50 endif
     48OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
     49endif
     50endif
     51
     52DELPHES_LIBS += $(OPT_LIBS)
     53DISPLAY_LIBS += $(OPT_LIBS)
    5154
    5255###
    … …  
    238241        external/ExRootAnalysis/ExRootTreeWriter.h \
    239242        external/ExRootAnalysis/ExRootTreeBranch.h \
    240         external/ExRootAnalysis/ExRootProgressBar.h \
    241         external/ProMC/ProMCBook.h
     243        external/ExRootAnalysis/ExRootProgressBar.h
    242244EXECUTABLE +=  \
    243245        DelphesProMC$(ExeSuf)
    … …  
    245247EXECUTABLE_OBJ +=  \
    246248        tmp/readers/DelphesProMC.$(ObjSuf)
    247 
    248 tmp/external/ProMC/ProMCBook.$(ObjSuf): \
    249         external/ProMC/ProMCBook.$(SrcSuf)
    250 tmp/external/ProMC/ProMC.pb.$(ObjSuf): \
    251         external/ProMC/ProMC.pb.$(SrcSuf)
    252 tmp/external/ProMC/ProMCStat.pb.$(ObjSuf): \
    253         external/ProMC/ProMCStat.pb.$(SrcSuf)
    254 tmp/external/ProMC/ProMCHeader.pb.$(ObjSuf): \
    255         external/ProMC/ProMCHeader.pb.$(SrcSuf)
    256 tmp/external/ProMC/ProMCDescription.pb.$(ObjSuf): \
    257         external/ProMC/ProMCDescription.pb.$(SrcSuf)
    258 DELPHES_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 
    265 ifeq ($(HAS_PYTHIA8),true)
    266 DELPHES_OBJ +=  \
    267        
    268 endif
    269249
    270250endif
    … …  
    381361        display/DisplayLinkDef.h \
    382362        display/DelphesDisplay.h \
    383         display/DelphesCaloData.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
    384369DisplayDict$(PcmSuf): \
    385370        tmp/display/DisplayDict$(PcmSuf) \
    … …  
    12351220        display/DelphesDisplay.$(SrcSuf) \
    12361221        display/DelphesDisplay.h
     1222tmp/display/DelphesPlotSummary.$(ObjSuf): \
     1223        display/DelphesPlotSummary.$(SrcSuf) \
     1224        display/DelphesPlotSummary.h
     1225tmp/display/DelphesBranchElement.$(ObjSuf): \
     1226        display/DelphesBranchElement.$(SrcSuf) \
     1227        display/DelphesBranchElement.h \
     1228        classes/DelphesClasses.h
     1229tmp/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
     1238tmp/display/DelphesHtmlSummary.$(ObjSuf): \
     1239        display/DelphesHtmlSummary.$(SrcSuf) \
     1240        display/DelphesHtmlSummary.h
     1241tmp/display/Delphes3DGeometry.$(ObjSuf): \
     1242        display/Delphes3DGeometry.$(SrcSuf) \
     1243        display/Delphes3DGeometry.h \
     1244        external/ExRootAnalysis/ExRootConfReader.h \
     1245        classes/DelphesClasses.h
    12371246tmp/display/DelphesCaloData.$(ObjSuf): \
    12381247        display/DelphesCaloData.$(SrcSuf) \
    … …  
    12401249DISPLAY_OBJ +=  \
    12411250        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) \
    12421256        tmp/display/DelphesCaloData.$(ObjSuf)
    12431257
    … …  
    14611475        @touch $@
    14621476
     1477display/DelphesBranchElement.h: \
     1478        display/DelphesCaloData.h
     1479        @touch $@
     1480
    14631481external/fastjet/internal/DynamicNearestNeighbours.hh: \
    14641482        external/fastjet/internal/numconsts.hh
    … …  
    15001518        @touch $@
    15011519
     1520display/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
    15021528modules/TauTagging.h: \
    15031529        classes/DelphesModule.h
    … …  
    15841610modules/Hector.h: \
    15851611        classes/DelphesModule.h
     1612        @touch $@
     1613
     1614display/DelphesPlotSummary.h: \
     1615        external/ExRootAnalysis/ExRootTreeReader.h
    15861616        @touch $@
    15871617

  • doc/genMakefile.tcl

    rc3c9ac5 rf6b6ee7  
    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) $(SYSLIBS)
     210DISPLAY_LIBS = $(shell $(RC) --evelibs) -lGuiHtml  $(SYSLIBS)
    211211
    212212ifneq ($(CMSSW_FWLITE_INCLUDE_PATH),)
    213213HAS_CMSSW = true
    214214CXXFLAGS += -std=c++0x -I$(subst :, -I,$(CMSSW_FWLITE_INCLUDE_PATH))
    215 DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
     215OPT_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 DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
    221 endif
    222 DELPHES_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
     220OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
     221endif
     222OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
    223223endif
    224224
    225225ifneq ($(PROMC),)
    226226HAS_PROMC = true
    227 CXXFLAGS += -I$(PROMC)/include
    228 DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
     227CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
     228OPT_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
    229229endif
    230230
    … …  
    232232HAS_PYTHIA8 = true
    233233CXXFLAGS += -I$(PYTHIA8)/include
    234 DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
     234OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
    235235else
    236236ifneq ($(PYTHIA8DATA),)
    237237HAS_PYTHIA8 = true
    238238CXXFLAGS += -I$(PYTHIA8DATA)/../include
    239 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
    240 endif
    241 endif
     239OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
     240endif
     241endif
     242
     243DELPHES_LIBS += $(OPT_LIBS)
     244DISPLAY_LIBS += $(OPT_LIBS)
    242245
    243246###
    … …  
    268271puts {ifeq ($(HAS_PROMC),true)}
    269272executableDeps {readers/DelphesProMC.cpp}
    270 sourceDeps {DELPHES} {external/ProMC/*.cc}
    271273puts {endif}
    272274puts {}

  • modules/ParticlePropagator.cc

    rc3c9ac5 rf6b6ee7  
    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

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

  • readers/DelphesProMC.cpp

    rc3c9ac5 rf6b6ee7  
    4747#include "ExRootAnalysis/ExRootProgressBar.h"
    4848
    49 #include "ProMC/ProMC.pb.h"
    50 #include "ProMC/ProMCBook.h"
    51 #include "ProMC/ProMCHeader.pb.h"
     49#include "ProMC.pb.h"
     50#include "ProMCBook.h"
     51#include "ProMCHeader.pb.h"
    5252
    5353using namespace std;
    … …  
    5555//---------------------------------------------------------------------------
    5656
    57 void ConvertInput(ProMCEvent &event, ExRootTreeBranch *branch, DelphesFactory *factory,
    58   TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray,
    59   TStopwatch *readStopWatch, TStopwatch *procStopWatch)
     57void ConvertInput(ProMCEvent &event, double momentumUnit, double positionUnit,
     58  ExRootTreeBranch *branch, DelphesFactory *factory,
     59  TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray,
     60  TObjArray *partonOutputArray, TStopwatch *readStopWatch, TStopwatch *procStopWatch)
    6061{
    6162  Int_t i;
    … …  
    107108    pid = mutableParticles->pdg_id(i);
    108109    status = mutableParticles->status(i);
    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);
     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;
    111119
    112120    candidate = factory->NewCandidate();
    … …  
    172180  Int_t i;
    173181  Long64_t eventCounter, numberOfEvents;
     182  double momentumUnit = 1.0, positionUnit = 1.0;
    174183
    175184  if(argc < 4)
    … …  
    224233      inputFile = new ProMCBook(argv[i], "r");
    225234
     235      ProMCHeader header = inputFile->getHeader();
     236
     237      momentumUnit = static_cast<double>(header.momentumunit());
     238      positionUnit = static_cast<double>(header.lengthunit());
     239
     240
     241
    226242      if(inputFile == NULL)
    227243      {
    … …  
    248264
    249265        procStopWatch.Start();
    250         ConvertInput(event, branchEvent, factory,
    251           allParticleOutputArray, stableParticleOutputArray, partonOutputArray,
    252           &readStopWatch, &procStopWatch);
     266        ConvertInput(event, momentumUnit, positionUnit,
     267          branchEvent, factory,
     268          allParticleOutputArray, stableParticleOutputArray,
     269          partonOutputArray, &readStopWatch, &procStopWatch);
    253270        modularDelphes->ProcessTask();
    254271        procStopWatch.Stop();

  • readers/DelphesProMC.py

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

  • readers/DelphesPythia8.cpp

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