Changeset c57ee9e in sasmodels


Ignore:
Timestamp:
Aug 21, 2018 12:32:32 PM (6 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
5399809
Parents:
296c52b
Message:

update dll interface to work with effective_radius_type parameter

Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/kernel_iq.c

    r6e7ba14 rc57ee9e  
    286286    global double *result,  // nq+1 return values, again with padding 
    287287    const double cutoff,     // cutoff in the dispersity weight product 
    288     int effective_radius_type // which effective radius to compute 
     288    int32_t effective_radius_type // which effective radius to compute 
    289289    ) 
    290290{ 

  • sasmodels/product.py

    raa44a6a rc57ee9e  
    290290            beta_mode = 0 
    291291        if p_info.effective_radius_type is not None: 
    292             effective_radius_type = values[extra_offset] 
     292            effective_radius_type = int(values[extra_offset]) 
    293293            extra_offset += 1 
    294294        else: 
Note: See TracChangeset for help on using the changeset viewer.