update to v1.6.6

README.md

@@ -4,8 +4,8 @@
 
 # Python toolbox for lighting and color science
 * Author: Kevin A.G. Smet (ksmet1977 at gmail.com)
-* Version: 1.6.5
-* Date: April 14, 2021
+* Version: 1.6.6
+* Date: May 04, 2021
 * License: [GPLv3](https://github.com/ksmet1977/luxpy/blob/master/LICENSE.md)
 
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1298963.svg)](https://doi.org/10.5281/zenodo.1298963)

docs/build/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: a4a10d66a557df685d56fe37867ec75a
+config: 5a499049b6dab9c621e95e45d269776f
 tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/build/html/_modules/index.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>Overview: module code &mdash; LuxPy 1.6.5 documentation</title>
+  <title>Overview: module code &mdash; LuxPy 1.6.6 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.5
+                1.6.6
               </div>
 
 
@@ -203,7 +203,8 @@ <h1>All modules for which code is available</h1>
 <li><a href="luxpy/toolboxes/indvcmf/individual_observer_cmf_model.html">luxpy.toolboxes.indvcmf.individual_observer_cmf_model</a></li>
 <li><a href="luxpy/toolboxes/iolidfiles/io_lid_files.html">luxpy.toolboxes.iolidfiles.io_lid_files</a></li>
 <li><a href="luxpy/toolboxes/photbiochem/ASNZS_1680_2_5_1997_COI.html">luxpy.toolboxes.photbiochem.ASNZS_1680_2_5_1997_COI</a></li>
-<li><a href="luxpy/toolboxes/photbiochem/cie_tn003_2015.html">luxpy.toolboxes.photbiochem.cie_tn003_2015</a></li>
+<li><a href="luxpy/toolboxes/photbiochem/alpha_opic_quantities_cie_s026_2018_cie_tn003_2015.html">luxpy.toolboxes.photbiochem.alpha_opic_quantities_cie_s026_2018_cie_tn003_2015</a></li>
+<li><a href="luxpy/toolboxes/photbiochem/blue_light_hazard_IEC62471_IECTR62778.html">luxpy.toolboxes.photbiochem.blue_light_hazard_IEC62471_IECTR62778</a></li>
 <li><a href="luxpy/toolboxes/photbiochem/circadian_CS_CLa_lrc.html">luxpy.toolboxes.photbiochem.circadian_CS_CLa_lrc</a></li>
 <li><a href="luxpy/toolboxes/rgb2spec.html">luxpy.toolboxes.rgb2spec</a></li>
 <ul><li><a href="luxpy/toolboxes/rgb2spec/smits_mitsuba.html">luxpy.toolboxes.rgb2spec.smits_mitsuba</a></li>

docs/build/html/_modules/luxpy/color/cam/cam02ucs.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cam.cam02ucs &mdash; LuxPy 1.6.5 documentation</title>
+  <title>luxpy.color.cam.cam02ucs &mdash; LuxPy 1.6.6 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.5
+                1.6.6
               </div>
 
 

docs/build/html/_modules/luxpy/color/cam/cam15u.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cam.cam15u &mdash; LuxPy 1.6.5 documentation</title>
+  <title>luxpy.color.cam.cam15u &mdash; LuxPy 1.6.6 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.5
+                1.6.6
               </div>
 
 

docs/build/html/_modules/luxpy/color/cam/cam16ucs.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cam.cam16ucs &mdash; LuxPy 1.6.5 documentation</title>
+  <title>luxpy.color.cam.cam16ucs &mdash; LuxPy 1.6.6 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.5
+                1.6.6
               </div>
 
 

docs/build/html/_modules/luxpy/color/cam/cam18sl.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cam.cam18sl &mdash; LuxPy 1.6.5 documentation</title>
+  <title>luxpy.color.cam.cam18sl &mdash; LuxPy 1.6.6 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.5
+                1.6.6
               </div>
 
 
@@ -466,8 +466,12 @@ <h1>Source code for luxpy.color.cam.cam18sl</h1><div class="highlight"><pre>
                 <span class="n">s</span> <span class="o">=</span> <span class="p">(</span><span class="n">a</span><span class="o">**</span><span class="mf">2.0</span> <span class="o">+</span> <span class="n">b</span><span class="o">**</span><span class="mf">2.0</span><span class="p">)</span><span class="o">**</span><span class="mf">0.5</span>
                 <span class="n">M</span> <span class="o">=</span> <span class="n">s</span><span class="o">*</span><span class="n">Q</span>
 
-            <span class="k">if</span> <span class="s1">&#39;h&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">:</span>
+            <span class="k">if</span> <span class="p">(</span><span class="s1">&#39;h&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">)</span> <span class="o">|</span> <span class="p">(</span><span class="s1">&#39;H&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">):</span>
                 <span class="n">Q</span><span class="p">,</span> <span class="n">WsM</span><span class="p">,</span> <span class="n">h</span> <span class="o">=</span> <span class="n">asplit</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="n">i</span><span class="p">])</span>
+
+                <span class="k">if</span> <span class="p">(</span><span class="s1">&#39;H&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">):</span>
+                    <span class="n">h</span> <span class="o">=</span> <span class="n">hue_quadrature</span><span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="n">unique_hue_data</span> <span class="o">=</span> <span class="n">unique_hue_data</span><span class="p">,</span> <span class="n">forward</span> <span class="o">=</span> <span class="kc">False</span><span class="p">)</span>
+
                 <span class="n">Q</span> <span class="o">=</span> <span class="n">Q</span> <span class="o">/</span> <span class="p">((</span><span class="n">fov</span><span class="o">/</span><span class="mf">10.0</span><span class="p">)</span><span class="o">**</span><span class="n">cfov</span><span class="p">)</span> <span class="c1">#adjust Q for size (fov) of stimulus back to that 10° ref</span>
                 <span class="k">if</span> <span class="s1">&#39;W&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">:</span>
                      <span class="n">s</span> <span class="o">=</span> <span class="p">(((</span><span class="mf">1.0</span> <span class="o">/</span> <span class="n">WsM</span><span class="p">)</span> <span class="o">-</span> <span class="mf">1.0</span><span class="p">)</span><span class="o">/</span><span class="n">cW</span><span class="p">[</span><span class="mi">0</span><span class="p">])</span><span class="o">**</span><span class="p">(</span><span class="mf">1.0</span><span class="o">/</span><span class="n">cW</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span>

docs/build/html/_modules/luxpy/color/cam/ciecam02.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cam.ciecam02 &mdash; LuxPy 1.6.5 documentation</title>
+  <title>luxpy.color.cam.ciecam02 &mdash; LuxPy 1.6.6 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.5
+                1.6.6
               </div>
 
 
@@ -512,6 +512,11 @@ <h1>Source code for luxpy.color.cam.ciecam02</h1><div class="highlight"><pre>
         <span class="k">else</span><span class="p">:</span>
             <span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s1">&#39;No lightness or brightness values in data. Inverse CAM-transform not possible!&#39;</span><span class="p">)</span>
 
+        <span class="c1">#-------------------------------------------- </span>
+        <span class="c1"># calculate Hue quadrature (if requested in &#39;out&#39;):</span>
+        <span class="k">if</span> <span class="s1">&#39;H&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">:</span>    
+            <span class="n">h</span> <span class="o">=</span> <span class="n">hue_quadrature</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="n">outin</span><span class="o">.</span><span class="n">index</span><span class="p">(</span><span class="s1">&#39;H&#39;</span><span class="p">)],</span> <span class="n">unique_hue_data</span> <span class="o">=</span> <span class="n">_UNIQUE_HUE_DATA</span><span class="p">,</span> <span class="n">forward</span> <span class="o">=</span> <span class="kc">False</span><span class="p">)</span>
+
 
         <span class="c1">#--------------------------------------------    </span>
         <span class="k">if</span> <span class="s1">&#39;a&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">[</span><span class="mi">1</span><span class="p">]:</span> 
@@ -521,9 +526,14 @@ <h1>Source code for luxpy.color.cam.ciecam02</h1><div class="highlight"><pre>
             <span class="c1">#--------------------------------------------</span>
             <span class="c1"># calculate Colorfulness M or Chroma C or Saturation s from a,b:</span>
             <span class="n">MCs</span> <span class="o">=</span> <span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="mi">1</span><span class="p">]</span><span class="o">**</span><span class="mf">2.0</span> <span class="o">+</span> <span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="mi">2</span><span class="p">]</span><span class="o">**</span><span class="mf">2.0</span><span class="p">)</span><span class="o">**</span><span class="mf">0.5</span>   
-        <span class="k">else</span><span class="p">:</span>
+        <span class="k">elif</span> <span class="s1">&#39;H&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">:</span>    
+            <span class="n">h</span> <span class="o">=</span> <span class="n">hue_quadrature</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="n">outin</span><span class="o">.</span><span class="n">index</span><span class="p">(</span><span class="s1">&#39;H&#39;</span><span class="p">)],</span> <span class="n">unique_hue_data</span> <span class="o">=</span> <span class="n">_UNIQUE_HUE_DATA</span><span class="p">,</span> <span class="n">forward</span> <span class="o">=</span> <span class="kc">False</span><span class="p">)</span>
+            <span class="n">MCs</span> <span class="o">=</span> <span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="mi">1</span><span class="p">]</span> 
+        <span class="k">elif</span> <span class="s1">&#39;h&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">:</span>
             <span class="n">h</span> <span class="o">=</span> <span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="mi">2</span><span class="p">]</span>
             <span class="n">MCs</span> <span class="o">=</span> <span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="mi">1</span><span class="p">]</span>  
+        <span class="k">else</span><span class="p">:</span>
+            <span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s1">&#39;No (a,b) or hue angle or Hue quadrature data in input!&#39;</span><span class="p">)</span>
 
 
         <span class="k">if</span> <span class="p">(</span><span class="s1">&#39;S&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">[</span><span class="mi">1</span><span class="p">]):</span>

docs/build/html/_modules/luxpy/color/cam/ciecam16.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cam.ciecam16 &mdash; LuxPy 1.6.5 documentation</title>
+  <title>luxpy.color.cam.ciecam16 &mdash; LuxPy 1.6.6 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.5
+                1.6.6
               </div>
 
 
@@ -482,6 +482,13 @@ <h1>Source code for luxpy.color.cam.ciecam16</h1><div class="highlight"><pre>
         <span class="k">else</span><span class="p">:</span>
             <span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s1">&#39;No lightness or brightness values in data. Inverse CAM-transform not possible!&#39;</span><span class="p">)</span>
 
+
+        <span class="c1">#-------------------------------------------- </span>
+        <span class="c1"># calculate Hue quadrature (if requested in &#39;out&#39;):</span>
+        <span class="k">if</span> <span class="s1">&#39;H&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">:</span>    
+            <span class="n">h</span> <span class="o">=</span> <span class="n">hue_quadrature</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="n">outin</span><span class="o">.</span><span class="n">index</span><span class="p">(</span><span class="s1">&#39;H&#39;</span><span class="p">)],</span> <span class="n">unique_hue_data</span> <span class="o">=</span> <span class="n">_UNIQUE_HUE_DATA</span><span class="p">,</span> <span class="n">forward</span> <span class="o">=</span> <span class="kc">False</span><span class="p">)</span>
+
+
         <span class="c1">#--------------------------------------------    </span>
         <span class="k">if</span> <span class="s1">&#39;a&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">[</span><span class="mi">1</span><span class="p">]:</span> 
             <span class="c1"># calculate hue h:</span>
@@ -490,9 +497,14 @@ <h1>Source code for luxpy.color.cam.ciecam16</h1><div class="highlight"><pre>
             <span class="c1">#--------------------------------------------</span>
             <span class="c1"># calculate Colorfulness M or Chroma C or Saturation s from a,b:</span>
             <span class="n">MCs</span> <span class="o">=</span> <span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="mi">1</span><span class="p">]</span><span class="o">**</span><span class="mf">2.0</span> <span class="o">+</span> <span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="mi">2</span><span class="p">]</span><span class="o">**</span><span class="mf">2.0</span><span class="p">)</span><span class="o">**</span><span class="mf">0.5</span>   
-        <span class="k">else</span><span class="p">:</span>
+        <span class="k">elif</span> <span class="s1">&#39;H&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">:</span>    
+            <span class="n">h</span> <span class="o">=</span> <span class="n">hue_quadrature</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="n">outin</span><span class="o">.</span><span class="n">index</span><span class="p">(</span><span class="s1">&#39;H&#39;</span><span class="p">)],</span> <span class="n">unique_hue_data</span> <span class="o">=</span> <span class="n">_UNIQUE_HUE_DATA</span><span class="p">,</span> <span class="n">forward</span> <span class="o">=</span> <span class="kc">False</span><span class="p">)</span>
+            <span class="n">MCs</span> <span class="o">=</span> <span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="mi">1</span><span class="p">]</span> 
+        <span class="k">elif</span> <span class="s1">&#39;h&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">:</span>
             <span class="n">h</span> <span class="o">=</span> <span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="mi">2</span><span class="p">]</span>
-            <span class="n">MCs</span> <span class="o">=</span> <span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="mi">1</span><span class="p">]</span>
+            <span class="n">MCs</span> <span class="o">=</span> <span class="n">data</span><span class="p">[</span><span class="o">...</span><span class="p">,</span><span class="mi">1</span><span class="p">]</span>  
+        <span class="k">else</span><span class="p">:</span>
+            <span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s1">&#39;No (a,b) or hue angle or Hue quadrature data in input!&#39;</span><span class="p">)</span>
 
 
         <span class="k">if</span> <span class="p">(</span><span class="s1">&#39;S&#39;</span> <span class="ow">in</span> <span class="n">outin</span><span class="p">[</span><span class="mi">1</span><span class="p">]):</span>

docs/build/html/_modules/luxpy/color/cam/colorappearancemodels.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cam.colorappearancemodels &mdash; LuxPy 1.6.5 documentation</title>
+  <title>luxpy.color.cam.colorappearancemodels &mdash; LuxPy 1.6.6 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.5
+                1.6.6
               </div>
 
 

docs/build/html/_modules/luxpy/color/cam/helpers.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cam.helpers &mdash; LuxPy 1.6.5 documentation</title>
+  <title>luxpy.color.cam.helpers &mdash; LuxPy 1.6.6 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.5
+                1.6.6
               </div>