Changeset 41661a0 in sasview for fittingview/src/sans

Timestamp:

Oct 5, 2011 1:14:09 PM (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:

634ca14

Parents:

0f17dd9

Message:

make sure all plot are mapped to the correct data

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fitproblem.py (modified) (4 diffs)
• fitting.py (modified) (7 diffs)

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

@@ -135 +135 @@
         Get graph_id
         """  
+    def set_result(self, result):
+        """
+        """
+
+    def get_result(self):
+        """
+        get result 
+        """   
+
    
 class FitProblemDictionary(FitProblemComponent, dict):
@@ -419 +428 @@
         return self.itervalues()
     
-    def set_result(self, batch_inputs, batch_outputs):
+    def  set_result(self, result, fid):
+        """
+        """
+        if fid in self.iterkeys():
+            self[fid].set_result(result)
+            
+    def set_batch_result(self, batch_inputs, batch_outputs):
         """
         set a list of result
@@ -425 +440 @@
         self.batch_inputs = batch_inputs
         self.batch_outputs = batch_outputs
-                
-    def get_result(self):
+             
+    def get_result(self, fid):
+        """
+        get result 
+        """   
+        if fid in self.iterkeys():
+            return self[fid].get_result()
+            
+    def get_batch_result(self):
         """
         get result 
@@ -689 +711 @@
         """  
         return self.graph_id
-   
+    
+    def set_result(self, result):
+        """
+        """
+        self.result = result
+        
+    def get_result(self):
+        """
+        get result 
+        """   
+        return self.result

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

@@ -761 +761 @@
                         pars.append(name)
                     fitproblem_list = value.values()
-                    fitproblem_list.sort()
                     for fitproblem in  fitproblem_list:
                         if sim_fitter is None:
@@ -999 +998 @@
                     listOfConstraint.append((item[0],item[1]))
         new_model = model#deepcopy(model)
-        fitter.set_model(new_model, fit_id, pars, constraints=listOfConstraint)
+        fitter.set_model(new_model, fit_id, pars, data=data,
+                         constraints=listOfConstraint)
         fitter.set_data(data=data, id=fit_id, smearer=smearer, qmin=qmin, 
                         qmax=qmax)
@@ -1035 +1035 @@
         print "update_fit result", result
         
+   
+        
     def _batch_single_fit_complete_helper(self, result, pars, page_id, 
                             batch_outputs, batch_inputs, elapsed=None):
@@ -1048 +1050 @@
         wx.PostEvent(self.parent, StatusEvent(status=msg, info="info",
                                                       type="stop"))
+        pid = page_id[0]
         if batch_outputs is None:
             batch_outputs = {}
@@ -1079 +1082 @@
                         item = res.stderr[index]
                         batch_inputs["error on %s" % pars[index]].append(item)
-            pid = page_id[0]
-            self.page_finder[pid].set_result(batch_inputs=batch_inputs,
-                                             batch_outputs=batch_outputs)   
-            count = len(self.page_finder[pid].keys())
-            for pid in page_id:
+                
+               
+                self.page_finder[pid].set_batch_result(batch_inputs=batch_inputs,
+                                                 batch_outputs=batch_outputs)   
                 cpage = self.fit_panel.get_page_by_id(pid)
                 cpage._on_fit_complete()
-                fitproblem_list = self.page_finder[pid].values()
-                fitproblem_list.sort()
-                for fitproblem in fitproblem_list:
-                    data = fitproblem.get_fit_data()
-                    model = fitproblem.get_model()
-                    smearer = fitproblem.get_smearer()
-                    qmin, qmax = fitproblem.get_range()
-                    weight = fitproblem.get_weight()
-                    flag = issubclass(data.__class__, Data2D)
-                    self.draw_model(model=model,
-                                      page_id=pid, 
-                                      data=data, 
-                                      smearer=smearer,
-                                      enable1D=not flag, 
-                                      enable2D=flag,
-                                      state=None,
-                                      toggle_mode_on=False,
-                                      fid=data.id,
-                                      qmin=qmin, qmax=qmax, 
-                                      update_chisqr=False, 
-                                      weight=weight)
-           
-    
-        
-                    
+                model, data = res.inputs[0]
+                self.page_finder[pid][data.id].set_result(res)
+                fitproblem = self.page_finder[pid][data.id]
+                smearer = fitproblem.get_smearer()
+                qmin, qmax = fitproblem.get_range()
+                weight = fitproblem.get_weight()
+                flag = issubclass(data.__class__, Data2D)
+                self.draw_model(model=model,
+                                  page_id=pid, 
+                                  data=data, 
+                                  smearer=smearer,
+                                  enable1D=not flag, 
+                                  enable2D=flag,
+                                  state=None,
+                                  toggle_mode_on=False,
+                                  fid=data.id,
+                                  qmin=qmin, qmax=qmax, 
+                                  update_chisqr=False, 
+                                  weight=weight)
+       
     def on_set_batch_result(self, page_id, fid, batch_outputs, batch_inputs):
         """
@@ -1262 +1259 @@
                     #Separate result in to data corresponding to each page
                     for p in result.parameters:
+                        #print "simul ----", p , p.__class__, p.model.name, p.data.name
                         model_name, param_name = self.split_string(p.name)  
                         if model.name == model_name:
@@ -1793 +1791 @@
         m = self.page_finder[page_id].nbr_residuals_computed
         flag = False
-        batch_inputs, batch_outputs = self.page_finder[page_id].get_result()
+        batch_inputs, batch_outputs = self.page_finder[page_id].get_batch_result()
          
         if self.page_finder[page_id].nbr_residuals_computed == -1: