Changeset 61a8b58 in sasview for src/sas/sascalc

Timestamp:

Sep 29, 2017 5:46:22 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

7d8bebf

Parents:

7d97e2d (diff), 7d353af (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.

Message:

Merge branch 'ESS_GUI_SasView250' into ESS_GUI

File:

• src/sas/sascalc/calculator/resolution_calculator.py (modified) (5 diffs)

src/sas/sascalc/calculator/resolution_calculator.py

@@ -93 +93 @@
         : qy_value: y component of q
         """
+
         # make sure to update all the variables need.
         # except lambda, dlambda, and intensity
@@ -152 +153 @@
                                  sig2_list[ind], sigr_list[ind],
                                  qx_min, qx_max, qy_min, qy_max, coord)
-            # this is the case of q being outside the detector
-            #if numpy.all(out==0.0):
-            #    continue
             image = out
             # set variance as sigmas
@@ -186 +184 @@
             sigma_2 = 0
             sigma1d = 0
+
         if len(self.image) > 0:
             self.image += image_out
@@ -192 +191 @@
 
         # plot image
-        return self.plot_image(self.image)
+        return self.image  # self.plot_image(self.image)
 
     def setup_tof(self, wavelength, wavelength_spread):
@@ -214 +213 @@
                 coord='cartesian', tof=False):
         """
-        Compute the Q resoltuion in || and + direction of 2D
+        Compute the Q resolution in || and + direction of 2D
         : qx_value: x component of q
         : qy_value: y component of q