Changeset 535e181 in sasview for src/sas/sascalc/file_converter/bsl_loader.py

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

File:

• src/sas/sascalc/file_converter/bsl_loader.py (modified) (5 diffs)

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))