X-Git-Url: http://users.mur.at/ms/git/gitweb/?a=blobdiff_plain;f=aces_1.0.0%2Fpython%2Faces_ocio%2Fcolorspaces%2Fcanon.py;h=505f6c8ccbd92a0ed2875da950117a03eadfb1d5;hb=529f7b361204176430ea0df642e4ec00a5c54ad7;hp=e19f7148bc1a1ef61d66057d3f8568d68d3d5758;hpb=7a22772bdc32ebbbdc8ea394ff1b94d00eb55645;p=OpenColorIO-Configs.git

diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/canon.py b/aces_1.0.0/python/aces_ocio/colorspaces/canon.py
index e19f714..505f6c8 100644
--- a/aces_1.0.0/python/aces_ocio/colorspaces/canon.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/canon.py
@@ -12,7 +12,7 @@ import os
 
 import PyOpenColorIO as ocio
 
-import aces_ocio.generate_lut as genlut
+import aces_ocio.lut as genlut
 from aces_ocio.utilities import ColorSpace
 
 __author__ = 'ACES Developers'
@@ -28,7 +28,6 @@ __all__ = ['create_c_log',
 
 def create_c_log(gamut,
                  transfer_function,
-                 name,
                  lut_directory,
                  lut_resolution_1d,
                  aliases):
@@ -61,7 +60,7 @@ def create_c_log(gamut,
     cs.family = 'Input/Canon'
     cs.is_data = False
 
-    # A linear space needs allocation variables
+    # A linear space needs allocation variables.
     if transfer_function == '':
         cs.allocation_type = ocio.Constants.ALLOCATION_LG2
         cs.allocation_vars = [-8, 5, 0.00390625]
@@ -177,7 +176,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_1 = create_c_log(
         'Rec. 709 Daylight',
         'Canon-Log',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['canonlog_rec709day'])
@@ -186,7 +184,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_2 = create_c_log(
         'Rec. 709 Tungsten',
         'Canon-Log',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['canonlog_rec709tung'])
@@ -195,7 +192,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_3 = create_c_log(
         'DCI-P3 Daylight',
         'Canon-Log',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['canonlog_dcip3day'])
@@ -204,7 +200,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_4 = create_c_log(
         'DCI-P3 Tungsten',
         'Canon-Log',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['canonlog_dcip3tung'])
@@ -213,7 +208,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_5 = create_c_log(
         'Cinema Gamut Daylight',
         'Canon-Log',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['canonlog_cgamutday'])
@@ -222,7 +216,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_6 = create_c_log(
         'Cinema Gamut Tungsten',
         'Canon-Log',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['canonlog_cgamuttung'])
@@ -232,7 +225,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_7 = create_c_log(
         '',
         'Canon-Log',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['crv_canonlog'])
@@ -242,7 +234,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_8 = create_c_log(
         'Rec. 709 Daylight',
         '',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['lin_canonrec709day'])
@@ -251,7 +242,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_9 = create_c_log(
         'Rec. 709 Tungsten',
         '',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['lin_canonrec709tung'])
@@ -260,7 +250,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_10 = create_c_log(
         'DCI-P3 Daylight',
         '',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['lin_canondcip3day'])
@@ -269,7 +258,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_11 = create_c_log(
         'DCI-P3 Tungsten',
         '',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['lin_canondcip3tung'])
@@ -278,7 +266,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_12 = create_c_log(
         'Cinema Gamut Daylight',
         '',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['lin_canoncgamutday'])
@@ -287,7 +274,6 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     c_log_13 = create_c_log(
         'Cinema Gamut Tungsten',
         '',
-        'Canon-Log',
         lut_directory,
         lut_resolution_1d,
         ['lin_canoncgamuttung'])