Changeset 4c00964 in sasview for DataLoader/test

Timestamp:

Aug 28, 2008 4:53:26 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:

579ba85

Parents:

3c404d3

Message:

Working on cansas writer

Location:

DataLoader/test

Files:

• cansas1d.xml (modified) (3 diffs)
• testplugings.py (modified) (1 diff)
• utest_abs_reader.py (modified) (1 diff)

DataLoader/test/cansas1d.xml

@@ -51 +51 @@
                 <SASinstrument name="TEST instrument">
                         <name>canSAS instrument</name>
-                        <SASsource>
+                        <SASsource name="source name">
                                 <radiation>neutron</radiation>
                                 <beam_size>
@@ -65 +65 @@
                                 </wavelength_spread>
                         </SASsource>
-                        <SAScollimation>
+                        <SAScollimation name="test coll name">
                                 <length unit='mm'> 123.0</length>
                                 <aperture name="source" type="radius">
@@ -90 +90 @@
                                         <yaw unit="degree">0.00</yaw>
                                 </orientation>
+                                <offset>
+                                        <x unit="mm">1</x>
+                                        <y unit="mm">2</y>
+                                </offset>
                                 <beam_center>
                                         <x unit="mm">322.64</x>

DataLoader/test/testplugings.py

@@ -50 +50 @@
             self.assertEqual(output.x[i],x[i])
             self.assertEqual(output.y[i],y[i])
+
+# How about actually executing the tests...
+if __name__ == '__main__':
+    unittest.main()

DataLoader/test/utest_abs_reader.py

@@ -207 +207 @@
             raise RuntimeError, "Could not find all data %s %s" % (_found1, _found2) 
             
+        # Detector
+        self.assertEqual(self.data.detector[0].name, "fictional hybrid")
+        self.assertEqual(self.data.detector[0].distance_unit, "m")
+        self.assertEqual(self.data.detector[0].distance, 4.150)
+        
+        self.assertEqual(self.data.detector[0].orientation_unit, "degree")
+        self.assertEqual(self.data.detector[0].orientation.x, 1.0)
+        self.assertEqual(self.data.detector[0].orientation.y, 0.0)
+        self.assertEqual(self.data.detector[0].orientation.z, 0.0)
+        
+        self.assertEqual(self.data.detector[0].offset_unit, "m")
+        self.assertEqual(self.data.detector[0].offset.x, .01)
+        self.assertEqual(self.data.detector[0].offset.y, .02)
+        self.assertEqual(self.data.detector[0].offset.z, None)
+        
+        self.assertEqual(self.data.detector[0].beam_center_unit, "mm")
+        self.assertEqual(self.data.detector[0].beam_center.x, 322.64)
+        self.assertEqual(self.data.detector[0].beam_center.y, 327.68)
+        self.assertEqual(self.data.detector[0].beam_center.z, None)
+        
+        self.assertEqual(self.data.detector[0].pixel_size_unit, "mm")
+        self.assertEqual(self.data.detector[0].pixel_size.x, 5)
+        self.assertEqual(self.data.detector[0].pixel_size.y, 5)
+        self.assertEqual(self.data.detector[0].pixel_size.z, None)
+        
+        # Process
+        
+        
+        
+    def test_writer(self):
+        from DataLoader.readers.cansas_reader import Reader
+        r = Reader()
+        x = numpy.ones(5)
+        y = numpy.ones(5)
+        dy = numpy.ones(5)
+        
+        d = Loader().load("jan08002.ABS")
+        #d = Data1D(x, y, dy)
+        r.write("write_test.xml", d)
+        
+