Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scarrazza merged 5 commits into from
Jul 30, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57fc038
fixing dilog computation based on sign of kinematics for T4
scarrazza Jul 30, 2020
fb9d733
replacing fabs with abs
scarrazza Jul 30, 2020
e68983d
adding c++11 flag in qcdloop-config
scarrazza Jul 30, 2020
bd0b8fc
fixing another fabs to abs
scarrazza Jul 30, 2020
7c8cf22
including redhat lib paths
scarrazza Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,./")
Expand Down
2 changes: 1 addition & 1 deletion src/qcdloop-config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@"
Expand Down
4 changes: 2 additions & 2 deletions src/qcdloop/maths.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/triangle.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down