Changeset b2f4f83 in sasview

Timestamp:

Sep 17, 2009 7:59:25 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:

e5664f2

Parents:

920a6e5

Message:

reverce code for copy_data and add check for value of source

File:

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

sansview/perspectives/fitting/fitting.py

@@ -277 +277 @@
             @param return 
         """
-       
+        detector=None
+        source=None
         info = None
         id=None
-    
+        dxl=None
+        dxw=None
+        dx=None
+        if hasattr(item, "dxl"):
+            dxl = copy.deepcopy(item.dxl)
+        if hasattr(item, "dxw"):
+            dxw = copy.deepcopy(item.dxw)
+        if hasattr(item, "detector"):
+            detector = copy.deepcopy(item.detector)
+        if hasattr(item, "source"):
+            source = copy.deepcopy(item.source)
         if hasattr(item ,"info"):
             info= copy.deepcopy(item.info)
         if hasattr(item,"id"):
             id = copy.deepcopy(item.id)
-       
-        data= Data1D(x=item.x, y=item.y,dx=None, dy=None)
-        data.copy_from_datainfo(item) 
-        item.clone_without_data(clone=data)      
-        data.dy= dy
+        if hasattr(item, "dx"):
+            dx= item.dx
+            
+        
+        data= Data1D(x=item.x, y=item.y,dx=dx, dy=dy)
+        data.dxl = dxl
+        data.dxw = dxw
+        
         data.name = item.name
-      
+        if detector!=None:
+            data.detector = detector
+        if source!=None:
+            data.source = source
         ## allow to highlight data when plotted
         data.interactive = copy.deepcopy(item.interactive)
@@ -299 +316 @@
         ## to save  data 1D as cansas xml file
         data.info= info
+        ## If the data file does not tell us what the axes are, just assume...
+        data.xaxis(copy.deepcopy(item._xaxis),copy.deepcopy(item._xunit))
+        data.yaxis(copy.deepcopy(item._yaxis),copy.deepcopy(item._yunit))
+       
         data.group_id = item.group_id
         return data