Changeset 1534c1d in sasview for calculatorview/src/sans

Timestamp:

Aug 11, 2011 8:25:15 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

643a82a

Parents:

c0a30a24

Message:

better resultant info

File:

• calculatorview/src/sans/perspectives/calculator/resolution_calculator_panel.py (modified) (6 diffs)

calculatorview/src/sans/perspectives/calculator/resolution_calculator_panel.py

@@ -82 +82 @@
         # dQ 2d image
         self.image = None
+        # results of sigmas
+        self.sigma_strings =' '
         #Font size 
         self.SetWindowVariant(variant=FONT_VARIANT)
@@ -821 +823 @@
         try:
             from sans.perspectives.calculator.resolcal_thread import CalcRes as thread
+            self.sigma_strings = '\nResolution COmputation is Finished:\n'
             cal_res = thread(func = self._map_func,
                          qx = self.qx,
@@ -829 +832 @@
                          qy_max = qy_max,
                          image = self.image,
-                         completefn = self.complete_cal)
+                         completefn = self.complete)
             #self.image = map(self._map_func, self.qx, self.qy, 
             #                 qx_min, qx_max, qy_min, qy_max)[0]
@@ -849 +852 @@
         Callafter complete: wx call after needed for stable output
         """
-        wx.CallAfter(self.complte, image, elapsed)   
+        wx.CallAfter(self.complete_cal, image, elapsed)   
         
     def complete_cal(self, image, elapsed=None):
@@ -878 +881 @@
         self.sigma_lamd_tcl.SetValue(str(sigma_lamd))
         self.sigma_1d_tcl.SetValue(str(sigma_1d))
-        msg = "Resolution computation is finished."
+        msg = self.sigma_strings
+        msg += "\n"
         status_type = 'stop'
         self._status_info(msg, status_type)
@@ -978 +982 @@
                                  qx_min, qx_max, qy_min, qy_max, 
                                  self.det_coordinate)
-        
-
+        # record sigmas
+        self.sigma_strings += " At Qx = %s, Qy = %s; \n"% (qx_value,qy_value)
+        self._sigma_strings()
         return image
+    def _sigma_strings(self):
+        """
+        Recode sigmas as strins
+        """
+        sigma_r = self.format_number(self.resolution.sigma_1)
+        sigma_phi = self.format_number(self.resolution.sigma_2)
+        sigma_lamd = self.format_number(self.resolution.sigma_lamd)
+        sigma_1d =  self.format_number(self.resolution.sigma_1d)
+        # Set output values 
+        self.sigma_strings += "   sigma_x = %s\n"% sigma_r
+        self.sigma_strings += "   sigma_y = %s\n"% sigma_phi
+        self.sigma_strings += "   sigma_lamd = %s\n"% sigma_lamd
+        self.sigma_strings += "   sigma_1D = %s\n"% sigma_1d
     
     def _validate_q_input(self, qx, qy):