Changeset 678 for sans/XOP_Dev/SANSAnalysis/lib/libSphere.c

Timestamp:

Apr 9, 2010 3:43:15 PM (13 years ago)

Author:

srkline

Message:

Fixed FuzzySphere?.c to inclde the Lorentzian term, to match the Igor code.

File:

• sans/XOP_Dev/SANSAnalysis/lib/libSphere.c (modified) (3 diffs)

sans/XOP_Dev/SANSAnalysis/lib/libSphere.c

@@ -2221 +2221 @@
         double scale,rad,pd,sig,rho,rhos,bkg,delrho,sig_surf,f2,bes,vol,f;              //my local names
         double va,vb,zi,yy,summ,inten;
+        double lor_scale,lor_L;                 //for the lorentzian
         int nord=20,ii;
         
@@ -2234 +2235 @@
         rhos=dp[5];
         delrho=rho-rhos;
-        bkg=dp[6];
+        bkg=dp[8];
+        lor_scale = dp[6];
+        lor_L = dp[7];
         
                         
@@ -2277 +2280 @@
         
         inten *= scale;
+
+// add the lorentzian term
+        inten += lor_scale/(1.0 + (x*lor_L)*(x*lor_L));
+                
         inten += bkg;