Fork me on GitHub

Changes in / [365dbc9:5565691] in git


Ignore:
Files:
10 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r365dbc9 r5565691  
    3434ifneq ($(PROMC),)
    3535HAS_PROMC = true
    36 CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
    37 DELPHES_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
     
    238238        external/ExRootAnalysis/ExRootTreeWriter.h \
    239239        external/ExRootAnalysis/ExRootTreeBranch.h \
    240         external/ExRootAnalysis/ExRootProgressBar.h
     240        external/ExRootAnalysis/ExRootProgressBar.h \
     241        external/ProMC/ProMCBook.h
    241242EXECUTABLE +=  \
    242243        DelphesProMC$(ExeSuf)
     
    244245EXECUTABLE_OBJ +=  \
    245246        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
    246269
    247270endif
  • doc/genMakefile.tcl

    r365dbc9 r5565691  
    225225ifneq ($(PROMC),)
    226226HAS_PROMC = true
    227 CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
    228 DELPHES_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
     
    268268puts {ifeq ($(HAS_PROMC),true)}
    269269executableDeps {readers/DelphesProMC.cpp}
     270sourceDeps {DELPHES} {external/ProMC/*.cc}
    270271puts {endif}
    271272puts {}
  • modules/PileUpMergerPythia8.cc

    r365dbc9 r5565691  
    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

    r365dbc9 r5565691  
    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

    r365dbc9 r5565691  
    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

    r365dbc9 r5565691  
    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.