Changeset f001bc9 in sasview for test/fileconverter

Timestamp:

Aug 22, 2017 2:55:17 PM (8 years ago)

Author:

GitHub <noreply@…>

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fca1f50, 17e257b5, f9ba422, 783c1b5

Parents:

a06ee7e (diff), dcb91cf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jeff Krzywon <krzywon@…> (08/22/17 14:55:17)

git-committer:

GitHub <noreply@…> (08/22/17 14:55:17)

Message:

Merge pull request #95 from lewisodriscoll/ticket-876

Refactor File Loaders - fixes #889 #950 #849 #876 #922 #983 #970

Location:

test/fileconverter/test

Files:

• cansas1d.xml (modified) (2 diffs)
• utest_nxcansas_writer.py (modified) (5 diffs)

test/fileconverter/test/cansas1d.xml

@@ -26 +26 @@
                                 <Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
                         </Idata>
+      <Idata>
+                                <Q unit="1/A">0.04</Q>
+                                <I unit="1/cm">1002</I>
+                                <Idev unit="1/cm">4</Idev>
+                                <Qdev unit="1/A">0.02</Qdev>
+                                <Qmean unit="1/A"><!-- Qmean is optional --></Qmean>
+                                <Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
+                        </Idata>
+      <Idata>
+                                <Q unit="1/A">0.05</Q>
+                                <I unit="1/cm">1003</I>
+                                <Idev unit="1/cm">4</Idev>
+                                <Qdev unit="1/A">0.02</Qdev>
+                                <Qmean unit="1/A"><!-- Qmean is optional --></Qmean>
+                                <Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
+                        </Idata>
+      <Idata>
+                                <Q unit="1/A">0.06</Q>
+                                <I unit="1/cm">1004</I>
+                                <Idev unit="1/cm">4</Idev>
+                                <Qdev unit="1/A">0.02</Qdev>
+                                <Qmean unit="1/A"><!-- Qmean is optional --></Qmean>
+                                <Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
+                        </Idata>
                 </SASdata>
                 <SASsample name='my sample'>
@@ -47 +71 @@
                                 Some text here
                         </details>
-                        
+
                 </SASsample>
                 <SASinstrument>

test/fileconverter/test/utest_nxcansas_writer.py

@@ -1 +1 @@
 from sas.sascalc.file_converter.nxcansas_writer import NXcanSASWriter
-from sas.sascalc.dataloader.readers.cansas_reader import Reader as XMLReader
-from sas.sascalc.dataloader.readers.red2d_reader import Reader as DATReader
-from sas.sascalc.dataloader.readers.cansas_reader_HDF5 import Reader as HDF5Reader
+from sas.sascalc.dataloader.loader import Loader
 
 import os
@@ -14 +12 @@
 
     def setUp(self):
+        self.loader = Loader()
         self.writer = NXcanSASWriter()
         self.read_file_1d = "cansas1d.xml"
@@ -19 +18 @@
         self.read_file_2d = "exp18_14_igor_2dqxqy.dat"
         self.write_file_2d = "export2d.h5"
-        self.hdf5_reader = HDF5Reader()
 
-        xml_reader = XMLReader()
-        self.data_1d = xml_reader.read(self.read_file_1d)[0]
+        self.data_1d = self.loader.load(self.read_file_1d)[0]
 
-        dat_reader = DATReader()
-        self.data_2d = dat_reader.read(self.read_file_2d)
+        self.data_2d = self.loader.load(self.read_file_2d)[0]
         self.data_2d.detector[0].name = ''
         self.data_2d.source.radiation = 'neutron'
@@ -31 +27 @@
     def test_write_1d(self):
         self.writer.write([self.data_1d], self.write_file_1d)
-        data = self.hdf5_reader.read(self.write_file_1d)
+        data = self.loader.load(self.write_file_1d)
         self.assertTrue(len(data) == 1)
         data = data[0]
@@ -41 +37 @@
     def test_write_2d(self):
         self.writer.write([self.data_2d], self.write_file_2d)
-        data = self.hdf5_reader.read(self.write_file_2d)
+        data = self.loader.load(self.write_file_2d)
         self.assertTrue(len(data) == 1)
         data = data[0]