[{"id":30304,"web_url":"https://patchwork.libcamera.org/comment/30304/","msgid":"","date":"2024-07-04T09:42:25","subject":"Re: [PATCH v3 14/23] libtuning: Use the color member of the Image\n\tclass","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"On Wed, Jul 03, 2024 at 04:17:03PM +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> Reviewed-by: Laurent Pinchart \n\nReviewed-by: Paul Elder \n\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> 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> \"\"\"\n> -- \n> 2.43.0\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 77589BD87C\n\tfor ;\n\tThu, 4 Jul 2024 09:42:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3A75462E22;\n\tThu, 4 Jul 2024 11:42:34 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3AC0C619C4\n\tfor ;\n\tThu, 4 Jul 2024 11:42:32 +0200 (CEST)","from pyrite.rasen.tech (h175-177-049-156.catv02.itscom.jp\n\t[175.177.49.156])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 51DD93A2;\n\tThu, 4 Jul 2024 11:42:02 +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=\"Pedp0E9K\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1720086123;\n\tbh=5BcAocHetqKo0LJOKhh/QBjweMen4HHgw/yw7o7hAos=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Pedp0E9KnRNp+igtXy/aANV/jwHAmBvNPyKH3nKvN60KxeHW/rG8zCUQ94+W/cMkE\n\tMXT/w13rz3uPHAlk2buPBBF8Ki6+9DE5yaCAH5L0bn9NBdYjQwhrkVMmQfY+ZRW9Q0\n\tLVpFvg2vJ7b2tuuQAagEnttYareclPH2snMnpSgw=","Date":"Thu, 4 Jul 2024 18:42:25 +0900","From":"Paul Elder ","To":"Stefan Klug ","Cc":"libcamera-devel@lists.libcamera.org,\n\tLaurent Pinchart ","Subject":"Re: [PATCH v3 14/23] libtuning: Use the color member of the Image\n\tclass","Message-ID":"","References":"<20240703141726.252368-1-stefan.klug@ideasonboard.com>\n\t<20240703141726.252368-15-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20240703141726.252368-15-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\" "}}]