Changeset 4a0dc427 in sasview

Timestamp:

May 16, 2014 5:30:57 PM (10 years ago)

Author:

pkienzle

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

eff93b8

Parents:

786685e

Message:

bumps simultaneous fit failure workaround

File:

• src/sans/fit/BumpsFitting.py (modified) (1 diff)

src/sans/fit/BumpsFitting.py

@@ -111 +111 @@
         for k,p in self._pars.items():
             p.fixed = (k not in param_list or k in self.constraints)
-        self.fitted_pars = [self._pars[k] for k in param_list]
-        self.fitted_par_names = param_list
+        self.fitted_pars = [self._pars[k] for k in param_list if k not in self.constraints]
+        self.fitted_par_names = [k for k in param_list if k not in self.constraints]
 
     # ===== Fitness interface ====