Changeset f71c2de in sasview for sansview/perspectives

Timestamp:

Apr 9, 2010 10:45:12 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:

ba535a6

Parents:

e0e873b

Message:

disable fitting for data generated for prview

File:

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

sansview/perspectives/fitting/fitting.py

@@ -197 +197 @@
                 return [[fit_option, fit_hint, self._onSelect]]
             else:
-                if item.name==graph.selected_plottable :
-                    if item.name !="$I_{obs}(q)$" and item.name !="$P_{fit}(r)$":
-                        if hasattr(item, "group_id"):
-                            # if is_data is true , this in an actual data loaded
-                            #else it is a data created from a theory model
-                            if hasattr(item,"is_data"):
-                                if item.is_data:
-                                    return [[fit_option, fit_hint,
-                                              self._onSelect]]
-                                else:
-                                    return [] 
+                if item.name == graph.selected_plottable :
+                    if item.name in ["$I_{obs}(q)$","$I_{fit}(q)$","$P_{fit}(r)$"]:
+                        return [] 
+                    if hasattr(item, "group_id"):
+                        # if is_data is true , this in an actual data loaded
+                        #else it is a data created from a theory model
+                        if hasattr(item,"is_data"):
+                            if item.is_data:
+                                return [[fit_option, fit_hint,
+                                          self._onSelect]]
                             else:
-                               return [[fit_option, fit_hint, self._onSelect]]
+                                return [] 
+                        else:
+                           return [[fit_option, fit_hint, self._onSelect]]
         return []   
 
@@ -566 +567 @@
         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): must be used 
-        #for checking
-        if not hasattr(data, "is_data"):
-            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
-                data = temp_data
-            if class_name == 'Data1D':
-                temp_data = Data1D(x=data.x, y=data.y, dx=data.dx, dy=data.y)
-                temp_data.copy_from_datainfo(data1d=data)
-                temp_data.name = data.name
-                data = temp_data
-        
+      
         #get the appropriate dy 
         dy = deepcopy(data.dy)
@@ -597 +584 @@
                                                    reset=True))
         else:
-            new_data = self.copy_data(data, dy)  
+            new_data = self.copy_data(data, dy) 
+            new_data.id = data.id 
             new_data.is_data = True
         return new_data