Add return checker, needed 4 fixes

This commit is contained in:
Julian Stirling 2025-06-10 14:00:56 +01:00
parent 3f0564f253
commit 2050c2dc7c
5 changed files with 14 additions and 23 deletions

View file

@ -118,20 +118,12 @@ class RecentringThing(Thing):
logging.info(
f"Breaking because the highest point is at {np.argmax(sorted_all_heights)} in the list"
)
# plt.plot(sorted_lateral, sorted_all_heights,'.')
# plt.plot(sorted_lateral, quad_fit_func(sorted_lateral))
# plt.show()
break
else:
if turning_loc < np.min(sorted_lateral):
moves = -1
elif turning_loc > np.max(sorted_lateral):
moves = 1
else:
# plt.plot(sorted_lateral, sorted_all_heights,'.')
# plt.plot(sorted_lateral, quad_fit_func(sorted_lateral))
# plt.show()
pass
if turning_loc < np.min(sorted_lateral):
moves = -1
elif turning_loc > np.max(sorted_lateral):
moves = 1
# Centre value is replaced by the maximum value recorded in that axis
centre[direction] = focused_pos[direction][np.argmax(all_heights)][

View file

@ -105,11 +105,12 @@ class JPEGSharpnessMonitor:
stop: int = int(np.argmax(jpeg_times > stage_times[1]))
except ValueError as e:
if np.sum(jpeg_times > stage_times[0]) == 0:
raise ValueError(
"No images were captured during the move of the stage. Perhaps the camera is not streaming images?"
) from e
else:
raise e
errmsg = (
"No images were captured during the move of the stage. "
"Perhaps the camera is not streaming images?"
)
raise ValueError(errmsg) from e
raise e
if stop < 1:
stop = len(jpeg_times)
logging.debug("changing stop to %s", (stop))

View file

@ -23,8 +23,7 @@ class BackgroundDetectThing(Thing):
bd = self.thing_settings.get("background_distributions", None)
if bd:
return ChannelDistributions(**bd)
else:
return None
return None
@background_distributions.setter
def background_distributions(self, value: Optional[ChannelDistributions]) -> None: