Changeset b99ac227 in sasview for DataLoader/data_info.py

Timestamp:

Aug 6, 2008 10:54:02 AM (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:

17a6843

Parents:

99d1af6

Message:

Updates and tests for readers

File:

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

DataLoader/data_info.py

@@ -14 +14 @@
 project funded by the US National Science Foundation. 
 
-See the license text in license.txt
+If you use DANSE applications to do scientific research that leads to 
+publication, we ask that you acknowledge the use of the software with the 
+following sentence:
+
+"This work benefited from DANSE software developed under NSF award DMR-0520547." 
 
 copyright 2008, University of Tennessee
@@ -307 +311 @@
     errors = []
             
+    def __init__(self):
+        """
+            Initialization
+        """
+        ## Title 
+        self.title      = ''
+        ## Run number
+        self.run        = None
+        ## File name
+        self.filename   = ''
+        ## Notes
+        self.notes      = []
+        ## Processes (Action on the data)
+        self.process    = []
+        ## Instrument name
+        self.instrument = ''
+        ## Detector information
+        self.detector   = []
+        ## Sample information
+        self.sample     = Sample()
+        ## Source information
+        self.source     = Source()
+        ## Collimation information
+        self.collimation = []
+        ## Additional meta-data
+        self.meta_data  = {}
+        ## Loading errors
+        self.errors = []        
+        
     def __str__(self):
         """
@@ -429 +462 @@
     
     def __init__(self, x, y, dx=None, dy=None):
+        DataInfo.__init__(self)
         plottable_1D.__init__(self, x, y, dx, dy)
+        if len(self.detector)>0:
+            raise RuntimeError, "Data1D: Detector bank already filled at init"
+        
         
     def __str__(self):
@@ -553 +590 @@
     
     def __init__(self, data=None, err_data=None):
+        DataInfo.__init__(self)
         plottable_2D.__init__(self, data, err_data)
+        if len(self.detector)>0:
+            raise RuntimeError, "Data2D: Detector bank already filled at init"
 
     def __str__(self):