Changeset adbb821 in sasview

Timestamp:

Dec 22, 2009 7:55:47 PM (15 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:

112f54c

Parents:

918fcb1

Message:

DataLoader?: modify unit tests to reflect the changes to nsxunit (conversions that were wrong have been corrected)

Location:

DataLoader/test

Files:

• cansas1d_units.xml (modified) (1 diff)
• utest_abs_reader.py (modified) (1 diff)
• utest_ascii.py (modified) (1 diff)

DataLoader/test/cansas1d_units.xml

@@ -11 +11 @@
                 <SASdata>
                         <Idata>
-                                <Q unit="1/nm">0.002</Q>
-                                <I unit="1/nm">1</I>
-                                <Idev unit="1/nm">.003</Idev>
-                                <Qdev unit="1/nm">0.001</Qdev>
+                                <Q unit="1/nm">0.2</Q>
+                                <I unit="1/nm">0.0001</I>
+                                <Idev unit="1/nm">.0000003</Idev>
+                                <Qdev unit="1/nm">0.1</Qdev>
                                 <Qmean unit="1/A"><!-- Qmean is optional --></Qmean>
                                 <Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
                         </Idata>
                         <Idata>
-                                <Q unit="1/nm">0.003</Q>
-                                <I unit="1/nm">1.001</I>
-                                <Idev unit="1/nm">.004</Idev>
-                                <Qdev unit="1/nm">0.002</Qdev>
+                                <Q unit="1/nm">0.3</Q>
+                                <I unit="1/nm">0.0001001</I>
+                                <Idev unit="1/nm">.0000004</Idev>
+                                <Qdev unit="1/nm">0.2</Qdev>
                                 <Qmean unit="1/A"><!-- Qmean is optional --></Qmean>
                                 <Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>

DataLoader/test/utest_abs_reader.py

@@ -182 +182 @@
         self.assertEqual(self.data.x_unit, '1/A')
         self.assertEqual(self.data.y_unit, '1/cm')
-        self.assertEqual(self.data.x[0], 0.02)
-        self.assertEqual(self.data.y[0], 1000)
-        self.assertEqual(self.data.dx[0], 0.01)
-        self.assertEqual(self.data.dy[0], 3)
-        self.assertEqual(self.data.x[1], 0.03)
-        self.assertAlmostEquals(self.data.y[1], 1001.0)
-        self.assertEqual(self.data.dx[1], 0.02)
-        self.assertEqual(self.data.dy[1], 4)
+        self.assertAlmostEqual(self.data.x[0], 0.02, 6)
+        self.assertAlmostEqual(self.data.y[0], 1000, 6)
+        self.assertAlmostEqual(self.data.dx[0], 0.01, 6)
+        self.assertAlmostEqual(self.data.dy[0], 3, 6)
+        self.assertAlmostEqual(self.data.x[1], 0.03, 6)
+        self.assertAlmostEqual(self.data.y[1], 1001.0)
+        self.assertAlmostEqual(self.data.dx[1], 0.02, 6)
+        self.assertAlmostEqual(self.data.dy[1], 4, 6)
         self.assertEqual(self.data.run_name['1234'], 'run name')
         self.assertEqual(self.data.title, "Test title")

DataLoader/test/utest_ascii.py

@@ -24 +24 @@
         self.assertEqual(f.x[0],0.002618)
         self.assertEqual(f.x[9],0.0497)
+        self.assertEqual(f.x_unit, '1/A')
+        self.assertEqual(f.y_unit, '1/cm')
         
         self.assertEqual(f.meta_data['loader'],"ASCII")