Changeset acf8e4a5 in sasview for src/sas/perspectives/fitting/basepage.py

Timestamp:

Mar 31, 2015 9:52:01 AM (9 years ago)

Author:

Paul Kienzle <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:

4342107f, c971c98

Parents:

6987c8a

Message:

reference BumpsFit? directly and remove fit engine selection layer

File:

• src/sas/perspectives/fitting/basepage.py (modified) (5 diffs)

src/sas/perspectives/fitting/basepage.py

@@ -98 +98 @@
         self.npts = None
         self.num_points = None
-        ## default fitengine type
-        self.engine_type = 'bumps'
         ## smear default
         self.current_smearer = None
@@ -947 +945 @@
         Store current state
         """
-        self.state.engine_type = copy.deepcopy(self.engine_type)
         ## save model option
         if self.model != None:
@@ -1045 +1042 @@
             self.state.disp_list = copy.deepcopy(self.disp_list)
             self.state.model = self.model.clone()
-        if hasattr(self, "engine_type"):
-            self.state.engine_type = copy.deepcopy(self.engine_type)
 
         self.state.enable2D = copy.deepcopy(self.enable2D)
@@ -1299 +1294 @@
             # Backward compatibility (for older state files)
             self.magnetic_on = False
-        self.engine_type = state.engine_type
 
         self.disp_cb_dict = state.disp_cb_dict
@@ -1355 +1349 @@
             self.multifactorbox.SetSelection(state.multi_factor)
 
-        #reset the fitting engine type
-        self.engine_type = state.engine_type
-        #draw the pnael according to the new model parameter
+        #draw the panel according to the new model parameter
         self._on_select_model(event=None)