Fork me on GitHub

Changeset 1189 in svn for trunk


Ignore:
Timestamp:
Jul 8, 2013, 9:27:21 PM (11 years ago)
Author:
Pavel Demin
Message:

use mass from input file

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/classes/DelphesHepMCReader.cc

    r1108 r1189  
    338338  pdgParticle = fPDG->GetParticle(fPID);
    339339  candidate->Charge = pdgParticle ? int(pdgParticle->Charge()/3.0) : -999;
    340   candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
     340  candidate->Mass = fMass;
    341341
    342342  candidate->Momentum.SetPxPyPzE(fPx, fPy, fPz, fE);
  • trunk/classes/DelphesLHEFReader.cc

    r1143 r1189  
    181181  pdgParticle = fPDG->GetParticle(fPID);
    182182  candidate->Charge = pdgParticle ? int(pdgParticle->Charge()/3.0) : -999;
    183   candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
     183  candidate->Mass = fMass;
    184184
    185185  candidate->Momentum.SetPxPyPzE(fPx, fPy, fPz, fE);
  • trunk/classes/DelphesSTDHEPReader.cc

    r1129 r1189  
    415415  int number;
    416416  int pid, status, m1, m2, d1, d2;
    417   double px, py, pz, e, m;
     417  double px, py, pz, e, mass;
    418418  double x, y, z, t;
    419419
     
    439439    xdr_double(&bufferXDR[4], &pz);
    440440    xdr_double(&bufferXDR[4], &e);
    441     xdr_double(&bufferXDR[4], &m);
     441    xdr_double(&bufferXDR[4], &mass);
    442442
    443443    xdr_double(&bufferXDR[5], &x);
     
    461461    pdgParticle = fPDG->GetParticle(pid);
    462462    candidate->Charge = pdgParticle ? int(pdgParticle->Charge()/3.0) : -999;
    463     candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
     463    candidate->Mass = mass;
    464464
    465465    candidate->Momentum.SetPxPyPzE(px, py, pz, e);
  • trunk/readers/DelphesCMSFWLite.cpp

    r1185 r1189  
    5757
    5858  Int_t pid, status;
    59   Double_t px, py, pz, e;
     59  Double_t px, py, pz, e, mass;
    6060  Double_t x, y, z;
    6161
     
    7373    pid = particle.pdgId();
    7474    status = particle.status();
    75     px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.energy();
     75    px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.energy(); mass = particle.mass();
    7676    x = particle.vx(); y = particle.vy(); z = particle.vz();
    7777
  • trunk/readers/DelphesProMC.cpp

    r1185 r1189  
    5353
    5454  Int_t pid, status;
    55   Double_t px, py, pz, e, mass;
     55  Double_t px, py, pz, mass;
    5656  Double_t x, y, z;
    5757
     
    9191    px = mutableParticles->px(i); py = mutableParticles->py(i); pz = mutableParticles->pz(i); mass = mutableParticles->mass(i);
    9292    x = mutableParticles->x(i); y = mutableParticles->y(i); z = mutableParticles->z(i);
    93     e = TMath::Sqrt(px*px + py*py + pz*pz + mass*mass);
    9493
    9594    candidate = factory->NewCandidate();
     
    108107    pdgParticle = pdg->GetParticle(pid);
    109108    candidate->Charge = pdgParticle ? Int_t(pdgParticle->Charge()/3.0) : -999;
    110     candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
    111 
    112     candidate->Momentum.SetPxPyPzE(px, py, pz, e);
     109    candidate->Mass = mass;
     110
     111    candidate->Momentum.SetXYZM(px, py, pz, mass);
    113112
    114113    candidate->Position.SetXYZT(x, y, z, 0.0);
  • trunk/readers/DelphesPythia8.cpp

    r1185 r1189  
    4343
    4444  Int_t pid, status;
    45   Double_t px, py, pz, e;
     45  Double_t px, py, pz, e, mass;
    4646  Double_t x, y, z, t;
    4747
     
    7777    pid = particle.id();
    7878    status = particle.status();
    79     px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.e();
     79    px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.e(); mass = particle.m();
    8080    x = particle.xProd(); y = particle.yProd(); z = particle.zProd(); t = particle.tProd();
    8181
Note: See TracChangeset for help on using the changeset viewer.