Changeset 3275c13 in sasview for sansmodels/src

Timestamp:

Mar 31, 2009 5:52:28 PM (16 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:

be28027

Parents:

db1dcef

Message:

Added 2nd virial coeff. functions

File:

• sansmodels/src/libigor/libStructureFactor.c (modified) (5 diffs)

sansmodels/src/libigor/libStructureFactor.c

@@ -7 +7 @@
 #include "StandardHeaders.h"                    // Include ANSI headers, Mac headers, IgorXOP.h, XOP.h and XOPSupport.h
 #include "libStructureFactor.h"
-
-
 //Hard Sphere Structure Factor
 //
@@ -650 +648 @@
 }
 
-// called as DiamCyl(hcyl,rcyl)
+// called as DiamCyl(hcyl,rcyl) 
+//modified from Igor NIST package XOP
 double
-DiamCyl(double hcyl, double rcyl)
+DiamCyl(double dp[], double q)
 {
-        
+        double hcyl, rcyl;
         double diam,a,b,t1,t2,ddd;
         double pi;
         
+        rcyl = dp[0];
+        hcyl = dp[1];
         pi = 4.0*atan(1.0);
-        
+        if (rcyl == 0 || hcyl == 0) {
+                return 0.0;
+        }
         a = rcyl;
         b = hcyl/2.0;
@@ -667 +670 @@
         diam = pow(ddd,(1.0/3.0));
         
-        return(diam);
+        return(diam/2);  //return radius
 }
 
@@ -677 +680 @@
 //returns DIAMETER
 // called as DiamEllip(aa,bb)
+
+//modified from Igor NIST package XOP
 double
-DiamEllip(double aa, double bb)
+DiamEllip(double dp[], double q)
 {
-        
+        double aa, bb;
         double ee,e1,bd,b1,bL,b2,del,ddd,diam;
         
+        aa = dp[0];
+        bb = dp[1];
+        if (aa == 0 || bb == 0) {
+                return 0.0;
+        }
+        if (aa == bb) {
+                return aa;
+        }
         if(aa>bb) {
                 ee = (aa*aa - bb*bb)/(aa*aa);
@@ -699 +712 @@
         diam = pow(ddd,(1.0/3.0));
         
-        return(diam);
+        return(diam/2);      //return radius
 }