Changeset 55e13ab in sasview

Timestamp:

Nov 18, 2008 9:58:50 AM (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:

5fcfca4

Parents:

9696b075

Message:

smearing added

Location:

sansview/perspectives/fitting

Files:

• AnnulusSlicer.py (added)
• fitpage1D.py (modified) (2 diffs)
• fitpanel.py (modified) (2 diffs)
• fitting.py (modified) (1 diff)
• models.py (modified) (1 diff)

sansview/perspectives/fitting/fitpage1D.py

@@ -133 +133 @@
         ix = 0
         iy = 1
-        self.smear= wx.CheckBox(self, -1, "Smear", (10, 10))
+        self.smear= wx.CheckBox(self, -1, "Fit with Smear", (10, 10))
+        wx.EVT_CHECKBOX(self, self.smear.GetId(), self.onSmear)
         self.sizer1.Add(self.smear,(iy,ix),(1,1),\
                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
@@ -594 +595 @@
         self.vbox.Layout()
         self.GrandParent.GetSizer().Layout()
-    
+    def onSmear(self, event):
+        if self.smear.GetValue()==True:
+            from DataLoader.qsmearing import smear_selection
+            smear =smear_selection( self.data )
+            self.data.smearer= smear
+            #print "on smearing", self.data.smearer._compute_matrix()
+        else:
+            self.data.smearer=None
+        

sansview/perspectives/fitting/fitpanel.py

@@ -75 +75 @@
         """     
         try:
-            name = data.group_id # item in Data1D
+            name = data.name # item in Data1D
         except:
             name = 'Fit'
@@ -177 +177 @@
             raise
         print "fitpanel", self.draw_model_name 
+        
     def set_model_list(self,dict):
          """ 

sansview/perspectives/fitting/fitting.py

@@ -332 +332 @@
                     #Do the single fit
                     self.fitter.set_model(Model(model), self.id, pars) 
+                    print "Single fit : on smearing",metadata.smearer
                     self.fitter.set_data(metadata,self.id,qmin,qmax)
                     self.fitter.select_problem_for_fit(Uid=self.id,value=value.get_scheduled())

sansview/perspectives/fitting/models.py

@@ -92 +92 @@
         self.model_list[str(wx.NewId())] = EllipsoidModel 
         
-        from sans.guitools.LineModel import LineModel
+        from sans.models.LineModel import LineModel
         self.model_list[str(wx.NewId())]  = LineModel