Changeset 9f5b505 in sasview for calculator/resolution_calculator.py

Timestamp:

Apr 11, 2011 8:59:00 AM (14 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:

4d1dce4

Parents:

aad74b3

Message:

small sigma correction in r-direction

File:

• calculator/resolution_calculator.py (modified) (1 diff)

calculator/resolution_calculator.py

@@ -645 +645 @@
         y_p = -x_value * sin_phi + y_value * cos_phi
         
-        new_x = x_p * cos_phi / (sigma_r / sigma_x + 1) - y_p * sin_phi
+        new_sig_x = sqrt(sigma_r * sigma_r / (sigma_x * sigma_x ) + 1)
+        new_sig_y = sqrt(sigma_r * sigma_r / (sigma_y * sigma_y ) + 1)
+        new_x = x_p * cos_phi / new_sig_x - y_p * sin_phi
         new_x /= sigma_x
-        new_y = x_p * sin_phi / (sigma_r / sigma_y + 1) + y_p * cos_phi
+        new_y = x_p * sin_phi / new_sig_y + y_p * cos_phi
         new_y /= sigma_y