From 77b0b6dc6ef1d5f56dbd9d2761938bfea812682f Mon Sep 17 00:00:00 2001 From: Benjamin Loison <12752145+Benjamin-Loison@users.noreply.github.com> Date: Fri, 3 May 2024 01:59:39 +0200 Subject: [PATCH] Make `getMultipleColorsImage` also return `singleColorChannelImages` --- datasets/raise/attribute_source_camera.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/datasets/raise/attribute_source_camera.py b/datasets/raise/attribute_source_camera.py index a319024..934a813 100755 --- a/datasets/raise/attribute_source_camera.py +++ b/datasets/raise/attribute_source_camera.py @@ -58,11 +58,11 @@ def getImageFilePath(camera, cameraImageIndex): imageFilePath = f'{IMAGES_CAMERAS_FOLDER[camera]}/{imageFileName}' return imageFilePath -def getMultipleColorsImage(camera, cameraImageIndex): +def getSingleColorChannelAndMultipleColorsImage(camera, cameraImageIndex): imageFilePath = getImageFilePath(camera, cameraImageIndex) singleColorChannelImages = {color: rescaleIfNeeded(getColorChannel(imageFilePath, color)[:minimalColorChannelCameraResolution[0],:minimalColorChannelCameraResolution[1]], minColor, maxColor) for color in Color} multipleColorsImage = mergeSingleColorChannelImagesAccordingToBayerFilter(singleColorChannelImages) - return multipleColorsImage + return singleColorChannelImages, multipleColorsImage from utils import silentTqdm #tqdm = silentTqdm @@ -78,7 +78,7 @@ for computeExtremes in tqdm(([True] if minColor is None or maxColor is None else for cameraTestingImageIndex in tqdm(range(numberOfTestingImages), 'Camera testing image index'): print(f'{camera=} {numberOfTrainingImages + cameraTestingImageIndex=}') - multipleColorsImage = getMultipleColorsImage(camera, numberOfTrainingImages + cameraTestingImageIndex) + singleColorChannelImages, multipleColorsImage = getSingleColorChannelAndMultipleColorsImage(camera, numberOfTrainingImages + cameraTestingImageIndex) # Should make a function singleColorChannelDenoisedImages = {color: denoise(singleColorChannelImages[color], DENOISER) for color in Color} @@ -88,7 +88,7 @@ for computeExtremes in tqdm(([True] if minColor is None or maxColor is None else cameraTestingImagesNoise[camera] = cameraTestingImagesNoise.get(camera, []) + [imagePrnuEstimateNpArray] for cameraTrainingImageIndex in tqdm(range(minimumNumberOfImagesCameras if computeExtremes else numberOfTrainingImages), 'Camera training image index'): for cameraIndex, camera in enumerate(tqdm(IMAGES_CAMERAS_FOLDER, 'Camera')): - multipleColorsImage = getMultipleColorsImage(camera, cameraTrainingImageIndex) + singleColorChannelImages, multipleColorsImage = getSingleColorChannelAndMultipleColorsImage(camera, cameraTrainingImageIndex) if computeExtremes: minColor, maxColor = updateExtremes(multipleColorsImage, minColor, maxColor)