Changeset 8ff5cb3 in sasview for sansmodels/src/sans/models/c_extensions/libmultifunc/librefl.c

Timestamp:

Dec 14, 2011 3:26:29 PM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

96814e1

Parents:

5d75d65a

Message:

Re #4 Fix a few model warnings

File:

• sansmodels/src/sans/models/c_extensions/libmultifunc/librefl.c (modified) (8 diffs)

sansmodels/src/sans/models/c_extensions/libmultifunc/librefl.c

@@ -21 +21 @@
 
 
-complex cadd(x,y)
+complex cplx_add(x,y)
         complex x,y;
 {
@@ -40 +40 @@
 }
 
-complex csub(x,y)
+complex cplx_sub(x,y)
         complex x,y;
 {
@@ -50 +50 @@
 
 
-complex cmult(x,y)
+complex cplx_mult(x,y)
         complex x,y;
 {
@@ -59 +59 @@
 }
 
-complex cdiv(x,y)
+complex cplx_div(x,y)
         complex x,y;
 {
@@ -68 +68 @@
 }
 
-complex cexp(b)
+complex cplx_exp(b)
         complex b;
 {
@@ -81 +81 @@
 
 
-complex csqrt(z)    //see Schaum`s Math Handbook p. 22, 6.6 and 6.10
+complex cplx_sqrt(z)    //see Schaum`s Math Handbook p. 22, 6.6 and 6.10
         complex z;
 {
@@ -124 +124 @@
 }
 
-complex ccos(b)
+complex cplx_cos(b)
         complex b;
 {
@@ -131 +131 @@
         two = cassign(2.0,0.0);
         i = cassign(0.0,1.0);
-        bi = cmult(b,i);
-        negbi = csub(zero,bi);
-        z = cdiv(cadd(cexp(bi),cexp(negbi)),two);
+        bi = cplx_mult(b,i);
+        negbi = cplx_sub(zero,bi);
+        z = cplx_div(cplx_add(cplx_exp(bi),cplx_exp(negbi)),two);
         return z;
 }