Skip to content

Dark frame subtraction #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Dark frame subtraction #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a547763
Dark frame subtraction
russss Jan 5, 2025
33adb99
Replaced cv2.absdiff with cv2.subtract
TheMariday Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions marimapper/detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,12 @@ def set_cam_dark(cam: Camera, exposure: int) -> None:


def find_led(
cam: Camera, threshold: int = 128, display: bool = True
cam: Camera, threshold: int = 128, display: bool = True, dark_frame=None
) -> Optional[Point2D]:

image = cam.read()
if dark_frame is not None:
cv2.subtract(image, dark_frame, image)
results = find_led_in_image(image, threshold)

if display:
Expand All @@ -138,8 +140,10 @@ def enable_and_find_led(
display: bool = False,
) -> Optional[LED2D]:

dark_frame = cam.read()

# First wait for no leds to be visible
while find_led(cam, threshold, display) is not None:
while find_led(cam, threshold, display, dark_frame=dark_frame) is not None:
pass

# Set the led to on and start the clock
Expand All @@ -152,7 +156,7 @@ def enable_and_find_led(
while (
point is None and time.time() < response_time_start + timeout_controller.timeout
):
point = find_led(cam, threshold, display)
point = find_led(cam, threshold, display, dark_frame)

led_backend.set_led(led_id, False)

Expand All @@ -161,7 +165,7 @@ def enable_and_find_led(

timeout_controller.add_response_time(time.time() - response_time_start)

while find_led(cam, threshold, display) is not None:
while find_led(cam, threshold, display, dark_frame=dark_frame) is not None:
pass

return LED2D(led_id, view_id, point)
6 changes: 5 additions & 1 deletion marimapper/detector_process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,13 @@ def run(self):

# scan start here
set_cam_dark(cam, self._dark_exposure)
dark_frame = cam.read()

# Firstly, if there are leds visible, break out
if find_led(cam, self._threshold, self._display) is not None:
if (
find_led(cam, self._threshold, self._display, dark_frame=dark_frame)
is not None
):
logger.error(
"Detector process can detect an LED when no LEDs should be visible"
)
Expand Down
Loading