Changeset f8644dd in sasview

Timestamp:

Jul 9, 2012 9:57:01 AM (12 years ago)

Author:

Kieran Campbell <kieranrcampbell@…>

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:

14e4804

Parents:

a269378

Message:

Fixed calculation functions to pass unit tests

Location:

sansmodels/src/c_models

Files:

• dabmodel.cpp (modified) (1 diff)
• libfunc.c (modified) (2 diffs)
• teubner_strey.cpp (modified) (1 diff)

sansmodels/src/c_models/dabmodel.cpp

@@ -47 +47 @@
 
 double DABModel::calculate_ER() {
+  // not implemented yet
   return 0.0;
 }
 
 double DABModel::calculate_VR() {
-  return 0.0;
+  return 1.0;
 }
 
 double DABModel::evaluate_rphi(double q,double phi) {
-  return 1.0;
+  double qx = q * cos(phi);
+  double qy = q * sin(phi);
+  return this->operator()(qx,qy);
 }

sansmodels/src/c_models/libfunc.c

@@ -1 +1 @@
 // by jcho
+
 #include <math.h>
+
 #include "libmultifunc/libfunc.h"
+
 #include <stdio.h>
 
+
+
 //used in Si func
+
 int factorial(int i)
+
 {
+
         int k, j;
+
         if (i<2){
+
                 return 1;
+
         }
+
         k=1;
+
         for(j=1;j<i;j++)
+
         {
+
                 k=k*(j+1);
+
         }
+
         return k;
+
 }
 
+
+
 // Used in pearl nec model
+
 // Sine integral function: approximated within 1%!!!
+
 // integral of sin(x)/x up to namx term nmax=6 looks the best.
+
 double Si(double x)
+
 {
+
         int i;
+
         int nmax=6;
+
         double out;
+
         long double power;
+
         double pi = 4.0*atan(1.0);
+
         if (x >= pi*6.2/4.0){
 
+
+
                 double out_sin = 0.0;
+
                 double out_cos = 0.0;
+
                 out = pi/2.0;
+
                 for (i=0; i<nmax-2; i+=1){
+
                         out_cos += pow(-1.0, i) * (double)factorial(2*i) / pow(x, 2*i+1);
+
                         out_sin += pow(-1.0, i) * (double)factorial(2*i+1) / pow(x, 2*i+2);
+
                 }
+
                 out -= cos(x) * out_cos;
+
                 out -= sin(x) * out_sin;
+
                 return out;
+
         }
+
         out = 0.0;
+
         for (i=0; i<nmax; i+=1)
+
         {
+
                 if (i==0){
+
                         out += x;
+
                         continue;
+
                 }
+
                 power = pow(x,(2 * i + 1));
+
                 out += (double)pow(-1, i) * power / ((2.0 * (double)i + 1.0) * (double)factorial(2 * i + 1));
+
                 //printf ("Si=%g %g %d\n", x, out, i);
+
         }
+
         return out;
+
 }
+
+
 
 double sinc(double x)
 {
-        if (x==0.0){
-                return 1.0;
-        }
-        return sin(x)/x;
+  if (x==0.0){
+    return 1.0;
+  }
+  return sin(x)/x;
 }
+
 
 double gamln(double xx) {
@@ -79 +137 @@
     return -tmp+log(2.5066282746310005*ser/x);
 }
+

sansmodels/src/c_models/teubner_strey.cpp

@@ -38 +38 @@
 
 double TeubnerStreyModel::calculate_ER() {
+  // not implemented yet
   return 0.0;
 }
 
 double TeubnerStreyModel::calculate_VR() {
-  return 0.0;
+  return 1.0;
 }
 
 double TeubnerStreyModel::evaluate_rphi(double q,double phi) {
-  return 1.0;
+  double qx = q*cos(phi);
+  double qy = q*sin(phi);
+  return this->operator()(qx, qy);
 }
+