rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply suggestions from code review of branch reorganise-picamera-tuning-and-recal

Browse source 
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
This commit is contained in:
Julian Stirling 2025-09-18 10:25:05 +00:00
parent 2ba8f3d6fb
commit ca66234379
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/openflexure_microscope_server/things/camera/picamera_recalibrate_utils.py
View file

@ -90,7 +90,7 @@ IMX477_SENSOR_INFO = SensorInfo(
blacklevel=256, blacklevel=256,
default_target_white_level=2800, default_target_white_level=2800,
short_pause=0.2, short_pause=0.2,
long_pause=0.5, long_pause=1.0,
) )
@ -116,7 +116,7 @@ def adjust_shutter_and_gain_from_raw(
sensor bit depth. We recommend values of 700 for 10-bit sensors and 2800 for sensor bit depth. We recommend values of 700 for 10-bit sensors and 2800 for
12-bit sensors. This is about 70% of saturated once the blacklevel is 12-bit sensors. This is about 70% of saturated once the blacklevel is
subtracted. The maximum possible value depends on the sensor bit depth, the subtracted. The maximum possible value depends on the sensor bit depth, the
sensor blackleve, the tolerance argument. sensor blacklevel and the tolerance argument.
:param max_iterations: We will terminate once we perform this many iterations, :param max_iterations: We will terminate once we perform this many iterations,
whether or not we converge. More than 10 shouldn't happen. whether or not we converge. More than 10 shouldn't happen.
:param tolerance: How close to the target value we consider "done". Expressed as a :param tolerance: How close to the target value we consider "done". Expressed as a
@ -127,6 +127,7 @@ def adjust_shutter_and_gain_from_raw(
than just ``np.max()``. than just ``np.max()``.
""" """
# Calculate the maximum possible pixel value once blacklevel is subtracted.
max_level = 2**sensor_info.bit_depth - 1 - sensor_info.blacklevel max_level = 2**sensor_info.bit_depth - 1 - sensor_info.blacklevel
if target_white_level * (tolerance + 1) >= max_level: if target_white_level * (tolerance + 1) >= max_level:
raise ValueError( raise ValueError(