Merged in master (pull request #14)

Master

Approved-by: Andreas Suter
This commit is contained in:
Zaher Salman 2023-09-28 11:25:29 +00:00 committed by Andreas Suter
commit 578dc900c2
3 changed files with 3 additions and 6 deletions

View File

@ -32,7 +32,6 @@ For a more exhaustive user documentation see:
<andreas.suter@psi.ch>
For the beta-NMR related parts, please contact
For the beta-NMR related parts, please contact Zaher Salman
<zaher.salman@psi.ch>

View File

@ -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 );
}

View File

@ -25,8 +25,6 @@
#include <cmath>
#include <vector>
#include <algorithm>
#include <boost/math/special_functions/ellint_1.hpp>
#ifndef PI
#define PI 3.14159265358979323846 /* pi */