From 1c4efc5c67e2313dfadf4a0786baaabd8d6489a6 Mon Sep 17 00:00:00 2001 From: Thomas Mansencal Date: Wed, 28 Jan 2015 16:14:14 +0100 Subject: [PATCH] Improve case consistency. --- aces_1.0.0/python/aces_ocio/__init__.py | 4 +- .../python/aces_ocio/create_aces_colorspaces.py | 560 ++++++++++---------- aces_1.0.0/python/aces_ocio/create_aces_config.py | 76 +-- .../python/aces_ocio/create_canon_colorspaces.py | 8 +- .../python/aces_ocio/create_general_colorspaces.py | 4 +- aces_1.0.0/python/aces_ocio/generate_lut.py | 18 +- 6 files changed, 320 insertions(+), 350 deletions(-) diff --git a/aces_1.0.0/python/aces_ocio/__init__.py b/aces_1.0.0/python/aces_ocio/__init__.py index 7a50220..3d33635 100644 --- a/aces_1.0.0/python/aces_ocio/__init__.py +++ b/aces_1.0.0/python/aces_ocio/__init__.py @@ -12,9 +12,9 @@ Python ****** >>> from aces_ocio.create_aces_config import create_ACES_config ->>> aces_CTL_directory = '/path/to/github/checkout/releases/v1.0.0/transforms/ctl' +>>> aces_ctl_directory = '/path/to/github/checkout/releases/v1.0.0/transforms/ctl' >>> config_directory = '/path/to/configuration/dir' ->>> create_ACES_config(aces_CTL_directory, config_directory, 1024, 33, True) +>>> create_ACES_config(aces_ctl_directory, config_directory, 1024, 33, True) Command Line ************ diff --git a/aces_1.0.0/python/aces_ocio/create_aces_colorspaces.py b/aces_1.0.0/python/aces_ocio/create_aces_colorspaces.py index 8c0eeb4..0a79ec6 100644 --- a/aces_1.0.0/python/aces_ocio/create_aces_colorspaces.py +++ b/aces_1.0.0/python/aces_ocio/create_aces_colorspaces.py @@ -34,25 +34,21 @@ __status__ = 'Production' __all__ = ['ACES_AP1_TO_AP0', 'ACES_AP0_TO_XYZ', + 'create_ACES', 'create_ACEScc', 'create_ACESproxy', 'create_ACEScg', 'create_ADX', - 'create_generic_log', 'create_ACES_LMT', - 'create_lmts', 'create_ACES_RRT_plus_ODT', - 'create_odts', - 'create_aces', + 'create_generic_log', + 'create_LMTs', + 'create_ODTs', 'get_transform_info', - 'get_ODT_info', - 'get_LMT_info', + 'get_ODTs_info', + 'get_LMTs_info', 'create_colorspaces'] -# ------------------------------------------------------------------------- -# *Matrices* -# ------------------------------------------------------------------------- - # Matrix converting *ACES AP1* primaries to *AP0*. ACES_AP1_TO_AP0 = [0.6954522414, 0.1406786965, 0.1638690622, 0.0447945634, 0.8596711185, 0.0955343182, @@ -63,10 +59,37 @@ ACES_AP0_TO_XYZ = [0.9525523959, 0.0000000000, 0.0000936786, 0.3439664498, 0.7281660966, -0.0721325464, 0.0000000000, 0.0000000000, 1.0088251844] -# ------------------------------------------------------------------------- -# *ACEScc* -# ------------------------------------------------------------------------- -def create_ACEScc(aces_CTL_directory, + +def create_ACES(): + """ + Object description. + + Parameters + ---------- + parameter : type + Parameter description. + + Returns + ------- + type + Return value description. + """ + + # Defining the reference colorspace. + aces2065_1 = ColorSpace('ACES2065-1') + aces2065_1.description = ( + 'The Academy Color Encoding System reference color space') + aces2065_1.equality_group = '' + aces2065_1.aliases = ["lin_ap0", "aces"] + aces2065_1.family = 'ACES' + aces2065_1.is_data = False + aces2065_1.allocation_type = ocio.Constants.ALLOCATION_LG2 + aces2065_1.allocation_vars = [-15, 6] + + return aces2065_1 + + +def create_ACEScc(aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup, @@ -75,7 +98,7 @@ def create_ACEScc(aces_CTL_directory, max_value=1.0, input_scale=1.0): """ - Object description. + Creates the *ACEScc* colorspace. Parameters ---------- @@ -84,8 +107,8 @@ def create_ACEScc(aces_CTL_directory, Returns ------- - type - Return value description. + Colorspace + *ACEScc* colorspace. """ cs = ColorSpace(name) @@ -95,13 +118,13 @@ def create_ACEScc(aces_CTL_directory, cs.family = 'ACES' cs.is_data = False - ctls = [os.path.join(aces_CTL_directory, + ctls = [os.path.join(aces_ctl_directory, 'ACEScc', 'ACEScsc.ACEScc_to_ACES.a1.0.0.ctl'), # This transform gets back to the *AP1* primaries. # Useful as the 1d LUT is only covering the transfer function. # The primaries switch is covered by the matrix below: - os.path.join(aces_CTL_directory, + os.path.join(aces_ctl_directory, 'ACEScg', 'ACEScsc.ACES_to_ACEScg.a1.0.0.ctl')] lut = '%s_to_ACES.spi1d' % name @@ -117,7 +140,7 @@ def create_ACEScc(aces_CTL_directory, 1.0, {}, cleanup, - aces_CTL_directory, + aces_ctl_directory, min_value, max_value) @@ -138,16 +161,13 @@ def create_ACEScc(aces_CTL_directory, return cs -# ------------------------------------------------------------------------- -# *ACESproxy* -# ------------------------------------------------------------------------- -def create_ACESproxy(aces_CTL_directory, +def create_ACESproxy(aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup, name='ACESproxy'): """ - Object description. + Creates the *ACESproxy* colorspace. Parameters ---------- @@ -156,8 +176,8 @@ def create_ACESproxy(aces_CTL_directory, Returns ------- - type - Return value description. + Colorspace + *ACESproxy* colorspace. """ cs = ColorSpace(name) @@ -167,13 +187,13 @@ def create_ACESproxy(aces_CTL_directory, cs.family = 'ACES' cs.is_data = False - ctls = [os.path.join(aces_CTL_directory, + ctls = [os.path.join(aces_ctl_directory, 'ACESproxy', 'ACEScsc.ACESproxy10i_to_ACES.a1.0.0.ctl'), # This transform gets back to the *AP1* primaries. # Useful as the 1d LUT is only covering the transfer function. # The primaries switch is covered by the matrix below: - os.path.join(aces_CTL_directory, + os.path.join(aces_ctl_directory, 'ACEScg', 'ACEScsc.ACES_to_ACEScg.a1.0.0.ctl')] lut = '%s_to_aces.spi1d' % name @@ -189,22 +209,20 @@ def create_ACESproxy(aces_CTL_directory, 1.0, {}, cleanup, - aces_CTL_directory) + aces_ctl_directory) cs.to_reference_transforms = [] cs.to_reference_transforms.append({ 'type': 'lutFile', 'path': lut, 'interpolation': 'linear', - 'direction': 'forward' - }) + 'direction': 'forward'}) # *AP1* primaries to *AP0* primaries. cs.to_reference_transforms.append({ 'type': 'matrix', 'matrix': mat44_from_mat33(ACES_AP1_TO_AP0), - 'direction': 'forward' - }) + 'direction': 'forward'}) cs.from_reference_transforms = [] return cs @@ -213,13 +231,13 @@ def create_ACESproxy(aces_CTL_directory, # ------------------------------------------------------------------------- # *ACEScg* # ------------------------------------------------------------------------- -def create_ACEScg(aces_CTL_directory, +def create_ACEScg(aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup, name='ACEScg'): """ - Object description. + Creates the *ACEScg* colorspace. Parameters ---------- @@ -228,8 +246,8 @@ def create_ACEScg(aces_CTL_directory, Returns ------- - type - Return value description. + Colorspace + *ACEScg* colorspace. """ cs = ColorSpace(name) @@ -259,7 +277,7 @@ def create_ADX(lut_directory, bit_depth=10, name='ADX'): """ - Object description. + Creates the *ADX* colorspace. Parameters ---------- @@ -268,8 +286,8 @@ def create_ADX(lut_directory, Returns ------- - type - Return value description. + Colorspace + *ADX* colorspace. """ name = '%s%s' % (name, bit_depth) @@ -282,26 +300,25 @@ def create_ADX(lut_directory, if bit_depth == 10: cs.bit_depth = ocio.Constants.BIT_DEPTH_UINT10 - adx_to_cdd = [1023.0 / 500.0, 0.0, 0.0, 0.0, + ADX_to_CDD = [1023.0 / 500.0, 0.0, 0.0, 0.0, 0.0, 1023.0 / 500.0, 0.0, 0.0, 0.0, 0.0, 1023.0 / 500.0, 0.0, 0.0, 0.0, 0.0, 1.0] offset = [-95.0 / 500.0, -95.0 / 500.0, -95.0 / 500.0, 0.0] elif bit_depth == 16: cs.bit_depth = ocio.Constants.BIT_DEPTH_UINT16 - adx_to_cdd = [65535.0 / 8000.0, 0.0, 0.0, 0.0, + ADX_to_CDD = [65535.0 / 8000.0, 0.0, 0.0, 0.0, 0.0, 65535.0 / 8000.0, 0.0, 0.0, 0.0, 0.0, 65535.0 / 8000.0, 0.0, 0.0, 0.0, 0.0, 1.0] - offset = [-1520.0 / 8000.0, -1520.0 / 8000.0, -1520.0 / 8000.0, - 0.0] + offset = [-1520.0 / 8000.0, -1520.0 / 8000.0, -1520.0 / 8000.0, 0.0] cs.to_reference_transforms = [] # Converting from *ADX* to *Channel-Dependent Density*. cs.to_reference_transforms.append({ 'type': 'matrix', - 'matrix': adx_to_cdd, + 'matrix': ADX_to_CDD, 'offset': offset, 'direction': 'forward'}) @@ -358,20 +375,20 @@ def create_ADX(lut_directory, return (value - from_min) / (from_max - from_min) * ( to_max - to_min) + to_min - NUM_SAMPLES = 2 ** 12 - RANGE = (-0.19, 3.0) + num_samples = 2 ** 12 + domain = (-0.19, 3.0) data = [] - for i in xrange(NUM_SAMPLES): - x = i / (NUM_SAMPLES - 1.0) - x = fit(x, 0.0, 1.0, RANGE[0], RANGE[1]) + for i in xrange(num_samples): + x = i / (num_samples - 1.0) + x = fit(x, 0.0, 1.0, domain[0], domain[1]) data.append(cid_to_rle(x)) lut = 'ADX_CID_to_RLE.spi1d' write_SPI_1d(os.path.join(lut_directory, lut), - RANGE[0], - RANGE[1], + domain[0], + domain[1], data, - NUM_SAMPLES, 1) + num_samples, 1) return lut @@ -404,90 +421,17 @@ def create_ADX(lut_directory, return cs -# ------------------------------------------------------------------------- -# *Generic Log Transform* -# ------------------------------------------------------------------------- -def create_generic_log(aces_CTL_directory, - lut_directory, - lut_resolution_1d, - cleanup, - name='log', - aliases=[], - min_value=0.0, - max_value=1.0, - input_scale=1.0, - middle_grey=0.18, - min_exposure=-6.0, - max_exposure=6.5): - """ - Object description. - - Parameters - ---------- - parameter : type - Parameter description. - - Returns - ------- - type - Return value description. - """ - - cs = ColorSpace(name) - cs.description = 'The %s color space' % name - cs.aliases = aliases - cs.equality_group = name - cs.family = 'Utility' - cs.is_data = False - - ctls = [os.path.join( - aces_CTL_directory, - 'utilities', - 'ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl')] - lut = '%s_to_aces.spi1d' % name - - lut = sanitize(lut) - - generate_1d_LUT_from_CTL( - os.path.join(lut_directory, lut), - ctls, - lut_resolution_1d, - 'float', - input_scale, - 1.0, - {'middleGrey': middle_grey, - 'minExposure': min_exposure, - 'maxExposure': max_exposure}, - cleanup, - aces_CTL_directory, - min_value, - max_value) - - cs.to_reference_transforms = [] - cs.to_reference_transforms.append({ - 'type': 'lutFile', - 'path': lut, - 'interpolation': 'linear', - 'direction': 'forward'}) - - cs.from_reference_transforms = [] - return cs - - -# ------------------------------------------------------------------------- -# *Individual LMTs* -# ------------------------------------------------------------------------- def create_ACES_LMT(lmt_name, lmt_values, shaper_info, - aces_CTL_directory, + aces_ctl_directory, lut_directory, lut_resolution_1d=1024, lut_resolution_3d=64, cleanup=True, aliases=[]): """ - Object description. + Creates the *ACES LMT* colorspace. Parameters ---------- @@ -496,8 +440,8 @@ def create_ACES_LMT(lmt_name, Returns ------- - type - Return value description. + Colorspace + *ACES LMT* colorspace. """ cs = ColorSpace('%s' % lmt_name) @@ -518,7 +462,7 @@ def create_ACES_LMT(lmt_name, shaper_lut = '%s_to_aces.spi1d' % shaper_name if not os.path.exists(os.path.join(lut_directory, shaper_lut)): - ctls = [shaper_to_ACES_CTL % aces_CTL_directory] + ctls = [shaper_to_ACES_CTL % aces_ctl_directory] shaper_lut = sanitize(shaper_lut) @@ -531,7 +475,7 @@ def create_ACES_LMT(lmt_name, 1.0, shaper_params, cleanup, - aces_CTL_directory) + aces_ctl_directory) shaper_OCIO_transform = { 'type': 'lutFile', @@ -543,8 +487,8 @@ def create_ACES_LMT(lmt_name, cs.from_reference_transforms = [] if 'transformCTL' in lmt_values: - ctls = [shaper_to_ACES_CTL % aces_CTL_directory, - os.path.join(aces_CTL_directory, + ctls = [shaper_to_ACES_CTL % aces_ctl_directory, + os.path.join(aces_ctl_directory, lmt_values['transformCTL'])] lut = '%s.%s.spi3d' % (shaper_name, lmt_name) @@ -559,25 +503,24 @@ def create_ACES_LMT(lmt_name, 1.0, shaper_params, cleanup, - aces_CTL_directory) + aces_ctl_directory) cs.from_reference_transforms.append(shaper_OCIO_transform) cs.from_reference_transforms.append({ 'type': 'lutFile', 'path': lut, 'interpolation': 'tetrahedral', - 'direction': 'forward' - }) + 'direction': 'forward'}) # Generating the inverse transform. cs.to_reference_transforms = [] if 'transformCTLInverse' in lmt_values: - ctls = [os.path.join(aces_CTL_directory, + ctls = [os.path.join(aces_ctl_directory, # TODO: Investigate "odt_values" undeclared # variable. odt_values['transformCTLInverse']), - shaper_from_ACES_CTL % aces_CTL_directory] + shaper_from_ACES_CTL % aces_ctl_directory] lut = 'Inverse.%s.%s.spi3d' % (odt_name, shaper_name) lut = sanitize(lut) @@ -591,7 +534,7 @@ def create_ACES_LMT(lmt_name, shaper_input_scale, shaper_params, cleanup, - aces_CTL_directory) + aces_ctl_directory) cs.to_reference_transforms.append({ 'type': 'lutFile', @@ -606,98 +549,10 @@ def create_ACES_LMT(lmt_name, return cs -# ------------------------------------------------------------------------- -# *LMTs* -# ------------------------------------------------------------------------- -def create_lmts(aces_CTL_directory, - lut_directory, - lut_resolution_1d, - lut_resolution_3d, - lmt_info, - shaper_name, - cleanup): - """ - Object description. - - Parameters - ---------- - parameter : type - Parameter description. - - Returns - ------- - type - Return value description. - """ - - colorspaces = [] - - # ------------------------------------------------------------------------- - # *LMT Shaper* - # ------------------------------------------------------------------------- - lmt_lut_resolution_1d = max(4096, lut_resolution_1d) - lmt_lut_resolution_3d = max(65, lut_resolution_3d) - - # Defining the *Log 2* shaper. - lmt_shaper_name = 'LMT Shaper' - lmt_shaper_name_aliases = ['crv_lmtshaper'] - lmt_params = { - 'middleGrey': 0.18, - 'minExposure': -10.0, - 'maxExposure': 6.5} - - lmt_shaper = create_generic_log(aces_CTL_directory, - lut_directory, - lmt_lut_resolution_1d, - cleanup, - name=lmt_shaper_name, - middle_grey=lmt_params['middleGrey'], - min_exposure=lmt_params['minExposure'], - max_exposure=lmt_params['maxExposure'], - aliases=lmt_shaper_name_aliases) - colorspaces.append(lmt_shaper) - - shaper_input_scale_generic_log2 = 1.0 - - # *Log 2* shaper name and *CTL* transforms bundled up. - lmt_shaper_data = [ - lmt_shaper_name, - os.path.join('%s', - 'utilities', - 'ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl'), - os.path.join('%s', - 'utilities', - 'ACESlib.OCIO_shaper_lin_to_log2_param.a1.0.0.ctl'), - shaper_input_scale_generic_log2, - lmt_params] - - sorted_LMTs = sorted(lmt_info.iteritems(), key=lambda x: x[1]) - print(sorted_LMTs) - for lmt in sorted_LMTs: - (lmt_name, lmt_values) = lmt - lmt_aliases = ["look_%s" % compact(lmt_values['transformUserName'])] - cs = create_ACES_LMT( - lmt_values['transformUserName'], - lmt_values, - lmt_shaper_data, - aces_CTL_directory, - lut_directory, - lmt_lut_resolution_1d, - lmt_lut_resolution_3d, - cleanup, - lmt_aliases) - colorspaces.append(cs) - - return colorspaces - - -# ------------------------------------------------------------------------- -# *ACES RRT* with supplied *ODT*. -# ------------------------------------------------------------------------- def create_ACES_RRT_plus_ODT(odt_name, odt_values, shaper_info, - aces_CTL_directory, + aces_ctl_directory, lut_directory, lut_resolution_1d=1024, lut_resolution_3d=64, @@ -741,7 +596,7 @@ def create_ACES_RRT_plus_ODT(odt_name, shaper_lut = '%s_to_aces.spi1d' % shaper_name if not os.path.exists(os.path.join(lut_directory, shaper_lut)): - ctls = [shaper_to_ACES_CTL % aces_CTL_directory] + ctls = [shaper_to_ACES_CTL % aces_ctl_directory] shaper_lut = sanitize(shaper_lut) @@ -754,7 +609,7 @@ def create_ACES_RRT_plus_ODT(odt_name, 1.0, shaper_params, cleanup, - aces_CTL_directory) + aces_ctl_directory) shaper_OCIO_transform = { 'type': 'lutFile', @@ -779,11 +634,11 @@ def create_ACES_RRT_plus_ODT(odt_name, 'direction': 'forward'}) elif 'transformCTL' in odt_values: ctls = [ - shaper_to_ACES_CTL % aces_CTL_directory, - os.path.join(aces_CTL_directory, + shaper_to_ACES_CTL % aces_ctl_directory, + os.path.join(aces_ctl_directory, 'rrt', 'RRT.a1.0.0.ctl'), - os.path.join(aces_CTL_directory, + os.path.join(aces_ctl_directory, 'odt', odt_values['transformCTL'])] lut = '%s.RRT.a1.0.0.%s.spi3d' % (shaper_name, odt_name) @@ -800,7 +655,7 @@ def create_ACES_RRT_plus_ODT(odt_name, 1.0, shaper_params, cleanup, - aces_CTL_directory) + aces_ctl_directory) cs.from_reference_transforms.append(shaper_OCIO_transform) cs.from_reference_transforms.append({ @@ -828,13 +683,13 @@ def create_ACES_RRT_plus_ODT(odt_name, shaper_inverse['direction'] = 'forward' cs.to_reference_transforms.append(shaper_inverse) elif 'transformCTLInverse' in odt_values: - ctls = [os.path.join(aces_CTL_directory, + ctls = [os.path.join(aces_ctl_directory, 'odt', odt_values['transformCTLInverse']), - os.path.join(aces_CTL_directory, + os.path.join(aces_ctl_directory, 'rrt', 'InvRRT.a1.0.0.ctl'), - shaper_from_ACES_CTL % aces_CTL_directory] + shaper_from_ACES_CTL % aces_ctl_directory] lut = 'InvRRT.a1.0.0.%s.%s.spi3d' % (odt_name, shaper_name) lut = sanitize(lut) @@ -849,7 +704,7 @@ def create_ACES_RRT_plus_ODT(odt_name, shaper_input_scale, shaper_params, cleanup, - aces_CTL_directory) + aces_ctl_directory) cs.to_reference_transforms.append({ 'type': 'lutFile', @@ -864,10 +719,156 @@ def create_ACES_RRT_plus_ODT(odt_name, return cs -# ------------------------------------------------------------------------- -# *ODTs* -# ------------------------------------------------------------------------- -def create_odts(aces_CTL_directory, +def create_generic_log(aces_ctl_directory, + lut_directory, + lut_resolution_1d, + cleanup, + name='log', + aliases=[], + min_value=0.0, + max_value=1.0, + input_scale=1.0, + middle_grey=0.18, + min_exposure=-6.0, + max_exposure=6.5): + """ + Creates the *Generic Log* colorspace. + + Parameters + ---------- + parameter : type + Parameter description. + + Returns + ------- + Colorspace + *Generic Log* colorspace. + """ + + cs = ColorSpace(name) + cs.description = 'The %s color space' % name + cs.aliases = aliases + cs.equality_group = name + cs.family = 'Utility' + cs.is_data = False + + ctls = [os.path.join( + aces_ctl_directory, + 'utilities', + 'ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl')] + lut = '%s_to_aces.spi1d' % name + + lut = sanitize(lut) + + generate_1d_LUT_from_CTL( + os.path.join(lut_directory, lut), + ctls, + lut_resolution_1d, + 'float', + input_scale, + 1.0, + {'middleGrey': middle_grey, + 'minExposure': min_exposure, + 'maxExposure': max_exposure}, + cleanup, + aces_ctl_directory, + min_value, + max_value) + + cs.to_reference_transforms = [] + cs.to_reference_transforms.append({ + 'type': 'lutFile', + 'path': lut, + 'interpolation': 'linear', + 'direction': 'forward'}) + + cs.from_reference_transforms = [] + return cs + + +def create_LMTs(aces_ctl_directory, + lut_directory, + lut_resolution_1d, + lut_resolution_3d, + lmt_info, + shaper_name, + cleanup): + """ + Object description. + + Parameters + ---------- + parameter : type + Parameter description. + + Returns + ------- + type + Return value description. + """ + + colorspaces = [] + + # ------------------------------------------------------------------------- + # *LMT Shaper* + # ------------------------------------------------------------------------- + lmt_lut_resolution_1d = max(4096, lut_resolution_1d) + lmt_lut_resolution_3d = max(65, lut_resolution_3d) + + # Defining the *Log 2* shaper. + lmt_shaper_name = 'LMT Shaper' + lmt_shaper_name_aliases = ['crv_lmtshaper'] + lmt_params = { + 'middleGrey': 0.18, + 'minExposure': -10.0, + 'maxExposure': 6.5} + + lmt_shaper = create_generic_log(aces_ctl_directory, + lut_directory, + lmt_lut_resolution_1d, + cleanup, + name=lmt_shaper_name, + middle_grey=lmt_params['middleGrey'], + min_exposure=lmt_params['minExposure'], + max_exposure=lmt_params['maxExposure'], + aliases=lmt_shaper_name_aliases) + colorspaces.append(lmt_shaper) + + shaper_input_scale_generic_log2 = 1.0 + + # *Log 2* shaper name and *CTL* transforms bundled up. + lmt_shaper_data = [ + lmt_shaper_name, + os.path.join('%s', + 'utilities', + 'ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl'), + os.path.join('%s', + 'utilities', + 'ACESlib.OCIO_shaper_lin_to_log2_param.a1.0.0.ctl'), + shaper_input_scale_generic_log2, + lmt_params] + + sorted_LMTs = sorted(lmt_info.iteritems(), key=lambda x: x[1]) + print(sorted_LMTs) + for lmt in sorted_LMTs: + lmt_name, lmt_values = lmt + lmt_aliases = ["look_%s" % compact(lmt_values['transformUserName'])] + cs = create_ACES_LMT( + lmt_values['transformUserName'], + lmt_values, + lmt_shaper_data, + aces_ctl_directory, + lut_directory, + lmt_lut_resolution_1d, + lmt_lut_resolution_3d, + cleanup, + lmt_aliases) + colorspaces.append(cs) + + return colorspaces + + +def create_ODTs(aces_ctl_directory, lut_directory, lut_resolution_1d, lut_resolution_3d, @@ -907,7 +908,7 @@ def create_odts(aces_CTL_directory, 'maxExposure': 6.5} log2_shaper = create_generic_log( - aces_CTL_directory, + aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup, @@ -937,8 +938,8 @@ def create_odts(aces_CTL_directory, # Shaper that also includes the AP1 primaries. # Needed for some LUT baking steps. log2_shaper_api1_name_aliases = ["%s_ap1" % compact(shaper_name)] - log2_shaper_AP1 = create_generic_log( - aces_CTL_directory, + log2_shaper_ap1 = create_generic_log( + aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup, @@ -947,15 +948,15 @@ def create_odts(aces_CTL_directory, min_exposure=log2_params['minExposure'], max_exposure=log2_params['maxExposure'], aliases=log2_shaper_api1_name_aliases) - log2_shaper_AP1.name = '%s - AP1' % log2_shaper_AP1.name + log2_shaper_ap1.name = '%s - AP1' % log2_shaper_ap1.name # *AP1* primaries to *AP0* primaries. - log2_shaper_AP1.to_reference_transforms.append({ + log2_shaper_ap1.to_reference_transforms.append({ 'type': 'matrix', 'matrix': mat44_from_mat33(ACES_AP1_TO_AP0), 'direction': 'forward' }) - colorspaces.append(log2_shaper_AP1) + colorspaces.append(log2_shaper_ap1) rrt_shaper = log2_shaper_data @@ -981,7 +982,7 @@ def create_odts(aces_CTL_directory, odt_name_legal, odt_legal, rrt_shaper, - aces_CTL_directory, + aces_ctl_directory, lut_directory, lut_resolution_1d, lut_resolution_3d, @@ -1010,7 +1011,7 @@ def create_odts(aces_CTL_directory, odt_name_full, odt_full, rrt_shaper, - aces_CTL_directory, + aces_ctl_directory, lut_directory, lut_resolution_1d, lut_resolution_3d, @@ -1026,35 +1027,6 @@ def create_odts(aces_CTL_directory, return (colorspaces, displays) -def create_aces(): - """ - Object description. - - Parameters - ---------- - parameter : type - Parameter description. - - Returns - ------- - type - Return value description. - """ - - # Defining the reference colorspace. - ACES = ColorSpace('ACES2065-1') - ACES.description = ( - 'The Academy Color Encoding System reference color space') - ACES.equality_group = '' - ACES.aliases = ["lin_ap0", "aces"] - ACES.family = 'ACES' - ACES.is_data = False - ACES.allocation_type = ocio.Constants.ALLOCATION_LG2 - ACES.allocation_vars = [-15, 6] - - return ACES - - def get_transform_info(ctl_transform): """ Object description. @@ -1092,7 +1064,7 @@ def get_transform_info(ctl_transform): transform_full_legal_switch) -def get_ODT_info(aces_CTL_directory): +def get_ODTs_info(aces_ctl_directory): """ Object description. @@ -1111,7 +1083,7 @@ def get_ODT_info(aces_CTL_directory): # TODO: Investigate usage of *files_walker* definition here. # Credit to *Alex Fry* for the original approach here. - odt_dir = os.path.join(aces_CTL_directory, 'odt') + odt_dir = os.path.join(aces_ctl_directory, 'odt') all_odt = [] for dir_name, subdir_list, file_list in os.walk(odt_dir): for fname in file_list: @@ -1141,7 +1113,7 @@ def get_ODT_info(aces_CTL_directory): transform_user_name, transform_user_name_prefix, transform_full_legal_switch) = get_transform_info( - os.path.join(aces_CTL_directory, 'odt', odt_dir, transform_CTL)) + os.path.join(aces_ctl_directory, 'odt', odt_dir, transform_CTL)) # Finding inverse. transform_CTL_inverse = 'InvODT.%s.ctl' % odt_name @@ -1182,7 +1154,7 @@ def get_ODT_info(aces_CTL_directory): return odts -def get_LMT_info(aces_CTL_directory): +def get_LMTs_info(aces_ctl_directory): """ Object description. @@ -1202,7 +1174,7 @@ def get_LMT_info(aces_CTL_directory): # TODO: Investigate refactoring with previous definition. # Credit to Alex Fry for the original approach here - lmt_dir = os.path.join(aces_CTL_directory, 'lmt') + lmt_dir = os.path.join(aces_ctl_directory, 'lmt') all_lmt = [] for dir_name, subdir_list, file_list in os.walk(lmt_dir): for fname in file_list: @@ -1233,7 +1205,7 @@ def get_LMT_info(aces_CTL_directory): transform_user_name, transform_user_name_prefix, transform_full_legal_switch) = get_transform_info( - os.path.join(aces_CTL_directory, lmt_dir, transform_CTL)) + os.path.join(aces_ctl_directory, lmt_dir, transform_CTL)) # Finding inverse. transform_CTL_inverse = 'InvLMT.%s.ctl' % lmt_name @@ -1269,7 +1241,7 @@ def get_LMT_info(aces_CTL_directory): return lmts -def create_colorspaces(aces_CTL_directory, +def create_colorspaces(aces_ctl_directory, lut_directory, lut_resolution_1d, lut_resolution_3d, @@ -1293,17 +1265,17 @@ def create_colorspaces(aces_CTL_directory, colorspaces = [] - ACES = create_aces() + ACES = create_ACES() - ACEScc = create_ACEScc(aces_CTL_directory, lut_directory, + ACEScc = create_ACEScc(aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup) colorspaces.append(ACEScc) - ACESproxy = create_ACESproxy(aces_CTL_directory, lut_directory, + ACESproxy = create_ACESproxy(aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup) colorspaces.append(ACESproxy) - ACEScg = create_ACEScg(aces_CTL_directory, lut_directory, + ACEScg = create_ACEScg(aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup) colorspaces.append(ACEScg) @@ -1313,7 +1285,7 @@ def create_colorspaces(aces_CTL_directory, ADX16 = create_ADX(lut_directory, lut_resolution_1d, bit_depth=16) colorspaces.append(ADX16) - lmts = create_lmts(aces_CTL_directory, + lmts = create_LMTs(aces_ctl_directory, lut_directory, lut_resolution_1d, lut_resolution_3d, @@ -1322,7 +1294,7 @@ def create_colorspaces(aces_CTL_directory, cleanup) colorspaces.extend(lmts) - odts, displays = create_odts(aces_CTL_directory, + odts, displays = create_ODTs(aces_ctl_directory, lut_directory, lut_resolution_1d, lut_resolution_3d, diff --git a/aces_1.0.0/python/aces_ocio/create_aces_config.py b/aces_1.0.0/python/aces_ocio/create_aces_config.py index 525da6b..96382e0 100755 --- a/aces_1.0.0/python/aces_ocio/create_aces_config.py +++ b/aces_1.0.0/python/aces_ocio/create_aces_config.py @@ -152,12 +152,11 @@ def generate_OCIO_transform(transforms): interpolation_options = { 'linear': ocio.Constants.INTERP_LINEAR, 'nearest': ocio.Constants.INTERP_NEAREST, - 'tetrahedral': ocio.Constants.INTERP_TETRAHEDRAL - } + 'tetrahedral': ocio.Constants.INTERP_TETRAHEDRAL} + direction_options = { 'forward': ocio.Constants.TRANSFORM_DIR_FORWARD, - 'inverse': ocio.Constants.TRANSFORM_DIR_INVERSE - } + 'inverse': ocio.Constants.TRANSFORM_DIR_INVERSE} ocio_transforms = [] @@ -210,7 +209,6 @@ def generate_OCIO_transform(transforms): direction_options[ 'forward']) ocio_transforms.append(ocio_transform) - # unknown type else: print("Ignoring unknown transform type : %s" % transform['type']) @@ -226,7 +224,9 @@ def generate_OCIO_transform(transforms): return transform -def add_colorspace_alias(config, reference_colorspace, colorspace, +def add_colorspace_alias(config, + reference_colorspace, + colorspace, colorspace_alias_names): """ Object description. @@ -246,10 +246,10 @@ def add_colorspace_alias(config, reference_colorspace, colorspace, if alias_name == colorspace.name.lower(): return - print( "Adding alias colorspace space %s, alias to %s" % ( + print('Adding alias colorspace space %s, alias to %s' % ( alias_name, colorspace.name)) - compact_family_name = "Aliases" + compact_family_name = 'Aliases' ocio_colorspace_alias = ocio.ColorSpace( name=alias_name, @@ -261,8 +261,8 @@ def add_colorspace_alias(config, reference_colorspace, colorspace, allocation=colorspace.allocation_type, allocationVars=colorspace.allocation_vars) - if colorspace.to_reference_transforms != []: - print("Generating To-Reference transforms") + if not colorspace.to_reference_transforms: + print('Generating To-Reference transforms') ocio_transform = generate_OCIO_transform( [{'type': 'colorspace', 'src': colorspace.name, @@ -272,8 +272,8 @@ def add_colorspace_alias(config, reference_colorspace, colorspace, ocio_transform, ocio.Constants.COLORSPACE_DIR_TO_REFERENCE) - if colorspace.from_reference_transforms != []: - print("Generating From-Reference transforms") + if not colorspace.from_reference_transforms: + print('Generating From-Reference transforms') ocio_transform = generate_OCIO_transform( [{'type': 'colorspace', 'src': reference_colorspace.name, @@ -428,7 +428,7 @@ def create_config(config_data, nuke=False): def generate_LUTs(odt_info, lmt_info, shaper_name, - aces_CTL_directory, + aces_ctl_directory, lut_directory, lut_resolution_1d=4096, lut_resolution_3d=64, @@ -463,7 +463,7 @@ def generate_LUTs(odt_info, (aces_reference, aces_colorspaces, aces_displays, - aces_log_display_space) = aces.create_colorspaces(aces_CTL_directory, + aces_log_display_space) = aces.create_colorspaces(aces_ctl_directory, lut_directory, lut_resolution_1d, lut_resolution_3d, @@ -547,22 +547,22 @@ def generate_baked_LUTs(odt_info, # Create two entries for ODTs that have full and legal range support odt_info_C = dict(odt_info) - for odt_CTL_name, odt_values in odt_info.iteritems(): + for odt_ctl_name, odt_values in odt_info.iteritems(): if odt_values['transformHasFullLegalSwitch']: odt_name = odt_values['transformUserName'] odt_values_legal = dict(odt_values) odt_values_legal['transformUserName'] = '%s - Legal' % odt_name - odt_info_C['%s - Legal' % odt_CTL_name] = odt_values_legal + odt_info_C['%s - Legal' % odt_ctl_name] = odt_values_legal odt_values_full = dict(odt_values) odt_values_full['transformUserName'] = '%s - Full' % odt_name - odt_info_C['%s - Full' % odt_CTL_name] = odt_values_full + odt_info_C['%s - Full' % odt_ctl_name] = odt_values_full - del (odt_info_C[odt_CTL_name]) + del (odt_info_C[odt_ctl_name]) # Generate appropriate LUTs for each ODT - for odt_CTL_name, odt_values in odt_info_C.iteritems(): + for odt_ctl_name, odt_values in odt_info_C.iteritems(): odt_prefix = odt_values['transformUserNamePrefix'] odt_name = odt_values['transformUserName'] @@ -585,10 +585,10 @@ def generate_baked_LUTs(odt_info, 'photoshop', '%s for %s.icc' % (odt_name, input_space))] - bake_LUT = Process(description='bake a LUT', + bake_lut = Process(description='bake a LUT', cmd='ociobakelut', args=args) - bake_LUT.execute() + bake_lut.execute() # *Flame*, *Lustre* for input_space in ['ACEScc', 'ACESproxy']: @@ -609,10 +609,10 @@ def generate_baked_LUTs(odt_info, baked_directory, 'flame', '%s for %s Flame.3dl' % (odt_name, input_space))] - bake_LUT = Process(description='bake a LUT', + bake_lut = Process(description='bake a LUT', cmd='ociobakelut', args=(args + fargs)) - bake_LUT.execute() + bake_lut.execute() largs = ['--format', 'lustre', @@ -620,10 +620,10 @@ def generate_baked_LUTs(odt_info, baked_directory, 'lustre', '%s for %s Lustre.3dl' % (odt_name, input_space))] - bake_LUT = Process(description='bake a LUT', + bake_lut = Process(description='bake a LUT', cmd='ociobakelut', args=(args + largs)) - bake_LUT.execute() + bake_lut.execute() # *Maya*, *Houdini* for input_space in ['ACEScg', 'ACES2065-1']: @@ -649,10 +649,10 @@ def generate_baked_LUTs(odt_info, baked_directory, 'maya', '%s for %s Maya.csp' % (odt_name, input_space))] - bake_LUT = Process(description='bake a LUT', + bake_lut = Process(description='bake a LUT', cmd='ociobakelut', args=(args + margs)) - bake_LUT.execute() + bake_lut.execute() hargs = ['--format', 'houdini', @@ -660,10 +660,10 @@ def generate_baked_LUTs(odt_info, baked_directory, 'houdini', '%s for %s Houdini.lut' % (odt_name, input_space))] - bake_LUT = Process(description='bake a LUT', + bake_lut = Process(description='bake a LUT', cmd='ociobakelut', args=(args + hargs)) - bake_LUT.execute() + bake_lut.execute() def create_config_dir(config_directory, bake_secondary_LUTs): @@ -697,7 +697,7 @@ def create_config_dir(config_directory, bake_secondary_LUTs): return lut_directory -def create_ACES_config(aces_CTL_directory, +def create_ACES_config(aces_ctl_directory, config_directory, lut_resolution_1d=4096, lut_resolution_3d=64, @@ -719,14 +719,14 @@ def create_ACES_config(aces_CTL_directory, lut_directory = create_config_dir(config_directory, bake_secondary_LUTs) - odt_info = aces.get_ODT_info(aces_CTL_directory) - lmt_info = aces.get_LMT_info(aces_CTL_directory) + odt_info = aces.get_ODTs_info(aces_ctl_directory) + lmt_info = aces.get_LMTs_info(aces_ctl_directory) shaper_name = 'Output Shaper' config_data = generate_LUTs(odt_info, lmt_info, shaper_name, - aces_CTL_directory, + aces_ctl_directory, lut_directory, lut_resolution_1d, lut_resolution_3d, @@ -790,11 +790,11 @@ def main(): options, arguments = p.parse_args() - aces_CTL_directory = options.acesCTLDir + aces_ctl_directory = options.acesCTLDir config_directory = options.configDir lut_resolution_1d = int(options.lutResolution1d) lut_resolution_3d = int(options.lutResolution3d) - bake_secondary_LUTs = not options.dontBakeSecondaryLUTs + bake_secondary_luts = not options.dontBakeSecondaryLUTs cleanup_temp_images = not options.keepTempImages # TODO: Investigate the following statements. @@ -807,7 +807,7 @@ def main(): print('command line : \n%s\n' % ' '.join(sys.argv)) - assert aces_CTL_directory is not None, ( + assert aces_ctl_directory is not None, ( 'process: No "{0}" environment variable defined or no "ACES CTL" ' 'directory specified'.format( ACES_OCIO_CTL_DIRECTORY_ENVIRON)) @@ -817,11 +817,11 @@ def main(): 'directory specified'.format( ACES_OCIO_CONFIGURATION_DIRECTORY_ENVIRON)) - return create_ACES_config(aces_CTL_directory, + return create_ACES_config(aces_ctl_directory, config_directory, lut_resolution_1d, lut_resolution_3d, - bake_secondary_LUTs, + bake_secondary_luts, cleanup_temp_images) diff --git a/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py b/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py index ed39c9d..ec419fd 100644 --- a/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py +++ b/aces_1.0.0/python/aces_ocio/create_canon_colorspaces.py @@ -57,17 +57,17 @@ def create_c_log(gamut, cs.family = 'Canon' cs.is_data = False - def legal_to_full(codeValue): - return (codeValue - 64.0) / (940.0 - 64.0) + def legal_to_full(code_value): + return (code_value - 64.0) / (940.0 - 64.0) - def c_log_to_linear(codeValue): + def c_log_to_linear(code_value): # log = fullToLegal(c1 * log10(c2*linear + 1) + c3) # linear = (pow(10, (legalToFul(log) - c3)/c1) - 1)/c2 c1 = 0.529136 c2 = 10.1596 c3 = 0.0730597 - linear = (pow(10.0, (legal_to_full(codeValue) - c3) / c1) - 1.0) / c2 + linear = (pow(10.0, (legal_to_full(code_value) - c3) / c1) - 1.0) / c2 linear *= 0.9 return linear diff --git a/aces_1.0.0/python/aces_ocio/create_general_colorspaces.py b/aces_1.0.0/python/aces_ocio/create_general_colorspaces.py index 3417e75..c1e10cb 100644 --- a/aces_1.0.0/python/aces_ocio/create_general_colorspaces.py +++ b/aces_1.0.0/python/aces_ocio/create_general_colorspaces.py @@ -19,9 +19,7 @@ __status__ = 'Production' __all__ = ['create_generic_matrix', 'create_colorspaces'] -# ------------------------------------------------------------------------- -# Generic Matrix transform -# ------------------------------------------------------------------------- + def create_generic_matrix(name='matrix', from_reference_values=None, to_reference_values=None, diff --git a/aces_1.0.0/python/aces_ocio/generate_lut.py b/aces_1.0.0/python/aces_ocio/generate_lut.py index 1f23b06..4ed78fe 100755 --- a/aces_1.0.0/python/aces_ocio/generate_lut.py +++ b/aces_1.0.0/python/aces_ocio/generate_lut.py @@ -210,7 +210,7 @@ def apply_CTL_to_image(input_image, input_scale=1.0, output_scale=1.0, global_params=None, - aces_CTL_directory=None): + aces_ctl_directory=None): """ Object description. @@ -232,11 +232,11 @@ def apply_CTL_to_image(input_image, if len(ctl_paths) > 0: ctlenv = os.environ - if aces_CTL_directory is not None: - if os.path.split(aces_CTL_directory)[1] != 'utilities': - ctl_module_path = os.path.join(aces_CTL_directory, 'utilities') + if aces_ctl_directory is not None: + if os.path.split(aces_ctl_directory)[1] != 'utilities': + ctl_module_path = os.path.join(aces_ctl_directory, 'utilities') else: - ctl_module_path = aces_CTL_directory + ctl_module_path = aces_ctl_directory ctlenv['CTL_MODULE_PATH'] = ctl_module_path args = [] @@ -292,7 +292,7 @@ def generate_1d_LUT_from_CTL(lut_path, output_scale=1.0, global_params=None, cleanup=True, - aces_CTL_directory=None, + aces_ctl_directory=None, min_value=0.0, max_value=1.0): """ @@ -335,7 +335,7 @@ def generate_1d_LUT_from_CTL(lut_path, input_scale, output_scale, global_params, - aces_CTL_directory) + aces_ctl_directory) generate_1d_LUT_from_image(transformed_LUT_image, lut_path, @@ -430,7 +430,7 @@ def generate_3d_LUT_from_CTL(lut_path, output_scale=1.0, global_params=None, cleanup=True, - aces_CTL_directory=None): + aces_ctl_directory=None): """ Object description. @@ -470,7 +470,7 @@ def generate_3d_LUT_from_CTL(lut_path, input_scale, output_scale, global_params, - aces_CTL_directory) + aces_ctl_directory) corrected_LUT_image = '%s.%s.%s' % (lut_path_base, 'correct', 'exr') corrected_LUT_image = correct_LUT_image(transformed_LUT_image, -- 1.7.10.4