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

Merge branch 'master' into auto-exposure-gain-awb

Browse source
This commit is contained in:
Richard Bowman 2021-04-21 12:10:47 +01:00
commit 1f1a75c02a
13 changed files with 1848 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openflexure_microscope/api/default_extensions/picamera_autocalibrate/recalibrate_utils.py
View file

@ -205,7 +205,7 @@ def lst_from_channels(channels: np.ndarray) -> np.ndarray:
logging.info("Generating a lens shading table at %sx%s", *lst_resolution)
lens_shading: np.ndarray = np.zeros(
[channels.shape[0]] + lst_resolution, dtype=np.float
[channels.shape[0]] + lst_resolution, dtype=float
)
for i in range(lens_shading.shape[0]):
image_channel: np.ndarray = channels[i, :, :]
@ -297,7 +297,7 @@ def recalibrate_camera(camera: PiCamera):
_ = rgb_image(camera)
# Fix the AWB gains so the image is neutral
channel_means = np.mean(np.mean(rgb_image(camera), axis=0, dtype=np.float), axis=0)
channel_means = np.mean(np.mean(rgb_image(camera), axis=0, dtype=float), axis=0)
old_gains = camera.awb_gains
camera.awb_gains = (
channel_means[1] / channel_means[0] * old_gains[0],