Changeset 2a2af47 in sasview

Timestamp:

Sep 18, 2009 9:36:17 AM (15 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:

aaea3714

Parents:

09fe12d

Message:

fixing smear when trying to apply smear with no model selected

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/fitpage.py

@@ -652 +652 @@
                 ## error occured on chisqr computation
                 pass
+            ## set smearing value whether or not the data contain the smearing info
+            self.manager.set_smearer(smearer=temp_smear, qmin= float(self.qmin_x),
+                                     qmax= float(self.qmax_x)) 
             evt = ModelEventbox(model=self.model)
             wx.PostEvent(self.event_owner, evt)   
@@ -902 +905 @@
             are compute when fitting
         """
+        if self.model ==None:
+            msg="Need model and data to smear plot"
+            wx.PostEvent(self.manager.parent, StatusEvent(status=\
+                            "Smear: %s"%msg))
+            return
         temp_smearer = None
         if self.enable_smearer.GetValue():
-            msg=""
             temp_smearer= self.smearer
             if hasattr(self.data,"dxl"):

sansview/perspectives/fitting/fitting.py

@@ -278 +278 @@
             @param return 
         """
-      
         id=None
-        
         if hasattr(item,"id"):
             id = copy.deepcopy(item.id)
-       
-        
+
         data= Data1D(x=item.x, y=item.y,dx=None, dy=None)
-        data.copy_from_datainfo(item) 
+        data.copy_from_datainfo(item)
         item.clone_without_data(clone=data)    
         data.dy=dy
         data.name = item.name
-       
         ## allow to highlight data when plotted
         data.interactive = copy.deepcopy(item.interactive)
         ## when 2 data have the same id override the 1 st plotted
         data.id = id
-       
         data.group_id = item.group_id
         return data