Changeset a3c538e1 in sasview

Timestamp:

Jul 22, 2016 4:08:49 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:

3931ea14

Parents:

94f4518

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/22/16 04:08:38)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/22/16 04:08:49)

Message:

Warn when qax input is wrong and fix loader for single-frame files

File:

• src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) (2 diffs)

src/sas/sasgui/perspectives/file_converter/converter_panel.py

@@ -166 +166 @@
                     self.iq_input.GetPath())
                 bsl_data = loader.load_bsl_data()
-                qdata = bsl_data.q_axis.data[0]
+                qdata = bsl_data.q_axis.data
                 iqdata = bsl_data.data_axis.data
+                if len(qdata) > 1:
+                    msg = ("Q-Axis file has multiple frames. Only 1 frame is "
+                        "allowed for the Q-Axis")
+                    wx.PostEvent(self.parent.manager.parent,
+                        StatusEvent(status=msg, info="error"))
+                    return
+                else:
+                    qdata = qdata[0]
                 frames = [iqdata.shape[0]]
                 increment = 1
                 single_file = True
+                # Standard file has 3 frames: SAS, calibration and WAS
                 if frames[0] > 3:
+                    # File has multiple frames
                     params = self.ask_frame_range(frames[0])
                     frames = params['frames']
@@ -177 +187 @@
                     single_file = params['file']
                     if frames == []: return
+                else: # Only interested in SAS data
+                    frames = [0]
         except Exception as ex:
             msg = str(ex)