Changeset a1b2471 in sasview for sansmodels/src/sans/models/c_extensions

Timestamp:

Sep 21, 2010 3:44:24 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:

db08737

Parents:

60c320b

Message:

added sld plot for onion model and etc…

File:

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

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

@@ -41 +41 @@
         fun_type[n+1] = 0;
 
-    double bes,fun,alpha,f,vol,qr,r,contr,f2;
+    double bes,fun,alpha,f,vol,vol_pre,vol_sub,qr,r,contr,f2;
     double sign;
     double pi;
@@ -48 +48 @@
     f = 0.0;
     r = 0.0;
+    vol = 0.0;
+    vol_pre = 0.0;
+    vol_sub = 0.0;
     double r0 = 0.0;
 
@@ -58 +61 @@
                 A[i] = 0.0;
         }
+        vol_pre = vol;
         switch(fun_type[i]){
             case 2 :
@@ -103 +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);
+                        }
                         f += vol * (contr * (fun) + (sld_in[i]-slope[i]) * bes);
                         }
@@ -141 +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);
+                            }
                             f += vol * (bes * contr + fun * slope[i]);
                             }
@@ -147 +157 @@
 
         }
-
+    vol += vol_sub;
     f2 = f * f / vol * 1.0e8;
         f2 *= scale;