From 561ec9d1e08f54908949daf27fb0a09f0677a524 Mon Sep 17 00:00:00 2001 From: Benjamin Loison Date: Sat, 27 Apr 2024 21:48:07 +0200 Subject: [PATCH] Add and use `escapeFilePath` --- datasets/raise/extract_noise.py | 4 ++-- datasets/raise/split_and_compare_prnus_of_subgroups.py | 4 ++-- datasets/raise/utils.py | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/datasets/raise/extract_noise.py b/datasets/raise/extract_noise.py index c63692e..8ccd865 100755 --- a/datasets/raise/extract_noise.py +++ b/datasets/raise/extract_noise.py @@ -7,12 +7,12 @@ import os from tqdm import tqdm import csv import rawpy -from utils import Color, denoise, iterativeMean, isARawImage +from utils import Color, denoise, iterativeMean, isARawImage, escapeFilePath import matplotlib.pyplot as plt from scipy.ndimage import gaussian_filter imagesFolderPath = 'rafael/arw' -imagesFolderPathFileName = imagesFolderPath.replace('/', '_') +imagesFolderPathFileName = escapeFilePath(imagesFolderPath) # Among: # `denoise` possible denoisers and `mean`. denoiser = 'mean' diff --git a/datasets/raise/split_and_compare_prnus_of_subgroups.py b/datasets/raise/split_and_compare_prnus_of_subgroups.py index 567fb36..195c15d 100755 --- a/datasets/raise/split_and_compare_prnus_of_subgroups.py +++ b/datasets/raise/split_and_compare_prnus_of_subgroups.py @@ -4,7 +4,7 @@ from PIL import Image import numpy as np import matplotlib.pyplot as plt from tqdm import tqdm -from utils import denoise, iterativeMean +from utils import denoise, iterativeMean, escapeFilePath from skimage import img_as_float import sys import os @@ -18,7 +18,7 @@ NUMBER_OF_SUBGROUPS = 2 DENOISER = 'wavelet' IMAGES_FOLDER = 'flat-field/TIF' -setting = IMAGES_FOLDER.replace('/', '_') + f'_{DENOISER}' +setting = escapeFilePath(IMAGES_FOLDER) + f'_{DENOISER}' imagesFileNames = os.listdir(IMAGES_FOLDER) # To not have a bias (chronological for instance) when split to make subgroups. diff --git a/datasets/raise/utils.py b/datasets/raise/utils.py index bed7f50..eff109a 100644 --- a/datasets/raise/utils.py +++ b/datasets/raise/utils.py @@ -69,4 +69,7 @@ def getRawColorChannel(raw, color): return imageNpArray def isARawImage(imageFilePath): - return any([imageFileName.lower().endswith(f'.{rawImageFileExtension}') for rawImageFileExtension in RAW_IMAGE_FILE_EXTENSIONS]) \ No newline at end of file + return any([imageFileName.lower().endswith(f'.{rawImageFileExtension}') for rawImageFileExtension in RAW_IMAGE_FILE_EXTENSIONS]) + +def escapeFilePath(filePath): + return filePath.replace('/', '_') \ No newline at end of file