Changeset 44f7c1b in sasview

Timestamp:

Oct 23, 2013 11:29:43 AM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

66f21cd

Parents:

abf7eed

Message:

From commit r6795

Fixed the problem with 2d averaging from state file data

​https://sourceforge.net/p/sasview/code/6795/

File:

• src/sans/perspectives/fitting/pagestate.py (modified) (1 diff)

src/sans/perspectives/fitting/pagestate.py

@@ -1498 +1498 @@
                 if field is not None:
                     list = [parse_entry_helper(node, item) for node in field]
-                exec "data_info.%s = numpy.array(list)" % item[0]
+                if len(list) < 2:
+                    exec "data_info.%s = None" % item[0]
+                else:
+                    exec "data_info.%s = numpy.array(list)" % item[0]
         
         return data_info