Changeset 1189 in svn
- Timestamp:
- Jul 8, 2013, 9:27:21 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/classes/DelphesHepMCReader.cc
r1108 r1189 338 338 pdgParticle = fPDG->GetParticle(fPID); 339 339 candidate->Charge = pdgParticle ? int(pdgParticle->Charge()/3.0) : -999; 340 candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;340 candidate->Mass = fMass; 341 341 342 342 candidate->Momentum.SetPxPyPzE(fPx, fPy, fPz, fE); -
trunk/classes/DelphesLHEFReader.cc
r1143 r1189 181 181 pdgParticle = fPDG->GetParticle(fPID); 182 182 candidate->Charge = pdgParticle ? int(pdgParticle->Charge()/3.0) : -999; 183 candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;183 candidate->Mass = fMass; 184 184 185 185 candidate->Momentum.SetPxPyPzE(fPx, fPy, fPz, fE); -
trunk/classes/DelphesSTDHEPReader.cc
r1129 r1189 415 415 int number; 416 416 int pid, status, m1, m2, d1, d2; 417 double px, py, pz, e, m ;417 double px, py, pz, e, mass; 418 418 double x, y, z, t; 419 419 … … 439 439 xdr_double(&bufferXDR[4], &pz); 440 440 xdr_double(&bufferXDR[4], &e); 441 xdr_double(&bufferXDR[4], &m );441 xdr_double(&bufferXDR[4], &mass); 442 442 443 443 xdr_double(&bufferXDR[5], &x); … … 461 461 pdgParticle = fPDG->GetParticle(pid); 462 462 candidate->Charge = pdgParticle ? int(pdgParticle->Charge()/3.0) : -999; 463 candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;463 candidate->Mass = mass; 464 464 465 465 candidate->Momentum.SetPxPyPzE(px, py, pz, e); -
trunk/readers/DelphesCMSFWLite.cpp
r1185 r1189 57 57 58 58 Int_t pid, status; 59 Double_t px, py, pz, e ;59 Double_t px, py, pz, e, mass; 60 60 Double_t x, y, z; 61 61 … … 73 73 pid = particle.pdgId(); 74 74 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(); 76 76 x = particle.vx(); y = particle.vy(); z = particle.vz(); 77 77 -
trunk/readers/DelphesProMC.cpp
r1185 r1189 53 53 54 54 Int_t pid, status; 55 Double_t px, py, pz, e,mass;55 Double_t px, py, pz, mass; 56 56 Double_t x, y, z; 57 57 … … 91 91 px = mutableParticles->px(i); py = mutableParticles->py(i); pz = mutableParticles->pz(i); mass = mutableParticles->mass(i); 92 92 x = mutableParticles->x(i); y = mutableParticles->y(i); z = mutableParticles->z(i); 93 e = TMath::Sqrt(px*px + py*py + pz*pz + mass*mass);94 93 95 94 candidate = factory->NewCandidate(); … … 108 107 pdgParticle = pdg->GetParticle(pid); 109 108 candidate->Charge = pdgParticle ? Int_t(pdgParticle->Charge()/3.0) : -999; 110 candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;111 112 candidate->Momentum.Set PxPyPzE(px, py, pz, e);109 candidate->Mass = mass; 110 111 candidate->Momentum.SetXYZM(px, py, pz, mass); 113 112 114 113 candidate->Position.SetXYZT(x, y, z, 0.0); -
trunk/readers/DelphesPythia8.cpp
r1185 r1189 43 43 44 44 Int_t pid, status; 45 Double_t px, py, pz, e ;45 Double_t px, py, pz, e, mass; 46 46 Double_t x, y, z, t; 47 47 … … 77 77 pid = particle.id(); 78 78 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(); 80 80 x = particle.xProd(); y = particle.yProd(); z = particle.zProd(); t = particle.tProd(); 81 81
Note:
See TracChangeset
for help on using the changeset viewer.