Changeset fa4a994 in sasmodels

Timestamp:

Dec 20, 2016 4:59:59 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

abb6e4f

Parents:

768c0c4

Message:

round to case_num rather than assuming it is an integer

Location:

sasmodels/models

Files:

• rpa.c (modified) (3 diffs)
• rpa.py (modified) (1 diff)

sasmodels/models/rpa.c

@@ -1 @@
-double Iq(double q, double case_num,
+double Iq(double q, double fp_case_num,
     double N[], double Phi[], double v[], double L[], double b[],
     double Kab, double Kac, double Kad,
@@ -5 +5 @@
     );
 
-double Iq(double q, double case_num,
+double Iq(double q, double fp_case_num,
     double N[],    // DEGREE OF POLYMERIZATION
     double Phi[],  // VOL FRACTION
@@ -15 +15 @@
     )
 {
-  int icase = (int)case_num;
+  int icase = (int)(fp_case_num+0.5);
 
   double Nab,Nac,Nad,Nbc,Nbd,Ncd;

sasmodels/models/rpa.py

@@ -114 +114 @@
     Return a list of parameters to hide depending on the multiplicity parameter.
     """
+    case_num = int(case_num+0.5)
     if case_num < 2:
         return HIDE_AB