Changeset d555416 in sasview

Timestamp:

Apr 4, 2013 2: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

Files:

• sansdataloader/src/sans/dataloader/manipulations.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/boxSum.py (modified) (4 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/slicerpanel.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):

sansguiframe/src/sans/guiframe/local_perspectives/plotting/boxSum.py

@@ -53 +53 @@
         self.count = 0
         self.error = 0
+        self.total = 0
+        self.totalerror = 0
+        self.points = 0
         ## Flag to determine if the current figure has moved
         ## set to False == no motion , set to True== motion
@@ -182 +185 @@
         box =  Boxavg(x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max)
         self.count, self.error = box(self.base.data2D)
+        # Dig out number of points summed, SMK & PDB, 04/03/2013
+        from sans.dataloader.manipulations import Boxsum
+        boxtotal =  Boxsum(x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max)
+        self.total, self.totalerror, self.points = boxtotal(self.base.data2D)
         
     def moveend(self, ev):
@@ -229 +236 @@
         params["center_x"] = self.center.x
         params["center_y"] = self.center.y
-        params["count"] = self.count
-        params["errors"] = self.error
+        params["num_points"] = self.points
+        params["avg"] = self.count
+        params["avg_error"] = self.error
+        params["sum"] = self.total
+        params["sum_error"] = self.totalerror
         return params
     
@@ -238 +248 @@
         """
         result = {}
-        result["count"] = self.count
-        result["error"] = self.error
+        result["num_points"] = self.points
+        result["avg"] = self.count
+        result["avg_error"] = self.error
+        params["sum"] = self.total
+        params["sum_error"] = self.totalerror
         return result
         

sansguiframe/src/sans/guiframe/local_perspectives/plotting/slicerpanel.py

@@ -84 +84 @@
             keys.sort()
             for item in keys:
-                if not item.lower() in ["errors", "count"]:
+                if not item.lower() in ["num_points", "avg", "avg_error", "sum",
+                                         "sum_error"]:
                     n += 1
                     text = wx.StaticText(self, -1, item, style=wx.ALIGN_LEFT)
@@ -101 +102 @@
                     self.bck.Add(ctl, (n-1, 1), flag=wx.TOP|wx.BOTTOM, border=0)
             for item in keys:
-                if  item.lower() in ["errors", "count"]:
+                if  item.lower() in ["num_points", "avg", "avg_error", "sum",
+                                      "sum_error"]:
                     n += 1
                     text = wx.StaticText(self, -1, item + ": ",