Changeset 469 in svn for trunk/src

Timestamp:

Jul 13, 2009, 9:40:57 AM (15 years ago)

Author:

Xavier Rouby

Message:

property 'invisible()' added to PdgParticle

Location:

trunk/src

Files:

• PdgParticle.cc (modified) (4 diffs)
• SmearUtil.cc (modified) (1 diff)

trunk/src/PdgParticle.cc

@@ -43 +43 @@
 //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 ctau) :
-  _pid(pid), _mass(m), _charge(q), _gamma_tot(gamma), _ctau(ctau), _name(name) {}
+PdgParticle::PdgParticle(const long 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) {
+  if( (abs(pid) == 12)       || (abs(pid) == 14)       || (abs(pid) == 16)      || 
+      (abs(pid) == 1000022 ) || (abs(pid) == 1000023 ) || (abs(pid) == 1000025) || 
+      (abs(pid) == 1000035 ) || (abs(pid) == 1000045 ) ) { /*std::cout << "invisible : " << pid << std::endl;*/ _isInvisible = true; }
+  else _isInvisible = false;
+}
 
 
 PdgParticle::PdgParticle(const PdgParticle& p) :
-  _pid(p._pid), _mass(p._mass), _charge(p._charge), _gamma_tot(p._gamma_tot), _ctau(p._ctau), _name(p._name) {}
+  _pid(p._pid), _mass(p._mass), _charge(p._charge), _gamma_tot(p._gamma_tot), _ctau(p._ctau), _name(p._name), _isInvisible(p._isInvisible) {}
 
 PdgParticle& PdgParticle::operator=(const PdgParticle& p) {
@@ -54 +59 @@
     _pid = p._pid;      _name= p._name;                 _mass=p._mass; 
     _charge=p._charge;  _gamma_tot=p._gamma_tot;        _ctau = p._ctau;
+    _isInvisible = p._isInvisible;
    return *this;
 }
@@ -71 +77 @@
 }
 
-void PdgTable::insert(const int pid, const PdgParticle &p) {
+void PdgTable::insert(const long int pid, const PdgParticle &p) {
    _table.insert(std::map<int,PdgParticle>::value_type(pid,p));
 }
@@ -77 +83 @@
 void PdgTable::print() const {
    std::map<int, PdgParticle>::const_iterator i;
-   for(i = _table.begin(); i != _table.end(); i++)
+   for(i = _table.begin(); i != _table.end(); i++) {
          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;
+                   << "\t ctau=" << i->second.ctau() << " m";
+         if(i->second.invisible()) std::cout << "\t invisible";
+         std::cout << std::endl;
+   }
 }
 

trunk/src/SmearUtil.cc

@@ -1467 +1467 @@
     curstring.clear(); // needed when using several times istringstream::str(string)
     curstring.str(temp_string);
-    int ID; string name; int charge; float mass; float width; float lifetime;
+    long int ID; std::string name; int charge; float mass; float width; float lifetime;
     // ID name   chg       mass    total width   lifetime
     //  1 d      -1      0.33000     0.00000   0.00000E+00