colour-science / colour

99%

develop: 99%

LAST BUILD ON BRANCH feature/cie2024_integration

branch: feature/cie2024_integration

CHANGE BRANCH

x

Reset

• feature/cie2024_integration
• develop
• docs/pre-commit
• feature/CLF
• feature/CLF_execution
• feature/PMC
• feature/ampas_io
• feature/apple_log_profile
• feature/barten_pupil_diameter
• feature/benchmarks
• feature/callback
• feature/callback_alternative
• feature/canon_log_v1.2
• feature/checks
• feature/cie2024_varnish
• feature/cie_xyy
• feature/cif_recommendation
• feature/colorchecker_sg
• feature/continuous_interpolation
• feature/continuous_ssi
• feature/copyless
• feature/coverage
• feature/delegate
• feature/devcontainer
• feature/diagrams_models
• feature/dimensionality_reduction
• feature/docstrings
• feature/domain-range-scale-annotations
• feature/fichet2021
• feature/flattened_hellwig2022
• feature/flattened_hellwig2022_linear_extension
• feature/flog2c
• feature/fujifilm_flog2
• feature/gamma_class
• feature/gamma_partials
• feature/graph
• feature/hyab_staging
• feature/hych
• feature/hych_staging
• feature/idt
• feature/isort
• feature/iterable_signal
• feature/jenv
• feature/line_locus
• feature/literals
• feature/lut_support_improvements
• feature/lut_write
• feature/metadata
• feature/mired
• feature/numpy-2
• feature/numpy_1_24_0
• feature/openimageio
• feature/openimageio-ci
• feature/osa-ucs
• feature/osa_ucs
• feature/plasa_ansi_e154
• feature/polar_conversions
• feature/pydot
• feature/pyproject_upgrade
• feature/pyright
• feature/pytest
• feature/python-3.12
• feature/python-3.13
• feature/qhull-regression
• feature/rayleigh
• feature/rayleigh_jeans_blackbody
• feature/reshape_sd_copy
• feature/rgb_xyz
• feature/robertson1968
• feature/ruff
• feature/scalar-type-aliases-staging
• feature/sd_gaussian
• feature/sd_reference_illum
• feature/sdiv
• feature/shape_from_array
• feature/small_labels
• feature/spow_bt1886
• feature/ssi
• feature/sucs-scam-staging
• feature/thin_film
• feature/tjdcs/v0.4.4
• feature/unit_tests
• feature/unittests
• feature/uv
• feature/v0.4.2
• feature/v0.4.3
• feature/v0.4.4
• feature/v0.4.5
• feature/v0.4.6
• feature/v0.4.7
• feature/vaab_colour
• feature/vk20
• feature/web_colours
• feature/wgpu
• feature/xdist-shenanigans
• feature/xiaomi_log_profile
• feature/xxhash
• feature/yrg
• feature_cct_improvements
• hych_staging
• maintenence/ctlrender
• maintenence/poetry_packages
• master
• performance/cfi2017
• performance/interpolation
• poetry_packages
• pre-commit-ci-update-config
• sd_to_xyz_integration_shape
• v0.4.2
• v0.4.3
• v0.4.4
• v0.4.5
• v0.4.6
• v0.4.7

Build # 13892706961

Build Type

push

github

Committed by web-flow

Commit Message

PR: Datasets: TCS: Adding TCS15 (#1337)

Datasets: TCS: Adding TCS15

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 #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 <christophm30@gmail.com>

* CRI: Fix integration of TCS15

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 <thomas.mansencal@gmail.com>
Signed-off-by: Christoph Müllner <christophm30@gmail.com>

---------

Signed-off-by: ... (continued)

Run Details

23 of 23 new or added lines in 5 files covered. (100.0%)

41620 of 41898 relevant lines covered (99.34%)

0.99 hits per line