Changeset 0d64713 in sasview for src/sas/sascalc/dataloader/data_info.py

Timestamp:

Feb 28, 2017 1:17:19 PM (7 years ago)

Author:

GitHub <noreply@…>

Children:

13043af

Parents:

46f798f

git-author:

Jeff Krzywon <krzywon@…> (02/28/17 13:17:19)

git-committer:

GitHub <noreply@…> (02/28/17 13:17:19)

Message:

Revert "Sesans41"

File:

• src/sas/sascalc/dataloader/data_info.py (modified) (13 diffs)

src/sas/sascalc/dataloader/data_info.py

@@ -25 +25 @@
 import numpy
 import math
+
+class plottable_sesans1D(object):
+    """
+    SESANS is a place holder for 1D SESANS plottables.
+
+    #TODO: This was directly copied from the plottables_1D. Modified Somewhat.
+    #Class has been updated.
+    """
+    # The presence of these should be mutually
+    # exclusive with the presence of Qdev (dx)
+    x = None
+    y = None
+    lam = None
+    dx = None
+    dy = None
+    dlam = None
+    ## Slit smearing length
+    dxl = None
+    ## Slit smearing width
+    dxw = None
+
+    # Units
+    _xaxis = ''
+    _xunit = ''
+    _yaxis = ''
+    _yunit = ''
+
+    def __init__(self, x, y, lam, dx=None, dy=None, dlam=None):
+#        print "SESANS plottable working"
+        self.x = numpy.asarray(x)
+        self.y = numpy.asarray(y)
+        self.lam = numpy.asarray(lam)
+        if dx is not None:
+            self.dx = numpy.asarray(dx)
+        if dy is not None:
+            self.dy = numpy.asarray(dy)
+        if dlam is not None:
+            self.dlam = numpy.asarray(dlam)
+
+    def xaxis(self, label, unit):
+        """
+        set the x axis label and unit
+        """
+        self._xaxis = label
+        self._xunit = unit
+
+    def yaxis(self, label, unit):
+        """
+        set the y axis label and unit
+        """
+        self._yaxis = label
+        self._yunit = unit
+
 
 class plottable_1D(object):
@@ -40 +93 @@
     ## Slit smearing width
     dxw = None
-    ## SESANS specific params (wavelengths for spin echo length calculation)
-    lam = None
-    dlam = None
 
     # Units
@@ -50 +100 @@
     _yunit = ''
 
-    def __init__(self, x, y, dx=None, dy=None, dxl=None, dxw=None, lam=None, dlam=None):
+    def __init__(self, x, y, dx=None, dy=None, dxl=None, dxw=None):
         self.x = numpy.asarray(x)
         self.y = numpy.asarray(y)
@@ -61 +111 @@
         if dxw is not None:
             self.dxw = numpy.asarray(dxw)
-        if lam is not None:
-            self.lam = numpy.asarray(lam)
-        if dlam is not None:
-            self.dlam = numpy.asarray(dlam)
 
     def xaxis(self, label, unit):
@@ -352 +398 @@
     ## Details
     details = None
-    ## SESANS zacceptance
-    zacceptance = None
 
     def __init__(self):
@@ -491 +535 @@
     ## Loading errors
     errors = None
-    ## SESANS data check
-    isSesans = None
-
 
     def __init__(self):
@@ -526 +567 @@
         ## Loading errors
         self.errors = []
-        ## SESANS data check
-        self.isSesans = False
 
     def append_empty_process(self):
@@ -547 +586 @@
         _str += "Title:           %s\n" % self.title
         _str += "Run:             %s\n" % str(self.run)
-        _str += "SESANS:          %s\n" % str(self.isSesans)
         _str += "Instrument:      %s\n" % str(self.instrument)
         _str += "%s\n" % str(self.sample)
@@ -698 +736 @@
         return self._perform_union(other)
 
-class Data1D(plottable_1D, DataInfo):
-    """
-    1D data class
-    """
-    def __init__(self, x=None, y=None, dx=None, dy=None, lam=None, dlam=None, isSesans=None):
+class SESANSData1D(plottable_sesans1D, DataInfo):
+    """
+    SESANS 1D data class
+    """
+    x_unit = 'nm'
+    y_unit = 'pol'
+
+    def __init__(self, x=None, y=None, lam=None, dx=None, dy=None, dlam=None):
         DataInfo.__init__(self)
-        plottable_1D.__init__(self, x, y, dx, dy,None, None, lam, dlam)
-        self.isSesans = isSesans
-        try:
-            if self.isSesans: # the data is SESANS
-                self.x_unit = 'A'
-                self.y_unit = 'pol'
-            elif not self.isSesans: # the data is SANS
-                self.x_unit = '1/A'
-                self.y_unit = '1/cm'
-        except: # the data is not recognized/supported, and the user is notified
-            raise(TypeError, 'data not recognized, check documentation for supported 1D data formats')
+        plottable_sesans1D.__init__(self, x, y, lam, dx, dy, dlam)
 
     def __str__(self):
@@ -728 +759 @@
         return _str
 
+    def clone_without_data(self, length=0, clone=None):
+        """
+        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
+        :param clone: if provided, the data will be copied to clone
+        """
+        from copy import deepcopy
+        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
+        clone.filename = self.filename
+        clone.instrument = self.instrument
+        clone.notes = deepcopy(self.notes)
+        clone.process = deepcopy(self.process)
+        clone.detector = deepcopy(self.detector)
+        clone.sample = deepcopy(self.sample)
+        clone.source = deepcopy(self.source)
+        clone.collimation = deepcopy(self.collimation)
+        clone.trans_spectrum = deepcopy(self.trans_spectrum)
+        clone.meta_data = deepcopy(self.meta_data)
+        clone.errors = deepcopy(self.errors)
+
+        return clone
+
+class Data1D(plottable_1D, DataInfo):
+    """
+    1D data class
+    """
+    x_unit = '1/A'
+    y_unit = '1/cm'
+
+    def __init__(self, x, y, dx=None, dy=None):
+        DataInfo.__init__(self)
+        plottable_1D.__init__(self, x, y, dx, dy)
+
+    def __str__(self):
+        """
+        Nice printout
+        """
+        _str = "%s\n" % DataInfo.__str__(self)
+        _str += "Data:\n"
+        _str += "   Type:         %s\n" % self.__class__.__name__
+        _str += "   X-axis:       %s\t[%s]\n" % (self._xaxis, self._xunit)
+        _str += "   Y-axis:       %s\t[%s]\n" % (self._yaxis, self._yunit)
+        _str += "   Length:       %g\n" % len(self.x)
+        return _str
+
     def is_slit_smeared(self):
         """
@@ -756 +843 @@
             y = numpy.zeros(length)
             dy = numpy.zeros(length)
-            lam = numpy.zeros(length)
-            dlam = numpy.zeros(length)
-            clone = Data1D(x, y, lam=lam, dx=dx, dy=dy, dlam=dlam)
+            clone = Data1D(x, y, dx=dx, dy=dy)
 
         clone.title = self.title
@@ -933 +1018 @@
     ## Vector of Q-values at the center of each bin in y
     y_bins = None
-    ## No 2D SESANS data as of yet. Always set it to False
-    isSesans = False
 
     def __init__(self, data=None, err_data=None, qx_data=None,
                  qy_data=None, q_data=None, mask=None,
                  dqx_data=None, dqy_data=None):
+        self.y_bins = []
+        self.x_bins = []
         DataInfo.__init__(self)
         plottable_2D.__init__(self, data, err_data, qx_data,
                               qy_data, q_data, mask, dqx_data, dqy_data)
-        self.y_bins = []
-        self.x_bins = []
-
         if len(self.detector) > 0:
             raise RuntimeError, "Data2D: Detector bank already filled at init"
@@ -1183 +1265 @@
     final_dataset.xmin = data.xmin
     final_dataset.ymin = data.ymin
-    final_dataset.isSesans = datainfo.isSesans
     final_dataset.title = datainfo.title
     final_dataset.run = datainfo.run