Changeset 1e2a1ba in sasmodels for sasmodels/kernelpy.py


Ignore:
Timestamp:
Apr 5, 2016 10:06:36 AM (8 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:
d2bb604
Parents:
ea05c87 (diff), 4d76711 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/core.py
sasmodels/custom/init.py
sasmodels/direct_model.py
sasmodels/generate.py
sasmodels/kernelpy.py
sasmodels/sasview_model.py

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/kernelpy.py

    r48fbd50 r1e2a1ba  
    1919        self.info = model_info 
    2020 
    21     def __call__(self, q_vectors): 
     21    def make_kernel(self, q_vectors): 
    2222        q_input = PyInput(q_vectors, dtype=F64) 
    2323        kernel = self.info['Iqxy'] if q_input.is_2d else self.info['Iq'] 
Note: See TracChangeset for help on using the changeset viewer.