PR: Add *FilmLight E-Gamut 2*. (#1323)

* Add Filmlight E-Gamut 2

* Combine E-Gamut imports

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Lower E-Gamut 2 matrix tolerance

* Revert copyright date in `colour.models.rgb.datasets.filmlight.py` module.

* Update `colour.models.RGB_COLOURSPACE_FILMLIGHT_E_GAMUT_2` attribute reference.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Thomas Mansencal <[email protected]>

Author: 3 people

colour/models/__init__.py

@@ -306,6 +306,7 @@
     RGB_COLOURSPACE_EKTA_SPACE_PS_5,
     RGB_COLOURSPACE_ERIMM_RGB,
     RGB_COLOURSPACE_FILMLIGHT_E_GAMUT,
+    RGB_COLOURSPACE_FILMLIGHT_E_GAMUT_2,
     RGB_COLOURSPACE_F_GAMUT,
     RGB_COLOURSPACE_G18_REC709_SCENE,
     RGB_COLOURSPACE_G22_ADOBERGB_SCENE,
@@ -849,6 +850,7 @@
     "RGB_COLOURSPACE_EKTA_SPACE_PS_5",
     "RGB_COLOURSPACE_ERIMM_RGB",
     "RGB_COLOURSPACE_FILMLIGHT_E_GAMUT",
+    "RGB_COLOURSPACE_FILMLIGHT_E_GAMUT_2",
     "RGB_COLOURSPACE_F_GAMUT",
     "RGB_COLOURSPACE_F_GAMUT_C",
     "RGB_COLOURSPACE_G18_REC709_SCENE",

colour/models/rgb/__init__.py

@@ -201,6 +201,7 @@
     RGB_COLOURSPACE_EKTA_SPACE_PS_5,
     RGB_COLOURSPACE_ERIMM_RGB,
     RGB_COLOURSPACE_FILMLIGHT_E_GAMUT,
+    RGB_COLOURSPACE_FILMLIGHT_E_GAMUT_2,
     RGB_COLOURSPACE_F_GAMUT,
     RGB_COLOURSPACE_G18_REC709_SCENE,
     RGB_COLOURSPACE_G22_ADOBERGB_SCENE,
@@ -487,6 +488,7 @@
     "RGB_COLOURSPACE_EKTA_SPACE_PS_5",
     "RGB_COLOURSPACE_ERIMM_RGB",
     "RGB_COLOURSPACE_FILMLIGHT_E_GAMUT",
+    "RGB_COLOURSPACE_FILMLIGHT_E_GAMUT_2",
     "RGB_COLOURSPACE_F_GAMUT",
     "RGB_COLOURSPACE_F_GAMUT_C",
     "RGB_COLOURSPACE_G18_REC709_SCENE",

colour/models/rgb/datasets/__init__.py

@@ -32,7 +32,10 @@
 from .ebu_3213_e import RGB_COLOURSPACE_EBU_3213_E
 from .eci_rgb_v2 import RGB_COLOURSPACE_ECI_RGB_V2
 from .ekta_space_ps5 import RGB_COLOURSPACE_EKTA_SPACE_PS_5
-from .filmlight_e_gamut import RGB_COLOURSPACE_FILMLIGHT_E_GAMUT
+from .filmlight import (
+    RGB_COLOURSPACE_FILMLIGHT_E_GAMUT,
+    RGB_COLOURSPACE_FILMLIGHT_E_GAMUT_2,
+)
 from .gopro import RGB_COLOURSPACE_PROTUNE_NATIVE
 from .itur_bt_470 import RGB_COLOURSPACE_BT470_525, RGB_COLOURSPACE_BT470_625
 from .itur_bt_709 import RGB_COLOURSPACE_BT709
@@ -159,6 +162,7 @@
     "RGB_COLOURSPACE_ECI_RGB_V2",
     "RGB_COLOURSPACE_EKTA_SPACE_PS_5",
     "RGB_COLOURSPACE_FILMLIGHT_E_GAMUT",
+    "RGB_COLOURSPACE_FILMLIGHT_E_GAMUT_2",
     "RGB_COLOURSPACE_PROTUNE_NATIVE",
     "RGB_COLOURSPACE_MAX_RGB",
     "RGB_COLOURSPACE_N_GAMUT",

colour/models/rgb/datasets/filmlight_e_gamut.py renamed to colour/models/rgb/datasets/filmlight.py

@@ -1,15 +1,19 @@
 """
-FilmLight E-Gamut Colourspace
-=============================
+FilmLight Colourspaces
+======================
 
-Define the *FilmLight E-Gamut* colourspace:
+Define the *FilmLight* colourspaces:
 
 -   :attr:`colour.models.RGB_COLOURSPACE_FILMLIGHT_E_GAMUT`.
+-   :attr:`colour.models.RGB_COLOURSPACE_FILMLIGHT_E_GAMUT_2`.
 
 References
 ----------
 -   :cite:`Siragusano2018a` : Siragusano, D. (2018). Private Discussion with
     Shaw, Nick.
+-   :cite:`Siragusano2025` : Siragusano, D. (2025). Private discussion on
+    colour-science Discord server. https://discord.com/channels/\
+    1269935627386884106/1269935628808622102/1325770472058523668
 """
 
 from __future__ import annotations
@@ -44,6 +48,10 @@
     "MATRIX_FILMLIGHT_E_GAMUT_TO_XYZ",
     "MATRIX_XYZ_TO_FILMLIGHT_E_GAMUT",
     "RGB_COLOURSPACE_FILMLIGHT_E_GAMUT",
+    "PRIMARIES_FILMLIGHT_E_GAMUT_2",
+    "MATRIX_FILMLIGHT_E_GAMUT_2_TO_XYZ",
+    "MATRIX_XYZ_TO_FILMLIGHT_E_GAMUT_2",
+    "RGB_COLOURSPACE_FILMLIGHT_E_GAMUT_2",
 ]
 
 PRIMARIES_FILMLIGHT_E_GAMUT: NDArrayFloat = np.array(
@@ -90,3 +98,44 @@
 ----------
 :cite:`Siragusano2018a`
 """
+
+PRIMARIES_FILMLIGHT_E_GAMUT_2: NDArrayFloat = np.array(
+    [
+        [0.8300, 0.3100],
+        [0.1500, 0.9500],
+        [0.0650, -0.0805],
+    ]
+)
+"""*FilmLight E-Gamut 2* colourspace primaries."""
+
+MATRIX_FILMLIGHT_E_GAMUT_2_TO_XYZ: NDArrayFloat = np.array(
+    [
+        [0.736478, 0.130740, 0.083239],
+        [0.275070, 0.828018, -0.103088],
+        [-0.124225, -0.087160, 1.300443],
+    ]
+)
+"""*FilmLight E-Gamut 2* colourspace to *CIE XYZ* tristimulus values matrix."""
+
+MATRIX_XYZ_TO_FILMLIGHT_E_GAMUT_2: NDArrayFloat = np.linalg.inv(
+    MATRIX_FILMLIGHT_E_GAMUT_2_TO_XYZ
+)
+"""*CIE XYZ* tristimulus values to *FilmLight E-Gamut 2* colourspace matrix."""
+
+RGB_COLOURSPACE_FILMLIGHT_E_GAMUT_2: RGB_Colourspace = RGB_Colourspace(
+    "FilmLight E-Gamut 2",
+    PRIMARIES_FILMLIGHT_E_GAMUT_2,
+    CCS_WHITEPOINT_FILMLIGHT_E_GAMUT,
+    WHITEPOINT_NAME_FILMLIGHT_E_GAMUT,
+    MATRIX_FILMLIGHT_E_GAMUT_2_TO_XYZ,
+    MATRIX_XYZ_TO_FILMLIGHT_E_GAMUT_2,
+    log_encoding_FilmLightTLog,
+    log_decoding_FilmLightTLog,
+)
+RGB_COLOURSPACE_FILMLIGHT_E_GAMUT_2.__doc__ = """
+*FilmLight E-Gamut 2* colourspace.
+
+References
+----------
+:cite:`Siragusano2025`
+"""

colour/models/rgb/datasets/tests/test__init__.py

@@ -41,6 +41,7 @@ def test_transformation_matrices(self) -> None:
             "ARRI Wide Gamut 3": 1e-6,
             "DJI D-Gamut": 5e-4,
             "ERIMM RGB": 1e-3,
+            "FilmLight E-Gamut 2": 1e-6,
             "Gamma 2.2 Encoded AdobeRGB": 1e-5,
             "Linear AdobeRGB": 1e-5,
             "ProPhoto RGB": 1e-3,