Model.__call__ -> _get_current_data

hyperspy/model.py

@@ -271,7 +271,7 @@ def __hash__(self):
         # raise an exception when using windows.connect
         return id(self)
 
-    def __call__(self, non_convolved=False, onlyactive=False, component_list=None, binned=None):
+    def _get_current_data(self, non_convolved=False, onlyactive=False, component_list=None, binned=None):
         """Evaluate the model numerically. Implementation requested in all sub-classes"""
         raise NotImplementedError
 
@@ -597,7 +597,7 @@ def _as_signal_iter(self, data, component_list=None,
             for index in self.axes_manager:
                 self.fetch_stored_values(only_fixed=False)
                 data[self.axes_manager._getitem_tuple][
-                    np.where(self._channel_switches)] = self.__call__(
+                    np.where(self._channel_switches)] = self._get_current_data(
                     non_convolved=not self.convolved, onlyactive=True).ravel()
                 pbar.update(1)
 
@@ -925,7 +925,7 @@ def _model2plot(self, axes_manager, out_of_range2nans=True):
             old_axes_manager = self.axes_manager
             self.axes_manager = axes_manager
             self.fetch_stored_values()
-        s = self.__call__(non_convolved=False, onlyactive=True)
+        s = self._get_current_data(non_convolved=False, onlyactive=True)
         if old_axes_manager is not None:
             self.axes_manager = old_axes_manager
             self.fetch_stored_values()
@@ -939,7 +939,7 @@ def _model2plot(self, axes_manager, out_of_range2nans=True):
     def _model_function(self, param):
         self.p0 = param
         self._fetch_values_from_p0()
-        to_return = self.__call__(non_convolved=False, onlyactive=True, binned=self._binned)
+        to_return = self._get_current_data(non_convolved=False, onlyactive=True, binned=self._binned)
         return to_return
 
     @property
@@ -1068,7 +1068,7 @@ def _linear_fit(self, optimizer="lstsq", calculate_errors=False,
                     p = twin_parameters_mapping[p]
 
                 index = parameters.index(p)
-                comp_value = self.__call__(
+                comp_value = self._get_current_data(
                     component_list=[component], binned=False
                     )
                 comp_constant_values = component._compute_constant_term()
@@ -1077,7 +1077,7 @@ def _linear_fit(self, optimizer="lstsq", calculate_errors=False,
 
             else:
                 # No free parameters, so component is fixed.
-                constant_term += self.__call__(
+                constant_term += self._get_current_data(
                     component_list=[component], binned=False
                     )
 

hyperspy/models/model1d.py

@@ -381,7 +381,7 @@ def remove(self, things):
 
     remove.__doc__ = BaseModel.remove.__doc__
 
-    def __call__(self, non_convolved=False, onlyactive=False,
+    def _get_current_data(self, non_convolved=False, onlyactive=False,
                  component_list=None, binned=None,
                  ignore_channel_switches=False):
         """
@@ -736,7 +736,7 @@ def _model2plot(self, axes_manager, out_of_range2nans=True):
             old_axes_manager = self.axes_manager
             self.axes_manager = axes_manager
             self.fetch_stored_values()
-        s = self.__call__(non_convolved=False, onlyactive=True)
+        s = self._get_current_data(non_convolved=False, onlyactive=True)
         if old_axes_manager is not None:
             self.axes_manager = old_axes_manager
             self.fetch_stored_values()
@@ -752,7 +752,7 @@ def _residual_for_plot(self,**kwargs):
         by the model signal then returns the residual
         """
 
-        return self.signal._get_current_data() - self.__call__(ignore_channel_switches=True)
+        return self.signal._get_current_data() - self._get_current_data(ignore_channel_switches=True)
 
     def plot(self, plot_components=False,plot_residual=False, **kwargs):
         """Plot the current spectrum to the screen and a map with a

hyperspy/models/model2d.py

@@ -160,7 +160,7 @@ def signal(self, value):
         else:
             raise WrongObjectError(str(type(value)), 'Signal2D')
 
-    def __call__(self, non_convolved=True, onlyactive=False,
+    def _get_current_data(self, non_convolved=True, onlyactive=False,
                  component_list=None, binned=None):
         """Returns the corresponding 2D model for the current coordinates
 
@@ -389,7 +389,7 @@ def _model2plot(self, axes_manager, out_of_range2nans=True):
             old_axes_manager = self.axes_manager
             self.axes_manager = axes_manager
             self.fetch_stored_values()
-        s = self.__call__(non_convolved=False, onlyactive=True)
+        s = self._get_current_data(non_convolved=False, onlyactive=True)
         if old_axes_manager is not None:
             self.axes_manager = old_axes_manager
             self.fetch_stored_values()