Changeset ad92c5a in sasview for src/sas/sascalc/dataloader/file_reader_base_class.py

Timestamp:

Apr 18, 2017 2:56:03 PM (8 years ago)

Author:

krzywon

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:

080d88e

Parents:

da8bb53

git-author:

Jeff Krzywon <krzywon@…> (04/18/17 14:56:03)

git-committer:

krzywon <krzywon@…> (04/18/17 14:56:03)

Message:

ABS reader converted to new system.

File:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (4 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -52 +52 @@
                 # Try to load the file, but raise an error if unable to.
                 try:
-                    self.load_unit_converter()
                     self.f_open = open(filepath, 'rb')
                     self.get_file_contents()
@@ -94 +93 @@
         self.output.append(data_obj)
 
-    def load_unit_converter(self):
-        """
-        Generic unit conversion import 
-        """
-        # Check whether we have a converter available
-        self.has_converter = True
-        try:
-            from sas.sascalc.data_util.nxsunit import Converter
-        except:
-            self.has_converter = False
-
     def sort_one_d_data(self):
         """
@@ -138 +126 @@
         self.output = []
 
+    def remove_empty_q_values(self, has_error_dx=False, has_error_dy=False):
+        """
+        Remove any point where Q == 0
+        """
+        x = self.current_dataset.x
+        self.current_dataset.x = self.current_dataset.x[x != 0]
+        self.current_dataset.y = self.current_dataset.y[x != 0]
+        self.current_dataset.dy = self.current_dataset.dy[x != 0] if \
+            has_error_dy else np.zeros(len(self.current_dataset.y))
+        self.current_dataset.dx = self.current_dataset.dx[x != 0] if \
+            has_error_dx else np.zeros(len(self.current_dataset.x))
+
+    def reset_data_list(self, no_lines=0):
+        """
+        Reset the plottable_1D object
+        """
+        # Initialize data sets with arrays the maximum possible size
+        x = np.zeros(no_lines)
+        y = np.zeros(no_lines)
+        dy = np.zeros(no_lines)
+        dx = np.zeros(no_lines)
+        self.current_dataset = plottable_1D(x, y, dx, dy)
+
     @staticmethod
     def splitline(line):
@@ -158 +169 @@
     def get_file_contents(self):
         """
+        Reader specific class to access the contents of the file
         All reader classes that inherit from FileReader must implement
         """