From af011052ad3b3e98e1a4cc823646fa89914295b6 Mon Sep 17 00:00:00 2001 From: Anton Dukhovnikov Date: Fri, 5 Sep 2025 14:30:55 +1200 Subject: [PATCH] move camera files to data/camera/ Signed-off-by: Anton Dukhovnikov --- .../Arashi_Vision_Insta360_X5_380_780_5.json | 0 .../Canon_EOS-1D_X_Mark_II_380_780_5.json | 0 .../Canon_EOS-1Ds_Mark_III_380_780_5.json | 0 .../Canon_EOS-1Ds_Mark_II_380_780_5.json | 0 .../Canon_EOS_100D_380_780_5.json | 0 .../Canon_EOS_200D_380_780_5.json | 0 .../Canon_EOS_200D_II_380_780_5.json | 0 .../{ => camera}/Canon_EOS_5DS_380_780_5.json | 0 data/{ => camera}/Canon_EOS_5D_380_780_5.json | 0 .../Canon_EOS_5D_Mark_III_380_780_5.json | 0 .../Canon_EOS_5D_Mark_II_380_780_5.json | 0 .../Canon_EOS_5D_Mark_IV_380_780_5.json | 0 .../Canon_EOS_600D_380_780_5.json | 0 data/{ => camera}/Canon_EOS_M_380_780_5.json | 0 .../{ => camera}/Canon_EOS_R10_380_780_5.json | 0 data/{ => camera}/Canon_EOS_R5_380_780_5.json | 0 .../Canon_EOS_R5m2_380_780_5.json | 0 data/{ => camera}/Canon_EOS_R6_380_780_5.json | 0 data/{ => camera}/Canon_EOS_R_380_780_5.json | 0 .../{ => camera}/Fujifilm_X-T3_380_780_5.json | 0 .../{ => camera}/Fujifilm_X-T4_380_780_5.json | 0 .../Hasselblad_L1D-20c_380_780_5.json | 0 data/{ => camera}/Nikon_D3300_380_780_5.json | 0 data/{ => camera}/Nikon_D5300_380_780_5.json | 0 data/{ => camera}/Nikon_D800E_380_780_5.json | 0 data/{ => camera}/Nikon_D810_380_780_5.json | 0 data/{ => camera}/Nikon_D850_380_780_5.json | 0 data/{ => camera}/Nikon_Z_f_380_780_5.json | 0 .../Panasonic_DC-GX9_380_780_5.json | 0 .../Sony_DSC-RX100M4_380_780_5.json | 0 .../Sony_ILCE-6400_380_780_5.json | 0 .../Sony_ILCE-7CM2_380_780_5.json | 0 .../{ => camera}/Sony_ILCE-7M3_380_780_5.json | 0 .../{ => camera}/Sony_ILCE-7M4_380_780_5.json | 0 .../Sony_ILCE-7RM2_380_780_5.json | 0 .../Sony_ILCE-7RM3_380_780_5.json | 0 .../Sony_ILCE-7RM4_380_780_5.json | 0 .../Sony_ILCE-7SM2_380_780_5.json | 0 .../Sony_ILCE-7SM3_380_780_5.json | 0 data/{ => camera}/Sony_ILCE-9_380_780_5.json | 0 data/plot_curves.ipynb | 31 ++++++++++++------- 41 files changed, 20 insertions(+), 11 deletions(-) rename data/{ => camera}/Arashi_Vision_Insta360_X5_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS-1D_X_Mark_II_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS-1Ds_Mark_III_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS-1Ds_Mark_II_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_100D_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_200D_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_200D_II_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_5DS_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_5D_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_5D_Mark_III_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_5D_Mark_II_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_5D_Mark_IV_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_600D_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_M_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_R10_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_R5_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_R5m2_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_R6_380_780_5.json (100%) rename data/{ => camera}/Canon_EOS_R_380_780_5.json (100%) rename data/{ => camera}/Fujifilm_X-T3_380_780_5.json (100%) rename data/{ => camera}/Fujifilm_X-T4_380_780_5.json (100%) rename data/{ => camera}/Hasselblad_L1D-20c_380_780_5.json (100%) rename data/{ => camera}/Nikon_D3300_380_780_5.json (100%) rename data/{ => camera}/Nikon_D5300_380_780_5.json (100%) rename data/{ => camera}/Nikon_D800E_380_780_5.json (100%) rename data/{ => camera}/Nikon_D810_380_780_5.json (100%) rename data/{ => camera}/Nikon_D850_380_780_5.json (100%) rename data/{ => camera}/Nikon_Z_f_380_780_5.json (100%) rename data/{ => camera}/Panasonic_DC-GX9_380_780_5.json (100%) rename data/{ => camera}/Sony_DSC-RX100M4_380_780_5.json (100%) rename data/{ => camera}/Sony_ILCE-6400_380_780_5.json (100%) rename data/{ => camera}/Sony_ILCE-7CM2_380_780_5.json (100%) rename data/{ => camera}/Sony_ILCE-7M3_380_780_5.json (100%) rename data/{ => camera}/Sony_ILCE-7M4_380_780_5.json (100%) rename data/{ => camera}/Sony_ILCE-7RM2_380_780_5.json (100%) rename data/{ => camera}/Sony_ILCE-7RM3_380_780_5.json (100%) rename data/{ => camera}/Sony_ILCE-7RM4_380_780_5.json (100%) rename data/{ => camera}/Sony_ILCE-7SM2_380_780_5.json (100%) rename data/{ => camera}/Sony_ILCE-7SM3_380_780_5.json (100%) rename data/{ => camera}/Sony_ILCE-9_380_780_5.json (100%) diff --git a/data/Arashi_Vision_Insta360_X5_380_780_5.json b/data/camera/Arashi_Vision_Insta360_X5_380_780_5.json similarity index 100% rename from data/Arashi_Vision_Insta360_X5_380_780_5.json rename to data/camera/Arashi_Vision_Insta360_X5_380_780_5.json diff --git a/data/Canon_EOS-1D_X_Mark_II_380_780_5.json b/data/camera/Canon_EOS-1D_X_Mark_II_380_780_5.json similarity index 100% rename from data/Canon_EOS-1D_X_Mark_II_380_780_5.json rename to data/camera/Canon_EOS-1D_X_Mark_II_380_780_5.json diff --git a/data/Canon_EOS-1Ds_Mark_III_380_780_5.json b/data/camera/Canon_EOS-1Ds_Mark_III_380_780_5.json similarity index 100% rename from data/Canon_EOS-1Ds_Mark_III_380_780_5.json rename to data/camera/Canon_EOS-1Ds_Mark_III_380_780_5.json diff --git a/data/Canon_EOS-1Ds_Mark_II_380_780_5.json b/data/camera/Canon_EOS-1Ds_Mark_II_380_780_5.json similarity index 100% rename from data/Canon_EOS-1Ds_Mark_II_380_780_5.json rename to data/camera/Canon_EOS-1Ds_Mark_II_380_780_5.json diff --git a/data/Canon_EOS_100D_380_780_5.json b/data/camera/Canon_EOS_100D_380_780_5.json similarity index 100% rename from data/Canon_EOS_100D_380_780_5.json rename to data/camera/Canon_EOS_100D_380_780_5.json diff --git a/data/Canon_EOS_200D_380_780_5.json b/data/camera/Canon_EOS_200D_380_780_5.json similarity index 100% rename from data/Canon_EOS_200D_380_780_5.json rename to data/camera/Canon_EOS_200D_380_780_5.json diff --git a/data/Canon_EOS_200D_II_380_780_5.json b/data/camera/Canon_EOS_200D_II_380_780_5.json similarity index 100% rename from data/Canon_EOS_200D_II_380_780_5.json rename to data/camera/Canon_EOS_200D_II_380_780_5.json diff --git a/data/Canon_EOS_5DS_380_780_5.json b/data/camera/Canon_EOS_5DS_380_780_5.json similarity index 100% rename from data/Canon_EOS_5DS_380_780_5.json rename to data/camera/Canon_EOS_5DS_380_780_5.json diff --git a/data/Canon_EOS_5D_380_780_5.json b/data/camera/Canon_EOS_5D_380_780_5.json similarity index 100% rename from data/Canon_EOS_5D_380_780_5.json rename to data/camera/Canon_EOS_5D_380_780_5.json diff --git a/data/Canon_EOS_5D_Mark_III_380_780_5.json b/data/camera/Canon_EOS_5D_Mark_III_380_780_5.json similarity index 100% rename from data/Canon_EOS_5D_Mark_III_380_780_5.json rename to data/camera/Canon_EOS_5D_Mark_III_380_780_5.json diff --git a/data/Canon_EOS_5D_Mark_II_380_780_5.json b/data/camera/Canon_EOS_5D_Mark_II_380_780_5.json similarity index 100% rename from data/Canon_EOS_5D_Mark_II_380_780_5.json rename to data/camera/Canon_EOS_5D_Mark_II_380_780_5.json diff --git a/data/Canon_EOS_5D_Mark_IV_380_780_5.json b/data/camera/Canon_EOS_5D_Mark_IV_380_780_5.json similarity index 100% rename from data/Canon_EOS_5D_Mark_IV_380_780_5.json rename to data/camera/Canon_EOS_5D_Mark_IV_380_780_5.json diff --git a/data/Canon_EOS_600D_380_780_5.json b/data/camera/Canon_EOS_600D_380_780_5.json similarity index 100% rename from data/Canon_EOS_600D_380_780_5.json rename to data/camera/Canon_EOS_600D_380_780_5.json diff --git a/data/Canon_EOS_M_380_780_5.json b/data/camera/Canon_EOS_M_380_780_5.json similarity index 100% rename from data/Canon_EOS_M_380_780_5.json rename to data/camera/Canon_EOS_M_380_780_5.json diff --git a/data/Canon_EOS_R10_380_780_5.json b/data/camera/Canon_EOS_R10_380_780_5.json similarity index 100% rename from data/Canon_EOS_R10_380_780_5.json rename to data/camera/Canon_EOS_R10_380_780_5.json diff --git a/data/Canon_EOS_R5_380_780_5.json b/data/camera/Canon_EOS_R5_380_780_5.json similarity index 100% rename from data/Canon_EOS_R5_380_780_5.json rename to data/camera/Canon_EOS_R5_380_780_5.json diff --git a/data/Canon_EOS_R5m2_380_780_5.json b/data/camera/Canon_EOS_R5m2_380_780_5.json similarity index 100% rename from data/Canon_EOS_R5m2_380_780_5.json rename to data/camera/Canon_EOS_R5m2_380_780_5.json diff --git a/data/Canon_EOS_R6_380_780_5.json b/data/camera/Canon_EOS_R6_380_780_5.json similarity index 100% rename from data/Canon_EOS_R6_380_780_5.json rename to data/camera/Canon_EOS_R6_380_780_5.json diff --git a/data/Canon_EOS_R_380_780_5.json b/data/camera/Canon_EOS_R_380_780_5.json similarity index 100% rename from data/Canon_EOS_R_380_780_5.json rename to data/camera/Canon_EOS_R_380_780_5.json diff --git a/data/Fujifilm_X-T3_380_780_5.json b/data/camera/Fujifilm_X-T3_380_780_5.json similarity index 100% rename from data/Fujifilm_X-T3_380_780_5.json rename to data/camera/Fujifilm_X-T3_380_780_5.json diff --git a/data/Fujifilm_X-T4_380_780_5.json b/data/camera/Fujifilm_X-T4_380_780_5.json similarity index 100% rename from data/Fujifilm_X-T4_380_780_5.json rename to data/camera/Fujifilm_X-T4_380_780_5.json diff --git a/data/Hasselblad_L1D-20c_380_780_5.json b/data/camera/Hasselblad_L1D-20c_380_780_5.json similarity index 100% rename from data/Hasselblad_L1D-20c_380_780_5.json rename to data/camera/Hasselblad_L1D-20c_380_780_5.json diff --git a/data/Nikon_D3300_380_780_5.json b/data/camera/Nikon_D3300_380_780_5.json similarity index 100% rename from data/Nikon_D3300_380_780_5.json rename to data/camera/Nikon_D3300_380_780_5.json diff --git a/data/Nikon_D5300_380_780_5.json b/data/camera/Nikon_D5300_380_780_5.json similarity index 100% rename from data/Nikon_D5300_380_780_5.json rename to data/camera/Nikon_D5300_380_780_5.json diff --git a/data/Nikon_D800E_380_780_5.json b/data/camera/Nikon_D800E_380_780_5.json similarity index 100% rename from data/Nikon_D800E_380_780_5.json rename to data/camera/Nikon_D800E_380_780_5.json diff --git a/data/Nikon_D810_380_780_5.json b/data/camera/Nikon_D810_380_780_5.json similarity index 100% rename from data/Nikon_D810_380_780_5.json rename to data/camera/Nikon_D810_380_780_5.json diff --git a/data/Nikon_D850_380_780_5.json b/data/camera/Nikon_D850_380_780_5.json similarity index 100% rename from data/Nikon_D850_380_780_5.json rename to data/camera/Nikon_D850_380_780_5.json diff --git a/data/Nikon_Z_f_380_780_5.json b/data/camera/Nikon_Z_f_380_780_5.json similarity index 100% rename from data/Nikon_Z_f_380_780_5.json rename to data/camera/Nikon_Z_f_380_780_5.json diff --git a/data/Panasonic_DC-GX9_380_780_5.json b/data/camera/Panasonic_DC-GX9_380_780_5.json similarity index 100% rename from data/Panasonic_DC-GX9_380_780_5.json rename to data/camera/Panasonic_DC-GX9_380_780_5.json diff --git a/data/Sony_DSC-RX100M4_380_780_5.json b/data/camera/Sony_DSC-RX100M4_380_780_5.json similarity index 100% rename from data/Sony_DSC-RX100M4_380_780_5.json rename to data/camera/Sony_DSC-RX100M4_380_780_5.json diff --git a/data/Sony_ILCE-6400_380_780_5.json b/data/camera/Sony_ILCE-6400_380_780_5.json similarity index 100% rename from data/Sony_ILCE-6400_380_780_5.json rename to data/camera/Sony_ILCE-6400_380_780_5.json diff --git a/data/Sony_ILCE-7CM2_380_780_5.json b/data/camera/Sony_ILCE-7CM2_380_780_5.json similarity index 100% rename from data/Sony_ILCE-7CM2_380_780_5.json rename to data/camera/Sony_ILCE-7CM2_380_780_5.json diff --git a/data/Sony_ILCE-7M3_380_780_5.json b/data/camera/Sony_ILCE-7M3_380_780_5.json similarity index 100% rename from data/Sony_ILCE-7M3_380_780_5.json rename to data/camera/Sony_ILCE-7M3_380_780_5.json diff --git a/data/Sony_ILCE-7M4_380_780_5.json b/data/camera/Sony_ILCE-7M4_380_780_5.json similarity index 100% rename from data/Sony_ILCE-7M4_380_780_5.json rename to data/camera/Sony_ILCE-7M4_380_780_5.json diff --git a/data/Sony_ILCE-7RM2_380_780_5.json b/data/camera/Sony_ILCE-7RM2_380_780_5.json similarity index 100% rename from data/Sony_ILCE-7RM2_380_780_5.json rename to data/camera/Sony_ILCE-7RM2_380_780_5.json diff --git a/data/Sony_ILCE-7RM3_380_780_5.json b/data/camera/Sony_ILCE-7RM3_380_780_5.json similarity index 100% rename from data/Sony_ILCE-7RM3_380_780_5.json rename to data/camera/Sony_ILCE-7RM3_380_780_5.json diff --git a/data/Sony_ILCE-7RM4_380_780_5.json b/data/camera/Sony_ILCE-7RM4_380_780_5.json similarity index 100% rename from data/Sony_ILCE-7RM4_380_780_5.json rename to data/camera/Sony_ILCE-7RM4_380_780_5.json diff --git a/data/Sony_ILCE-7SM2_380_780_5.json b/data/camera/Sony_ILCE-7SM2_380_780_5.json similarity index 100% rename from data/Sony_ILCE-7SM2_380_780_5.json rename to data/camera/Sony_ILCE-7SM2_380_780_5.json diff --git a/data/Sony_ILCE-7SM3_380_780_5.json b/data/camera/Sony_ILCE-7SM3_380_780_5.json similarity index 100% rename from data/Sony_ILCE-7SM3_380_780_5.json rename to data/camera/Sony_ILCE-7SM3_380_780_5.json diff --git a/data/Sony_ILCE-9_380_780_5.json b/data/camera/Sony_ILCE-9_380_780_5.json similarity index 100% rename from data/Sony_ILCE-9_380_780_5.json rename to data/camera/Sony_ILCE-9_380_780_5.json diff --git a/data/plot_curves.ipynb b/data/plot_curves.ipynb index 20f5dd1..4cb3e63 100644 --- a/data/plot_curves.ipynb +++ b/data/plot_curves.ipynb @@ -16,7 +16,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 1, "metadata": {}, "outputs": [ { @@ -73,7 +73,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 2, "metadata": {}, "outputs": [], "source": [ @@ -103,7 +103,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 3, "metadata": { "tags": [] }, @@ -535,16 +535,25 @@ " plt.show()\n", " plt.close()\n", "\n", - "profiles = sorted(glob.glob('*.json'))\n", + "profiles = sorted(glob.glob('camera/*.json'))\n", "for profile in profiles:\n", " draw_curves(load_camera_data(profile))\n" ] }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 4, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stderr", + "output_type": "stream", + "text": [ + "/opt/homebrew/Caskroom/miniconda/base/lib/python3.12/site-packages/colour/utilities/verbose.py:322: ColourUsageWarning: \"colour.algebra.vector_dot\" object has been renamed to \"colour.algebra.vecmul\".\n", + " warn(*args, **kwargs) # noqa: B028\n" + ] + } + ], "source": [ "# Convert a spectral distribution to camera RGB space using the given CMFs and\n", "# illuminant.\n", @@ -783,7 +792,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 5, "metadata": {}, "outputs": [ { @@ -798,22 +807,22 @@ } ], "source": [ - "canon_5dmkiv = load_camera_data('Canon_EOS_5D_Mark_IV_380_780_5.json').align(SpectralShape(360, 830, 1))\n", + "canon_5dmkiv = load_camera_data('camera/Canon_EOS_5D_Mark_IV_380_780_5.json').align(SpectralShape(360, 830, 1))\n", "rgb_canon_5dmkiv_d65 = sd_to_CameraRGB(colour.sd_ones(), canon_5dmkiv, illuminant = sd_d65) / 100\n", "mtx_canon_5dmkiv = solve_matrix(canon_5dmkiv, sd_d65, sd_d65, rgb_canon_5dmkiv_d65)\n", "chart_canon_5dmkiv = create_chart(canon_5dmkiv, sd_d65, sd_d65, mtx_canon_5dmkiv, rgb_canon_5dmkiv_d65)\n", "\n", - "hasselblad_l1d = load_camera_data('Hasselblad_L1D-20c_380_780_5.json').align(SpectralShape(360, 830, 1))\n", + "hasselblad_l1d = load_camera_data('camera/Hasselblad_L1D-20c_380_780_5.json').align(SpectralShape(360, 830, 1))\n", "rgb_hasselblad_l1d_d65 = sd_to_CameraRGB(colour.sd_ones(), hasselblad_l1d, illuminant = sd_d65) / 100\n", "mtx_hasselblad_l1d = solve_matrix(hasselblad_l1d, sd_d65, sd_d65, rgb_hasselblad_l1d_d65)\n", "chart_hasselblad_l1d = create_chart(hasselblad_l1d, sd_d65, sd_d65, mtx_hasselblad_l1d, rgb_hasselblad_l1d_d65)\n", "\n", - "nikon_d850 = load_camera_data('Nikon_D850_380_780_5.json').align(SpectralShape(360, 830, 1))\n", + "nikon_d850 = load_camera_data('camera/Nikon_D850_380_780_5.json').align(SpectralShape(360, 830, 1))\n", "rgb_nikon_d850_d65 = sd_to_CameraRGB(colour.sd_ones(), nikon_d850, illuminant = sd_d65) / 100\n", "mtx_nikon_d850 = solve_matrix(nikon_d850, sd_d65, sd_d65, rgb_nikon_d850_d65)\n", "chart_nikon_d850 = create_chart(nikon_d850, sd_d65, sd_d65, mtx_nikon_d850, rgb_nikon_d850_d65)\n", "\n", - "sony_a7m3 = load_camera_data('Sony_ILCE-7M3_380_780_5.json').align(SpectralShape(360, 830, 1))\n", + "sony_a7m3 = load_camera_data('camera/Sony_ILCE-7M3_380_780_5.json').align(SpectralShape(360, 830, 1))\n", "rgb_sony_a7m3_d65 = sd_to_CameraRGB(colour.sd_ones(), sony_a7m3, illuminant = sd_d65) / 100\n", "mtx_sony_a7m3 = solve_matrix(sony_a7m3, sd_d65, sd_d65, rgb_sony_a7m3_d65)\n", "chart_sony_a7m3 = create_chart(sony_a7m3, sd_d65, sd_d65, mtx_sony_a7m3, rgb_sony_a7m3_d65)\n",