Changeset 67ae937 in sasview

Timestamp:

Aug 3, 2011 10:55:13 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:

8677607

Parents:

4225aed

Message:

working on batch mode

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fit_thread.py (modified) (2 diffs)
• fitpage.py (modified) (4 diffs)
• fitting.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -71 +71 @@
         self.qmin_data_set = None
         self.qmax_data_set = None
+        self.npts_data_set = 0
         ## Q range
         self.qmin = None

sansview/perspectives/fitting/fit_thread.py

@@ -69 +69 @@
                 list_map_get_attr.append(map_getattr)
             from multiprocessing import Pool
-            inputs = zip(list_map_get_attr,self.fitter, list_fit_function, list_handler, list_q, list_curr_thread,list_ftol)
-            print inputs
+            inputs = zip(list_map_get_attr,self.fitter, list_fit_function,
+                         list_handler, list_q, list_curr_thread,list_ftol)
             result =  Pool(1).map(func=map_apply, 
                                iterable=inputs)
             #self.handler.starting_fit()
-            #Result from the fit
-            """
-                result = self.fitter.fit(handler=self.handler, 
-                                         curr_thread=self,
-                                         ftol=self.ftol)
-            """
-            print "fithread result", result
             self.complete(result= result,
                           page_id=self.page_id,
@@ -89 +82 @@
             # Real code should not print, but this is an example...
             #print "keyboard exception"
-            #Stop on exception during fitting. Todo: need to put some mssg and reset progress bar.
+            #Stop on exception during fitting. Todo: need to put 
+            #some mssg and reset progress bar.
             raise
             #if self.handler is not None:

sansview/perspectives/fitting/fitpage.py

@@ -98 +98 @@
         self.enable_datasource()
         if data_list:
-            qmin, qmax, _ = self.compute_data_range(data_list[0])
+            qmin, qmax, npts = self.compute_data_range(data_list[0])
             self.qmin_data_set, self.qmax_data_set = qmin, qmax
+            self.npts_data_set = npts
         for data in self.data_list:
             if data is not None:
@@ -1010 +1011 @@
         # when y(q=0)=None at x[0].         
         self.qmin_x = float(self.qmin.GetValue())
-        self.qmax_x = float( self.qmax.GetValue())
+        self.qmax_x = float(self.qmax.GetValue())
         self._manager._reset_schedule_problem(value=0, uid=self.uid)
-        self._manager.schedule_for_fit(uid=self.uid,value=1, fitproblem =None) 
-        self._manager.set_fit_range(uid=self.uid,qmin= self.qmin_x, 
-                                   qmax= self.qmax_x)
-        
+        self._manager.schedule_for_fit(uid=self.uid,value=1, fitproblem=None) 
+        self._manager.set_fit_range(uid=self.uid,qmin=self.qmin_x, 
+                                   qmax=self.qmax_x)
         #single fit 
         self._manager.onFit(uid=self.uid)
@@ -1648 +1648 @@
         """
         if data is not None:
-            qmin, qmax, _ = self.compute_data_range(data)
+            qmin, qmax, npts = self.compute_data_range(data)
             self.qmin_data_set = min(self.qmin_data_set, qmin)
             self.qmax_data_set = max(self.qmax_data_set, qmax)
-        
+            self.npts_data_set += npts
         
     def compute_data_range(self, data):
@@ -1720 +1720 @@
             self.structurebox.Enable()
             data_name = self.data.name
-            data_min, data_max, npts = self.compute_data_range(self.data)
+            #data_min, data_max, npts = self.compute_data_range(self.data)
+            data_min, data_max = self.qmin_data_set, self.qmax_data_set
+            npts =  self.npts_data_set
             #set maximum range for x in linear scale
             if not hasattr(self.data,"data"): #Display only for 1D data fit

sansview/perspectives/fitting/fitting.py

@@ -903 +903 @@
         smearer = value.get_smearer()
         qmin, qmax = value.get_range()
+        print "fitter_setter", qmin, qmax
         #Extra list of parameters and their constraints
         listOfConstraint = []