Changeset bee885e in sasview

Timestamp:

Sep 8, 2008 10:36:52 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:

1c66bc5

Parents:

060b857

Message:

Added HFIR 1D 4-col data reader

Location:

DataLoader

Files:

• notes.txt (modified) (1 diff)
• readers/hfir1d_reader.py (added)
• release_notes.txt (modified) (1 diff)
• test/S2-30dq.d1d (added)
• test/utest_abs_reader.py (modified) (1 diff)
• test/write_test.xml (added)

DataLoader/notes.txt

@@ -1 +1 @@
 - Need support for images. tiff_reader.py needs to be tested.
-- Need support for zip file plugins for when we use py2exe.

DataLoader/release_notes.txt

@@ -7 +7 @@
         - Release date: ?
         - First version of CanSAS reader/writer
-        - 1D data manipulations available
+        - 1D and 2D data manipulations available
+        - 1D CanSAS writer available
+        - HFIR 1D 4-col reader available (*.d1d)
+        - Allows plugins through python source or zip files
         
         Version 0.1

DataLoader/test/utest_abs_reader.py

@@ -57 +57 @@
     def test_checkdata2(self):
         self.assertEqual(self.data.dy[126], 1)
+        
+class hfir_reader(unittest.TestCase):
+    
+    def setUp(self):
+        self.data = Loader().load("S2-30dq.d1d")
+        
+    def test_checkdata(self):
+        """
+            Check the data content to see whether 
+            it matches the specific file we loaded.
+        """
+        self.assertEqual(self.data.filename, "S2-30dq.d1d")
+        #          Q           I               dI          dQ  
+        # Point 1: 0.003014    0.003010        0.000315    0.008249
+        self.assertEqual(self.data.x[1], 0.003014)
+        self.assertEqual(self.data.y[1], 0.003010)
+        self.assertEqual(self.data.dy[1], 0.000315)
+        self.assertEqual(self.data.dx[1], 0.008249)
+        
 
 class igor_reader(unittest.TestCase):