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

Timestamp:

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

Author:

Xavier Rouby

Message:

new PDG table

File:

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

trunk/src/BFieldProp.cc

@@ -31 +31 @@
 
 #include "BFieldProp.h"
+#include "PdgParticle.h"
 #include "SystemOfUnits.h"
 #include "PhysicalConstants.h"
@@ -131 +132 @@
   if (!DET->FLAG_bfield ) return;
 
-  q  = ChargeVal(Part->PID) *eplus; // in units of 'e'
+  double M;
+  //int q1  = ChargeVal(Part->PID) *eplus; // in units of 'e'
+  if(Part->M < -999) { // unitialised!
+     PdgParticle pdg_part = DET->PDGtable[Part->PID];
+     q  = pdg_part.charge() *eplus; // in units of 'e'
+     M  = pdg_part.mass(); // GeV
+  } else  { q = Part->Charge; M = Part->M; }
+
   if(q==0) return;
   if(R_max==0) { cout << "ERROR: magnetic field has no lateral extention\n"; return;}
@@ -165 +173 @@
     double PT = Part->PT;
     double E  = Part->E;              // [GeV]
-    double M  = Part->M;              // [GeV]/c²
+    //double M  = Part->M;            // [GeV]/c²
       double Phi = UNDEFINED;
 
@@ -477 +485 @@
   double p  = sqrt(pz*pz + pt*pt); //sqrt(px*px+py*py+pz*pz);
  
-  double M  = Part->M;
+  //double M  = Part->M; // see above
   double vx = px/M;
   double vy = py/M;