Merge pull request #12 from scarrazza/fixt4

Fixing finite part of triangle configuration with real masses and m1=p1, m2=m3=p2=0

Author: scarrazza

CMakeLists.txt

@@ -46,10 +46,11 @@ configure_file(
 set(QUADMATH_NAMES ${QUADMATH_NAMES} libquadmath.so quadmath)
 find_library(QUADMATH_LIBRARY
   NAMES ${QUADMATH_NAMES}
-  PATHS /usr/lib64/atlas /usr/lib/atlas 
-        /usr/lib64 /usr/lib /usr/local/lib64 
+  PATHS /usr/lib64/atlas /usr/lib/atlas
+        /usr/lib64 /usr/lib /usr/local/lib64
         /usr/local/lib /usr/x86_64-linux-gnu/*
         /usr/lib/gcc/x86_64-linux-gnu/*
+        /usr/lib/gcc/x86_64-redhat-linux/*
 )
 
 if(QUADMATH_LIBRARY)
@@ -105,7 +106,7 @@ if(ENABLE_EXAMPLES)
   add_executable(cache_test examples/cache_test.cc)
   target_link_libraries(cache_test qcdloop ${QUADMATH_LIBRARIES})
   set_target_properties(cache_test PROPERTIES LINK_FLAGS "-Wl,-rpath,./")
-  
+
   add_executable(cmass_test examples/cmass_test.cc)
   target_link_libraries(cmass_test qcdloop ${QUADMATH_LIBRARIES})
   set_target_properties(cmass_test PROPERTIES LINK_FLAGS "-Wl,-rpath,./")

src/qcdloop-config.in

@@ -28,7 +28,7 @@ tmp=$( echo "$*" | egrep -- '--\<incdir\>')
 test -n "$tmp" && OUT="$OUT @includedir@"
 
 tmp=$( echo "$*" | egrep -- '--\<cppflags\>')
-test -n "$tmp" && OUT="$OUT -I@includedir@"
+test -n "$tmp" && OUT="$OUT -I@includedir@ -std=c++11"
 
 tmp=$( echo "$*" | egrep -- '--\<libdir\>')
 test -n "$tmp" && OUT="$OUT @libdir@"

src/qcdloop/maths.h

@@ -34,9 +34,9 @@ namespace ql
   inline qcomplex Sqrt(qcomplex const& x){ return csqrtq(x); }
 
   // Absolute value
-  inline double  Abs(double const& x)   { return std::fabs(x); }
+  inline double  Abs(double const& x)   { return std::abs(x); }
   inline qdouble Abs(qdouble const& x)  { return fabsq(x);}
-  inline double  Abs(complex const& x)  { return std::fabs(x);}
+  inline double  Abs(complex const& x)  { return std::abs(x);}
   inline qdouble Abs(qcomplex const& x) { return cabsq(x); }
 
   // Complex tools, imag, real and conj.

src/triangle.cc

@@ -888,7 +888,7 @@ namespace ql
     const TOutput ct = TOutput(this->_pi2o6);
 
     TOutput dilog2;
-    if (Abs(omarg2) < this->_zero)
+    if (Real(omarg2) < this->_zero)
       dilog2 = ct-TOutput(this->ddilog(omarg2))-Log(arg2)*wlog;
     else
       dilog2 = TOutput(this->ddilog(arg2));