Changeset 572 in svn for trunk/Utilities/HepMC/interface/SimpleVector.icc

Timestamp:

Nov 2, 2011, 5:39:26 PM (13 years ago)

Author:

cp3-support

Message:

upgrade HepMC to version 2.06.05

File:

• trunk/Utilities/HepMC/interface/SimpleVector.icc (modified) (4 diffs)

trunk/Utilities/HepMC/interface/SimpleVector.icc

@@ -49 +49 @@
 }
 
-inline double  FourVector::mag() const { 
-return std::sqrt( m_x*m_x + m_y*m_y + m_z*m_z );
-}
-
 inline double FourVector::perp2() const { return m_x*m_x + m_y*m_y; }
 
@@ -78 +74 @@
 
 inline double FourVector::pseudoRapidity() const {
-  double m = mag();
+  double m = std::sqrt( m_x*m_x + m_y*m_y + m_z*m_z );
   if ( m==  0   ) return  0.0;   
   if ( m==  z() ) return  1.0E72;
@@ -106 +102 @@
 }
 
-inline double  ThreeVector::mag() const { 
+inline double ThreeVector::r()    const { 
 return std::sqrt( m_x*m_x + m_y*m_y + m_z*m_z );
 }
-
-inline double ThreeVector::r()    const { return mag(); }
 
 inline void ThreeVector::set(double x, double y, double z) {
@@ -125 +119 @@
 
 inline void ThreeVector::setTheta(double th) { 
-  double ma   = mag();
+  double ma   = r();
   double ph   = phi();
   setX(ma*std::sin(th)*std::cos(ph));