[v4,14/23] libtuning: Use the color member of the Image class
diff mbox series

Message ID 20240705144209.418906-15-stefan.klug@ideasonboard.com
State Accepted
Headers show
Series
  • Add ccm calibration to libtuning
Related show

Commit Message

Stefan Klug July 5, 2024, 2:41 p.m. UTC 
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 <stefan.klug@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
---
 utils/tuning/libtuning/ctt_awb.py | 2 +-
 utils/tuning/libtuning/ctt_ccm.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

Patch
diff mbox series 

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')
     """