Changeset 2fff4db in sasview for sansview/perspectives/fitting

Timestamp:

Apr 8, 2010 6:09:07 PM (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:

286bb6c

Parents:

8e87ece

Message:

working on select theory or data to fit

File:

• sansview/perspectives/fitting/fitting.py (modified) (7 diffs)

sansview/perspectives/fitting/fitting.py

@@ -13 +13 @@
 import time
 import thread
-
 from copy import deepcopy
+
 from DataLoader.data_info import Data1D as LoaderData1D
 from danse.common.plottools.PlotPanel import PlotPanel
@@ -21 +21 @@
 from sans.guiframe.dataFitting import Data1D
 from sans.guiframe.dataFitting import Theory1D
-from sans.guiframe import dataFitting 
+
 from sans.guiframe.utils import format_number
 
@@ -291 +291 @@
         data.copy_from_datainfo(item)
         item.clone_without_data(clone=data)    
-        data.dy=dy
+        data.dy = dy
         data.name = item.name
         ## allow to highlight data when plotted
@@ -544 +544 @@
         """
         if data.__class__.__name__ != "Data2D":
-            raise Valueerror, " create_fittable_data2D expects a Data2D"
+            raise ValueError, " create_fittable_data2D expects a Data2D"
         ## Data2D case
         new_data = deepcopy(data)
@@ -564 +564 @@
             @return Data1D
         """
+        class_name = data.__class__.__name__
+        if not class_name in ["Data1D", "Theory1D"]:
+            raise ValueError, "create_fittable_data1D expects Data1D"
+        #For prview the theory is not a subclass of DataLoader.Data1D
         if not issubclass(data.__class__, LoaderData1D):
-            raise ValueError, "create_fittable_data1D expects Data1D"
+            if class_name == 'Theory1D':
+                temp_data = Theory1D(x=data.x, y=data.y, dy=data.y)
+                temp_data.copy_from_datainfo(data1d=data)
+                temp_data.name = data.name
+            if class_name == 'Data1D':
+                temp_data = Data1D(x=data.x, y=data.y, dx=data.dx, dy=data.y)
+                temp_data.copy_from_datainfo(data=data)
+                temp_data.name = data.name
+            data = temp_data
+        
         #get the appropriate dy 
         dy = deepcopy(data.dy)
@@ -571 +584 @@
             if data.name in  self.err_dy.iterkeys():
                 dy = self.err_dy[data.name]   
-                print "err_dy ====", dy 
+               
         if data.dy is None or data.dy == []:
             dy = numpy.zeros(len(data.y))
-        print "dy ====", dy 
+        #print "dy ====", dy 
         if data.__class__.__name__ == "Theory1D":
-            
             new_data = self.copy_data(data, dy)
-            new_data.group_id += "data1D"
-            new_data.id +="data1D"
+            new_data.group_id = str(new_data.group_id)+"data1D"
+            new_data.id = str(new_data.id)+"data1D"
             new_data.is_data = False
             title = new_data.name
@@ -731 +743 @@
         Plugin.on_perspective(self,event=event)
         for plottable in self.panel.graph.plottables:
-            if issubclass(plottable.__class__, LoaderData1D):
+            if plottable.__class__.__name__ in ["Data1D", "Theory1D"]:
                 if plottable.name == self.panel.graph.selected_plottable:
                     data = self.create_fittable_data1D(data=plottable)