Changeset f67ed10 in sasview for sanscalculator

Timestamp:

Aug 18, 2011 7:02:23 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:

83bf44e1

Parents:

b470477

Message:

updated help doc and wave pulse shapes(TOF)

File:

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

sanscalculator/src/sans/calculator/resolution_calculator.py

@@ -228 +228 @@
         lamb_spread = wavelength_spread
         # the shape of wavelength distribution
+        print "tof", tof
         if tof:
             # rectangular
@@ -283 +284 @@
         sigma_1 += self.get_variance(rthree, l_two, phi, comp1)
         # for gravity term
-        sigma_1 +=  self.get_variance_gravity(l_ssa, l_sad, lamb, lamb_spread, 
-                             phi, comp1, 'on')  
+        sigma_1 +=  (self.get_variance_gravity(l_ssa, l_sad, lamb, lamb_spread, 
+                             phi, comp1, 'on') / tof_factor)
         # for wavelength spread
         # reserve for 1d calculation
-        sigma_wave_1 = self.get_variance_wave(radius, l_two, lamb_spread, 
-                                          phi, 'radial', 'on')
+        sigma_wave_1 = (self.get_variance_wave(radius, l_two, lamb_spread, 
+                                          phi, 'radial', 'on') / tof_factor)
         # for 1d
-        variance_1d_1 = sigma_1/2 + sigma_wave_1 / tof_factor
+        variance_1d_1 = sigma_1/2 + sigma_wave_1 
         # normalize
         variance_1d_1 = knot * knot * variance_1d_1 / 12
@@ -310 +311 @@
 
         # for gravity term
-        sigma_2 +=  self.get_variance_gravity(l_ssa, l_sad, lamb, lamb_spread, 
-                             phi, comp2, 'on')
+        sigma_2 +=  (self.get_variance_gravity(l_ssa, l_sad, lamb, lamb_spread, 
+                             phi, comp2, 'on') / tof_factor)
 
         
         # for wavelength spread
         # reserve for 1d calculation
-        sigma_wave_2 = self.get_variance_wave(radius, l_two, lamb_spread, 
-                                          phi, 'phi', 'on') 
+        sigma_wave_2 = (self.get_variance_wave(radius, l_two, lamb_spread, 
+                                          phi, 'phi', 'on') / tof_factor)
         # for 1d
-        variance_1d_2 = sigma_2 / 2 + sigma_wave_2 / tof_factor
+        variance_1d_2 = sigma_2 / 2 + sigma_wave_2 
         # normalize
         variance_1d_2 = knot*knot*variance_1d_2 / 12