Changeset fb8daaaf in sasview for sansview

Timestamp:

Apr 13, 2009 8:10:51 PM (16 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:

ff36f31

Parents:

707436d

Message:

plotting with smearing fixed

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• fitting.py (modified) (3 diffs)
• model_thread.py (modified) (1 diff)

sansview/perspectives/fitting/fitpage.py

@@ -478 +478 @@
                 wx.PostEvent(self.manager.parent, StatusEvent(status=\
                             "Data contains smearing information %s"%msg))
-            self.manager.set_smearer(smear, qmin= float(self.qmin_x),
+        ## set smearing value whether or not the data contain the smearing info
+        self.manager.set_smearer(smear, qmin= float(self.qmin_x),
                                       qmax= float(self.qmax_x))   
         ## save the state enable smearing

sansview/perspectives/fitting/fitting.py

@@ -361 +361 @@
         
         smearer =self.page_finder[current_pg].get_smearer()
-        if smearer != None:
-            self.draw_model( model=model, data= data, smearer= smearer,
+        self.draw_model( model=model, data= data, smearer= smearer,
                 qmin= qmin, qmax= qmax)
 
@@ -632 +631 @@
             model = self.page_finder[cpage].get_model()
             qmin, qmax= self.page_finder[cpage].get_range()
+            smearer =self.page_finder[cpage].get_smearer()
             #Replot models
             msg= "Single Fit completed. plotting... %s:"%model.name
             wx.PostEvent(self.parent, StatusEvent(status="%s " % msg))
-            self.draw_model( model=model, data= metadata,qmin= qmin, qmax= qmax)
+            self.draw_model( model=model, data= metadata, smearer= smearer,
+                             qmin= qmin, qmax= qmax)
             
         except:
@@ -686 +687 @@
                     wx.PostEvent(self.parent, StatusEvent(status="%s " % msg))
                     qmin, qmax= page.get_range()
-                    self.draw_model( model=model, data= metadata,qmin= qmin, qmax= qmax)
+                    smearer =self.page_finder[page].get_smearer()
+                    self.draw_model( model=model, data= metadata, smearer=smearer,
+                                     qmin= qmin, qmax= qmax)
                     
         except:

sansview/perspectives/fitting/model_thread.py

@@ -270 +270 @@
                 value = self.model.run(self.x[i_x])
                 output[i_x] = value
-                
+        ##smearer the ouput of the plot    
         if self.smearer!=None:
             output = self.smearer(output)
-            
                       
         elapsed = time.time()-self.starttime