Changeset b39c817 in sasview for DataLoader/data_info.py

Timestamp:

Aug 4, 2008 10:39:43 AM (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:

ccb560a

Parents:

cfe97ea

Message:

Added unit converter for CanSAS format reader

File:

• DataLoader/data_info.py (modified) (6 diffs)

DataLoader/data_info.py

@@ -18 +18 @@
 copyright 2008, University of Tennessee
 """
+
+#TODO: Keep track of data manipulation in the 'process' data structure.
 
 from sans.guitools.plottables import Data1D as plottable_1D
@@ -71 +73 @@
     ## Sample to detector distance [float] [mm]
     distance = None
-    distance_unit = 'm'
+    distance_unit = 'mm'
     ## Offset of this detector position in X, Y, (and Z if necessary) [Vector] [mm] 
     offset = Vector()
-    offset_unit = 'mm'
+    offset_unit = 'm'
     ## Orientation (rotation) of this detector in roll, pitch, and yaw [Vector] [degrees]
     orientation = Vector()
@@ -280 +282 @@
     errors = []
             
+    # Private method to perform operation. Not implemented for DataInfo,
+    # but should be implemented for each data class inherited from DataInfo
+    # that holds actual data (ex.: Data1D)
+    def _perform_operation(self, other, operation): return NotImplemented
+
+    def __add__(self, other):
+        """
+            Add two data sets
+            
+            @param other: data set to add to the current one
+            @return: new data set
+            @raise ValueError: raised when two data sets are incompatible
+        """
+        def operation(a, b): return a+b
+        return self._perform_operation(other, operation)
+        
+    def __radd__(self, other):
+        """
+            Add two data sets
+            
+            @param other: data set to add to the current one
+            @return: new data set
+            @raise ValueError: raised when two data sets are incompatible
+        """
+        def operation(a, b): return b+a
+        return self._perform_operation(other, operation)
+        
+    def __sub__(self, other):
+        """
+            Subtract two data sets
+            
+            @param other: data set to subtract from the current one
+            @return: new data set
+            @raise ValueError: raised when two data sets are incompatible
+        """
+        def operation(a, b): return a-b
+        return self._perform_operation(other, operation)
+        
+    def __rsub__(self, other):
+        """
+            Subtract two data sets
+            
+            @param other: data set to subtract from the current one
+            @return: new data set
+            @raise ValueError: raised when two data sets are incompatible
+        """
+        def operation(a, b): return b-a
+        return self._perform_operation(other, operation)
+        
+    def __mul__(self, other):
+        """
+            Multiply two data sets
+            
+            @param other: data set to subtract from the current one
+            @return: new data set
+            @raise ValueError: raised when two data sets are incompatible
+        """
+        def operation(a, b): return a*b
+        return self._perform_operation(other, operation)
+        
+    def __rmul__(self, other):
+        """
+            Multiply two data sets
+            
+            @param other: data set to subtract from the current one
+            @return: new data set
+            @raise ValueError: raised when two data sets are incompatible
+        """
+        def operation(a, b): return b*a
+        return self._perform_operation(other, operation)
+        
+    def __div__(self, other):
+        """
+            Divided a data set by another
+            
+            @param other: data set that the current one is divided by
+            @return: new data set
+            @raise ValueError: raised when two data sets are incompatible
+        """
+        def operation(a, b): return a/b
+        return self._perform_operation(other, operation)
+        
+    def __rdiv__(self, other):
+        """
+            Divided a data set by another
+            
+            @param other: data set that the current one is divided by
+            @return: new data set
+            @raise ValueError: raised when two data sets are incompatible
+        """
+        def operation(a, b): return b/a
+        return self._perform_operation(other, operation)            
+            
 class Data1D(plottable_1D, DataInfo):
     """
@@ -309 +404 @@
             _str += "%s\n" % str(item)
         
-        
         _str += "Data:\n"
         _str += "   Type:         %s\n" % self.__class__.__name__
@@ -319 +413 @@
 
     def clone_without_data(self, length=0):
+        """
+            Clone the current object, without copying the data (which
+            will be filled out by a subsequent operation).
+            The data arrays will be initialized to zero.
+            
+            @param length: length of the data array to be initialized
+        """
         from copy import deepcopy
         
@@ -401 +502 @@
         return result
         
-
-    def __add__(self, other):
-        """
-            Add two data sets
-            
-            @param other: data set to add to the current one
-            @return: new data set
-            @raise ValueError: raised when two data sets are incompatible
-        """
-        def operation(a, b): return a+b
-        return self._perform_operation(other, operation)
-        
-    def __radd__(self, other):
-        """
-            Add two data sets
-            
-            @param other: data set to add to the current one
-            @return: new data set
-            @raise ValueError: raised when two data sets are incompatible
-        """
-        def operation(a, b): return b+a
-        return self._perform_operation(other, operation)
-        
-    def __sub__(self, other):
-        """
-            Subtract two data sets
-            
-            @param other: data set to subtract from the current one
-            @return: new data set
-            @raise ValueError: raised when two data sets are incompatible
-        """
-        def operation(a, b): return a-b
-        return self._perform_operation(other, operation)
-        
-    def __rsub__(self, other):
-        """
-            Subtract two data sets
-            
-            @param other: data set to subtract from the current one
-            @return: new data set
-            @raise ValueError: raised when two data sets are incompatible
-        """
-        def operation(a, b): return b-a
-        return self._perform_operation(other, operation)
-        
-    def __mul__(self, other):
-        """
-            Multiply two data sets
-            
-            @param other: data set to subtract from the current one
-            @return: new data set
-            @raise ValueError: raised when two data sets are incompatible
-        """
-        def operation(a, b): return a*b
-        return self._perform_operation(other, operation)
-        
-    def __rmul__(self, other):
-        """
-            Multiply two data sets
-            
-            @param other: data set to subtract from the current one
-            @return: new data set
-            @raise ValueError: raised when two data sets are incompatible
-        """
-        def operation(a, b): return b*a
-        return self._perform_operation(other, operation)
-        
-    def __div__(self, other):
-        """
-            Divided a data set by another
-            
-            @param other: data set that the current one is divided by
-            @return: new data set
-            @raise ValueError: raised when two data sets are incompatible
-        """
-        def operation(a, b): return a/b
-        return self._perform_operation(other, operation)
-        
-    def __rdiv__(self, other):
-        """
-            Divided a data set by another
-            
-            @param other: data set that the current one is divided by
-            @return: new data set
-            @raise ValueError: raised when two data sets are incompatible
-        """
-        def operation(a, b): return b/a
-        return self._perform_operation(other, operation)
-        
-
-