Changeset b6627d9 in sasview for src/sas/calculator/resolution_calculator.py

Timestamp:

Mar 4, 2015 1:02:23 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

7cd87c2

Parents:

5a7d933

Message:

pylint fixes

File:

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

src/sas/calculator/resolution_calculator.py

@@ -13 +13 @@
 import math
 import numpy
+import sys
+import logging
 
 #Plank's constant in cgs unit
@@ -77 +79 @@
         self.detector_pix_size = []
         self.detector_size = []
-        # get all the values of the instrumental parameters
-        #self.intensity = self.get_intensity()
-        #self.wavelength = self.get_wavelength()
-        #self.wavelength_spread = self.get_wavelength_spread()
         self.get_all_instrument_params()
         # max q range for all lambdas
@@ -87 +85 @@
 
     def compute_and_plot(self, qx_value, qy_value, qx_min, qx_max,
-                          qy_min, qy_max, coord='cartesian'):
+                         qy_min, qy_max, coord='cartesian'):
         """
         Compute the resolution
@@ -120 +118 @@
             # make image
             image = self.get_image(qx_value, qy_value, sigma_1, sigma_2,
-                            sigma_r, qx_min, qx_max, qy_min, qy_max,
-                            coord, False)
+                                   sigma_r, qx_min, qx_max, qy_min, qy_max,
+                                   coord, False)
             if qx_min > self.qx_min:
                 qx_min = self.qx_min
@@ -150 +148 @@
             intens = self.setup_tof(lam, dlam)
             out = self.get_image(qx_value, qy_value, sig1_list[ind],
-                                   sig2_list[ind], sigr_list[ind],
-                                   qx_min, qx_max, qy_min, qy_max, coord)
+                                 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):
@@ -272 +270 @@
         # sigma in the radial/x direction
         # for source aperture
-        sigma_1  = self.get_variance(rone, l1_cor, phi, comp1)
+        sigma_1 = self.get_variance(rone, l1_cor, phi, comp1)
         # for sample apperture
         sigma_1 += self.get_variance(rtwo, lp_cor, phi, comp1)
@@ -279 +277 @@
         # for gravity term for 1d
         sigma_1grav1d = self.get_variance_gravity(l_ssa, l_sad, lamb,
-                            lamb_spread, phi, comp1, 'on') / tof_factor
+                                                  lamb_spread, phi, comp1, 'on') / tof_factor
         # for wavelength spread
         # reserve for 1d calculation
         A_value = self._cal_A_value(lamb, l_ssa, l_sad)
         sigma_wave_1, sigma_wave_1_1d = self.get_variance_wave(A_value,
-                                          radius, l_two, lamb_spread,
-                                          phi, 'radial', 'on')
+                                                               radius, l_two, lamb_spread,
+                                                               phi, 'radial', 'on')
         sigma_wave_1 /= tof_factor
         sigma_wave_1_1d /= tof_factor
@@ -300 +298 @@
         # sigma in the phi/y direction
         # for source apperture
-        sigma_2  = self.get_variance(rone, l1_cor, phi, comp2)
+        sigma_2 = self.get_variance(rone, l1_cor, phi, comp2)
 
         # for sample apperture
@@ -310 +308 @@
         # for gravity term for 1d
         sigma_2grav1d = self.get_variance_gravity(l_ssa, l_sad, lamb,
-                                lamb_spread, phi, comp2, 'on') / tof_factor
+                                                  lamb_spread, phi, comp2, 'on') / tof_factor
 
         # for wavelength spread
         # reserve for 1d calculation
         sigma_wave_2, sigma_wave_2_1d = self.get_variance_wave(A_value,
-                                          radius, l_two, lamb_spread,
-                                          phi, 'phi', 'on')
+                                                               radius, l_two, lamb_spread,
+                                                               phi, 'phi', 'on')
         sigma_wave_2 /= tof_factor
         sigma_wave_2_1d /= tof_factor
@@ -377 +375 @@
 
         # Check whether the q value is within the detector range
-        #msg = "Invalid input: Q value out of the detector range..."
         if qx_min < self.qx_min:
             self.qx_min = qx_min
@@ -409 +406 @@
             # Calculate the 2D Gaussian distribution image
             image = self._gaussian2d_polar(q_1, q_2, qc_1, qc_2,
-                                 sigma_1, sigma_2, sigma_r)
+                                           sigma_1, sigma_2, sigma_r)
         else:
             # catesian coordinate
@@ -452 +449 @@
         # Image
         im = plt.imshow(image,
-                extent=[qx_min, qx_max, qy_min, qy_max])
+                        extent=[qx_min, qx_max, qy_min, qy_max])
 
         # bilinear interpolation to make it smoother
@@ -506 +503 @@
             raise ValueError, " Improper input..."
         # get them squared
-        sigma  = x_comp * x_comp
+        sigma = x_comp * x_comp
         sigma += y_comp * y_comp
         # normalize by distance
@@ -918 +915 @@
 
     def _gaussian2d_polar(self, x_val, y_val, x0_val, y0_val,
-                        sigma_x, sigma_y, sigma_r):
+                          sigma_x, sigma_y, sigma_r):
         """
         Calculate 2D Gaussian distribution for polar coodinate
@@ -933 +930 @@
         sigma_x = sqrt(sigma_x * sigma_x + sigma_r * sigma_r)
         # call gaussian1d
-        gaussian  = self._gaussian1d(x_val, x0_val, sigma_x)
+        gaussian = self._gaussian1d(x_val, x0_val, sigma_x)
         gaussian *= self._gaussian1d(y_val, y0_val, sigma_y)
 
@@ -974 +971 @@
         phi = math.atan2(qy_value, qx_value)
         return phi
-        # default
-        phi = 0
-        # ToDo: This is misterious - sign???
-        #qy_value = -qy_value
-        # Take care of the singular point
-        if qx_value == 0:
-            if qy_value > 0:
-                phi = pi / 2
-            elif qy_value < 0:
-                phi = -pi / 2
-            else:
-                phi = 0
-        else:
-            # the angle
-            phi = math.atan2(qy_value, qx_value)
-
-        return phi
 
     def _get_detector_qxqy_pixels(self):
@@ -1026 +1006 @@
             detector_offset = self.sample2detector_distance[1]
         except:
-            pass
+            logging.error(sys.exc_value)
 
         # detector size in [no of pix_x,no of pix_y]
@@ -1043 +1023 @@
         # beam center position in pix number (start from 0)
         center_x, center_y = self._get_beamcenter_position(detector_pix_nums_x,
-                                    detector_pix_nums_y, offset_x, offset_y)
+                                                           detector_pix_nums_y,
+                                                           offset_x, offset_y)
         # distance [cm] from the beam center on detector plane
         detector_ind_x = numpy.arange(detector_pix_nums_x)
@@ -1088 +1069 @@
         # i.e., edges of the last pixels.
         self.qy_min += self._get_qx(-0.5 * pix_y_size,
-                                sample2detector_distance, wavelength)
+                                    sample2detector_distance, wavelength)
         self.qy_max += self._get_qx(0.5 * pix_y_size,
-                                sample2detector_distance, wavelength)
+                                    sample2detector_distance, wavelength)
         #if self.qx_min == self.qx_max:
         self.qx_min += self._get_qx(-0.5 * pix_x_size,
-                                sample2detector_distance, wavelength)
+                                    sample2detector_distance, wavelength)
         self.qx_max += self._get_qx(0.5 * pix_x_size,
                                     sample2detector_distance, wavelength)
@@ -1108 +1089 @@
             output = Data2D()
             inten = numpy.zeros_like(qx_value)
-            output.data    = inten
+            output.data = inten
             output.qx_data = qx_value
             output.qy_data = qy_value
         except:
-            pass
+            logging.error(sys.exc_value)
 
         return output