Changeset eafc9fa in sasmodels for sasmodels/direct_model.py


Ignore:
Timestamp:
Jan 30, 2016 9:39:59 PM (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:
5925e90
Parents:
823e620
Message:

refactor kernel wrappers to simplify q input handling

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/direct_model.py

    r803f835 reafc9fa  
    149149    def _calc_theory(self, pars, cutoff=0.0): 
    150150        if self._kernel is None: 
    151             q_input = self._model.make_input(self._kernel_inputs) 
    152             self._kernel = self._model(q_input)  # pylint: disable=attribute-defined-outside-init 
     151            self._kernel = make_kernel(self._model, self._kernel_inputs)  # pylint: disable=attribute-defined-outside-init 
    153152 
    154153        Iq_calc = call_kernel(self._kernel, pars, cutoff=cutoff) 
    … …  
    177176        # Note: _interpret_data defines the model attributes 
    178177        self._interpret_data(data, model) 
    179         self.kernel = make_kernel(self.model, self._kernel_inputs) 
    180178 
    181179    def __call__(self, **pars): 
Note: See TracChangeset for help on using the changeset viewer.