Changeset 7d8094b in sasview

Timestamp:

Jun 5, 2009 6:56:17 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

1abcb04

Parents:

1b69256

Message:

dataloader: allow for input to write to be child class. Modify clone_without_data to receive a Data1D (or child of Data1D) as an input.

Location:

DataLoader

Files:

• data_info.py (modified) (4 diffs)
• readers/cansas_reader.py (modified) (1 diff)

DataLoader/data_info.py

@@ -565 +565 @@
         return _str
 
-    def clone_without_data(self, length=0):
+    def clone_without_data(self, length=0, clone=None):
         """
             Clone the current object, without copying the data (which
@@ -572 +572 @@
             
             @param length: length of the data array to be initialized
+            @param clone: if provided, the data will be copied to clone
         """
         from copy import deepcopy
         
-        x  = numpy.zeros(length) 
-        dx = numpy.zeros(length) 
-        y  = numpy.zeros(length) 
-        dy = numpy.zeros(length) 
-        
-        clone = Data1D(x, y, dx=dx, dy=dy)
+        if clone is None or not issubclass(clone.__class__, Data1D):
+            x  = numpy.zeros(length) 
+            dx = numpy.zeros(length) 
+            y  = numpy.zeros(length) 
+            dy = numpy.zeros(length) 
+            clone = Data1D(x, y, dx=dx, dy=dy)
+        
         clone.title       = self.title
         clone.run         = self.run
@@ -694 +696 @@
         return _str
   
-    def clone_without_data(self, length=0):
+    def clone_without_data(self, length=0, clone=None):
         """
             Clone the current object, without copying the data (which
@@ -701 +703 @@
             
             @param length: length of the data array to be initialized
+            @param clone: if provided, the data will be copied to clone
         """
         from copy import deepcopy
         
-        data     = numpy.zeros(length) 
-        err_data = numpy.zeros(length) 
-        
-        clone = Data2D(data, err_data)
+        if clone is None or not issubclass(clone.__class__, Data2D):  
+            data     = numpy.zeros(length) 
+            err_data = numpy.zeros(length) 
+            clone = Data2D(data, err_data)
+            
         clone.title       = self.title
         clone.run         = self.run

DataLoader/readers/cansas_reader.py

@@ -603 +603 @@
         """
         
-        if not datainfo.__class__ == Data1D: 
+        if not issubclass(datainfo.__class__, Data1D):
             raise RuntimeError, "The cansas writer expects a Data1D instance"