Changeset 55bb249c in sasview for fittingview/src/sans/perspectives/fitting/fitproblem.py

Timestamp:

Sep 7, 2011 6:24:56 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

44f9c8b

Parents:

7ad194fa

Message:

added custom weighting for single fit

File:

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

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

@@ -87 +87 @@
         """
         :return: fitting range
+        """
+    def set_weight(self, weight=None):
+        """
+        set fitting range 
+        """
+    def get_weight(self):
+        """
+        get fitting weight
         """
     def clear_model_param(self):
@@ -257 +265 @@
                 self[d.id].set_model(self.model)
                 self[d.id].set_range(self.qmin, self.qmax)
-          
+                #self[d.id].set_smearer(self[d.id].get_smearer())
     def get_fit_data(self, fid):
         """
@@ -322 +330 @@
             return self[fid].get_range()
         
-    
+    def set_weight(self, weight, is2d, fid=None):
+        """
+        fit weight
+        """
+        if fid is None:
+            for value in self.itervalues():
+                value.set_weight(weight, is2d)
+        else:
+            if fid in self.iterkeys():
+                self[fid].value.set_weight(weight, is2d)
+                
+    def get_weight(self, fid=None):
+        """
+        return fit weight
+        """
+        if fid in self.iterkeys():
+            return self[fid].get_weight()
+                 
     def clear_model_param(self, fid=None):
         """
@@ -381 +406 @@
         self.qmin = None
         self.qmax = None
+        # fit weight
+        self.weight = None
         
         
@@ -459 +486 @@
         :param data: list of data selected
         """
-        self.fit_data = data
+        self.fit_data = copy.deepcopy(data)
             
     def get_fit_data(self):
@@ -467 +494 @@
         return self.fit_data
     
+    def set_weight(self, weight, is2d):
+        """
+        Set weight array
+        """
+        self.weight = weight
+        if is2d:
+            self.fit_data.err_data = self.weight
+        else:
+            self.fit_data.dy = self.weight
+
+    def get_weight(self):
+        """
+        returns weight array
+        """
+        return self.weight
+        
     def set_model_param(self,name,value=None):
         """