Merge pull request #2921 from ericpre/fix_multifit_ridge_regression

Fix passing keyword argument to ridge_regression

hyperspy/model.py

@@ -1965,7 +1965,10 @@ def multifit(
                 # 3. leave earlier because we don't need to go iterate over
                 #    the navigation indices
                 kwargs['only_current'] = False
-                kwargs['show_progressbar'] = show_progressbar
+                # Add the 'show_progressbar' only with lazy signal to avoid
+                # passing it down to 'ridge_regression'
+                if self.signal._lazy:
+                    kwargs['show_progressbar'] = show_progressbar
                 self.fit( **kwargs)
 
                 # TODO: check what happen to linear twinned parameter

hyperspy/tests/model/test_linear_model.py

@@ -162,6 +162,20 @@ def test_channel_switches(self, weighted):
         single_nonlinear = m.as_signal()
         np.testing.assert_allclose(single(), single_nonlinear())
 
+    def test_multifit_ridge(self, weighted):
+        pytest.importorskip("sklearn")
+        m = self.m
+        L = Gaussian(centre=15.)
+        L.set_parameters_not_free(['centre', 'sigma'])
+        m.append(L)
+
+        if m.signal._lazy:
+            with pytest.raises(ValueError):
+                m.multifit(optimizer='ridge_regression')
+            return
+        else:
+            m.multifit(optimizer='ridge_regression')
+
 
 class TestLinearFitting: