Changeset 579ba85 in sasview for DataLoader/data_info.py

Timestamp:

Aug 29, 2008 3:56:50 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:

442f42f

Parents:

4c00964

Message:

CanSAS format reader/writer completed/tested.

File:

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

DataLoader/data_info.py

@@ -24 +24 @@
 
 #TODO: Keep track of data manipulation in the 'process' data structure.
-
-from sans.guitools.plottables import Data1D as plottable_1D
+#TODO: This module should be independent of plottables. We should write
+#        an adapter class for plottables when needed.
+
+#from sans.guitools.plottables import Data1D as plottable_1D
 from data_util.uncertainty import Uncertainty
 import numpy
 import math
 
+class plottable_1D:
+    """
+        Data1D is a place holder for 1D plottables.
+    """
+    x = None
+    y = None
+    dx = None
+    dy = None
+    
+    # Units
+    _xaxis = ''
+    _xunit = ''
+    _yaxis = ''
+    _yunit = ''
+    
+    def __init__(self,x,y,dx=None,dy=None):
+        self.x = x
+        self.y = y
+        self.dx = dx
+        self.dy = dy
+
+    def xaxis(self, label, unit):
+        self._xaxis = label
+        self._xunit = unit
+        
+    def yaxis(self, label, unit):
+        self._yaxis = label
+        self._yunit = unit
+
 class plottable_2D:
     """
-        Data2D is a place holder for 2D plottables, which are 
-        not yet implemented.
+        Data2D is a place holder for 2D plottables.
     """
     xmin = None
@@ -148 +178 @@
 class Aperture:
     ## Name
-    name = ''
+    name = None
     ## Type
-    type = ''
+    type = None
+    ## Size name
+    size_name = None
     ## Aperture size [Vector]
     size = None
@@ -192 +224 @@
     """  
     ## Name
-    name = ''
+    name = None
     ## Radiation type [string]
-    radiation = ''
+    radiation = None
+    ## Beam size name
+    beam_size_name = None
     ## Beam size [Vector] [mm]
     beam_size = None
     beam_size_unit = 'mm'
     ## Beam shape [string]
-    beam_shape = ''
+    beam_shape = None
     ## Wavelength [float] [Angstrom]
     wavelength = None
@@ -246 +280 @@
         Class to hold the sample description
     """
+    ## Short name for sample
+    name = ''
     ## ID
     ID = ''
@@ -327 +363 @@
     ## Run number
     run        = None
+    ## Run name
+    run_name   = None
     ## File name
     filename   = ''
@@ -355 +393 @@
         self.title      = ''
         ## Run number
-        self.run        = None
+        self.run        = []
+        self.run_name   = {}
         ## File name
         self.filename   = ''