Changeset 5e326a6 in sasview

Timestamp:

Feb 18, 2015 5:32:58 PM (9 years ago)

Author:

jhbakker

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:

66f21cd

Parents:

cbe8c5c

Message:

added sesans_reader for SESANS analysis

Location:

src/sas/dataloader

Files:

• data_info.py (modified) (6 diffs)
• loader.py (modified) (1 diff)
• readers/associations.py (modified) (1 diff)
• readers/defaults.json (modified) (1 diff)
• readers/sesans_reader.py (added)

src/sas/dataloader/data_info.py

@@ -26 +26 @@
 import math
 
-
 class plottable_sesans1D:
     """
     SESANS is a place holder for 1D SESANS plottables.
     
-    #TODO: This was directly copied from the plottables_1D.
-    #TODO: The class has not been updated from there.
+    #TODO: This was directly copied from the plottables_1D. Modified Somewhat.
+    #Class has been updated.
     """
     # The presence of these should be mutually
@@ -38 +37 @@
     x = None
     y = None
+    lam = None
     dx = None
     dy = None
+    dlam = None
     ## Slit smearing length
     dxl = None
@@ -51 +52 @@
     _yunit = ''
     
-    def __init__(self, x, y, dx=None, dy=None, dxl=None, dxw=None):
+    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 dxl is not None:
-            self.dxl = numpy.asarray(dxl)
-        if dxw is not None: 
-            self.dxw = numpy.asarray(dxw)
-
+        if dlam is not None:
+            self.dlam = numpy.asarray(dlam)
+#        if dxl is not None:
+#            self.dxl = numpy.asarray(dxl)
+#        if dxw is not None: 
+#            self.dxw = numpy.asarray(dxw)
+#        print "SESANS plottable init fin"
     def xaxis(self, label, unit):
         """
@@ -69 +74 @@
         self._xaxis = label
         self._xunit = unit
-        
+        print "xaxis active"
+        print label
+        print unit
     def yaxis(self, label, unit):
         """
         set the y axis label and unit
         """
+        print "yaxis active"
+        print label
+        print unit
+        
         self._yaxis = label
         self._yunit = unit
@@ -750 +761 @@
         """
         return self._perform_union(other)
-                
+  
+class SESANSData1D(plottable_sesans1D, DataInfo):
+    """
+    SESANS 1D data class
+    """
+    x_unit = 'nm'
+    y_unit = 'a.u.'
+    
+    def __init__(self, x=None, y=None, lam=None, dy=None, dx=None, dlam=None):
+#        print "dat init"
+        DataInfo.__init__(self)
+#        print "dat init fin"
+        plottable_sesans1D.__init__(self, x, y, lam, dx, dy, dlam)
+#        print "SESANSdata1D init"
+    def __str__(self):
+        """
+        Nice printout
+        """
+#        print "string printer active"
+        _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)
+#        print _str
+        return _str
+#
+#    def is_slit_smeared(self):
+#        """
+#        Check whether the data has slit smearing information
+#        
+#        :return: True is slit smearing info is present, False otherwise
+#        
+#        """
+#        def _check(v):
+#            if (v.__class__ == list or v.__class__ == numpy.ndarray) \
+#                and len(v) > 0 and min(v) > 0:
+#                return True
+#            
+#            return False
+#        
+#        return _check(self.dxl) or _check(self.dxw)
+        
+    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
+#        print " SESANS data 1D clone active"
+        if clone is None or not issubclass(clone.__class__, Data1D):
+            x  = numpy.zeros(length)
+            dx = numpy.zeros(length)
+            lam  = numpy.zeros(length)
+            dlam = 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)
+#        print "SESANS Data 1Dclone done"
+        return clone
+              
 class Data1D(plottable_1D, DataInfo):
     """
@@ -991 +1082 @@
         
         
-class SESANSData1D(plottable_sesans1D, DataInfo):
-    """
-    SESANS 1D data class
-    """
-    x_unit = '1/A'
-    y_unit = '1/cm'
-    
-    def __init__(self, x, y, dx=None, dy=None):
-        DataInfo.__init__(self)
-        plottable_sesans1D.__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):
-        """
-        Check whether the data has slit smearing information
-        
-        :return: True is slit smearing info is present, False otherwise
-        
-        """
-        def _check(v):
-            if (v.__class__ == list or v.__class__ == numpy.ndarray) \
-                and len(v) > 0 and min(v) > 0:
-                return True
-            
-            return False
-        
-        return _check(self.dxl) or _check(self.dxw)
-        
-    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 Data2D(plottable_2D, DataInfo):
     """

src/sas/dataloader/loader.py

@@ -363 +363 @@
         :return: DataInfo object
         """
+        print self.__registry.extensions
         return self.__registry.load(file, format)
     

src/sas/dataloader/readers/associations.py

@@ -91 +91 @@
     #import tiff_reader
     import nexus_reader
-
+    import sesans_reader
+    registry_function(sesans_reader)
     registry_function(abs_reader)
     registry_function(ascii_reader)

src/sas/dataloader/readers/defaults.json

@@ -5 +5 @@
             "-extension":".xml",
             "-reader":"cansas_reader"
+         },
+         {
+            "-extension":".ses",
+            "-reader":"sesans_reader"
          },
          {