Changeset 2760662 in sasview

Timestamp:

Aug 4, 2016 12:11:45 PM (8 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.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

cc03f59

Parents:

18e7309

Message:

Implement getters in python class

Location:

src/sas/sascalc/file_converter

Files:

• BSLLoader.py (modified) (2 diffs)
• c_ext/bsl_loader.c (modified) (2 diffs)

src/sas/sascalc/file_converter/BSLLoader.py

@@ -1 +1 @@
 from sas.sascalc.file_converter.core.bsl_loader import CLoader
+import numpy as np
 
 class BSLLoader(CLoader):
 
+    # TODO: Change to __init__(self, filename, frame)
+    # and parse n_(pixels/rasters) from header file
+    def __init__(self, filename, frame, n_pixels, n_rasters):
+        CLoader.__init__(self, filename, frame, n_pixels, n_rasters)
+
     # See invertor.py for implementation of pickling and setters/getters
-
 
     # def __setattr__(self, name, value):
@@ -10 +15 @@
     #     #     return self.set_param(value)
     #     return CBSLLoader.__set_attr__(self, name, value)
-    #
-    # def __getattr__(self, name):
-    #     if name == 'val':
-    #         return self.get_val()
-    #     return CBSLLoader.__getattr__(self, name)
+
+    def __getattr__(self, name):
+        if name == 'filename':
+            return self.get_filename()
+        elif name == 'frame':
+            return self.get_frame()
+        elif name == 'n_pixels':
+            return self.get_n_pixels()
+        elif name == 'n_rasters':
+            return self.get_n_rasters()
+        return CBSLLoader.__getattr__(self, name)
+
+    def create_arr(self):
+        return np.zeros((self.n_rasters, self.n_pixels))

src/sas/sascalc/file_converter/c_ext/bsl_loader.c

@@ -53 +53 @@
 }
 
+static PyObject *get_filename(CLoader *self, PyObject *args) {
+    return Py_BuildValue("s", self->params.filename);
+}
+
+static PyObject *get_frame(CLoader *self, PyObject *args) {
+    return Py_BuildValue("i", self->params.frame);
+}
+
+static PyObject *get_n_pixels(CLoader *self, PyObject *args) {
+    return Py_BuildValue("i", self->params.n_pixels);
+}
+
+static PyObject *get_n_rasters(CLoader *self, PyObject *args) {
+    return Py_BuildValue("i", self->params.n_rasters);
+}
+
 static PyObject *load_data(CLoader *self, PyObject *args) {
     int raster;
@@ -100 +116 @@
 static PyMethodDef CLoader_methods[] = {
     { "to_string", (PyCFunction)to_string, METH_VARARGS, "Print the objects params" },
-    {"load_data", (PyCFunction)load_data, METH_VARARGS, "Load the data into a numpy array"},
+    { "get_filename", (PyCFunction)get_filename, METH_VARARGS, "Get the filename" },
+    { "get_frame", (PyCFunction)get_frame, METH_VARARGS, "Get the frame that will be loaded" },
+    { "get_n_pixels", (PyCFunction)get_n_pixels, METH_VARARGS, "Get n_pixels" },
+    { "get_n_rasters", (PyCFunction)get_n_rasters, METH_VARARGS, "Get n_rasters" },
+    { "load_data", (PyCFunction)load_data, METH_VARARGS, "Load the data into a numpy array" },
     {NULL}
 };