Remove implicit getColorMeans denoiser argument

This commit is contained in:
Benjamin Loison 2024-05-03 03:39:57 +02:00
parent 0c429aa4d6
commit 9fd44debf5
No known key found for this signature in database
3 changed files with 4 additions and 4 deletions

View File

@ -74,7 +74,7 @@ def getImagePrnuEstimateNpArray(singleColorChannelImages, multipleColorsImage, c
return imagePrnuEstimateNpArray
imagesCamerasFilePaths = {camera: [f'{IMAGES_CAMERAS_FOLDER[camera]}/{imagesCamerasFileName}' for imagesCamerasFileName in imagesCamerasFileNames[camera]] for camera in imagesCamerasFileNames}
cameraColorMeans = {camera: getColorMeans(imagesCamerasFilePaths[camera], Color, DENOISER, minimalColorChannelCameraResolution) for camera in imagesCamerasFilePaths}
cameraColorMeans = {camera: getColorMeans(imagesCamerasFilePaths[camera], Color, minimalColorChannelCameraResolution) for camera in imagesCamerasFilePaths}
from utils import silentTqdm
#tqdm = silentTqdm

View File

@ -80,7 +80,7 @@ if (minColor is None or maxColor is None) and DENOISER != 'mean':
print(f'{maxColor=}')
if DENOISER == 'mean':
colorMeans = getColorMeans(imagesFileNames, COLORS, DENOISER)
colorMeans = getColorMeans(imagesFileNames, COLORS)
for color in Color:
colorMeans[color] = colorMeans[color]
fileName = f'mean_{imagesFolderPathFileName}_{color}'

View File

@ -132,12 +132,12 @@ def updateExtremes(imageNpArray, minColor, maxColor):
def print(*toPrint):
__builtin__.print(datetime.now(), *toPrint)
def getColorMeans(imagesFileNames, colors, denoiser, singleColorChannelCropResolution = None):
def getColorMeans(imagesFileNames, colors, singleColorChannelCropResolution = None):
colorMeans = {}
for color in colors:
colorIterativeMean = iterativeMean()
for imageFileName in tqdm(imagesFileNames, f'Computing mean of {color} colored images'):
imageNpArray = getImageNpArray(imageFileName, False, color, denoiser)
imageNpArray = getImageNpArray(imageFileName, False, color, 'mean')
if singleColorChannelCropResolution is not None:
imageNpArray = getImageCrop(imageNpArray, singleColorChannelCropResolution)
imageNpArray = gaussian_filter(imageNpArray, sigma = 5)