Changeset 632 for sans/XOP_Dev/SANSAnalysis/lib/libTwoPhase.c

Timestamp:

Mar 1, 2010 1:57:12 PM (12 years ago)

Author:

srkline

Message:

incorporating Jae-Hie's changes to the library functions to explicitly handle the cases at qr==0. Also a lot of changes to explicitly declare constant values as floating point, rather than chance the interpretation as integer. (probably not necessary)

File:

• sans/XOP_Dev/SANSAnalysis/lib/libTwoPhase.c (modified) (2 diffs)

sans/XOP_Dev/SANSAnalysis/lib/libTwoPhase.c

@@ -417 +417 @@
         
         uval = Mw_Mn - 1.0;
-        if(uval == 0) {
+        if(uval == 0.0) {
                 uval = 1e-6;            //avoid divide by zero error
         }
@@ -453 +453 @@
         bgd = dp[4]; 
         
-        inten = Ig0*exp(-1.0*x*x*gg*gg/2.0) + Il0/(1 + (x*ll)*(x*ll)) + bgd;
+        inten = Ig0*exp(-1.0*x*x*gg*gg/2.0) + Il0/(1.0 + (x*ll)*(x*ll)) + bgd;
         
         return(inten);