Changeset 3cd95c8 in sasview

Timestamp:

Mar 12, 2010 12:36:35 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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:

095ab1b

Parents:

eadf1f9

Message:

new sans qmap 2D reader that enables reading TOF sans data as well as some other type of detector data

Location:

DataLoader

Files:

• data_info.py (modified) (5 diffs)
• readers/red2d_reader.py (added)

DataLoader/data_info.py

@@ -77 +77 @@
     ymax = None
     data = None
-    err_data = None
+    qx_data     = None
+    qy_data     = None
+    q_data      = None
+    err_data    = None
+    dqx_data    = None
+    dqy_data    = None
+    mask        = None
     
     # Units
@@ -87 +93 @@
     _zunit = ''
     
-    def __init__(self, data=None, err_data=None):
+    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.data = numpy.asarray(data)
+        self.qx_data = numpy.asarray(qx_data)
+        self.qy_data = numpy.asarray(qy_data)
+        self.q_data = numpy.asarray(q_data)
+        self.mask = numpy.asarray(mask)
         self.err_data = numpy.asarray(err_data)
-        
+        if dqx_data is not None: self.dqx_data = numpy.asarray(dqx_data) 
+        if dqy_data is not None: self.dqy_data = numpy.asarray(dqy_data) 
+               
     def xaxis(self, label, unit):
         self._xaxis = label
@@ -688 +700 @@
     
     
-    def __init__(self, data=None, err_data=None):
+    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)
+        plottable_2D.__init__(self, data, err_data, qx_data, qy_data, q_data,mask, dqx_data, dqy_data)
         if len(self.detector)>0:
             raise RuntimeError, "Data2D: Detector bank already filled at init"
@@ -705 +717 @@
         leny = 0
         if len(self.data)>0:
-            leny = len(self.data[0])
-        _str += "   Length:       %g x %g\n" % (len(self.data), leny)
+            leny = len(self.data)
+        _str += "   Length:       %g \n" % (len(self.data))
         
         return _str
@@ -724 +736 @@
             data     = numpy.zeros(length) 
             err_data = numpy.zeros(length) 
-            clone = Data2D(data, err_data)
-            
+            qx_data = numpy.zeros(length)
+            qy_data = numpy.zeros(length)
+            q_data = numpy.zeros(length)
+            mask = numpy.zeros(length)
+            dqx_data = None
+            dqy_data = None
+            clone = Data2D(data, err_data, qx_data, qy_data, q_data,mask, dqx_data=dqx_data, dqy_data=dqy_data)
+
         clone.title       = self.title
         clone.run         = self.run