Changeset bf8c271 in sasmodels


Ignore:
Timestamp:
Apr 10, 2017 12:57:40 PM (6 months ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, costrafo411, flexible-cylinder, ticket-776-orientation
Children:
2662828
Parents:
b2921d0
Message:

partial fix of P(q), S(q) intermediate value display

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/sasview_model.py

    r749a7d4 rbf8c271  
    148148        _previous_name = model.name 
    149149        model.name = model.id 
    150          
     150 
    151151        # If the new model name is still in the model list (for instance, 
    152152        # if we put a cylinder.py in our plug-in directory), then append 
     
    598598        return p_model, s_model 
    599599 
     600 
     601    def calc_composition_models(self, qx): 
     602        with calculation_lock: 
     603            self._calculate_Iq(qx) 
     604            return self._intermediate_results 
     605 
    600606    def calculate_Iq(self, qx, qy=None): 
    601607        # type: (Sequence[float], Optional[Sequence[float]]) -> np.ndarray 
     
    637643        result = calculator(call_details, values, cutoff=self.cutoff, 
    638644                            magnetic=is_magnetic) 
     645        self._intermediate_results = getattr(calculator, 'results', None) 
    639646        calculator.release() 
    640647        self._model.release() 
Note: See TracChangeset for help on using the changeset viewer.