Changeset fa4a994 in sasmodels


Ignore:
Timestamp:
Dec 20, 2016 2:59:59 PM (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/rpa.c

    r6351bfa rfa4a994  
    1 double Iq(double q, double case_num, 
     1double Iq(double q, double fp_case_num, 
    22    double N[], double Phi[], double v[], double L[], double b[], 
    33    double Kab, double Kac, double Kad, 
     
    55    ); 
    66 
    7 double Iq(double q, double case_num, 
     7double Iq(double q, double fp_case_num, 
    88    double N[],    // DEGREE OF POLYMERIZATION 
    99    double Phi[],  // VOL FRACTION 
     
    1515    ) 
    1616{ 
    17   int icase = (int)case_num; 
     17  int icase = (int)(fp_case_num+0.5); 
    1818 
    1919  double Nab,Nac,Nad,Nbc,Nbd,Ncd; 
  • sasmodels/models/rpa.py

    r40a87fa rfa4a994  
    114114    Return a list of parameters to hide depending on the multiplicity parameter. 
    115115    """ 
     116    case_num = int(case_num+0.5) 
    116117    if case_num < 2: 
    117118        return HIDE_AB 
Note: See TracChangeset for help on using the changeset viewer.