Changeset 80d4a34 in git for classes

Timestamp:

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

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

bba4646

Parents:

47bd664

Message:

use mass from input file

Location:

classes

Files:

• DelphesHepMCReader.cc (modified) (1 diff)
• DelphesLHEFReader.cc (modified) (1 diff)
• DelphesSTDHEPReader.cc (modified) (3 diffs)

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);

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);

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);