Changeset d6513cd in sasview for DataLoader/data_info.py

Timestamp:

Aug 22, 2008 3:13:34 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:

48882d1

Parents:

533550c

Message:

Data loader update (still working)

File:

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

DataLoader/data_info.py

@@ -104 +104 @@
     distance_unit = 'mm'
     ## Offset of this detector position in X, Y, (and Z if necessary) [Vector] [mm] 
-    offset = Vector()
+    offset = None
     offset_unit = 'm'
     ## Orientation (rotation) of this detector in roll, pitch, and yaw [Vector] [degrees]
-    orientation = Vector()
+    orientation = None
     orientation_unit = 'degree'
     ## Center of the beam on the detector in X and Y (and Z if necessary) [Vector] [mm]
-    beam_center = Vector()
+    beam_center = None
     beam_center_unit = 'mm'
     ## Pixel size in X, Y, (and Z if necessary) [Vector] [mm]
-    pixel_size = Vector()
+    pixel_size = None
     pixel_size_unit = 'mm'
     ## Slit length of the instrument for this detector.[float] [mm]
     slit_length = None
     slit_length_unit = 'mm'
+    
+    def __init__(self):
+        """
+            Initialize class attribute that are objects...
+        """
+        self.offset      = Vector()
+        self.orientation = Vector()
+        self.beam_center = Vector()
+        self.pixel_size  = Vector()
+        
     
     def __str__(self):
@@ -136 +146 @@
         return _str
 
+class Aperture:
+    # Aperture size [Vector]
+    size = None
+    size_unit = 'mm'
+    # Aperture distance [float]
+    distance = None
+    distance_unit = 'mm'
+    
+    def __init__(self):
+        self.size = Vector()
+    
 class Collimation:
     """
         Class to hold collimation information
     """
-    class Aperture:
-        # Aperture size [Vector]
-        size = Vector()
-        size_unit = 'mm'
-        # Aperture distance [float]
-        distance = None
-        distance_unit = 'mm'
     
     ## Length [float] [mm]
@@ -152 +166 @@
     length_unit = 'mm'
     ## Aperture
-    aperture = []
+    aperture = None
+    
+    def __init__(self):
+        self.aperture = []
     
     def __str__(self):
@@ -172 +189 @@
     radiation = ''
     ## Beam size [Vector] [mm]
-    beam_size = Vector()
+    beam_size = None
     beam_size_unit = 'mm'
     ## Beam shape [string]
@@ -189 +206 @@
     wavelength_spread_unit = 'percent'
     
+    def __init__(self):
+        self.beam_size = Vector()
+        
+    
     def __str__(self):
         _str  = "Source:\n"
@@ -229 +250 @@
     temperature_unit = 'C'
     ## Position [Vector] [mm]
-    position = Vector()
+    position = None
     position_unit = 'mm'
     ## Orientation [Vector] [degrees]
-    orientation = Vector()
+    orientation = None
     orientation_unit = 'degree'
     ## Details
-    details = []
+    details = None
+    
+    def __init__(self):
+        self.position    = Vector()
+        self.orientation = Vector()
+        self.details     = []
     
     def __str__(self):
@@ -264 +290 @@
     date = ''
     description= ''
-    term = []
-    notes = []
+    term = None
+    notes = None
+    
+    def __init__(self):
+        self.term = []
+        self.notes = []
     
     def __str__(self):
@@ -293 +323 @@
     filename   = ''
     ## Notes
-    notes      = []
+    notes      = None
     ## Processes (Action on the data)
-    process    = []
+    process    = None
     ## Instrument name
     instrument = ''
     ## Detector information
-    detector   = []
+    detector   = None
     ## Sample information
-    sample     = Sample()
+    sample     = None
     ## Source information
-    source     = Source()
+    source     = None
     ## Collimation information
-    collimation = []
+    collimation = None
     ## Additional meta-data
-    meta_data  = {}
+    meta_data  = None
     ## Loading errors
-    errors = []
+    errors = None
             
     def __init__(self):
@@ -583 +613 @@
     
     ## Vector of Q-values at the center of each bin in x
-    x_bins = []
+    x_bins = None
     
     ## Vector of Q-values at the center of each bin in y
-    y_bins = []
+    y_bins = None
     
     
     def __init__(self, data=None, err_data=None):
+        self.y_bins = []
+        self.x_bins = []
         DataInfo.__init__(self)
         plottable_2D.__init__(self, data, err_data)