Rename various private attributes in "colour.colorimetry.datasets" su…

…b-package.
colour-science · Apr 11, 2020 · 4b029aa · 4b029aa
1 parent fe47ae8
commit 4b029aa
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/colour/colorimetry/datasets/light_sources/chromaticity_coordinates.py b/colour/colorimetry/datasets/light_sources/chromaticity_coordinates.py
@@ -29,8 +29,7 @@
     F40/CWX (Broadband FL), F40/DX (Broadband FL), F40/DXTP (Delux FL),
     F40/N (Natural FL), H38HT-100 (Mercury), H38JA-100/DX (Mercury DX),
     MHC100/U/MP /3K, MHC100/U/MP /4K, SDW-T 100W/LV (Super HPS)
--   Projectors and Xenon Arc Lamps:
-    Kinoton 75P
+-   Common light sources: Kinoton 75P
 
 References
 ----------
@@ -65,8 +64,8 @@
     'LIGHT_SOURCES_NIST_LED_CIE_1964_10_DEGREE_STANDARD_OBSERVER',
     'LIGHT_SOURCES_NIST_PHILIPS_CIE_1931_2_DEGREE_STANDARD_OBSERVER',
     'LIGHT_SOURCES_NIST_PHILIPS_CIE_1964_10_DEGREE_STANDARD_OBSERVER',
-    'LIGHT_SOURCES_PROJECTORS_CIE_1931_2_DEGREE_STANDARD_OBSERVER',
-    'LIGHT_SOURCES_PROJECTORS_CIE_1964_10_DEGREE_STANDARD_OBSERVER',
+    'LIGHT_SOURCES_COMMON_CIE_1931_2_DEGREE_STANDARD_OBSERVER',
+    'LIGHT_SOURCES_COMMON_CIE_1964_10_DEGREE_STANDARD_OBSERVER',
     'LIGHT_SOURCES'
 ]
 
@@ -425,30 +424,30 @@
     'MHC100/U/MP /3K', 'MHC100/U/MP /4K', 'SDW-T 100W/LV (Super HPS)'}**
 """
 
-LIGHT_SOURCES_PROJECTORS_CIE_1931_2_DEGREE_STANDARD_OBSERVER = (
+LIGHT_SOURCES_COMMON_CIE_1931_2_DEGREE_STANDARD_OBSERVER = (
     CaseInsensitiveMapping({
         'Kinoton 75P': np.array([0.315252413629716, 0.332870794805328])
     }))
 """
-Projectors and Xenon Arc Lamps.
+Common light sources for the *CIE 1931 2 Degree Standard Observer*.
 
 References
 ----------
 :cite:`Houston2015a`
 
-LIGHT_SOURCES_PROJECTORS_CIE_1931_2_DEGREE_STANDARD_OBSERVER :
+LIGHT_SOURCES_COMMON_CIE_1931_2_DEGREE_STANDARD_OBSERVER :
     CaseInsensitiveMapping
     **{'Kinoton 75P', }**
 """
 
-LIGHT_SOURCES_PROJECTORS_CIE_1964_10_DEGREE_STANDARD_OBSERVER = (
+LIGHT_SOURCES_COMMON_CIE_1964_10_DEGREE_STANDARD_OBSERVER = (
     CaseInsensitiveMapping({
         'Kinoton 75P': np.array([0.317086642148234, 0.336222428041514])
     }))
 """
-Projectors and Xenon Arc Lamps. [3_]
+Common light sources for the *CIE 1964 10 Degree Standard Observer*. [3_]
 
-LIGHT_SOURCES_PROJECTORS_CIE_1964_10_DEGREE_STANDARD_OBSERVER :
+LIGHT_SOURCES_COMMON_CIE_1964_10_DEGREE_STANDARD_OBSERVER :
     CaseInsensitiveMapping
     **{'Kinoton 75P', }**
 """
@@ -494,6 +493,6 @@
     LIGHT_SOURCES_NIST_PHILIPS_CIE_1964_10_DEGREE_STANDARD_OBSERVER)
 
 LIGHT_SOURCES['CIE 1931 2 Degree Standard Observer'].update(
-    LIGHT_SOURCES_PROJECTORS_CIE_1931_2_DEGREE_STANDARD_OBSERVER)
+    LIGHT_SOURCES_COMMON_CIE_1931_2_DEGREE_STANDARD_OBSERVER)
 LIGHT_SOURCES['CIE 1964 10 Degree Standard Observer'].update(
-    LIGHT_SOURCES_PROJECTORS_CIE_1964_10_DEGREE_STANDARD_OBSERVER)
+    LIGHT_SOURCES_COMMON_CIE_1964_10_DEGREE_STANDARD_OBSERVER)
diff --git a/colour/colorimetry/datasets/light_sources/sds.py b/colour/colorimetry/datasets/light_sources/sds.py
@@ -66,8 +66,8 @@
     '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_PROJECTORS_SDS_DATA',
-    'LIGHT_SOURCES_PROJECTORS_SDS', 'LIGHT_SOURCES_SDS'
+    'LIGHT_SOURCES_NIST_PHILIPS_SDS', 'LIGHT_SOURCES_COMMON_SDS_DATA',
+    'LIGHT_SOURCES_COMMON_SDS', 'LIGHT_SOURCES_SDS'
 ]
 
 LIGHT_SOURCES_RIT_SDS_DATA = {
@@ -4930,7 +4930,7 @@
     'MHC100/U/MP /3K', 'MHC100/U/MP /4K', 'SDW-T 100W/LV (Super HPS)'}**
 """
 
-LIGHT_SOURCES_PROJECTORS_SDS_DATA = {
+LIGHT_SOURCES_COMMON_SDS_DATA = {
     'Kinoton 75P': {
         380: 0.0001099667,
         382: 0.0001415667,
@@ -5136,11 +5136,10 @@
     }
 }
 
-LIGHT_SOURCES_PROJECTORS_SDS = CaseInsensitiveMapping({
+LIGHT_SOURCES_COMMON_SDS = CaseInsensitiveMapping({
     'Kinoton 75P':
         SpectralDistribution(
-            LIGHT_SOURCES_PROJECTORS_SDS_DATA['Kinoton 75P'],
-            name='Kinoton 75P')
+            LIGHT_SOURCES_COMMON_SDS_DATA['Kinoton 75P'], name='Kinoton 75P')
 })
 """
 Projectors and Xenon Arc Lamps.
@@ -5149,7 +5148,7 @@
 ----------
 :cite:`Houston2015a`
 
-LIGHT_SOURCES_PROJECTORS_SDS : CaseInsensitiveMapping
+LIGHT_SOURCES_COMMON_SDS : CaseInsensitiveMapping
     **{'Kinoton 75P', }**
 """
 
@@ -5163,7 +5162,7 @@
 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_PROJECTORS_SDS)
+LIGHT_SOURCES_SDS.update(LIGHT_SOURCES_COMMON_SDS)
 
 # *CIE 15:2004* recommends using linear interpolation for
 # *CIE Standard Illuminant D Series*, for consistency all the light sources are