Update instrument.py

forgot import after changing to CAPI function.

Author: joelvbernier

hexrd/instrument.py

@@ -55,7 +55,7 @@
                                       mapAngle, \
                                       oscillAnglesOfHKLs, \
                                       rowNorm, \
-                                      validateAngleRanges
+                                      unitRowVector
 from hexrd.xrd import xrdutil
 from hexrd.xrd.crystallography import PlaneData
 from hexrd import constants as ct
@@ -600,7 +600,7 @@ def extract_line_positions(self, plane_data, imgser_dict,
             tth_ranges = np.degrees(plane_data.getMergedRanges()[1])
             tth_tols = np.vstack([i[1] - i[0] for i in tth_ranges])
         else:
-            tth_tols=np.ones(len(plane_data))*tth_tol
+            tth_tols = np.ones(len(plane_data))*tth_tol
 
         # =====================================================================
         # LOOP OVER DETECTORS
@@ -624,7 +624,8 @@ def extract_line_positions(self, plane_data, imgser_dict,
 
             # make rings
             pow_angs, pow_xys = panel.make_powder_rings(
-                plane_data, merge_hkls=True, delta_tth=tth_tol, delta_eta=eta_tol)
+                plane_data, merge_hkls=True,
+                delta_tth=tth_tol, delta_eta=eta_tol)
 
             # =================================================================
             # LOOP OVER RING SETS
@@ -681,7 +682,7 @@ def extract_line_positions(self, plane_data, imgser_dict,
                         ims_data = []
                     for j_p in np.arange(len(images)):
                         # catch interpolation type
-                        image=images[j_p]
+                        image = images[j_p]
                         if do_interpolation:
                             tmp = panel.interpolate_bilinear(
                                     xy_eval,
@@ -1552,13 +1553,13 @@ def clip_to_panel(self, xy, buffer_edges=True):
                     )
                     on_panel = np.logical_and(on_panel_x, on_panel_y)
             elif not buffer_edges:
-                    on_panel_x = np.logical_and(
-                        xy[:, 0] >= -xlim, xy[:, 0] <= xlim
-                    )
-                    on_panel_y = np.logical_and(
-                        xy[:, 1] >= -ylim, xy[:, 1] <= ylim
-                    )
-                    on_panel = np.logical_and(on_panel_x, on_panel_y)
+                on_panel_x = np.logical_and(
+                    xy[:, 0] >= -xlim, xy[:, 0] <= xlim
+                )
+                on_panel_y = np.logical_and(
+                    xy[:, 1] >= -ylim, xy[:, 1] <= ylim
+                )
+                on_panel = np.logical_and(on_panel_x, on_panel_y)
         return xy[on_panel, :], on_panel
 
     def cart_to_angles(self, xy_data):
@@ -1743,7 +1744,7 @@ def make_powder_rings(
         eta_centers = eta_edges[:-1] + del_eta
 
         # !!! get chi and ome from rmat_s
-        chi = np.arctan2(rmat_s[2, 1], rmat_s[1, 1])
+        # chi = np.arctan2(rmat_s[2, 1], rmat_s[1, 1])
         ome = np.arctan2(rmat_s[0, 2], rmat_s[0, 0])
 
         # make list of angle tuples