diff --git a/README.rst b/README.rst index 4666ba37d2..a7b6787fd7 100644 --- a/README.rst +++ b/README.rst @@ -287,7 +287,7 @@ Spectral Computations .. code-block:: python - >>> colour.sd_to_XYZ(colour.LIGHT_SOURCES_SDS['Neodimium Incandescent']) + >>> colour.sd_to_XYZ(colour.LIGHT_SOURCE_SDS['Neodimium Incandescent']) array([ 36.94726204, 32.62076174, 13.0143849 ]) >>> sorted(colour.SPECTRAL_TO_XYZ_METHODS.keys()) ['ASTM E308', 'Integration', 'astm2015'] @@ -424,13 +424,13 @@ Luminous Flux, Efficiency & Efficacy Computation .. code-block:: python - >>> sd = colour.LIGHT_SOURCES_SDS['Neodimium Incandescent'] + >>> sd = colour.LIGHT_SOURCE_SDS['Neodimium Incandescent'] >>> colour.luminous_flux(sd) 23807.655527367202 - >>> sd = colour.LIGHT_SOURCES_SDS['Neodimium Incandescent'] + >>> sd = colour.LIGHT_SOURCE_SDS['Neodimium Incandescent'] >>> colour.luminous_efficiency(sd) 0.19943935624521045 - >>> sd = colour.LIGHT_SOURCES_SDS['Neodimium Incandescent'] + >>> sd = colour.LIGHT_SOURCE_SDS['Neodimium Incandescent'] >>> colour.luminous_efficacy(sd) 136.21708031547874 diff --git a/colour/__init__.py b/colour/__init__.py index 913180d88a..b6479ad454 100644 --- a/colour/__init__.py +++ b/colour/__init__.py @@ -63,7 +63,7 @@ from .colorimetry import ( ASTME308_PRACTISE_SHAPE, BANDPASS_CORRECTION_METHODS, CMFS, DEFAULT_SPECTRAL_SHAPE, HUNTERLAB_ILLUMINANTS, ILLUMINANTS, ILLUMINANT_SDS, - LEFS, LIGHTNESS_METHODS, LIGHT_SOURCES, LIGHT_SOURCES_SDS, LMS_CMFS, + LEFS, LIGHTNESS_METHODS, LIGHT_SOURCES, LIGHT_SOURCE_SDS, LMS_CMFS, LUMINANCE_METHODS, MULTI_SD_TO_XYZ_METHODS, MultiSpectralDistributions, PHOTOPIC_LEFS, RGB_CMFS, SCOTOPIC_LEFS, SD_GAUSSIAN_METHODS, SD_MULTI_LEDS_METHODS, SD_SINGLE_LED_METHODS, SD_TO_XYZ_METHODS, @@ -189,7 +189,7 @@ 'ASTME308_PRACTISE_SHAPE', 'BANDPASS_CORRECTION_METHODS', 'CMFS', 'DEFAULT_SPECTRAL_SHAPE', 'HUNTERLAB_ILLUMINANTS', 'ILLUMINANTS', 'ILLUMINANT_SDS', 'LEFS', 'LIGHTNESS_METHODS', 'LIGHT_SOURCES', - 'LIGHT_SOURCES_SDS', 'LMS_CMFS', 'LUMINANCE_METHODS', + 'LIGHT_SOURCE_SDS', 'LMS_CMFS', 'LUMINANCE_METHODS', 'MULTI_SD_TO_XYZ_METHODS', 'MultiSpectralDistributions', 'PHOTOPIC_LEFS', 'RGB_CMFS', 'SCOTOPIC_LEFS', 'SD_GAUSSIAN_METHODS', 'SD_MULTI_LEDS_METHODS', 'SD_SINGLE_LED_METHODS', 'SD_TO_XYZ_METHODS', @@ -1632,7 +1632,7 @@ def __getattr__(self, attribute): ], [ 'colour.LIGHT_SOURCES_RELATIVE_SPDS', - 'colour.LIGHT_SOURCES_SDS', + 'colour.LIGHT_SOURCE_SDS', ], [ 'colour.MultiSpectralPowerDistribution', @@ -1790,6 +1790,10 @@ def __getattr__(self, attribute): 'colour.ILLUMINANTS_SDS', 'colour.ILLUMINANT_SDS', ], + [ + 'colour.LIGHT_SOURCES_SDS', + 'colour.LIGHT_SOURCE_SDS', + ], ] if not is_documentation_building(): diff --git a/colour/colorimetry/datasets/light_sources/__init__.py b/colour/colorimetry/datasets/light_sources/__init__.py index b2a05a157e..39d2091167 100644 --- a/colour/colorimetry/datasets/light_sources/__init__.py +++ b/colour/colorimetry/datasets/light_sources/__init__.py @@ -3,6 +3,6 @@ from __future__ import absolute_import from .chromaticity_coordinates import LIGHT_SOURCES -from .sds import LIGHT_SOURCES_SDS +from .sds import LIGHT_SOURCE_SDS -__all__ = ['LIGHT_SOURCES', 'LIGHT_SOURCES_SDS'] +__all__ = ['LIGHT_SOURCES', 'LIGHT_SOURCE_SDS'] diff --git a/colour/colorimetry/datasets/light_sources/sds.py b/colour/colorimetry/datasets/light_sources/sds.py index 7a596ee4c4..5fd68e0d5f 100644 --- a/colour/colorimetry/datasets/light_sources/sds.py +++ b/colour/colorimetry/datasets/light_sources/sds.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- """ -Light Sources Spectral Distributions -==================================== +Light Source Spectral Distributions +=================================== -Defines various light sources spectral distributions. +Defines various light source spectral distributions. The light sources data is in the form of a *dict* of :class:`colour.SpectralDistribution` classes as follows:: @@ -62,15 +62,15 @@ __status__ = 'Production' __all__ = [ - 'LIGHT_SOURCES_RIT_SDS_DATA', 'LIGHT_SOURCES_RIT_SDS', - 'LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA', - 'LIGHT_SOURCES_NIST_TRADITIONAL_SDS', 'LIGHT_SOURCES_NIST_LED_SDS_DATA', - 'LIGHT_SOURCES_NIST_LED_SDS', 'LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA', - 'LIGHT_SOURCES_NIST_PHILIPS_SDS', 'LIGHT_SOURCES_COMMON_SDS_DATA', - 'LIGHT_SOURCES_COMMON_SDS', 'LIGHT_SOURCES_SDS' + 'LIGHT_SOURCE_RIT_SDS_DATA', 'LIGHT_SOURCE_RIT_SDS', + 'LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA', + 'LIGHT_SOURCE_NIST_TRADITIONAL_SDS', 'LIGHT_SOURCE_NIST_LED_SDS_DATA', + 'LIGHT_SOURCE_NIST_LED_SDS', 'LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA', + 'LIGHT_SOURCE_NIST_PHILIPS_SDS', 'LIGHT_SOURCE_COMMON_SDS_DATA', + 'LIGHT_SOURCE_COMMON_SDS', 'LIGHT_SOURCE_SDS' ] -LIGHT_SOURCES_RIT_SDS_DATA = { +LIGHT_SOURCE_RIT_SDS_DATA = { 'Natural': { 380: 1.88, 385: 2.24, @@ -737,38 +737,38 @@ } } -LIGHT_SOURCES_RIT_SDS = CaseInsensitiveMapping({ +LIGHT_SOURCE_RIT_SDS = CaseInsensitiveMapping({ 'Natural': SpectralDistribution( - LIGHT_SOURCES_RIT_SDS_DATA['Natural'], + LIGHT_SOURCE_RIT_SDS_DATA['Natural'], name='Natural'), 'Philips TL-84': SpectralDistribution( - LIGHT_SOURCES_RIT_SDS_DATA['Philips TL-84'], + LIGHT_SOURCE_RIT_SDS_DATA['Philips TL-84'], name='Philips TL-84'), 'SA': SpectralDistribution( - LIGHT_SOURCES_RIT_SDS_DATA['SA'], + LIGHT_SOURCE_RIT_SDS_DATA['SA'], name='SA'), 'SC': SpectralDistribution( - LIGHT_SOURCES_RIT_SDS_DATA['SC'], + LIGHT_SOURCE_RIT_SDS_DATA['SC'], name='SC'), 'T8 Luxline Plus White': SpectralDistribution( - LIGHT_SOURCES_RIT_SDS_DATA['T8 Luxline Plus White'], + LIGHT_SOURCE_RIT_SDS_DATA['T8 Luxline Plus White'], name='T8 Luxline Plus White'), 'T8 Polylux 3000': SpectralDistribution( - LIGHT_SOURCES_RIT_SDS_DATA['T8 Polylux 3000'], + LIGHT_SOURCE_RIT_SDS_DATA['T8 Polylux 3000'], name='T8 Polylux 3000'), 'T8 Polylux 4000': SpectralDistribution( - LIGHT_SOURCES_RIT_SDS_DATA['T8 Polylux 4000'], + LIGHT_SOURCE_RIT_SDS_DATA['T8 Polylux 4000'], name='T8 Polylux 4000'), 'Thorn Kolor-rite': SpectralDistribution( - LIGHT_SOURCES_RIT_SDS_DATA['Thorn Kolor-rite'], + LIGHT_SOURCE_RIT_SDS_DATA['Thorn Kolor-rite'], name='Thorn Kolor-rite') }) # yapf: disable """ @@ -784,12 +784,12 @@ ---------- :cite:`Pointer1980a` -LIGHT_SOURCES_RIT_SDS_DATA : CaseInsensitiveMapping +LIGHT_SOURCE_RIT_SDS_DATA : CaseInsensitiveMapping **{'Natural', 'Philips TL-84', 'T8 Luxline Plus White', 'SA', 'SC', 'T8 Polylux 3000', 'T8 Polylux 4000', 'Thorn Kolor-rite'}** """ -LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA = { +LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA = { 'Cool White FL': { 380: 0.03353465, 385: 0.04082136, @@ -1622,44 +1622,43 @@ } } -LIGHT_SOURCES_NIST_TRADITIONAL_SDS = CaseInsensitiveMapping({ +LIGHT_SOURCE_NIST_TRADITIONAL_SDS = CaseInsensitiveMapping({ 'Cool White FL': SpectralDistribution( - LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA['Cool White FL'], + LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA['Cool White FL'], name='Cool White FL'), 'Daylight FL': SpectralDistribution( - LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA['Daylight FL'], + LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA['Daylight FL'], name='Daylight FL'), 'HPS': SpectralDistribution( - LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA['HPS'], name='HPS'), + LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA['HPS'], name='HPS'), 'Incandescent': SpectralDistribution( - LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA['Incandescent'], + LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA['Incandescent'], name='Incandescent'), 'LPS': SpectralDistribution( - LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA['LPS'], name='LPS'), + LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA['LPS'], name='LPS'), 'Mercury': SpectralDistribution( - LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA['Mercury'], - name='Mercury'), + LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA['Mercury'], name='Mercury'), 'Metal Halide': SpectralDistribution( - LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA['Metal Halide'], + LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA['Metal Halide'], name='Metal Halide'), 'Neodimium Incandescent': SpectralDistribution( - LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA['Neodimium Incandescent'], + LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA['Neodimium Incandescent'], name='Neodimium Incandescent'), 'Super HPS': SpectralDistribution( - LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA['Super HPS'], + LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA['Super HPS'], name='Super HPS'), 'Triphosphor FL': SpectralDistribution( - LIGHT_SOURCES_NIST_TRADITIONAL_SDS_DATA['Triphosphor FL'], + LIGHT_SOURCE_NIST_TRADITIONAL_SDS_DATA['Triphosphor FL'], name='Triphosphor FL') }) """ @@ -1670,12 +1669,12 @@ ---------- :cite:`Ohno2008a` -LIGHT_SOURCES_NIST_TRADITIONAL_SDS : CaseInsensitiveMapping +LIGHT_SOURCE_NIST_TRADITIONAL_SDS : CaseInsensitiveMapping **{'Cool White FL', 'Daylight FL', 'HPS', 'Incandescent', 'LPS', 'Mercury', 'Metal Halide', 'Neodimium Incandescent', 'Super HPS', 'Triphosphor FL'}** """ -LIGHT_SOURCES_NIST_LED_SDS_DATA = { +LIGHT_SOURCE_NIST_LED_SDS_DATA = { '3-LED-1 (457/540/605)': { 380: 8.47479023841784e-08, 385: 5.45760813791522e-07, @@ -2923,68 +2922,68 @@ } } -LIGHT_SOURCES_NIST_LED_SDS = CaseInsensitiveMapping({ +LIGHT_SOURCE_NIST_LED_SDS = CaseInsensitiveMapping({ '3-LED-1 (457/540/605)': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['3-LED-1 (457/540/605)'], + LIGHT_SOURCE_NIST_LED_SDS_DATA['3-LED-1 (457/540/605)'], name='3-LED-1 (457/540/605)'), '3-LED-2 (473/545/616)': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['3-LED-2 (473/545/616)'], + LIGHT_SOURCE_NIST_LED_SDS_DATA['3-LED-2 (473/545/616)'], name='3-LED-2 (473/545/616)'), '3-LED-2 Yellow': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['3-LED-2 Yellow'], + LIGHT_SOURCE_NIST_LED_SDS_DATA['3-LED-2 Yellow'], name='3-LED-2 Yellow'), '3-LED-3 (465/546/614)': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['3-LED-3 (465/546/614)'], + LIGHT_SOURCE_NIST_LED_SDS_DATA['3-LED-3 (465/546/614)'], name='3-LED-3 (465/546/614)'), '3-LED-4 (455/547/623)': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['3-LED-4 (455/547/623)'], + LIGHT_SOURCE_NIST_LED_SDS_DATA['3-LED-4 (455/547/623)'], name='3-LED-4 (455/547/623)'), '4-LED No Yellow': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['4-LED No Yellow'], + LIGHT_SOURCE_NIST_LED_SDS_DATA['4-LED No Yellow'], name='4-LED No Yellow'), '4-LED Yellow': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['4-LED Yellow'], + LIGHT_SOURCE_NIST_LED_SDS_DATA['4-LED Yellow'], name='4-LED Yellow'), '4-LED-1 (461/526/576/624)': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['4-LED-1 (461/526/576/624)'], + LIGHT_SOURCE_NIST_LED_SDS_DATA['4-LED-1 (461/526/576/624)'], name='4-LED-1 (461/526/576/624)'), '4-LED-2 (447/512/573/627)': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['4-LED-2 (447/512/573/627)'], + LIGHT_SOURCE_NIST_LED_SDS_DATA['4-LED-2 (447/512/573/627)'], name='4-LED-2 (447/512/573/627)'), 'Luxeon WW 2880': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['Luxeon WW 2880'], + LIGHT_SOURCE_NIST_LED_SDS_DATA['Luxeon WW 2880'], name='Luxeon WW 2880'), 'PHOS-1': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['PHOS-1'], name='PHOS-1'), + LIGHT_SOURCE_NIST_LED_SDS_DATA['PHOS-1'], name='PHOS-1'), 'PHOS-2': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['PHOS-2'], name='PHOS-2'), + LIGHT_SOURCE_NIST_LED_SDS_DATA['PHOS-2'], name='PHOS-2'), 'PHOS-3': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['PHOS-3'], name='PHOS-3'), + LIGHT_SOURCE_NIST_LED_SDS_DATA['PHOS-3'], name='PHOS-3'), 'PHOS-4': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['PHOS-4'], name='PHOS-4'), + LIGHT_SOURCE_NIST_LED_SDS_DATA['PHOS-4'], name='PHOS-4'), 'Phosphor LED YAG': SpectralDistribution( - LIGHT_SOURCES_NIST_LED_SDS_DATA['Phosphor LED YAG'], + LIGHT_SOURCE_NIST_LED_SDS_DATA['Phosphor LED YAG'], name='Phosphor LED YAG') }) """ LED light sources from *NIST* *NIST CQS simulation 7.4.xls* spreadsheet. [2]_ -LIGHT_SOURCES_NIST_LED_SDS : CaseInsensitiveMapping +LIGHT_SOURCE_NIST_LED_SDS : CaseInsensitiveMapping **{'3-LED-1 (457/540/605)', '3-LED-2 (473/545/616)', '3-LED-2 Yellow', '3-LED-3 (465/546/614)', '3-LED-4 (455/547/623)', '4-LED No Yellow', '4-LED Yellow', '4-LED-1 (461/526/576/624)', '4-LED-2 (447/512/573/627)', @@ -2992,7 +2991,7 @@ 'Phosphor LED YAG'}** """ -LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA = { +LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA = { '60 A/W (Soft White)': { 380: 0.0221129274, 385: 0.0257550191, @@ -4821,104 +4820,103 @@ } } -LIGHT_SOURCES_NIST_PHILIPS_SDS = CaseInsensitiveMapping({ +LIGHT_SOURCE_NIST_PHILIPS_SDS = CaseInsensitiveMapping({ '60 A/W (Soft White)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['60 A/W (Soft White)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['60 A/W (Soft White)'], name='60 A/W (Soft White)'), 'C100S54 (HPS)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['C100S54 (HPS)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['C100S54 (HPS)'], name='C100S54 (HPS)'), 'C100S54C (HPS)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['C100S54C (HPS)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['C100S54C (HPS)'], name='C100S54C (HPS)'), 'F32T8/TL830 (Triphosphor)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['F32T8/TL830 (Triphosphor)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F32T8/TL830 (Triphosphor)'], name='F32T8/TL830 (Triphosphor)'), 'F32T8/TL835 (Triphosphor)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['F32T8/TL835 (Triphosphor)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F32T8/TL835 (Triphosphor)'], name='F32T8/TL835 (Triphosphor)'), 'F32T8/TL841 (Triphosphor)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['F32T8/TL841 (Triphosphor)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F32T8/TL841 (Triphosphor)'], name='F32T8/TL841 (Triphosphor)'), 'F32T8/TL850 (Triphosphor)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['F32T8/TL850 (Triphosphor)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F32T8/TL850 (Triphosphor)'], name='F32T8/TL850 (Triphosphor)'), 'F32T8/TL865 /PLUS (Triphosphor)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA[ + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA[ 'F32T8/TL865 /PLUS (Triphosphor)'], name='F32T8/TL865 /PLUS (Triphosphor)'), 'F34/CW/RS/EW (Cool White FL)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA[ - 'F34/CW/RS/EW (Cool White FL)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F34/CW/RS/EW (Cool White FL)'], name='F34/CW/RS/EW (Cool White FL)'), 'F34T12/LW/RS /EW': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['F34T12/LW/RS /EW'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F34T12/LW/RS /EW'], name='F34T12/LW/RS /EW'), 'F34T12WW/RS /EW (Warm White FL)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA[ + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA[ 'F34T12WW/RS /EW (Warm White FL)'], name='F34T12WW/RS /EW (Warm White FL)'), 'F40/C50 (Broadband FL)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['F40/C50 (Broadband FL)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F40/C50 (Broadband FL)'], name='F40/C50 (Broadband FL)'), 'F40/C75 (Broadband FL)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['F40/C75 (Broadband FL)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F40/C75 (Broadband FL)'], name='F40/C75 (Broadband FL)'), 'F40/CWX (Broadband FL)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['F40/CWX (Broadband FL)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F40/CWX (Broadband FL)'], name='F40/CWX (Broadband FL)'), 'F40/DX (Broadband FL)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['F40/DX (Broadband FL)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F40/DX (Broadband FL)'], name='F40/DX (Broadband FL)'), 'F40/DXTP (Delux FL)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['F40/DXTP (Delux FL)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F40/DXTP (Delux FL)'], name='F40/DXTP (Delux FL)'), 'F40/N (Natural FL)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['F40/N (Natural FL)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['F40/N (Natural FL)'], name='F40/N (Natural FL)'), 'H38HT-100 (Mercury)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['H38HT-100 (Mercury)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['H38HT-100 (Mercury)'], name='H38HT-100 (Mercury)'), 'H38JA-100/DX (Mercury DX)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['H38JA-100/DX (Mercury DX)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['H38JA-100/DX (Mercury DX)'], name='H38JA-100/DX (Mercury DX)'), 'MHC100/U/MP /3K': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['MHC100/U/MP /3K'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['MHC100/U/MP /3K'], name='MHC100/U/MP /3K'), 'MHC100/U/MP /4K': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['MHC100/U/MP /4K'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['MHC100/U/MP /4K'], name='MHC100/U/MP /4K'), 'SDW-T 100W/LV (Super HPS)': SpectralDistribution( - LIGHT_SOURCES_NIST_PHILIPS_SDS_DATA['SDW-T 100W/LV (Super HPS)'], + LIGHT_SOURCE_NIST_PHILIPS_SDS_DATA['SDW-T 100W/LV (Super HPS)'], name='SDW-T 100W/LV (Super HPS)') }) """ Philips light sources from *NIST* *NIST CQS simulation 7.4.xls* spreadsheet. [2]_ -LIGHT_SOURCES_NIST_PHILIPS_SDS : CaseInsensitiveMapping +LIGHT_SOURCE_NIST_PHILIPS_SDS : CaseInsensitiveMapping **{'60 A/W (Soft White)', 'C100S54 (HPS)', 'C100S54C (HPS)', 'F32T8/TL830 (Triphosphor)', 'F32T8/TL835 (Triphosphor)', 'F32T8/TL841 (Triphosphor)', 'F32T8/TL850 (Triphosphor)', @@ -4930,7 +4928,7 @@ 'MHC100/U/MP /3K', 'MHC100/U/MP /4K', 'SDW-T 100W/LV (Super HPS)'}** """ -LIGHT_SOURCES_COMMON_SDS_DATA = { +LIGHT_SOURCE_COMMON_SDS_DATA = { 'Kinoton 75P': { 380: 0.0001099667, 382: 0.0001415667, @@ -5136,10 +5134,10 @@ } } -LIGHT_SOURCES_COMMON_SDS = CaseInsensitiveMapping({ +LIGHT_SOURCE_COMMON_SDS = CaseInsensitiveMapping({ 'Kinoton 75P': SpectralDistribution( - LIGHT_SOURCES_COMMON_SDS_DATA['Kinoton 75P'], name='Kinoton 75P') + LIGHT_SOURCE_COMMON_SDS_DATA['Kinoton 75P'], name='Kinoton 75P') }) """ Projectors and Xenon Arc Lamps. @@ -5148,24 +5146,24 @@ ---------- :cite:`Houston2015a` -LIGHT_SOURCES_COMMON_SDS : CaseInsensitiveMapping +LIGHT_SOURCE_COMMON_SDS : CaseInsensitiveMapping **{'Kinoton 75P', }** """ -LIGHT_SOURCES_SDS = CaseInsensitiveMapping(LIGHT_SOURCES_RIT_SDS) -LIGHT_SOURCES_SDS.__doc__ = """ +LIGHT_SOURCE_SDS = CaseInsensitiveMapping(LIGHT_SOURCE_RIT_SDS) +LIGHT_SOURCE_SDS.__doc__ = """ Aggregated light sources spectral distributions. -LIGHT_SOURCES_SDS : CaseInsensitiveMapping +LIGHT_SOURCE_SDS : CaseInsensitiveMapping """ -LIGHT_SOURCES_SDS.update(LIGHT_SOURCES_NIST_TRADITIONAL_SDS) -LIGHT_SOURCES_SDS.update(LIGHT_SOURCES_NIST_LED_SDS) -LIGHT_SOURCES_SDS.update(LIGHT_SOURCES_NIST_PHILIPS_SDS) -LIGHT_SOURCES_SDS.update(LIGHT_SOURCES_COMMON_SDS) +LIGHT_SOURCE_SDS.update(LIGHT_SOURCE_NIST_TRADITIONAL_SDS) +LIGHT_SOURCE_SDS.update(LIGHT_SOURCE_NIST_LED_SDS) +LIGHT_SOURCE_SDS.update(LIGHT_SOURCE_NIST_PHILIPS_SDS) +LIGHT_SOURCE_SDS.update(LIGHT_SOURCE_COMMON_SDS) # *CIE 15:2004* recommends using linear interpolation for # *CIE Standard Illuminant D Series*, for consistency all the light sources are # using a linear interpolator. -for _sd in LIGHT_SOURCES_SDS.values(): +for _sd in LIGHT_SOURCE_SDS.values(): _sd.interpolator = LinearInterpolator diff --git a/colour/colorimetry/photometry.py b/colour/colorimetry/photometry.py index 35ab581422..85640aca26 100644 --- a/colour/colorimetry/photometry.py +++ b/colour/colorimetry/photometry.py @@ -58,8 +58,8 @@ def luminous_flux(sd, Examples -------- - >>> from colour import LIGHT_SOURCES_SDS - >>> sd = LIGHT_SOURCES_SDS['Neodimium Incandescent'] + >>> from colour import LIGHT_SOURCE_SDS + >>> sd = LIGHT_SOURCE_SDS['Neodimium Incandescent'] >>> luminous_flux(sd) # doctest: +ELLIPSIS 23807.6555273... """ @@ -102,8 +102,8 @@ def luminous_efficiency( Examples -------- - >>> from colour import LIGHT_SOURCES_SDS - >>> sd = LIGHT_SOURCES_SDS['Neodimium Incandescent'] + >>> from colour import LIGHT_SOURCE_SDS + >>> sd = LIGHT_SOURCE_SDS['Neodimium Incandescent'] >>> luminous_efficiency(sd) # doctest: +ELLIPSIS 0.1994393... """ @@ -147,8 +147,8 @@ def luminous_efficacy( Examples -------- - >>> from colour import LIGHT_SOURCES_SDS - >>> sd = LIGHT_SOURCES_SDS['Neodimium Incandescent'] + >>> from colour import LIGHT_SOURCE_SDS + >>> sd = LIGHT_SOURCE_SDS['Neodimium Incandescent'] >>> luminous_efficacy(sd) # doctest: +ELLIPSIS 136.2170803... """ diff --git a/colour/colorimetry/tests/test_photometry.py b/colour/colorimetry/tests/test_photometry.py index 27bbdeaf87..19af0ac76f 100644 --- a/colour/colorimetry/tests/test_photometry.py +++ b/colour/colorimetry/tests/test_photometry.py @@ -7,7 +7,7 @@ import unittest -from colour.colorimetry import (ILLUMINANT_SDS, LIGHT_SOURCES_SDS, +from colour.colorimetry import (ILLUMINANT_SDS, LIGHT_SOURCE_SDS, luminous_flux, luminous_efficiency, luminous_efficacy, sd_zeros) @@ -40,12 +40,12 @@ def test_luminous_flux(self): places=7) self.assertAlmostEqual( - luminous_flux(LIGHT_SOURCES_SDS['Neodimium Incandescent']), + luminous_flux(LIGHT_SOURCE_SDS['Neodimium Incandescent']), 23807.65552737, places=7) self.assertAlmostEqual( - luminous_flux(LIGHT_SOURCES_SDS['F32T8/TL841 (Triphosphor)']), + luminous_flux(LIGHT_SOURCE_SDS['F32T8/TL841 (Triphosphor)']), 13090.06759053, places=7) @@ -68,13 +68,12 @@ def test_luminous_efficiency(self): places=7) self.assertAlmostEqual( - luminous_efficiency(LIGHT_SOURCES_SDS['Neodimium Incandescent']), + luminous_efficiency(LIGHT_SOURCE_SDS['Neodimium Incandescent']), 0.19943936, places=7) self.assertAlmostEqual( - luminous_efficiency( - LIGHT_SOURCES_SDS['F32T8/TL841 (Triphosphor)']), + luminous_efficiency(LIGHT_SOURCE_SDS['F32T8/TL841 (Triphosphor)']), 0.51080919, places=7) @@ -97,12 +96,12 @@ def test_luminous_efficacy(self): places=7) self.assertAlmostEqual( - luminous_efficacy(LIGHT_SOURCES_SDS['Neodimium Incandescent']), + luminous_efficacy(LIGHT_SOURCE_SDS['Neodimium Incandescent']), 136.21708032, places=7) self.assertAlmostEqual( - luminous_efficacy(LIGHT_SOURCES_SDS['F32T8/TL841 (Triphosphor)']), + luminous_efficacy(LIGHT_SOURCE_SDS['F32T8/TL841 (Triphosphor)']), 348.88267549, places=7) diff --git a/colour/examples/colorimetry/examples_light_sources.py b/colour/examples/colorimetry/examples_light_sources.py index 6010d2e774..4c4eb9582c 100644 --- a/colour/examples/colorimetry/examples_light_sources.py +++ b/colour/examples/colorimetry/examples_light_sources.py @@ -11,7 +11,7 @@ message_box('Light Sources Dataset') message_box('Light sources spectral distributions datasets.') -pprint(sorted(colour.LIGHT_SOURCES_SDS.keys())) +pprint(sorted(colour.LIGHT_SOURCE_SDS.keys())) print('\n') diff --git a/colour/examples/colorimetry/examples_photometry.py b/colour/examples/colorimetry/examples_photometry.py index 412af8c2d6..b3ad9264ac 100644 --- a/colour/examples/colorimetry/examples_photometry.py +++ b/colour/examples/colorimetry/examples_photometry.py @@ -8,7 +8,7 @@ message_box('"Photometry" Computations') -sd = colour.LIGHT_SOURCES_SDS['Neodimium Incandescent'] +sd = colour.LIGHT_SOURCE_SDS['Neodimium Incandescent'] message_box(('Computing "Luminous Flux" for given spectral ' 'distribution:\n' '\n\t{0}'.format(sd.name))) diff --git a/colour/examples/plotting/examples_quality_plots.py b/colour/examples/plotting/examples_quality_plots.py index 1727e079af..95a47b9b71 100644 --- a/colour/examples/plotting/examples_quality_plots.py +++ b/colour/examples/plotting/examples_quality_plots.py @@ -24,8 +24,8 @@ '"Colour Rendering Index (CRI)".')) plot_multi_sds_colour_rendering_indexes_bars( (colour.ILLUMINANT_SDS['FL2'], - colour.LIGHT_SOURCES_SDS['F32T8/TL841 (Triphosphor)'], - colour.LIGHT_SOURCES_SDS['Kinoton 75P'])) + colour.LIGHT_SOURCE_SDS['F32T8/TL841 (Triphosphor)'], + colour.LIGHT_SOURCE_SDS['Kinoton 75P'])) print('\n') @@ -38,5 +38,5 @@ '"Colour Quality Scale (CQS)".')) plot_multi_sds_colour_quality_scales_bars( (colour.ILLUMINANT_SDS['FL2'], - colour.LIGHT_SOURCES_SDS['F32T8/TL841 (Triphosphor)'], - colour.LIGHT_SOURCES_SDS['Kinoton 75P'])) + colour.LIGHT_SOURCE_SDS['F32T8/TL841 (Triphosphor)'], + colour.LIGHT_SOURCE_SDS['Kinoton 75P'])) diff --git a/colour/examples/quality/examples_cqs.py b/colour/examples/quality/examples_cqs.py index 643d469f1c..6008e078bb 100644 --- a/colour/examples/quality/examples_cqs.py +++ b/colour/examples/quality/examples_cqs.py @@ -19,7 +19,7 @@ 'with detailed output data.')) pprint( colour.colour_quality_scale( - colour.LIGHT_SOURCES_SDS['H38HT-100 (Mercury)'], additional_data=True)) + colour.LIGHT_SOURCE_SDS['H38HT-100 (Mercury)'], additional_data=True)) print('\n') @@ -27,7 +27,7 @@ '"Colour Quality Scale (CQS)".') print( colour.colour_quality_scale( - colour.LIGHT_SOURCES_SDS['SDW-T 100W/LV (Super HPS)'])) + colour.LIGHT_SOURCE_SDS['SDW-T 100W/LV (Super HPS)'])) print('\n') diff --git a/colour/plotting/common.py b/colour/plotting/common.py index 5db9673c98..a6dee33ca4 100644 --- a/colour/plotting/common.py +++ b/colour/plotting/common.py @@ -38,7 +38,7 @@ from matplotlib.colors import LinearSegmentedColormap from colour.characterisation import COLOURCHECKERS -from colour.colorimetry import CMFS, ILLUMINANT_SDS, LIGHT_SOURCES_SDS +from colour.colorimetry import CMFS, ILLUMINANT_SDS, LIGHT_SOURCE_SDS from colour.models import RGB_COLOURSPACES, XYZ_to_RGB from colour.utilities import (CaseInsensitiveMapping, Structure, as_float_array, is_sibling, is_string, @@ -899,7 +899,7 @@ def filter_illuminants(filterers, allow_non_siblings, flags)) illuminants.update( - filter_passthrough(LIGHT_SOURCES_SDS, filterers, anchors, + filter_passthrough(LIGHT_SOURCE_SDS, filterers, anchors, allow_non_siblings, flags)) return illuminants diff --git a/colour/plotting/quality.py b/colour/plotting/quality.py index 2f42538b94..1e89b703f6 100644 --- a/colour/plotting/quality.py +++ b/colour/plotting/quality.py @@ -76,9 +76,9 @@ def plot_colour_quality_bars(specifications, Examples -------- >>> from colour import (ILLUMINANT_SDS, - ... LIGHT_SOURCES_SDS, SpectralShape) + ... LIGHT_SOURCE_SDS, SpectralShape) >>> illuminant = ILLUMINANT_SDS['FL2'] - >>> light_source = LIGHT_SOURCES_SDS['Kinoton 75P'] + >>> light_source = LIGHT_SOURCE_SDS['Kinoton 75P'] >>> light_source = light_source.copy().align(SpectralShape(360, 830, 1)) >>> cqs_i = colour_quality_scale(illuminant, additional_data=True) >>> cqs_l = colour_quality_scale(light_source, additional_data=True) @@ -262,9 +262,9 @@ def plot_multi_sds_colour_rendering_indexes_bars(sds, **kwargs): Examples -------- >>> from colour import (ILLUMINANT_SDS, - ... LIGHT_SOURCES_SDS) + ... LIGHT_SOURCE_SDS) >>> illuminant = ILLUMINANT_SDS['FL2'] - >>> light_source = LIGHT_SOURCES_SDS['Kinoton 75P'] + >>> light_source = LIGHT_SOURCE_SDS['Kinoton 75P'] >>> plot_multi_sds_colour_rendering_indexes_bars( ... [illuminant, light_source]) # doctest: +ELLIPSIS (
, \ @@ -409,9 +409,9 @@ def plot_multi_sds_colour_quality_scales_bars(sds, Examples -------- >>> from colour import (ILLUMINANT_SDS, - ... LIGHT_SOURCES_SDS) + ... LIGHT_SOURCE_SDS) >>> illuminant = ILLUMINANT_SDS['FL2'] - >>> light_source = LIGHT_SOURCES_SDS['Kinoton 75P'] + >>> light_source = LIGHT_SOURCE_SDS['Kinoton 75P'] >>> plot_multi_sds_colour_quality_scales_bars([illuminant, light_source]) ... # doctest: +ELLIPSIS (
, \ diff --git a/colour/plotting/tests/test_quality.py b/colour/plotting/tests/test_quality.py index d244cc1127..d8fd05b1af 100644 --- a/colour/plotting/tests/test_quality.py +++ b/colour/plotting/tests/test_quality.py @@ -8,7 +8,7 @@ import unittest from matplotlib.pyplot import Axes, Figure -from colour.colorimetry import (ILLUMINANT_SDS, LIGHT_SOURCES_SDS, +from colour.colorimetry import (ILLUMINANT_SDS, LIGHT_SOURCE_SDS, SpectralShape) from colour.plotting import (plot_single_sd_colour_rendering_index_bars, plot_multi_sds_colour_rendering_indexes_bars, @@ -45,7 +45,7 @@ def test_plot_colour_quality_bars(self): """ illuminant = ILLUMINANT_SDS['FL2'] - light_source = LIGHT_SOURCES_SDS['Kinoton 75P'] + light_source = LIGHT_SOURCE_SDS['Kinoton 75P'] light_source = light_source.copy().align(SpectralShape(360, 830, 1)) cqs_i = colour_quality_scale(illuminant, additional_data=True) cqs_l = colour_quality_scale(light_source, additional_data=True) @@ -88,7 +88,7 @@ def test_plot_multi_sds_colour_rendering_indexes_bars(self): """ figure, axes = plot_multi_sds_colour_rendering_indexes_bars( - [ILLUMINANT_SDS['FL2'], LIGHT_SOURCES_SDS['Kinoton 75P']]) + [ILLUMINANT_SDS['FL2'], LIGHT_SOURCE_SDS['Kinoton 75P']]) self.assertIsInstance(figure, Figure) self.assertIsInstance(axes, Axes) @@ -126,7 +126,7 @@ def test_plot_multi_sds_colour_quality_scales_bars(self): """ figure, axes = plot_multi_sds_colour_quality_scales_bars( - [ILLUMINANT_SDS['FL2'], LIGHT_SOURCES_SDS['Kinoton 75P']]) + [ILLUMINANT_SDS['FL2'], LIGHT_SOURCE_SDS['Kinoton 75P']]) self.assertIsInstance(figure, Figure) self.assertIsInstance(axes, Axes) diff --git a/colour/quality/tests/test_cqs.py b/colour/quality/tests/test_cqs.py index 5137d77048..4aa5ab9f9e 100644 --- a/colour/quality/tests/test_cqs.py +++ b/colour/quality/tests/test_cqs.py @@ -9,7 +9,7 @@ import unittest from colour.quality import CQS_Specification, colour_quality_scale -from colour.colorimetry import ILLUMINANT_SDS, LIGHT_SOURCES_SDS +from colour.colorimetry import ILLUMINANT_SDS, LIGHT_SOURCE_SDS from colour.quality.cqs import VS_ColorimetryData, VS_ColourQualityScaleData __author__ = 'Colour Developers' @@ -54,50 +54,50 @@ def test_colour_quality_scale(self): places=7) self.assertAlmostEqual( - colour_quality_scale(LIGHT_SOURCES_SDS['Neodimium Incandescent']), + colour_quality_scale(LIGHT_SOURCE_SDS['Neodimium Incandescent']), 89.737441458687044, places=7) self.assertAlmostEqual( colour_quality_scale( - LIGHT_SOURCES_SDS['Neodimium Incandescent'], + LIGHT_SOURCE_SDS['Neodimium Incandescent'], method='NIST CQS 7.4'), 87.700319996664561, places=7) self.assertAlmostEqual( colour_quality_scale( - LIGHT_SOURCES_SDS['F32T8/TL841 (Triphosphor)']), + LIGHT_SOURCE_SDS['F32T8/TL841 (Triphosphor)']), 84.934929181986888, places=7) self.assertAlmostEqual( colour_quality_scale( - LIGHT_SOURCES_SDS['F32T8/TL841 (Triphosphor)'], + LIGHT_SOURCE_SDS['F32T8/TL841 (Triphosphor)'], method='NIST CQS 7.4'), 83.255458192000233, places=7) self.assertAlmostEqual( - colour_quality_scale(LIGHT_SOURCES_SDS['H38HT-100 (Mercury)']), + colour_quality_scale(LIGHT_SOURCE_SDS['H38HT-100 (Mercury)']), 20.019979778489535, places=7) self.assertAlmostEqual( colour_quality_scale( - LIGHT_SOURCES_SDS['H38HT-100 (Mercury)'], + LIGHT_SOURCE_SDS['H38HT-100 (Mercury)'], method='NIST CQS 7.4'), 23.011011107054145, places=7) self.assertAlmostEqual( - colour_quality_scale(LIGHT_SOURCES_SDS['Luxeon WW 2880']), + colour_quality_scale(LIGHT_SOURCE_SDS['Luxeon WW 2880']), 86.497986329513722, places=7) self.assertAlmostEqual( colour_quality_scale( - LIGHT_SOURCES_SDS['Luxeon WW 2880'], method='NIST CQS 7.4'), + LIGHT_SOURCE_SDS['Luxeon WW 2880'], method='NIST CQS 7.4'), 84.887918431764191, places=7) diff --git a/docs/colour.colorimetry.rst b/docs/colour.colorimetry.rst index 596bf05d4d..610f450239 100644 --- a/docs/colour.colorimetry.rst +++ b/docs/colour.colorimetry.rst @@ -218,7 +218,7 @@ Illuminants and Light Sources ILLUMINANT_SDS HUNTERLAB_ILLUMINANTS LIGHT_SOURCES - LIGHT_SOURCES_SDS + LIGHT_SOURCE_SDS **Ancillary Objects** diff --git a/docs/index.rst b/docs/index.rst index cce9259b42..7f8599ee7f 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -221,7 +221,7 @@ Spectral Computations .. code-block:: python - >>> colour.sd_to_XYZ(colour.LIGHT_SOURCES_SDS['Neodimium Incandescent']) + >>> colour.sd_to_XYZ(colour.LIGHT_SOURCE_SDS['Neodimium Incandescent']) array([ 36.94726204, 32.62076174, 13.0143849 ]) >>> sorted(colour.SPECTRAL_TO_XYZ_METHODS.keys()) ['ASTM E308', 'Integration', 'astm2015'] @@ -358,13 +358,13 @@ Luminous Flux, Efficiency & Efficacy Computation .. code-block:: python - >>> sd = colour.LIGHT_SOURCES_SDS['Neodimium Incandescent'] + >>> sd = colour.LIGHT_SOURCE_SDS['Neodimium Incandescent'] >>> colour.luminous_flux(sd) 23807.655527367202 - >>> sd = colour.LIGHT_SOURCES_SDS['Neodimium Incandescent'] + >>> sd = colour.LIGHT_SOURCE_SDS['Neodimium Incandescent'] >>> colour.luminous_efficiency(sd) 0.19943935624521045 - >>> sd = colour.LIGHT_SOURCES_SDS['Neodimium Incandescent'] + >>> sd = colour.LIGHT_SOURCE_SDS['Neodimium Incandescent'] >>> colour.luminous_efficacy(sd) 136.21708031547874 diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 2ac06d2590..c4023bd3fa 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -361,7 +361,7 @@ the objects needed for spectral computations and many others: 'HUNTERLAB_ILLUMINANTS', 'ILLUMINANT_SDS', 'LIGHT_SOURCES', - 'LIGHT_SOURCES_SDS', + 'LIGHT_SOURCE_SDS', 'LEFS', 'PHOTOPIC_LEFS', 'SCOTOPIC_LEFS', @@ -462,7 +462,7 @@ the following components: 'HUNTERLAB_ILLUMINANTS', 'ILLUMINANT_SDS', 'LIGHT_SOURCES', - 'LIGHT_SOURCES_SDS', + 'LIGHT_SOURCE_SDS', 'LEFS', 'PHOTOPIC_LEFS', 'SCOTOPIC_LEFS'] diff --git a/utilities/generate_plots.py b/utilities/generate_plots.py index c9a2de985b..8553104f0d 100755 --- a/utilities/generate_plots.py +++ b/utilities/generate_plots.py @@ -18,7 +18,7 @@ import colour # noqa from colour.characterisation import COLOURCHECKERS_SDS # noqa from colour.colorimetry import ( # noqa - ILLUMINANT_SDS, LIGHT_SOURCES_SDS, PHOTOPIC_LEFS, SCOTOPIC_LEFS, + ILLUMINANT_SDS, LIGHT_SOURCE_SDS, PHOTOPIC_LEFS, SCOTOPIC_LEFS, STANDARD_OBSERVERS_CMFS, SpectralDistribution, SpectralShape, sd_blackbody, sd_mesopic_luminous_efficiency_function, sd_to_XYZ) from colour.io import read_image # noqa @@ -588,7 +588,7 @@ def generate_documentation_plots(output_directory): arguments['filename'] = os.path.join( output_directory, 'Plotting_Plot_Colour_Quality_Bars.png') illuminant = ILLUMINANT_SDS['FL2'] - light_source = LIGHT_SOURCES_SDS['Kinoton 75P'] + light_source = LIGHT_SOURCE_SDS['Kinoton 75P'] light_source = light_source.copy().align(SpectralShape(360, 830, 1)) cqs_i = colour_quality_scale(illuminant, additional_data=True) cqs_l = colour_quality_scale(light_source, additional_data=True) @@ -604,7 +604,7 @@ def generate_documentation_plots(output_directory): arguments['filename'] = os.path.join( output_directory, 'Plotting_Plot_Multi_SDS_Colour_Rendering_Indexes_Bars.png') - light_source = LIGHT_SOURCES_SDS['Kinoton 75P'] + light_source = LIGHT_SOURCE_SDS['Kinoton 75P'] plt.close( plot_multi_sds_colour_rendering_indexes_bars( [illuminant, light_source], **arguments)[0]) @@ -619,7 +619,7 @@ def generate_documentation_plots(output_directory): arguments['filename'] = os.path.join( output_directory, 'Plotting_Plot_Multi_SDS_Colour_Quality_Scales_Bars.png') - light_source = LIGHT_SOURCES_SDS['Kinoton 75P'] + light_source = LIGHT_SOURCE_SDS['Kinoton 75P'] plt.close( plot_multi_sds_colour_quality_scales_bars([illuminant, light_source], **arguments)[0])