Fix a few missed argument changes

Signed-off-by: Patrick Avery <patrick.avery@kitware.com>
HEXRD · Apr 13, 2023 · 3d630f5 · 3d630f5
1 parent 0faa0bd
commit 3d630f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/hexrd/instrument/detector.py b/hexrd/instrument/detector.py
@@ -1433,7 +1433,7 @@ def simulate_laue_pattern(self, crystal_data,
             dpts = gvec_to_xy(ghat_c_str.T,
                               self.rmat, rmat_s, rmat_c,
                               self.tvec, tvec_s, tvec_c,
-                              beamVec=beam_vec)
+                              beam_vec=beam_vec)
 
             # check intersections with detector plane
             canIntersect = ~np.isnan(dpts[:, 0])

diff --git a/hexrd/instrument/planar_detector.py b/hexrd/instrument/planar_detector.py
@@ -68,11 +68,13 @@ def angles_to_cart(self, tth_eta,
         ome = np.arccos(rmat_s[0, 0])
 
         angs = np.hstack([tth_eta, np.tile(ome, (len(tth_eta), 1))])
+        gvec = angles_to_gvec(angs, beam_vec=self.bvec, eta_vec=self.evec,
+                              chi=chi)
         xy_det = gvec_to_xy(
-            angles_to_gvec(angs, bHat_l=self.bvec, eHat_l=self.evec, chi=chi),
+            gvec,
             self.rmat, rmat_s, rmat_c,
             self.tvec, tvec_s, tvec_c,
-            beamVec=self.bvec)
+            beam_vec=self.bvec)
         if apply_distortion and self.distortion is not None:
             xy_det = self.distortion.apply_inverse(xy_det)
         return xy_det