Changeset 08648c0 in sasview

Timestamp:

Feb 8, 2012 3:08:49 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

1b023334

Parents:

9cd0baa

Message:

more s king's fractal models: todo: doc, test

Files:

• fittingview/src/sans/perspectives/fitting/models.py (modified) (1 diff)
• sansmodels/include/libmultifunc/libfunc.h (modified) (1 diff)
• sansmodels/include/massfractal.h (added)
• sansmodels/include/masssurfacefractal.h (added)
• sansmodels/include/surfacefractal.h (added)
• sansmodels/src/c_models/c_models.cpp (modified) (2 diffs)
• sansmodels/src/c_models/libfunc.c (modified) (1 diff)
• sansmodels/src/c_models/massfractal.cpp (added)
• sansmodels/src/c_models/masssurfacefractal.cpp (added)
• sansmodels/src/c_models/surfacefractal.cpp (added)

fittingview/src/sans/perspectives/fitting/models.py

@@ -480 +480 @@
         self.shape_indep_list.append(FractalModel )
         self.model_name_list.append(FractalModel.__name__)
+
+        from sans.models.MassFractalModel import MassFractalModel
+        self.shape_indep_list.append(MassFractalModel)
+        self.model_name_list.append(MassFractalModel.__name__)
+
+        from sans.models.SurfaceFractalModel import SurfaceFractalModel
+        self.shape_indep_list.append(SurfaceFractalModel)
+        self.model_name_list.append(SurfaceFractalModel.__name__)
+        
+        from sans.models.MassSurfaceFractal import MassSurfaceFractal
+        self.shape_indep_list.append(MassSurfaceFractal)
+        self.model_name_list.append(MassSurfaceFractal.__name__)
         
         from sans.models.FractalCoreShellModel import FractalCoreShellModel

sansmodels/include/libmultifunc/libfunc.h

@@ -8 +8 @@
 double sinc(double x);
 
+double gamln(double x);
+
 #endif

sansmodels/src/c_models/c_models.cpp

@@ -58 +58 @@
 void addCRPAModel(PyObject *module);
 void addCFractalModel(PyObject *module);
+void addCMassSurfaceFractal(PyObject *module);
+void addCSurfaceFractalModel(PyObject *module);
+void addCMassFractalModel(PyObject *module);
 void addCPoly_GaussCoil(PyObject *module);
 
@@ -296 +299 @@
   addCRPAModel(m);
   addCFractalModel(m);
-}
+  addCMassSurfaceFractal(m);
+  addCMassFractalModel(m);
+  addCSurfaceFractalModel(m);
+}

sansmodels/src/c_models/libfunc.c

@@ -63 +63 @@
         return sin(x)/x;
 }
+
+double gamln(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);
+}