From 70eeb54e5c5e3998eaad700a677d50d2a5996fe4 Mon Sep 17 00:00:00 2001 From: Prohurtz <48768484+RedHawk989@users.noreply.github.com> Date: Sun, 23 Apr 2023 16:29:58 -0500 Subject: [PATCH] fix HSRAC crash --- EyeTrackApp/hsrac.py | 4 ++-- EyeTrackApp/intensity_eye_open.py | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/EyeTrackApp/hsrac.py b/EyeTrackApp/hsrac.py index ad3a139..ef31927 100644 --- a/EyeTrackApp/hsrac.py +++ b/EyeTrackApp/hsrac.py @@ -112,9 +112,9 @@ def fit_rotated_ellipse_ransac(data: np.ndarray, sfc: np.random.Generator, iter_ np.matmul(dm_rng_swap_trans, dm_rng_swap, out=dm_rng_5x5) # np.linalg.solve(np.matmul(dm_rng_swap_trans, dm_rng_swap), dm_rng_swap_trans) # solve is slow https://github.com/bogovicj/JaneliaMLCourse/issues/1 - _umath_linalg.inv(dm_rng_5x5, signature='d->d', + #_umath_linalg.inv(dm_rng_5x5, signature='d->d', extobj=inv_ext, out=dm_rng_5x5) - #dm_rng_5x5 = np.linalg.pinv(dm_rng_5x5) + dm_rng_5x5 = np.linalg.pinv(dm_rng_5x5) np.matmul(dm_rng_5x5, dm_rng_swap_trans, out=dm_rng_p5smp) np.matmul(dm_rng_p5smp, dm_rng_six, out=dm_rng_p_npaxis) diff --git a/EyeTrackApp/intensity_eye_open.py b/EyeTrackApp/intensity_eye_open.py index 24be5d6..2b2ded5 100644 --- a/EyeTrackApp/intensity_eye_open.py +++ b/EyeTrackApp/intensity_eye_open.py @@ -225,6 +225,11 @@ class IntensityBasedOpeness: data_val = self.data[int_y, int_x] else: data_val = 0 + + + + + # max pupil per cord if data_val == 0: # The value of the specified coordinates has not yet been recorded. @@ -236,7 +241,7 @@ class IntensityBasedOpeness: self.data[int_y, int_x] = intensity # set value changed = True else: - intensitya = max(data_val + 0.001, 1) # if current intensity value is less (more pupil), save that + intensitya = max(data_val + 0.001, 1) # if current intensity value is not less use self.data[int_y, int_x] = intensitya # set value changed = True @@ -256,18 +261,13 @@ class IntensityBasedOpeness: else: maxp = self.data[int_y, int_x] minp = self.maxval + + eyeopen = ((intensity - maxp) / (minp - maxp)) #for whatever reason when input and maxp are too close it outputs high eyeopen = 1 - eyeopen - # print(eyeopen, intensity, maxp, minp, x, y) - #if maxp - minp < 1.6: - # eyeopen = 0.0 - # eyeopen = eyeopen - 0.2 + print(eyeopen, intensity, maxp, minp, x, y) - # print(f"EYEOPEN: {eyeopen}") - # print(int(x), int(y), eyeopen, maxp, minp) - # print(self.data[0, -1]) - # print(self.maxval) if changed and ((time.time() - self.lct) > 5): # save every 5 seconds if something changed to save disk usage self.save() self.lct = time.time()