Changeset 388bd51 in sasview

Timestamp:

Apr 4, 2017 9:21:31 AM (8 years ago)

Author:

Adam Washington <adam.washington@…>

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:

09a0be5

Parents:

def97a0

Message:

Get sesans_reader utility functions out of the main namespace

Move the utility functions into the Reader class so that, if someone
performs an "import *", they won't pollute their namespace with some
private utility functions.

File:

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

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

@@ -74 +74 @@
                     dy = data[:, 2]
 
-                    lam_unit = _header_fetch(headers, "wavelength")
+                    lam_unit = self._header_fetch(headers, "wavelength")
                     if lam_unit == "AA":
                         lam_unit = "A"
@@ -80 +80 @@
                     x, x_unit = self._unit_conversion(
                         x, lam_unit,
-                        _fetch_unit(headers, "spin echo length"))
+                        self._fetch_unit(headers, "spin echo length"))
                     dx, dx_unit = self._unit_conversion(
                         dx, lam_unit,
-                        _fetch_unit(headers, "error SEL"))
+                        self._fetch_unit(headers, "error SEL"))
                     dlam, dlam_unit = self._unit_conversion(
                         dlam, lam_unit,
-                        _fetch_unit(headers, "error wavelength"))
+                        self._fetch_unit(headers, "error wavelength"))
                     y_unit = r'\AA^{-2} cm^{-1}'
 
@@ -101 +101 @@
 
                     output.sample.zacceptance = (
-                        float(_header_fetch(params, "Q_zmax")),
-                        _fetch_unit(params, "Q_zmax"))
+                        float(self._header_fetch(params, "Q_zmax")),
+                        self._fetch_unit(params, "Q_zmax"))
 
                     output.sample.yacceptance = (
-                        float(_header_fetch(params, "Q_ymax")),
-                        _fetch_unit(params, "Q_ymax"))
+                        float(self._header_fetch(params, "Q_ymax")),
+                        self._fetch_unit(params, "Q_ymax"))
 
                 if len(output.x) < 1:
@@ -125 +125 @@
         return value, new_unit
 
+    def _header_fetch(self, headers, key):
+        index = [k for k in headers.keys()
+                 if k.startswith(key)][0]
+        return headers[index]
 
-def _header_fetch(headers, key):
-    index = [k for k in headers.keys()
-             if k.startswith(key)][0]
-    return headers[index]
-
-
-def _fetch_unit(params, key):
-    index = [k for k in params.keys()
-             if k.startswith(key)][0]
-    unit = index.strip().split()[-1][1:-1]
-    if unit.startswith(r"\A"):
-        unit = "1/A"
-    return unit
+    def _fetch_unit(self, params, key):
+        index = [k for k in params.keys()
+                 if k.startswith(key)][0]
+        unit = index.strip().split()[-1][1:-1]
+        if unit.startswith(r"\A"):
+            unit = "1/A"
+        return unit