Changeset 3c102d4 in sasview for sansmodels/src/sans/models/c_extensions/stacked_disks.c

Timestamp:

Aug 18, 2009 1:56:49 PM (15 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:

eddff027

Parents:

7d11b81

Message:

fixed problems in 2d

File:

• sansmodels/src/sans/models/c_extensions/stacked_disks.c (modified) (7 diffs)

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

@@ -19 +19 @@
 double stacked_disks_analytical_1D(StackedDisksParameters *pars, double q) {
         double dp[10];
-        
+
         // Fill paramater array
         dp[0] = pars->scale;
         dp[1] = pars->radius;
-        dp[2] = pars->length;
-        dp[3] = pars->thickness;
+        dp[2] = pars->core_thick;
+        dp[3] = pars->layer_thick;
         dp[4] = pars->core_sld;
         dp[5] = pars->layer_sld;
         dp[6] = pars->solvent_sld;
-        dp[7] = pars->nlayers;
-        dp[8] = pars->spacing;
+        dp[7] = pars->n_stacking;
+        dp[8] = pars->sigma_d;
         dp[9] = pars->background;
 
         // Call library function to evaluate model
-        return StackedDiscs(dp, q);     
+        return StackedDiscs(dp, q);
 }
 /**
@@ -45 +45 @@
         q = sqrt(qx*qx+qy*qy);
     return stacked_disks_analytical_2D_scaled(pars, q, qx/q, qy/q);
-} 
+}
 
 
@@ -57 +57 @@
 double stacked_disks_analytical_2D(StackedDisksParameters *pars, double q, double phi) {
     return stacked_disks_analytical_2D_scaled(pars, q, cos(phi), sin(phi));
-} 
-        
+}
+
 /**
  * Function to evaluate 2D scattering function
@@ -71 +71 @@
         double q_z;
         double alpha, vol, cos_val;
-        double d, dum;
+        double d, dum, halfheight;
         double answer;
-        
-        
+
+
 
     // parallelepiped orientation
@@ -80 +80 @@
     cyl_y = sin(pars->axis_theta) * sin(pars->axis_phi);
     cyl_z = cos(pars->axis_theta);
-     
+
     // q vector
     q_z = 0;
-        
+
     // Compute the angle btw vector q and the
     // axis of the parallelepiped
     cos_val = cyl_x*q_x + cyl_y*q_y + cyl_z*q_z;
-    
+
     // The following test should always pass
     if (fabs(cos_val)>1.0) {
@@ -93 +93 @@
         return 0;
     }
-    
+
     // Note: cos(alpha) = 0 and 1 will get an
     // undefined value from Stackdisc_kern
@@ -99 +99 @@
 
         // Call the IGOR library function to get the kernel
-        dum =0.1;
-        d= 0.1;
+        d = 2 * pars->layer_thick + pars->core_thick;
+        halfheight = pars->core_thick/2.0;
+        dum =alpha ;
         answer = Stackdisc_kern(q, pars->radius, pars->core_sld,pars->layer_sld,
-                pars->solvent_sld,pars->length,pars->thickness, dum, pars->spacing, d,pars->nlayers);
-        
+                pars->solvent_sld, halfheight, pars->layer_thick, dum, pars->sigma_d, d, pars->n_stacking)/sin(alpha);
+
         // Multiply by contrast^2
         //answer *= pars->contrast*pars->contrast;
-        
+
         //normalize by staked disks volume
-        //NOTE that for this (Fournet) definition of the integral, one must MULTIPLY by Vparallel
-    vol = acos(-1.0) * pars->radius * pars->radius * pars->length;
-        answer *= vol;
-        
+    vol = acos(-1.0) * pars->radius * pars->radius * d * pars->n_stacking;
+        answer /= vol;
+
         //convert to [cm-1]
         answer *= 1.0e8;
-        
+
         //Scale
         answer *= pars->scale;
-        
+
         // add in the background
         answer += pars->background;
-        
+
         return answer;
 }
-    
 
+