[{"id":30137,"web_url":"https://patchwork.libcamera.org/comment/30137/","msgid":"<20240628232220.GK30900@pendragon.ideasonboard.com>","date":"2024-06-28T23:22:20","subject":"Re: [PATCH v2 13/25] libtuning: Use the color member of the Image\n\tclass","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Stefan,\n\nThank you for the patch.\n\nOn Fri, Jun 28, 2024 at 12:47:06PM +0200, Stefan Klug wrote:\n> In the Image class the variable holding the color temperature is named\n> color instead of col which was used by the raspberry pi scripts. Rename\n> accordingly.\n> \n> Signed-off-by: Stefan Klug \n> ---\n> utils/tuning/libtuning/ctt_awb.py | 2 +-\n> utils/tuning/libtuning/ctt_ccm.py | 8 ++++----\n> 2 files changed, 5 insertions(+), 5 deletions(-)\n> \n> diff --git a/utils/tuning/libtuning/ctt_awb.py b/utils/tuning/libtuning/ctt_awb.py\n> index f3a1ce779e21..abf22321a0ea 100644\n> --- a/utils/tuning/libtuning/ctt_awb.py\n> +++ b/utils/tuning/libtuning/ctt_awb.py\n> @@ -313,7 +313,7 @@ def get_alsc_patches(Img, colour_cals, grey=True):\n> g_patchs = (patches[1][3::4]+patches[2][3::4])/2 - Img.blacklevel_16\n> else:\n> cen_coords = Img.cen_coords\n> - col = Img.col\n> + col = Img.color\n\nWe should rename the local col variable to color, as 'col' is ambiguous\nand can mean column. In another patch of course.\n\nReviewed-by: Laurent Pinchart \n\n> patches = [np.array(Img.patches[i]) for i in Img.order]\n> r_patchs = patches[0] - Img.blacklevel_16\n> b_patchs = patches[3] - Img.blacklevel_16\n> diff --git a/utils/tuning/libtuning/ctt_ccm.py b/utils/tuning/libtuning/ctt_ccm.py\n> index c4362756c3c0..086ef8a2580b 100644\n> --- a/utils/tuning/libtuning/ctt_ccm.py\n> +++ b/utils/tuning/libtuning/ctt_ccm.py\n> @@ -249,7 +249,7 @@ def ccm(Cam, cal_cr_list, cal_cb_list):\n> logger.info(f'delta E optimized: average: {after_average:.2f} max:{new_worst_delta_e:.2f}')\n> logger.info(f'delta E old: average: {before_average:.2f} max:{old_worst_delta_e:.2f}')\n> \n> - visualise_macbeth_chart(m_rgb, optimised_ccm_rgb, after_gamma_rgb, str(Img.col) + str(matrix_selection_types[typenum]))\n> + visualise_macbeth_chart(m_rgb, optimised_ccm_rgb, after_gamma_rgb, str(Img.color) + str(matrix_selection_types[typenum]))\n> '''\n> The program will also save some visualisations of improvements.\n> Very pretty to look at. Top rectangle is ideal, Left square is\n> @@ -260,10 +260,10 @@ def ccm(Cam, cal_cr_list, cal_cb_list):\n> if a ccm has already been calculated for that temperature then don't\n> overwrite but save both. They will then be averaged later on\n> \"\"\" # Now going to use optimised color matrix, optimised_ccm\n> - if Img.col in ccm_tab.keys():\n> - ccm_tab[Img.col].append(optimised_ccm)\n> + if Img.color in ccm_tab.keys():\n> + ccm_tab[Img.color].append(optimised_ccm)\n> else:\n> - ccm_tab[Img.col] = [optimised_ccm]\n> + ccm_tab[Img.color] = [optimised_ccm]\n> \n> logger.info('Finished processing images')\n> \"\"\"","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 19DF1BD87C\n\tfor ;\n\tFri, 28 Jun 2024 23:22:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 59C9F62C9B;\n\tSat, 29 Jun 2024 01:22:42 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B074B62C95\n\tfor ;\n\tSat, 29 Jun 2024 01:22:41 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8764C63B;\n\tSat, 29 Jun 2024 01:22:16 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"lqZL58ON\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719616936;\n\tbh=FiBe3j54D7W1KvduTI+EsmsOnFsu5acWvWrldZur9dA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=lqZL58ONIDEEo2iRnZ3QlaJl69nSCwrGdIBBi3ciRUkMwpAYqyxBfbyRi5Ff1b6eY\n\tVfH7v7b9+ZuTJok3/KE00v0e8HzEJDGSojBYiUQj+1dkH/QmLvHDTKBodw/CosA4ji\n\tfWxezQoBFsh7ULAx5PiOW3E0uYk1XRTzfmu+1dLI=","Date":"Sat, 29 Jun 2024 02:22:20 +0300","From":"Laurent Pinchart ","To":"Stefan Klug ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v2 13/25] libtuning: Use the color member of the Image\n\tclass","Message-ID":"<20240628232220.GK30900@pendragon.ideasonboard.com>","References":"<20240628104828.2928109-1-stefan.klug@ideasonboard.com>\n\t<20240628104828.2928109-14-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20240628104828.2928109-14-stefan.klug@ideasonboard.com>","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]