update to v1.6.8

Added IES TM30 Annex E support
ksmet1977 · May 10, 2021 · 4753a16 · 4753a16
1 parent ddb9feb
commit 4753a16
Show file tree

Hide file tree

Showing 91 changed files with 1,683 additions and 565 deletions.
diff --git a/LuxPy_Documentation.pdf b/LuxPy_Documentation.pdf
diff --git a/README.md b/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.7
-* Date: May 05, 2021
+* Version: 1.6.8
+* Date: May 11, 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)
@@ -30,7 +30,7 @@ For some online spectral calculations (ANSI/IES TM30, CIE 13.3-1995 Ra, CIE 224:
 * color space transformations
 * chromatic adaptation transforms 
 * color appearance models 
-* color rendition indices 
+* color rendition indices (eg. CIE Ra, CIE 224:2017 Rf, ANSI/IES TM30 Rf, Rg, ... + IES TM30 Annex E priority levels & reports)
 * calculation of photobiological quantities (eg melanopic irradiance, MEDI, CS, ...)
 * multi-component spectrum creation and optimization
 * hyper-spectral image simulation and rendering
@@ -46,7 +46,7 @@ As of May 2019, LuxPy now also has a toolbox **spectro** for **spectral measurem
 * spectro.jeti: easy installation (dll's are part of sub-package).
 * spectro.oceanoptics: more tricky installation (requires manual install of  **python-seabreeze**, ...; see [here](https://github.com/ksmet1977/luxpy/blob/master/luxpy/toolboxes/spectro/oceanoptics/oceanoptics.md) or subpackage help for more info)
 
-**NEW** (Sep, 2020): **ANSI/IES-TM30-2018** graphical output (**Color Rendition Report**, **Color Vector Graphic**, ...)
+**UPDATED** (May, 2021): **ANSI/IES-TM30-2018** graphical output (**Color Rendition Reports**, **Color Vector Graphics**, **Annex E priority levels**...)
 
 -------------------------------------------------------------------------------
 ## How to use LuxPy (basics)?

diff --git a/conda/luxpy/meta.yaml b/conda/luxpy/meta.yaml
diff --git a/docs/LuxPy_Documentation-v1.6.7.pdf → docs/LuxPy_Documentation-v1.6.8.pdf b/docs/LuxPy_Documentation-v1.6.7.pdf → docs/LuxPy_Documentation-v1.6.8.pdf
diff --git a/docs/build/html/.buildinfo b/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: d4af526efb7aaadfe86837af0efd6bf3
+config: 4a3a98370a2c0a08b47dc57f64138cef
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/build/html/_modules/index.html b/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.7 documentation</title>
+  <title>Overview: module code &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cam/cam02ucs.html b/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.7 documentation</title>
+  <title>luxpy.color.cam.cam02ucs &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cam/cam15u.html b/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.7 documentation</title>
+  <title>luxpy.color.cam.cam15u &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cam/cam16ucs.html b/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.7 documentation</title>
+  <title>luxpy.color.cam.cam16ucs &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cam/cam18sl.html b/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.7 documentation</title>
+  <title>luxpy.color.cam.cam18sl &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 
@@ -214,7 +214,7 @@ <h1>Source code for luxpy.color.cam.cam18sl</h1><div class="highlight"><pre>
            <span class="s1">&#39;xyz_to_qabs_cam18sl&#39;</span><span class="p">,</span><span class="s1">&#39;qabs_cam18sl_to_xyz&#39;</span><span class="p">]</span>
 
 <span class="c1">#------------------------------------------------------------------------------------------------------------------------------------------------------------------------------            </span>
-<span class="k">def</span> <span class="nf">cam18sl</span><span class="p">(</span><span class="n">data</span><span class="p">,</span> <span class="n">datab</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span> <span class="n">Lb</span> <span class="o">=</span> <span class="p">[</span><span class="mi">100</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="n">inputtype</span> <span class="o">=</span> <span class="s1">&#39;xyz&#39;</span><span class="p">,</span> <span class="n">direction</span> <span class="o">=</span> <span class="s1">&#39;forward&#39;</span><span class="p">,</span> <span class="n">outin</span> <span class="o">=</span> <span class="s1">&#39;Q,aS,bS&#39;</span><span class="p">,</span> <span class="n">parameters</span> <span class="o">=</span> <span class="kc">None</span><span class="p">):</span>
+<div class="viewcode-block" id="cam18sl"><a class="viewcode-back" href="../../../../color.html#luxpy.color.cam.cam18sl">[docs]</a><span class="k">def</span> <span class="nf">cam18sl</span><span class="p">(</span><span class="n">data</span><span class="p">,</span> <span class="n">datab</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span> <span class="n">Lb</span> <span class="o">=</span> <span class="p">[</span><span class="mi">100</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="n">inputtype</span> <span class="o">=</span> <span class="s1">&#39;xyz&#39;</span><span class="p">,</span> <span class="n">direction</span> <span class="o">=</span> <span class="s1">&#39;forward&#39;</span><span class="p">,</span> <span class="n">outin</span> <span class="o">=</span> <span class="s1">&#39;Q,aS,bS&#39;</span><span class="p">,</span> <span class="n">parameters</span> <span class="o">=</span> <span class="kc">None</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">    Convert between CIE 2006 10°  XYZ tristimulus values (or spectral data) </span>
 <span class="sd">    and CAM18sl color appearance correlates.</span>
@@ -517,7 +517,7 @@ <h1>Source code for luxpy.color.cam.cam18sl</h1><div class="highlight"><pre>
     <span class="k">if</span> <span class="n">camout</span><span class="o">.</span><span class="n">shape</span><span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
         <span class="n">camout</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">squeeze</span><span class="p">(</span><span class="n">camout</span><span class="p">,</span><span class="n">axis</span> <span class="o">=</span> <span class="mi">1</span><span class="p">)</span>
 
-    <span class="k">return</span> <span class="n">camout</span>
+    <span class="k">return</span> <span class="n">camout</span></div>
 
 <span class="c1">#------------------------------------------------------------------------------</span>
 <span class="c1"># def xyz_to_qabW_cam18sl(xyz, xyzb = None, Lb = [100], fov = 10.0, parameters = None, **kwargs):</span>

diff --git a/docs/build/html/_modules/luxpy/color/cam/ciecam02.html b/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.7 documentation</title>
+  <title>luxpy.color.cam.ciecam02 &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cam/ciecam16.html b/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.7 documentation</title>
+  <title>luxpy.color.cam.ciecam16 &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cam/colorappearancemodels.html b/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.7 documentation</title>
+  <title>luxpy.color.cam.colorappearancemodels &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 
@@ -472,7 +472,7 @@ <h1>Source code for luxpy.color.cam.colorappearancemodels</h1><div class="highli
                       <span class="n">xyz_to_qabM_cam18sl</span><span class="p">,</span> <span class="n">qabM_cam18sl_to_xyz</span><span class="p">,</span> 
                       <span class="n">xyz_to_qabS_cam18sl</span><span class="p">,</span> <span class="n">qabS_cam18sl_to_xyz</span><span class="p">)</span>
 
-<span class="n">__all__</span> <span class="o">+=</span> <span class="p">[</span><span class="s1">&#39;xyz_to_qabM_cam18sl&#39;</span><span class="p">,</span> <span class="s1">&#39;qabM_cam18sl_to_xyz&#39;</span><span class="p">,</span>
+<span class="n">__all__</span> <span class="o">+=</span> <span class="p">[</span><span class="s1">&#39;cam18sl&#39;</span><span class="p">,</span><span class="s1">&#39;xyz_to_qabM_cam18sl&#39;</span><span class="p">,</span> <span class="s1">&#39;qabM_cam18sl_to_xyz&#39;</span><span class="p">,</span>
             <span class="s1">&#39;xyz_to_qabS_cam18sl&#39;</span><span class="p">,</span> <span class="s1">&#39;qabS_cam18sl_to_xyz&#39;</span><span class="p">]</span>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cam/helpers.html b/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.7 documentation</title>
+  <title>luxpy.color.cam.helpers &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cam/sww2016.html b/docs/build/html/_modules/luxpy/color/cam/sww2016.html
@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cam.sww2016 &mdash; LuxPy 1.6.7 documentation</title>
+  <title>luxpy.color.cam.sww2016 &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cam/utils.html b/docs/build/html/_modules/luxpy/color/cam/utils.html
@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cam.utils &mdash; LuxPy 1.6.7 documentation</title>
+  <title>luxpy.color.cam.utils &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cam/zcam.html b/docs/build/html/_modules/luxpy/color/cam/zcam.html
@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cam.zcam &mdash; LuxPy 1.6.7 documentation</title>
+  <title>luxpy.color.cam.zcam &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cat/chromaticadaptation.html b/docs/build/html/_modules/luxpy/color/cat/chromaticadaptation.html
@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cat.chromaticadaptation &mdash; LuxPy 1.6.7 documentation</title>
+  <title>luxpy.color.cat.chromaticadaptation &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cct/cct.html b/docs/build/html/_modules/luxpy/color/cct/cct.html
@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cct.cct &mdash; LuxPy 1.6.7 documentation</title>
+  <title>luxpy.color.cct.cct &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
 
 

diff --git a/docs/build/html/_modules/luxpy/color/cct/cctduv_ohno_CORM2011.html b/docs/build/html/_modules/luxpy/color/cct/cctduv_ohno_CORM2011.html
@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>luxpy.color.cct.cctduv_ohno_CORM2011 &mdash; LuxPy 1.6.7 documentation</title>
+  <title>luxpy.color.cct.cctduv_ohno_CORM2011 &mdash; LuxPy 1.6.8 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                1.6.7
+                1.6.8
               </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-      <title>Overview: module code &mdash; LuxPy 1.6.7 documentation</title>
+      <title>Overview: module code &mdash; LuxPy 1.6.8 documentation</title>
@@ Expand Down Expand Up / @@ -61,7 +61,7 @@ @@
                   <div class="version">
-.6.7
+.6.8
                   </div>
@@ Expand Down @@