Changeset 5f0dcab in sasview for sansmodels/src/sans/models/libigor/libSphere.h

Timestamp:

Dec 7, 2011 3:39:05 PM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

feadd6f

Parents:

2605da22

Message:

Re #4 Get rid of warnings by putting static and defs in the right place.

File:

• sansmodels/src/sans/models/libigor/libSphere.h (modified) (1 diff)

sansmodels/src/sans/models/libigor/libSphere.h

@@ -49 +49 @@
 double SC_Integrand(double w[], double qq, double xx, double yy);
 double SCeval(double Theta, double Phi, double temp3, double temp4, double temp5);
-
-
-
-static double
-gammln(double xx) {
-    double x,y,tmp,ser;
-    static double cof[6]={76.18009172947146,-86.50532032941677,
-                24.01409824083091,-1.231739572450155,
-                0.1208650973866179e-2,-0.5395239384953e-5};
-    int j;
-
-    y=x=xx;
-    tmp=x+5.5;
-    tmp -= (x+0.5)*log(tmp);
-    ser=1.000000000190015;
-    for (j=0;j<=5;j++) ser += cof[j]/++y;
-    return -tmp+log(2.5066282746310005*ser/x);
-}
-
-static double
-LogNormal_distr(double sig, double mu, double pt)
-{
-        double retval,pi;
-
-        pi = 4.0*atan(1.0);
-        retval = (1.0/ (sig*pt*sqrt(2.0*pi)) )*exp( -0.5*(log(pt) - mu)*(log(pt) - mu)/sig/sig );
-        return(retval);
-}
-
-static double
-Gauss_distr(double sig, double avg, double pt)
-{
-        double retval,Pi;
-
-        Pi = 4.0*atan(1.0);
-        retval = (1.0/ (sig*sqrt(2.0*Pi)) )*exp(-(avg-pt)*(avg-pt)/sig/sig/2.0);
-        return(retval);
-}
-
-static double SchulzPoint(double x, double avg, double zz) {
-    double dr;
-    dr = zz*log(x) - gammln(zz+1.0)+(zz+1.0)*log((zz+1.0)/avg)-(x/avg*(zz+1.0));
-    return (exp(dr));
-};
-