[Rivet-svn] r3916 - in branches/2012-06-aidarivet/include/Rivet: Math/eigen Projections

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Fri Aug 24 15:43:10 2012
New Revision: 3916

Log:
merge r3890-3892 from branches/2012-06-aidarivet

Modified:
   branches/2012-06-aidarivet/include/Rivet/Math/eigen/matrixbase.h
   branches/2012-06-aidarivet/include/Rivet/Math/eigen/vectorbase.h
   branches/2012-06-aidarivet/include/Rivet/Projections/Sphericity.hh

Modified: branches/2012-06-aidarivet/include/Rivet/Math/eigen/matrixbase.h
==============================================================================
--- branches/2012-06-aidarivet/include/Rivet/Math/eigen/matrixbase.h	Fri Aug 24 15:42:36 2012	(r3915)
+++ branches/2012-06-aidarivet/include/Rivet/Math/eigen/matrixbase.h	Fri Aug 24 15:43:10 2012	(r3916)
@@ -773,7 +773,7 @@
       */
     bool isZero( const T & precision = Util::epsilon<T>() ) const
     {
-        return isNegligible( static_cast<T>(1) );
+      return isNegligible( static_cast<T>(1), precision );
     }
 
     /**

Modified: branches/2012-06-aidarivet/include/Rivet/Math/eigen/vectorbase.h
==============================================================================
--- branches/2012-06-aidarivet/include/Rivet/Math/eigen/vectorbase.h	Fri Aug 24 15:42:36 2012	(r3915)
+++ branches/2012-06-aidarivet/include/Rivet/Math/eigen/vectorbase.h	Fri Aug 24 15:43:10 2012	(r3916)
@@ -607,7 +607,7 @@
       */
     bool isZero( const T & precision = Util::epsilon<T>() ) const
     {
-        return isNegligible( static_cast<T>(1) );
+      return isNegligible( static_cast<T>(1), precision );
     }
 
     /**

Modified: branches/2012-06-aidarivet/include/Rivet/Projections/Sphericity.hh
==============================================================================
--- branches/2012-06-aidarivet/include/Rivet/Projections/Sphericity.hh	Fri Aug 24 15:42:36 2012	(r3915)
+++ branches/2012-06-aidarivet/include/Rivet/Projections/Sphericity.hh	Fri Aug 24 15:43:10 2012	(r3916)
@@ -56,6 +56,8 @@
     //@{
 
     /// Constructor
+    Sphericity(double rparam=2.0): _regparam(rparam){}
+
     Sphericity(const FinalState& fsp, double rparam=2.0);
 
     /// Clone on the heap.