Changeset 425ef040 in sasview

Timestamp:

Oct 30, 2009 11:20:41 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:

c93cc15

Parents:

77f6a8b

Message:

guithread change on data2D

File:

• sansview/perspectives/fitting/gui_thread.py (modified) (2 diffs)

sansview/perspectives/fitting/gui_thread.py

@@ -36 +36 @@
             msg= str(data1d.__class__.__name__)
             raise ValueError, "need Data1D to compute chisqr. Current class %s"%msg
-        
-        self.fitdata= FitData1D(data1d, smearer=smearer)
+
+        self.fitdata= FitData1D(x=data1d.x,y=data1d.y,dx=data1d.dx,dy=data1d.dy, smearer=smearer)
         self.fitdata.setFitRange(qmin=qmin,qmax=qmax)
         self.model = model
@@ -105 +105 @@
             msg= str(data2d.__class__.__name__)
             raise ValueError, "need Data2D to compute chisqr. Current class %s"%msg
-        
-        self.fitdata = FitData2D(data2d)
+       
+        self.fitdata = FitData2D(sans_data2d=data2d ,data=data2d.data, err_data=data2d.err_data)
         self.fitdata.setFitRange(qmin=qmin,qmax=qmax)