Changeset 535e181 in sasview for src/sas/sascalc/file_converter

Timestamp:

Aug 5, 2016 11:48:33 AM (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:

05595c4

Parents:

c3f0114

Message:

Begin implementing 2D BSL loader into GUI

Location:

src/sas/sascalc/file_converter

Files:

• bsl_loader.py (modified) (5 diffs)
• c_ext/bsl_loader.c (modified) (7 diffs)
• c_ext/bsl_loader.h (modified) (1 diff)

src/sas/sascalc/file_converter/bsl_loader.py

@@ -8 +8 @@
     # TODO: Change to __init__(self, filename, frame)
     # and parse n_(pixels/rasters) from header file
-    def __init__(self, filename, frame):
+    def __init__(self, filename):
         header_file = open(filename, 'r')
         data_info = {}
@@ -56 +56 @@
             data_info['pixels'] = 1
 
-        CLoader.__init__(self, data_info['filename'], frame,
+        CLoader.__init__(self, data_info['filename'], data_info['frames'],
             data_info['pixels'], data_info['rasters'], data_info['swap_bytes'])
 
@@ -62 +62 @@
         if name == 'filename':
             return self.set_filename(value)
+        elif name == 'n_frames':
+            return self.set_n_frames(value)
         elif name == 'frame':
             return self.set_frame(value)
@@ -75 +77 @@
         if name == 'filename':
             return self.get_filename()
+        elif name == 'n_frames':
+            return self.get_n_frames()
         elif name == 'frame':
             return self.get_frame()
@@ -84 +88 @@
             return self.get_swap_bytes()
         return CLoader.__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

@@ -21 +21 @@
 static PyObject *CLoader_init(CLoader *self, PyObject *args, PyObject *kwds) {
     const char *filename;
-    const int frame;
+    const int n_frames;
     const int n_pixels;
     const int n_rasters;
@@ -27 +27 @@
 
     if (self != NULL) {
-        if (!PyArg_ParseTuple(args, "siiii", &filename, &frame, &n_pixels, &n_rasters, &swap_bytes))
+        if (!PyArg_ParseTuple(args, "siiii", &filename, &n_frames, &n_pixels, &n_rasters, &swap_bytes))
             Py_RETURN_NONE;
         if (!(self->params.filename = malloc(strlen(filename) + 1)))
             Py_RETURN_NONE;
         strcpy(self->params.filename, filename);
-        self->params.frame = frame;
+        self->params.n_frames = n_frames;
         self->params.n_pixels = n_pixels;
         self->params.n_rasters = n_rasters;
@@ -49 +49 @@
     char str[100];
     sprintf(str,
-        "Filename: %s\nframe: %d\nn_pixels: %d\nn_rasters: %d\nswap_bytes: %d",
+        "Filename: %s\nn_frames: %d\nframe: %d\nn_pixels: %d\nn_rasters: %d\nswap_bytes: %d",
         self->params.filename,
+        self->params.n_frames,
         self->params.frame,
         self->params.n_pixels,
@@ -73 +74 @@
 }
 
+static PyObject *get_n_frames(CLoader *self, PyObject *args) {
+    return Py_BuildValue("i", self->params.n_frames);
+}
+
+static PyObject *set_n_frames(CLoader *self, PyObject *args) {
+    int new_frames;
+    if (!PyArg_ParseTuple(args, "i", &new_frames))
+        return NULL;
+    self->params.n_frames = new_frames;
+
+    return Py_BuildValue("i", self->params.n_frames);
+}
+
 static PyObject *get_frame(CLoader *self, PyObject *args) {
     return Py_BuildValue("i", self->params.frame);
@@ -144 +158 @@
     int pixel;
     int frame_pos;
-    int size[2] = {self->params.n_rasters, self->params.n_pixels};
+    npy_intp size[2] = {self->params.n_rasters, self->params.n_pixels};
     float cur_val;
     FILE *input_file;
     PyArrayObject *data;
 
-    if (!PyArg_ParseTuple(args, "O!", &PyArray_Type, &data)) {
-        return NULL;
-    }
+    data = (PyArrayObject *)PyArray_SimpleNew(2, size, NPY_FLOAT);
 
     input_file = fopen(self->params.filename, "rb");
@@ -171 +183 @@
 
     fclose(input_file);
-    Py_DECREF(data);
-
-    return Py_BuildValue("O", data);
+
+    return Py_BuildValue("N", data);
 }
 
@@ -182 +193 @@
     { "get_filename", (PyCFunction)get_filename, METH_VARARGS, "Get the filename" },
     { "set_filename", (PyCFunction)set_filename, METH_VARARGS, "Set the filename" },
+    { "get_n_frames", (PyCFunction)get_n_frames, METH_VARARGS, "Get n_frames" },
+    { "set_n_frames", (PyCFunction)set_n_frames, METH_VARARGS, "Set n_frames" },
     { "get_frame", (PyCFunction)get_frame, METH_VARARGS, "Get the frame that will be loaded" },
     { "set_frame", (PyCFunction)set_frame, METH_VARARGS, "Set the frame that will be loaded" },

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

@@ -5 +5 @@
     // File to load
     char *filename;
+    // Number of frames in the file
+    int n_frames;
     // Frame to load
     int frame;