Changeset d555416 in sasview for sansdataloader/src/sans

Timestamp:

Apr 4, 2013 4:16:09 PM (11 years ago)

Author:

smk78

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:

6a84c0c

Parents:

240bdc80

Message:

Fix to Ticket #101; Modified Slicer Panel for Box Sum to display total sum and number of points summed; renamed captions for values accordingly

File:

• sansdataloader/src/sans/dataloader/manipulations.py (modified) (2 diffs)

sansdataloader/src/sans/dataloader/manipulations.py

@@ -294 +294 @@
         :param data2D: Data2D object
         
-        :return: number of counts, error on number of counts
+        :return: number of counts, error on number of counts,
+            number of points summed
         
         """
@@ -303 +304 @@
         error = 0 if y_counts == 0 else math.sqrt(err_y)
         
-        return counts, error
+        # Added y_counts to return, SMK & PDB, 04/03/2013
+        return counts, error, y_counts
         
     def _sum(self, data2D):