update

19vr · Mar 3, 2023 · 97e90da · 97e90da
1 parent ffe3448
commit 97e90da
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/luxpy/color/cam/camjabz.py b/luxpy/color/cam/camjabz.py
@@ -288,7 +288,7 @@ def run(data, xyzw = None, outin = 'J,aM,bM', cieobs = _CIEOBS,
 
     surround_parameters =  _SURROUND_PARAMETERS
     if isinstance(surround, str):
-        surround = surround_parameters[conditions['surround']]
+        surround = surround_parameters[surround]
     F, FLL, Nc, c = [surround[x] for x in sorted(surround.keys())]
 
     # Define cone/chromatic adaptation sensor space:  

diff --git a/luxpy/color/cam/ciecam02.py b/luxpy/color/cam/ciecam02.py
@@ -163,7 +163,7 @@ def run(data, xyzw = _DEFAULT_WHITE_POINT, Yw = None, outin = 'J,aM,bM',
 
     surround_parameters =  _SURROUND_PARAMETERS
     if isinstance(surround, str):
-        surround = surround_parameters[conditions['surround']]
+        surround = surround_parameters[surround]
     F, FLL, Nc, c = [surround[x] for x in sorted(surround.keys())]
     if naka_rushton_parameters is None: naka_rushton_parameters = _NAKA_RUSHTON_PARAMETERS
     if unique_hue_data is None: unique_hue_data = _UNIQUE_HUE_DATA
@@ -581,7 +581,9 @@ def normalize_to_Lw(Ill, Lw, cieobs, rflM):
     Ill2, Ill2M = normalize_to_Lw(Ill2, Lw, cieobs, rflM)
 
     n = 6
+
     xyz1, xyzw1 = lx.spd_to_xyz(Ill1, cieobs = cieobs, relative = True, rfl = rflM, out = 2)
+
     xyz1 = xyz1[:n,0,:]
     Ill1M = Ill1M[:(n+1),0,:]
 

diff --git a/luxpy/color/cam/ciecam16.py b/luxpy/color/cam/ciecam16.py
@@ -150,7 +150,7 @@ def run(data, xyzw = _DEFAULT_WHITE_POINT, Yw = None, outin = 'J,aM,bM',
 
     surround_parameters =  _SURROUND_PARAMETERS
     if isinstance(surround, str):
-        surround = surround_parameters[conditions['surround']]
+        surround = surround_parameters[surround]
     F, FLL, Nc, c = [surround[x] for x in sorted(surround.keys())]
     if naka_rushton_parameters is None: naka_rushton_parameters = _NAKA_RUSHTON_PARAMETERS
     if unique_hue_data is None: unique_hue_data = _UNIQUE_HUE_DATA 

diff --git a/luxpy/color/cam/zcam.py b/luxpy/color/cam/zcam.py
@@ -341,7 +341,7 @@ def run(data, xyzw = None, outin = 'J,aM,bM', cieobs = _CIEOBS,
 
     surround_parameters =  _SURROUND_PARAMETERS
     if isinstance(surround, str):
-        surround = surround_parameters[conditions['surround']]
+        surround = surround_parameters[surround]
     F, FLL, Nc, c = [surround[x] for x in sorted(surround.keys())]
 
     # Define cone/chromatic adaptation sensor space: