Changeset ce8c7bd in sasview

Timestamp:

Aug 4, 2017 2:56:58 AM (7 years ago)

Author:

lewis

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:

44daa56

Parents:

4dd90bf

Message:

Remove support for loading .d1d files

HFIR no longer use the .d1d format, so there's no need to support it
anymore.

Files:

• src/sas/sascalc/dataloader/readers/associations.py (modified) (1 diff)
• src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted)
• test/sasdataloader/test/utest_abs_reader.py (modified) (2 diffs)

src/sas/sascalc/dataloader/readers/associations.py

@@ -26 +26 @@
     ".dat": "red2d_reader",
     ".abs": "abs_reader",
-    ".d1d": "hfir1d_reader",
     ".sans": "danse_reader",
     ".pdh": "anton_paar_saxs_reader"

test/sasdataloader/test/utest_abs_reader.py

@@ -8 +8 @@
 from sas.sascalc.dataloader.loader import Loader
 from sas.sascalc.dataloader.readers.abs_reader import Reader as AbsReader
-from sas.sascalc.dataloader.readers.hfir1d_reader import Reader as HFIRReader
 from sas.sascalc.dataloader.readers.danse_reader import Reader as DANSEReader
 from sas.sascalc.dataloader.readers.cansas_reader import Reader as CANSASReader
@@ -71 +70 @@
         data = Loader().load("jan08002.ABS")
         self.assertEqual(data.meta_data['loader'], "IGOR 1D")
-
-
-class hfir_reader(unittest.TestCase):
-
-    def setUp(self):
-        reader = HFIRReader()
-        self.data = reader.read("S2-30dq.d1d")
-
-    def test_hfir_checkdata(self):
-        """
-            Check the data content to see whether
-            it matches the specific file we loaded.
-        """
-        self.assertEqual(self.data.filename, "S2-30dq.d1d")
-        # THIS FILE FORMAT IS CURRENTLY READ BY THE ASCII READER
-        self.assertEqual(self.data.meta_data['loader'], "HFIR 1D")
-        self.assertEqual(len(self.data.x), 134)
-        self.assertEqual(len(self.data.y), 134)
-        #          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)
-
-    def test_generic_loader(self):
-        # the generic loader should work as well
-        data = Loader().load("S2-30dq.d1d")
-        self.assertEqual(data.meta_data['loader'], "HFIR 1D")
 
 class DanseReaderTests(unittest.TestCase):