Changeset 8aec639 in sasview for src/sas/sascalc

Timestamp:

Dec 19, 2016 1:59:52 PM (8 years ago)

Author:

GitHub <noreply@…>

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:

6b9e76f

Parents:

0633048 (diff), 09fdc89 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jeff Krzywon <krzywon@…> (12/19/16 13:59:52)

git-committer:

GitHub <noreply@…> (12/19/16 13:59:52)

Message:

Merge branch 'master' into ticket-795

Location:

src/sas/sascalc

Files:

• dataloader/manipulations.py (modified) (2 diffs)
• dataloader/readers/cansas_reader_HDF5.py (modified) (1 diff)
• data_util/calcthread.py (modified) (2 diffs)

src/sas/sascalc/dataloader/manipulations.py

@@ -143 +143 @@
         :return: Data1D object
         """
-        if len(data2D.detector) != 1:
+        if len(data2D.detector) > 1:
             msg = "_Slab._avg: invalid number of "
             msg += " detectors: %g" % len(data2D.detector)
@@ -299 +299 @@
             error on number of counts, number of entries summed
         """
-        if len(data2D.detector) != 1:
+        if len(data2D.detector) > 1:
             msg = "Circular averaging: invalid number "
             msg += "of detectors: %g" % len(data2D.detector)

src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py

@@ -162 +162 @@
                     else:
                         self.current_dataset.x = data_set.flatten()
+                    continue
+                elif key == u'Qdev':
+                    self.current_dataset.dx = data_set.flatten()
                     continue
                 elif key == u'Qy':

src/sas/sascalc/data_util/calcthread.py

@@ -255 +255 @@
         # thread when the queue is empty and start a new thread when
         # there is more work to be done.
+        errors = 0
         while 1:
             self._lock.acquire()
@@ -270 +271 @@
                 pass
             except:
-                self.exception()
+                errors += 1
+        if errors > 0:
+            self.exception()
         self._running = False