Changeset c3f0114 in sasview

Timestamp:

Aug 5, 2016 7:35:03 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:

535e181

Parents:

6eaf89ea

Message:

Remove debug statements and tidy up

Location:

src/sas/sascalc/file_converter

Files:

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

src/sas/sascalc/file_converter/bsl_loader.py

@@ -21 +21 @@
 
         while True:
-            import pdb; pdb.set_trace()
             metadata = header_file.readline().strip()
             metadata = metadata.split()
@@ -43 +42 @@
             except:
                 is_valid = False
-                err_msg = "Invalid metadata in header file for {}".format(filename.replace('0.', '1.'))
+                err_msg = "Invalid metadata in header file for {}"
+                err_msg = err_msg.format(filename.replace('0.', '1.'))
             break
 

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

@@ -25 +25 @@
     const int n_rasters;
     const int swap_bytes;
+
     if (self != NULL) {
         if (!PyArg_ParseTuple(args, "siiii", &filename, &frame, &n_pixels, &n_rasters, &swap_bytes))
@@ -57 +58 @@
 }
 
+/*                    ----- Setters and Getters -----                        */
+
 static PyObject *get_filename(CLoader *self, PyObject *args) {
     return Py_BuildValue("s", self->params.filename);
@@ -121 +124 @@
     return Py_BuildValue("i", self->params.swap_bytes);
 }
+
+/*                        ----- Instance Methods -----                       */
 
 float reverse_float(const float in_float){
@@ -141 +146 @@
     int size[2] = {self->params.n_rasters, self->params.n_pixels};
     float cur_val;
-    PyObject *read_val;
     FILE *input_file;
     PyArrayObject *data;
 
-    printf("load_data called\n");
-
     if (!PyArg_ParseTuple(args, "O!", &PyArray_Type, &data)) {
-        printf("Failed parsing PyArray object");
         return NULL;
     }
@@ -154 +155 @@
     input_file = fopen(self->params.filename, "rb");
     if (!input_file) {
-        printf("Failed opening file\n");
-        return NULL;
-    }
-
-    printf("Calculating frame_pos\n");
+        return NULL;
+    }
+
     frame_pos = self->params.n_pixels * self->params.n_rasters * self->params.frame;
-    printf("frame_pos: %d\n", frame_pos);
     fseek(input_file, frame_pos*sizeof(float), SEEK_SET);
-    printf("fseek completed\n");
 
     for (raster = 0; raster < self->params.n_rasters; raster++) {
@@ -170 +167 @@
                 cur_val = reverse_float(cur_val);
             PyArray_SETITEM(data, PyArray_GETPTR2(data, raster, pixel), PyFloat_FromDouble(cur_val));
-            read_val = PyArray_GETITEM(data, PyArray_GETPTR2(data, raster, pixel));
         }
     }
-    printf("Data read.\n");
 
     fclose(input_file);
-    printf("File closed\n");
     Py_DECREF(data);
-    printf("Function completed\n");
+
     return Py_BuildValue("O", data);
 }
+
+/*                           ----- Class Registration -----                  */
 
 static PyMethodDef CLoader_methods[] = {