diff options
Diffstat (limited to 'utils/tuning/libtuning')
| -rw-r--r-- | utils/tuning/libtuning/ctt_awb.py | 2 | ||||
| -rw-r--r-- | 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 f3a1ce77..abf22321 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 c4362756..086ef8a2 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') """ |