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

Timestamp:

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

Author:

Xavier Rouby

Message:

new PDG table

File:

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

trunk/src/HepMCConverter.cc

@@ -36 +36 @@
 #include "BlockClasses.h"
 
-#include "SmearUtil.h"
+#include "PdgParticle.h"
 #include "ExRootTreeWriter.h"
 #include "ExRootTreeBranch.h"
@@ -197 +197 @@
       element->D1 = da1;
       element->D2 = da2;
-      element->Charge = ChargeVal(pid);
 
       element->E = index_to_particle[n]->momentum().e();
@@ -203 +202 @@
       element->Py = index_to_particle[n]->momentum().py();
       element->Pz = index_to_particle[n]->momentum().pz();
-      element->M =  index_to_particle[n]->momentum().m();
-
-      float PT = sqrt(pow(element->Px,2)+pow(element->Py,2));
-      element->PT = PT;
+
+
+      //cout << "element->PID = " << pid << "\t"; 
+      //PdgParticle pdg_part(PdgID[pid]);
+      //element->M =  index_to_particle[n]->momentum().m(); // this is the particle virtuality, not its rest mass
+      //element->M      = pdg_part.mass();
+      //element->Charge = pdg_part.charge();
+      //cout << "element->M = " << element->M << " \t element->Charge = " << element->Charge << endl;
+
+      element->PT = sqrt(pow(element->Px,2)+pow(element->Py,2));
 
       momentum.SetPxPyPzE(element->Px, element->Py, element->Pz, element->E);
@@ -256 +261 @@
 //------------------------------------------------------------------------------
 
-HepMCConverter::HepMCConverter(const string& inputFileList, const string& outputFileName, const int& Nevents) : DataConverter(Nevents)
+HepMCConverter::HepMCConverter(const string& inputFileList, const string& outputFileName, const PdgTable& pdg, const int& Nevents) : DataConverter(pdg,Nevents)
 {