Changeset 7afcae8 in sasview for fittingview/src/sans/perspectives/fitting

Timestamp:

Sep 12, 2011 10:56:53 AM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

33dd2e5

Parents:

8aa5788

Message:

make sure smearer is not computed multplie time

File:

• fittingview/src/sans/perspectives/fitting/fitproblem.py (modified) (4 diffs)

fittingview/src/sans/perspectives/fitting/fitproblem.py

@@ -400 +400 @@
         self.list_param = []
         ## smear object to smear or not data1D
-        self.smearer_compute_count = 0
+        self.smearer_computed = False
         self.smearer_enable = False
         self.smearer_computer_value = None
@@ -432 +432 @@
         if not self.smearer_enable:
             return None
-        #if self.smearer_computer_value is None and \
-        #     self.smearer_compute_count > 1:
+        if not self.smearer_computed:
             #smeari_selection should be call only once per fitproblem
-        self.smearer_computer_value = smear_selection(self.fit_data,
+            self.smearer_computer_value = smear_selection(self.fit_data,
                                                            self.model)
-        self.smearer_compute_count += 1
+            self.smearer_computed = True
         return self.smearer_computer_value
     
@@ -456 +455 @@
         :param name: name created for model
         """
-        self.model= model
+        self.model = model
+        self.smearer_computer_value = smear_selection(self.fit_data,
+                                                           self.model)
+        self.smearer_computed = True
         
     def get_model(self):
@@ -487 +489 @@
         """
         self.fit_data = copy.deepcopy(data)
+        self.smearer_computer_value = smear_selection(self.fit_data,
+                                                           self.model)
+        self.smearer_computed = True
         
     def get_fit_data(self):