Changeset 402 in svn

Timestamp:

May 20, 2009, 10:36:42 AM (16 years ago)

Author:

Xavier Rouby

Message:

move tau to ctau [m]

Location:

trunk

Files:

• interface/PdgParticle.h (modified) (3 diffs)
• src/PdgParticle.cc (modified) (2 diffs)

trunk/interface/PdgParticle.h

@@ -7 +7 @@
 class PdgParticle {
   public:
-        PdgParticle(): _pid(-999), _mass(0), _charge(0), _gamma_tot(0), _tau(0), _name("Unknown") {};
-        PdgParticle(const int pid, const std::string& name, const float m, const float q, const float gamma, const float tau);
+        PdgParticle(): _pid(-999), _mass(0), _charge(0), _gamma_tot(0), _ctau(0), _name("Unknown") {};
+        PdgParticle(const int pid, const std::string& name, const float m, const float q, const float gamma, const float ctau);
         PdgParticle(const PdgParticle& p);
         PdgParticle& operator=(const PdgParticle& p);
@@ -16 +16 @@
         float charge() const {return _charge;};
         float gamma_tot() const {return _gamma_tot;};
-        float tau() const {return _tau;};
+        double ctau() const {return _ctau;};
         std::string name() const {return _name;};
 
@@ -23 +23 @@
         float _mass;       // GeV
         float _charge;     // in e+
-        float _gamma_tot;  
-        float _tau;
+        float _gamma_tot;  // GeV
+        double _ctau;       // in m
         std::string _name;
 };

trunk/src/PdgParticle.cc

@@ -37 +37 @@
 #include <string>
 #include <map>
+#include <iomanip>
 
-//PdgParticle::PdgParticle() : _pid(1), _mass(-1), _charge(-999), _gamma_tot(-1), _tau(-1), _name("") {}
+//PdgParticle::PdgParticle() : _pid(1), _mass(-1), _charge(-999), _gamma_tot(-1), _ctau(-1), _name("") {}
 
-PdgParticle::PdgParticle(const int pid, const std::string& name, const float m, const float q, const float gamma, const float tau) :
-  _pid(pid), _mass(m), _charge(q), _gamma_tot(gamma), _tau(tau), _name(name) {}
+PdgParticle::PdgParticle(const int pid, const std::string& name, const float m, const float q, const float gamma, const float ctau) :
+  _pid(pid), _mass(m), _charge(q), _gamma_tot(gamma), _ctau(ctau), _name(name) {}
 
 
 PdgParticle::PdgParticle(const PdgParticle& p) :
-  _pid(p._pid), _mass(p._mass), _charge(p._charge), _gamma_tot(p._gamma_tot), _tau(p._tau), _name(p._name) {}
+  _pid(p._pid), _mass(p._mass), _charge(p._charge), _gamma_tot(p._gamma_tot), _ctau(p._ctau), _name(p._name) {}
 
 PdgParticle& PdgParticle::operator=(const PdgParticle& p) {
    if(this == &p) return *this;
     _pid = p._pid;      _name= p._name;                 _mass=p._mass; 
-    _charge=p._charge;  _gamma_tot=p._gamma_tot;        _tau = p._tau;
+    _charge=p._charge;  _gamma_tot=p._gamma_tot;        _ctau = p._ctau;
    return *this;
 }
@@ -75 +76 @@
    std::map<int, PdgParticle>::const_iterator i;
    for(i = _table.begin(); i != _table.end(); i++)
-         std::cout << "name = " << i->second.name() << "\t\tpid = " 
-                   << i->first << "\t M=" <<  i->second.mass() << "\t Q=" 
-                   << i->second.charge() << std::endl;
+         std::cout << "name = " << std::setw(20) << std::left << i->second.name() 
+                   << "pid = "  << std::setw(10) << i->first 
+                   << "\t M="   << std::setw(10) << i->second.mass() << "GeV/c^2" 
+                   << "\t Q="   << std::setw(6)  << i->second.charge() << "e+" 
+                   << "\t ctau=" << i->second.ctau() << " m" << std::endl;
 }