Changeset 4edec6f in sasmodels


Ignore:
Timestamp:
Aug 1, 2016 7:33:41 PM (3 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
ec77322
Parents:
f67f26c
Message:

fix sasview for new kernel interface

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/sasview_model.py

    r9eb3632 r4edec6f  
    514514        pairs = [self._get_weights(p) for p in parameters.call_parameters] 
    515515        call_details, values, is_magnetic = build_details(calculator, pairs) 
     516        #call_details.show() 
     517        #print("pairs", pairs) 
     518        #print("params", self.params) 
     519        #print("values", values) 
     520        #print("is_mag", is_magnetic) 
    516521        result = calculator(call_details, values, cutoff=self.cutoff, 
    517522                            magnetic=is_magnetic) 
     
    598603        if par.name not in self.params: 
    599604            if par.name == self.multiplicity_info.control: 
    600                 return [self.multiplicity], [] 
     605                return [self.multiplicity], [1.0] 
    601606            else: 
    602                 return [np.NaN], [] 
     607                return [np.NaN], [1.0] 
    603608        elif par.polydisperse: 
    604609            dis = self.dispersion[par.name] 
     
    608613            return value, weight / np.sum(weight) 
    609614        else: 
    610             return [self.params[par.name]], [] 
     615            return [self.params[par.name]], [1.0] 
    611616 
    612617def test_model(): 
Note: See TracChangeset for help on using the changeset viewer.