Changeset 7b0dd55 in sasview for sansmodels

Timestamp:

Aug 28, 2009 12:26:40 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:

25baf31

Parents:

a50ef5e

Message:

fix font problem wiht the last commit

Location:

sansmodels/src/libigor

Files:

• libStructureFactor.c (modified) (5 diffs)
• libStructureFactor.h (modified) (1 diff)

sansmodels/src/libigor/libStructureFactor.c

@@ -1 @@
-/*     SimpleFit.c
+/*      SimpleFit.c
 
 A simplified project designed to act as a template for your curve fitting function.
@@ -7 +7 @@
 #include "StandardHeaders.h"                    // Include ANSI headers, Mac headers, IgorXOP.h, XOP.h and XOPSupport.h
 #include "libStructureFactor.h"
-
-
 //Hard Sphere Structure Factor
 //
@@ -188 +186 @@
         QQ= q;
 
-        diam=dp[0];             //in �
+        diam=dp[0];             //in dp[0] coming from python is radius : cahnged on Mar. 30, 2009
         zz = dp[1];             //# of charges
         VolFrac=dp[2];
@@ -651 +649 @@
 
 // called as DiamCyl(hcyl,rcyl)
+//modified from Igor NIST package XOP
 double
 DiamCyl(double hcyl, double rcyl)
 {
-
         double diam,a,b,t1,t2,ddd;
         double pi;
 
         pi = 4.0*atan(1.0);
-
+        if (rcyl == 0 || hcyl == 0) {
+                return 0.0;
+        }
         a = rcyl;
         b = hcyl/2.0;
@@ -677 +677 @@
 //returns DIAMETER
 // called as DiamEllip(aa,bb)
+
+//modified from Igor NIST package XOP
 double
 DiamEllip(double aa, double bb)
 {
-
         double ee,e1,bd,b1,bL,b2,del,ddd,diam;
 
+        if (aa == 0 || bb == 0) {
+                return 0.0;
+        }
+        if (aa == bb) {
+                return aa;
+        }
         if(aa>bb) {
                 ee = (aa*aa - bb*bb)/(aa*aa);

sansmodels/src/libigor/libStructureFactor.h

@@ -6 +6 @@
 double StickyHS_Struct(double dp[], double q);
 double HayterPenfoldMSA(double dp[], double q);
-double DiamCyl(double a, double b);
-double DiamEllip(double a, double b);
+double DiamCyl(double aa, double bb);
+double DiamEllip(double hcyl, double rcyl);
 
 static double gMSAWave[17]={1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17};