Changeset 1189 in svn for trunk

Timestamp:

Jul 8, 2013, 9:27:21 PM (11 years ago)

Author:

Pavel Demin

Message:

use mass from input file

Location:

trunk

Files:

• classes/DelphesHepMCReader.cc (modified) (1 diff)
• classes/DelphesLHEFReader.cc (modified) (1 diff)
• classes/DelphesSTDHEPReader.cc (modified) (3 diffs)
• readers/DelphesCMSFWLite.cpp (modified) (2 diffs)
• readers/DelphesProMC.cpp (modified) (3 diffs)
• readers/DelphesPythia8.cpp (modified) (2 diffs)

trunk/classes/DelphesHepMCReader.cc

@@ -338 +338 @@
   pdgParticle = fPDG->GetParticle(fPID);
   candidate->Charge = pdgParticle ? int(pdgParticle->Charge()/3.0) : -999;
-  candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
+  candidate->Mass = fMass;
 
   candidate->Momentum.SetPxPyPzE(fPx, fPy, fPz, fE);

trunk/classes/DelphesLHEFReader.cc

@@ -181 +181 @@
   pdgParticle = fPDG->GetParticle(fPID);
   candidate->Charge = pdgParticle ? int(pdgParticle->Charge()/3.0) : -999;
-  candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
+  candidate->Mass = fMass;
 
   candidate->Momentum.SetPxPyPzE(fPx, fPy, fPz, fE);

trunk/classes/DelphesSTDHEPReader.cc

@@ -415 +415 @@
   int number;
   int pid, status, m1, m2, d1, d2;
-  double px, py, pz, e, m;
+  double px, py, pz, e, mass;
   double x, y, z, t;
 
@@ -439 +439 @@
     xdr_double(&bufferXDR[4], &pz);
     xdr_double(&bufferXDR[4], &e);
-    xdr_double(&bufferXDR[4], &m);
+    xdr_double(&bufferXDR[4], &mass);
 
     xdr_double(&bufferXDR[5], &x);
@@ -461 +461 @@
     pdgParticle = fPDG->GetParticle(pid);
     candidate->Charge = pdgParticle ? int(pdgParticle->Charge()/3.0) : -999;
-    candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
+    candidate->Mass = mass;
 
     candidate->Momentum.SetPxPyPzE(px, py, pz, e);

trunk/readers/DelphesCMSFWLite.cpp

@@ -57 +57 @@
 
   Int_t pid, status;
-  Double_t px, py, pz, e;
+  Double_t px, py, pz, e, mass;
   Double_t x, y, z;
 
@@ -73 +73 @@
     pid = particle.pdgId();
     status = particle.status();
-    px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.energy();
+    px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.energy(); mass = particle.mass();
     x = particle.vx(); y = particle.vy(); z = particle.vz();
 

trunk/readers/DelphesProMC.cpp

@@ -53 +53 @@
 
   Int_t pid, status;
-  Double_t px, py, pz, e, mass;
+  Double_t px, py, pz, mass;
   Double_t x, y, z;
 
@@ -91 +91 @@
     px = mutableParticles->px(i); py = mutableParticles->py(i); pz = mutableParticles->pz(i); mass = mutableParticles->mass(i);
     x = mutableParticles->x(i); y = mutableParticles->y(i); z = mutableParticles->z(i);
-    e = TMath::Sqrt(px*px + py*py + pz*pz + mass*mass);
 
     candidate = factory->NewCandidate();
@@ -108 +107 @@
     pdgParticle = pdg->GetParticle(pid);
     candidate->Charge = pdgParticle ? Int_t(pdgParticle->Charge()/3.0) : -999;
-    candidate->Mass = pdgParticle ? pdgParticle->Mass() : -999.9;
-
-    candidate->Momentum.SetPxPyPzE(px, py, pz, e);
+    candidate->Mass = mass;
+
+    candidate->Momentum.SetXYZM(px, py, pz, mass);
 
     candidate->Position.SetXYZT(x, y, z, 0.0);

trunk/readers/DelphesPythia8.cpp

@@ -43 +43 @@
 
   Int_t pid, status;
-  Double_t px, py, pz, e;
+  Double_t px, py, pz, e, mass;
   Double_t x, y, z, t;
 
@@ -77 +77 @@
     pid = particle.id();
     status = particle.status();
-    px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.e();
+    px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.e(); mass = particle.m();
     x = particle.xProd(); y = particle.yProd(); z = particle.zProd(); t = particle.tProd();