From cbdef9b7b9f7517b06731809c86e564065b2c8e6 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Tue, 26 May 2020 07:22:22 +0000 Subject: [PATCH 1/2] README.md edited online with Bitbucket --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 71c77d81..89382ade 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ For a more exhaustive user documentation see: -For the beta-NMR related parts, please contact - +For the beta-NMR related parts, please contact Zaher Salman From cf44df21eda14b5d210c8af1bad0c9351e5314a0 Mon Sep 17 00:00:00 2001 From: salman Date: Thu, 28 Sep 2023 13:16:19 +0200 Subject: [PATCH 2/2] Fixed compatibility with C++17 --- src/external/libBNMR/libLineProfile/LineProfile.cpp | 4 ++-- src/external/libBNMR/libLineProfile/LineProfile.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/external/libBNMR/libLineProfile/LineProfile.cpp b/src/external/libBNMR/libLineProfile/LineProfile.cpp index 58790068..eca2aa61 100644 --- a/src/external/libBNMR/libLineProfile/LineProfile.cpp +++ b/src/external/libBNMR/libLineProfile/LineProfile.cpp @@ -80,11 +80,11 @@ Double_t IAsym(Double_t x, Double_t omega_center, Double_t omega_min,Double_t om Double_t IAsym_low(Double_t omega, Double_t omega_center, Double_t omega_min,Double_t omega_max){ Double_t m =(omega-omega_min)*(omega_max-omega_center)/((omega_max-omega)*(omega_center-omega_min)); - return 1./PI/pow(omega_max-omega,0.5)/pow(omega_center-omega_min,0.5)*boost::math::ellint_1( m ); + return 1./PI/pow(omega_max-omega,0.5)/pow(omega_center-omega_min,0.5)*std::comp_ellint_1( m ); } Double_t IAsym_high(Double_t omega, Double_t omega_center, Double_t omega_min,Double_t omega_max){ Double_t m =(omega_center-omega_min)*(omega_max-omega)/((omega_max-omega_center)*(omega-omega_min)); - return 1./PI/pow(omega-omega_min,0.5)/pow(omega_max-omega_center,0.5)*boost::math::ellint_1( m ); + return 1./PI/pow(omega-omega_min,0.5)/pow(omega_max-omega_center,0.5)*std::comp_ellint_1( m ); } diff --git a/src/external/libBNMR/libLineProfile/LineProfile.h b/src/external/libBNMR/libLineProfile/LineProfile.h index 13a2a106..b1a0ff55 100644 --- a/src/external/libBNMR/libLineProfile/LineProfile.h +++ b/src/external/libBNMR/libLineProfile/LineProfile.h @@ -25,8 +25,6 @@ #include #include #include -#include - #ifndef PI #define PI 3.14159265358979323846 /* pi */