Changeset 380 in svn for trunk/src/STDHEPConverter.cc

Timestamp:

May 12, 2009, 9:47:12 AM (15 years ago)

Author:

Xavier Rouby

Message:

new PDG table

File:

• trunk/src/STDHEPConverter.cc (modified) (4 diffs)

trunk/src/STDHEPConverter.cc

@@ -41 +41 @@
 #include "stdhep_declarations.h"
 #include "STDHEPConverter.h"
+#include "PdgParticle.h"
 
 using namespace std;
@@ -79 +80 @@
     element->D1 = myhepevt.jdahep[number][0] - 1;
     element->D2 = myhepevt.jdahep[number][1] - 1;
-//    element->Charge = myhepevt.hepchg(element->PID);
-    element->Charge = ChargeVal(element->PID);
+    PdgParticle pdg_part = pdg_table[element->PID];
+    element->Charge = pdg_part.charge();
+    element->M = pdg_part.mass();
 
     element->E = myhepevt.phep[number][3];
@@ -86 +88 @@
     element->Py = myhepevt.phep[number][1];
     element->Pz = myhepevt.phep[number][2];
-    element->M = myhepevt.phep[number][4];
+    //element->M = myhepevt.phep[number][4];
 
     momentum.SetPxPyPzE(element->Px, element->Py, element->Pz, element->E);
@@ -111 +113 @@
 //------------------------------------------------------------------------------
 
-STDHEPConverter::STDHEPConverter(const string& inputFileList, const string& outputFileName, const int& Nevents) : DataConverter(Nevents)
+STDHEPConverter::STDHEPConverter(const string& inputFileList, const string& outputFileName, const PdgTable& pdg, const int& Nevents) : DataConverter(pdg, Nevents)
 {
   int ierr, entryType;