Fork me on GitHub

Changeset 1181 in svn


Ignore:
Timestamp:
07/04/13 13:44:56 (7 years ago)
Author:
pavel
Message:

fix DelphesPythia8.cpp

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/readers/DelphesPythia8.cpp

    r1178 r1181  
    55#include <signal.h>
    66
    7 #include "pythia->h"
     7#include "Pythia.h"
    88
    99#include "TROOT.h"
     
    4040  Int_t pid, status;
    4141  Double_t px, py, pz, e;
    42   Double_t x, y, z;
     42  Double_t x, y, z, t;
    4343
    4444  pdg = TDatabasePDG::Instance();
     
    5050    pid = particle.id();
    5151    status = particle.status();
    52     m1 = particle.mother1(); m2 = particle.mother2();
    53     d1 = particle.daughter1(); d2 = particle.daughter2();
    5452    px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.e();
    5553    x = particle.xProd(); y = particle.yProd(); z = particle.zProd(); t = particle.tProd();
     
    6260    candidate->Status = status;
    6361
    64     candidate->M1 = m1 - 1;
    65     candidate->M2 = m2 - 1;
    66 
    67     candidate->D1 = d1 - 1;
    68     candidate->D2 = d2 - 1;
     62    candidate->M1 = particle.mother1() - 1;
     63    candidate->M2 = particle.mother2() - 1;
     64
     65    candidate->D1 = particle.daughter1() - 1;
     66    candidate->D2 = particle.daughter2() - 1;
    6967
    7068    pdgParticle = pdg->GetParticle(pid);
     
    7472    candidate->Momentum.SetPxPyPzE(px, py, pz, e);
    7573
    76     candidate->Position.SetXYZT(x, y, z, 0.0);
     74    candidate->Position.SetXYZT(x, y, z, t);
    7775
    7876    allParticleOutputArray->Add(candidate);
     
    106104  char appName[] = "DelphesPythia8";
    107105  stringstream message;
    108   FILE *inputFile = 0;
    109106  TFile *outputFile = 0;
    110107  TStopwatch readStopWatch, procStopWatch;
     
    115112  DelphesFactory *factory = 0;
    116113  TObjArray *stableParticleOutputArray = 0, *allParticleOutputArray = 0, *partonOutputArray = 0;
    117   Int_t i;
    118114  Long64_t eventCounter, errorCounter;
    119115  Long64_t numberOfEvents, timesAllowErrors;
Note: See TracChangeset for help on using the changeset viewer.