Changeset 045b7eac in sasview for src/sas/sascalc/calculator/slit_length_calculator.py

Timestamp:

Mar 24, 2017 3:29:26 PM (8 years ago)

Author:

GitHub <noreply@…>

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

253eb6c6, 6d8a26c, f4de527

Parents:

1a30720 (diff), bfba720 (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.

git-author:

Andrew Nelson <andyfaff@…> (03/24/17 15:29:26)

git-committer:

GitHub <noreply@…> (03/24/17 15:29:26)

Message:

Merge pull request #49 from andyfaff/slit_calc

MAINT: SlitlengthCalculator? - removed float indexing

File:

• src/sas/sascalc/calculator/slit_length_calculator.py (modified) (6 diffs)

src/sas/sascalc/calculator/slit_length_calculator.py

@@ -16 +16 @@
         # y data
         self.y = None
-        #default slit length
+        # default slit length
         self.slit_length = 0.0
 
@@ -42 +42 @@
         """
         # None data do nothing
-        if self.y == None or self.x == None:
+        if self.y is None or self.x is None:
             return
         # set local variable
@@ -54 +54 @@
         y_sum = 0.0
         y_max = 0.0
-        ind = 0.0
+        ind = 0
 
         # sum 10 or more y values until getting max_y,
@@ -70 +70 @@
         # defaults
         y_half_d = 0.0
-        ind = 0.0
+        ind = 0
         # find indices where it crosses y = y_half.
         while True:
@@ -81 +81 @@
 
         # y value and ind just before passed the spot of the half height
-        y_half_u = y[ind-1]
+        y_half_u = y[ind - 1]
 
         # get corresponding x values
         x_half_d = x[ind]
-        x_half_u = x[ind-1]
+        x_half_u = x[ind - 1]
 
         # calculate x at y = y_half using linear interpolation
@@ -91 +91 @@
             x_half = (x_half_d + x_half_u)/2.0
         else:
-            x_half = (x_half_u * (y_half - y_half_d)  \
-                       + x_half_d * (y_half_u - y_half)) \
-                        / (y_half_u - y_half_d)
+            x_half = ((x_half_u * (y_half - y_half_d)
+                       + x_half_d * (y_half_u - y_half))
+                       / (y_half_u - y_half_d))
 
         # Our slit length is half width, so just give half beam value