-
-
Notifications
You must be signed in to change notification settings - Fork 268
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
datasets: TCS: Adding TCS15 #1337
base: develop
Are you sure you want to change the base?
Conversation
Force-pushed the following changes:
|
Hi @cmuellner, Thank you! The image io related tests failure is related to the fact that you probably don't have the Freeimage backend installed: The spectral uniformity tests are on the other hand a side effect to the fact you added a new TCS sample which leads me to the following point: We should not modify the existing samples because this will change CRI and everything that depends on it. What we should probably do instead is:
Let me know if that makes sense! Cheers, Thomas |
TCS15 was added to the CIE 1995 test color samples to get a better representation of the Japanese skin complexion. This commit adds this color sample and adjust the CRI test file to pass. Note, that the TCS15 dataset is published from 380-780 nm in 5 nm increments. This differs from all other TCS data, which is published from 360-830 nm (also in 5 nm increments). The integration of TCS15 in this commit is breaking existing code, which can be observed in the following regressions: * FAILED colour/colorimetry/tests/test_uniformity.py::TestSpectralUniformity::test_spectral_uniformity * FAILED colour/colorimetry/uniformity.py::colour.colorimetry.uniformity.spectral_uniformity The integration is addressed in a following commit. Source of data is the CIE's open access dataset page: https://www.cie.co.at/datatable/spectral-radiance-factors-test-colour-sample-15-japanese-skin-complexion-5nm-wavelength Data source reference: CIE 2024, Spectral radiance factors of test-colour sample colour-science#15 of the Japanese skin complexion, 5nm wavelength steps, International Commission on Illumination (CIE), Vienna, AT, DOI: 10.25039/CIE.DS.7chm7z5h Signed-off-by: Christoph Müllner <[email protected]>
530b93a
to
3efe76c
Compare
Yes, this fixed the failing tests.
Thanks for this advice! Please have a look at the changes (especially: is the naming of PR is rebased and all tests pass. |
92067ee
to
3f073f4
Compare
This commit fixes the TCS15 integration with the following steps: * Adding COLOUR_RENDERING_INDEX_METHODS to switch between "CIE 1995" and "CIE 2024" TCS sets * Introduce `SDS_TCS_SETS` to get the TCS set for the desired method * Introduce SDS_TCS_CIE_1995 (was SDS_TCS before) SDS_TCS_CIE_2024 * Add new parameter `method` to colour.colour_rendering_index to select the TCS set * Add a test for this new `method` parameter * Adjust the docs to reflect these changes with inspiration from the symbols exported by the CQS module Suggested-by: Thomas Mansencal <[email protected]> Signed-off-by: Christoph Müllner <[email protected]>
Summary
TCS15 was added to the CIE 1995 test color samples to get a better representation of the Japanese skin complexion.
This commit adds this color sample and adjust the CRI test file accordingly.
Note, that the TCS15 dataset is published from 380-780 nm in 5 nm increments. This differs from all other TCS data, which is published from 360-830 nm (also in 5 nm increments).
Source of data is the CIE's open access dataset page: https://www.cie.co.at/datatable/spectral-radiance-factors-test-colour-sample-15-japanese-skin-complexion-5nm-wavelength
Data source reference:
CIE 2024, Spectral radiance factors of test-colour sample #15 of the Japanese skin complexion, 5nm wavelength steps, International Commission on Illumination (CIE), Vienna, AT, DOI: 10.25039/CIE.DS.7chm7z5h
Preflight
Code Style and Quality
colour
,colour.models
.I observed the following fails on the
develop
branch (06edf82f054
with no changes on top) on my Fedora 41 (x86-64) machine:This commit seems to trigger the following additional fails, but I cannot find an obvious reason for that:
The pre-commit hook triggers the error
RuntimeError: failed to find interpreter for Builtin discover of python_spec='python3.10'
.Documentation