Changeset 18e6c5e in sasview for sansview/perspectives/fitting

Timestamp:

Mar 26, 2010 7:35:44 PM (15 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:

c4f52e3

Parents:

dde2d44

Message:

fixed 2d fitting w/park problem

File:

• sansview/perspectives/fitting/fitpage.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -322 +322 @@
                 self.enable_smearer.Disable()  
             else:
-                print "2dl"
                 self.smear_description_2d.Show(True) 
                 self.pinhole_smearer.Disable() 
@@ -831 +830 @@
                     flag1 = self.update_pinhole_smear()
                     flag = flag or flag1
-            else:
+            elif self.data.__class__.__name__ !="Data2D":
                 self.manager.set_smearer(smearer=temp_smearer, qmin= float(self.qmin_x),
                                                          qmax= float(self.qmax_x)) 
@@ -1173 +1172 @@
         qmin,qmax = self.get_range()
         if self.data.__class__.__name__ =="Data2D":
-            npts2fit = len(self.data[self.mask])
+            npts2fit = len(self.data.data[self.mask])
         else:
             for qx in self.data.x: