From patchwork Wed Jul 3 14:17:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 20528 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id DAD9BBEFBE for ; Wed, 3 Jul 2024 14:18:19 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3EF0263368; Wed, 3 Jul 2024 16:18:19 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="P5U/Hlb2"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C2FF363363 for ; Wed, 3 Jul 2024 16:18:14 +0200 (CEST) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:9263:c199:9587:576]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 968334CA; Wed, 3 Jul 2024 16:17:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1720016266; bh=5MpIYAHJLL4DqpfdN0/TluQv04AANiSdXaGOkaHuJ4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P5U/Hlb2RHlchdtw7N0/txyyOTF+MrIIF+K/dw7rBgu5b3l9q/At2VN1gmOzry3Ej efHf0cpZwR2lXfstem3twNKbhx5o6SoMGOxe0Gj5gjU/3DQZ007thbMrJBHFHberlQ zZrLfxfoHNhudeQB2PRW7scDvGrCXTxNv6LnUvLI= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug , Laurent Pinchart Subject: [PATCH v3 14/23] libtuning: Use the color member of the Image class Date: Wed, 3 Jul 2024 16:17:03 +0200 Message-ID: <20240703141726.252368-15-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240703141726.252368-1-stefan.klug@ideasonboard.com> References: <20240703141726.252368-1-stefan.klug@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" In the Image class the variable holding the color temperature is named color instead of col which was used by the raspberry pi scripts. Rename accordingly. Signed-off-by: Stefan Klug Reviewed-by: Laurent Pinchart Reviewed-by: Paul Elder --- utils/tuning/libtuning/ctt_awb.py | 2 +- utils/tuning/libtuning/ctt_ccm.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/tuning/libtuning/ctt_awb.py b/utils/tuning/libtuning/ctt_awb.py index f3a1ce779e21..abf22321a0ea 100644 --- a/utils/tuning/libtuning/ctt_awb.py +++ b/utils/tuning/libtuning/ctt_awb.py @@ -313,7 +313,7 @@ def get_alsc_patches(Img, colour_cals, grey=True): g_patchs = (patches[1][3::4]+patches[2][3::4])/2 - Img.blacklevel_16 else: cen_coords = Img.cen_coords - col = Img.col + col = Img.color patches = [np.array(Img.patches[i]) for i in Img.order] r_patchs = patches[0] - Img.blacklevel_16 b_patchs = patches[3] - Img.blacklevel_16 diff --git a/utils/tuning/libtuning/ctt_ccm.py b/utils/tuning/libtuning/ctt_ccm.py index c4362756c3c0..086ef8a2580b 100644 --- a/utils/tuning/libtuning/ctt_ccm.py +++ b/utils/tuning/libtuning/ctt_ccm.py @@ -249,7 +249,7 @@ def ccm(Cam, cal_cr_list, cal_cb_list): logger.info(f'delta E optimized: average: {after_average:.2f} max:{new_worst_delta_e:.2f}') logger.info(f'delta E old: average: {before_average:.2f} max:{old_worst_delta_e:.2f}') - visualise_macbeth_chart(m_rgb, optimised_ccm_rgb, after_gamma_rgb, str(Img.col) + str(matrix_selection_types[typenum])) + visualise_macbeth_chart(m_rgb, optimised_ccm_rgb, after_gamma_rgb, str(Img.color) + str(matrix_selection_types[typenum])) ''' The program will also save some visualisations of improvements. Very pretty to look at. Top rectangle is ideal, Left square is @@ -260,10 +260,10 @@ def ccm(Cam, cal_cr_list, cal_cb_list): if a ccm has already been calculated for that temperature then don't overwrite but save both. They will then be averaged later on """ # Now going to use optimised color matrix, optimised_ccm - if Img.col in ccm_tab.keys(): - ccm_tab[Img.col].append(optimised_ccm) + if Img.color in ccm_tab.keys(): + ccm_tab[Img.color].append(optimised_ccm) else: - ccm_tab[Img.col] = [optimised_ccm] + ccm_tab[Img.color] = [optimised_ccm] logger.info('Finished processing images') """