Changeset f72333f in sasview for sansview/perspectives/fitting/basepage.py

Timestamp:

May 10, 2010 4:50:05 PM (14 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:

4fbc93e

Parents:

2d409fa

Message:

Plugged in 2D smear: traditional over-sampling method

File:

• sansview/perspectives/fitting/basepage.py (modified) (11 diffs)

sansview/perspectives/fitting/basepage.py

@@ -14 +14 @@
 (PreviousStateEvent, EVT_PREVIOUS_STATE)   = wx.lib.newevent.NewEvent()
 (NextStateEvent, EVT_NEXT_STATE)   = wx.lib.newevent.NewEvent()
+
 _BOX_WIDTH = 76
 _QMIN_DEFAULT = 0.001
@@ -55 +56 @@
         self.data = None
         self.mask = None
+        self.theory = None
         self.state = PageState(parent=parent)
         ## dictionary containing list of models
@@ -136 +138 @@
         #self.onSave(event=None)
         self.Bind(wx.EVT_CONTEXT_MENU, self.onContextMenu)
-        
+
         ## create the basic structure of the panel with empty sizer
         self.define_page_structure()
@@ -1097 +1099 @@
                         flag = self.update_pinhole_smear()
                     else:
-                        self.manager.set_smearer(smearer=temp_smearer, qmin= float(self.qmin_x),
+                        self.manager.set_smearer_nodraw(smearer=temp_smearer, qmin= float(self.qmin_x),
                                                  qmax= float(self.qmax_x))
                 elif not is_2Ddata:
@@ -1362 +1364 @@
                     temp_smear= self.current_smearer
             
-            self.manager.draw_model(self.model, data=self.data,
+            self.manager.draw_model(self.model, 
+                                    data=self.data,
                                     smearer= temp_smear,
                                     qmin=float(self.qmin_x), 
                                     qmax=float(self.qmax_x),
                                     qstep= float(self.num_points),
-                                    enable2D=self.enable2D) 
-       
+                                    enable2D=self.enable2D)
         
     def _set_model_sizer(self,sizer, box_sizer, title="", object=None):
@@ -1507 +1509 @@
             item must model class
         """
+        st = time.time()
         for models in list:
             model= models()
@@ -1514 +1517 @@
                     name = model.name
                 combobox.Append(name,models)
-     
+
         return 0
 
@@ -1629 +1632 @@
             self.structurebox.Enable()
             self.text2.Enable()
-        if self.data.__class__.__name__ =="Data2D":
-            self.smear_description_2d.Show(True)
+        #if self.data.__class__.__name__ =="Data2D":
+            #self.smear_description_2d.Show(True)
             
         s_id = self.structurebox.GetCurrentSelection()
@@ -2152 +2155 @@
         if ON_MAC == True:
             time.sleep(1)
-             
+            
+
     def on_reset_clicked(self,event):
         """
@@ -2167 +2171 @@
             self.qmin_x = data_min
             self.qmax_x = math.sqrt(x*x + y*y)
+            # check smearing
+            if not self.disable_smearer.GetValue():
+                temp_smearer= self.current_smearer
+                ## set smearing value whether or not the data contain the smearing info
+                if self.pinhole_smearer.GetValue():
+                    flag = self.update_pinhole_smear()
+                else:
+                    flag = True
         elif self.data.__class__.__name__ != "Data2D":
             self.qmin_x = min(self.data.x)
@@ -2205 +2217 @@
         #reset the q range values
         self._reset_plotting_range(self.state)
-        self.compute_chisqr(smearer=self.current_smearer)
+        #self.compute_chisqr(smearer=self.current_smearer)
         #Re draw plot
         self._draw_model()