Changeset 0164899a in sasview for sansmodels/src/sans/models/c_extensions/onion.c

Timestamp:

Nov 1, 2010 4:22:12 PM (14 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:

4b3d25b

Parents:

6cda91f

Message:

new models and some bug fixes

File:

• sansmodels/src/sans/models/c_extensions/onion.c (modified) (5 diffs)

sansmodels/src/sans/models/c_extensions/onion.c

@@ -1 +1 @@
 /**
- * Scattering model for a sphere
+ * Scattering model for a onion
  */
 
@@ -7 +7 @@
 #include <stdio.h>
 #include <stdlib.h>
-
+// some details can be found in sld_cal.c
 double so_kernel(double dp[], double q) {
         int n = dp[0];
@@ -107 +107 @@
 
                         vol = 4.0 * pi / 3.0 * r * r * r;
-                        if (j == 1 && fabs(sld_in[i]-sld_solv) < 1e-04*fabs(sld_solv) && A[i]==0.0){
-                                vol_sub += (vol_pre - vol);
-                        }
+                        //if (j == 1 && fabs(sld_in[i]-sld_solv) < 1e-04*fabs(sld_solv) && A[i]==0.0){
+                        //      vol_sub += (vol_pre - vol);
+                        //}
                         f += vol * (contr * (fun) + (sld_in[i]-slope[i]) * bes);
                         }
@@ -148 +148 @@
                                 }
                             vol = 4.0 * pi / 3.0 * r * r * r;
-                            if (j == 1 && fabs(sld_in[i]-sld_solv) < 1e-04*fabs(sld_solv) && fun_type[i]==0){
-                                vol_sub += (vol_pre - vol);
-                            }
+                            //if (j == 1 && fabs(sld_in[i]-sld_solv) < 1e-04*fabs(sld_solv) && fun_type[i]==0){
+                            //  vol_sub += (vol_pre - vol);
+                            //}
                             f += vol * (bes * contr + fun * slope[i]);
                             }
@@ -157 +157 @@
 
         }
-    vol += vol_sub;
+    //vol += vol_sub;
     f2 = f * f / vol * 1.0e8;
         f2 *= scale;