Changeset 0b127025 in sasview for sanscalculator/src/sans

Timestamp:

Aug 16, 2011 6:50:56 PM (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:

aaeae3a0

Parents:

d66196a

Message:

for tof rectangular lamda distribution used

File:

• sanscalculator/src/sans/calculator/resolution_calculator.py (modified) (11 diffs)

sanscalculator/src/sans/calculator/resolution_calculator.py

@@ -39 +39 @@
         # resolutions
         # lamda in r-direction
-        self.sigma_lamda = 0
+        self.sigma_lamd = 0
         # x-dir (no lamda)
         self.sigma_1 = 0
@@ -61 +61 @@
         self.qymin_limit = 0
         self.qymax_limit = 0
-        # set sigmas
-        self.sigma_1 = 0
-        self.sigma_lamd = 0
-        self.sigma_2 = 0
-        self.sigma_1d = 0
+
         # plots
         self.plot = None
@@ -114 +110 @@
             intens = self.setup_tof(lam, dlam)
             intens_list.append(intens)
-            # save q min max
-            #qx_min = 0
-            #qx_max = 0
-            #qy_min = 0
-            #qy_max = 0
+            # cehck if tof
+            if num_lamda > 1:
+                tof = True
+            else:
+                tof = False
             # compute 2d resolution
             _, _, sigma_1, sigma_2, sigma_r, sigma1d = \
-                            self.compute(lam, dlam, qx_value, qy_value, coord)
+                        self.compute(lam, dlam, qx_value, qy_value, coord, tof)
             # make image
             image = self.get_image(qx_value, qy_value, sigma_1, sigma_2, 
@@ -222 +218 @@
         
     def compute(self, wavelength, wavelength_spread, qx_value, qy_value, 
-                coord = 'cartesian'):
+                coord = 'cartesian', tof=False):
         """
         Compute the Q resoltuion in || and + direction of 2D
@@ -231 +227 @@
         lamb = wavelength
         lamb_spread = wavelength_spread
-        
+        # the shape of wavelength distribution
+        if tof:
+            # rectangular
+            tof_factor =  2
+        else:
+            # triangular
+            tof_factor =  1
         # Find polar values
         qr_value, phi = self._get_polar_value(qx_value, qy_value)
@@ -288 +290 @@
                                           phi, 'radial', 'on')
         # for 1d
-        variance_1d_1 = sigma_1/2 + sigma_wave_1
+        variance_1d_1 = sigma_1/2 + sigma_wave_1 / tof_factor
         # normalize
         variance_1d_1 = knot * knot * variance_1d_1 / 12
@@ -296 +298 @@
         # normalize
         sigma_1 = knot*sqrt(sigma_1 / 12)
-        sigma_r = knot*sqrt(sigma_wave_1 / 12)
+        sigma_r = knot*sqrt(sigma_wave_1 / (tof_factor *12))
         # sigma in the phi/y direction
         # for source apperture
@@ -317 +319 @@
                                           phi, 'phi', 'on') 
         # for 1d
-        variance_1d_2 = sigma_2/2 +sigma_wave_2
+        variance_1d_2 = sigma_2 / 2 + sigma_wave_2 / tof_factor
         # normalize
         variance_1d_2 = knot*knot*variance_1d_2 / 12
@@ -878 +880 @@
         phi_i = numpy.arctan2(y_val, x_val)
 
+        phi_i = numpy.arctan2(y_val, x_val)
         sin_phi = numpy.sin(phi_i)
         cos_phi = numpy.cos(phi_i)
@@ -1110 +1113 @@
         plane_dist = dx_size
         # full scattering angle on the x-axis
-        theta  = math.atan(plane_dist / det_dist)
-        qx_value     = (2.0 * pi / wavelength) * math.sin(theta)
+        theta  = numpy.arctan(plane_dist / det_dist)
+        qx_value     = (2.0 * pi / wavelength) * numpy.sin(theta)
         return qx_value  
     
@@ -1162 +1165 @@
         delta_y = 0.5
         delta_y *= _GRAVITY
-        delta_y *= self.sample2detector_distance[0] 
+        sampletodetector = self.sample2detector_distance[0] - \
+                                    self.sample2sample_distance[0]
+        delta_y *= sampletodetector
         delta_y *= (self.source2sample_distance[0] + self.sample2detector_distance[0])
         delta_y /= (velocity * velocity)