X-Git-Url: http://users.mur.at/ms/git/gitweb/?a=blobdiff_plain;f=aces_1.0.0%2Fpython%2Faces_ocio%2Fcolorspaces%2Faces.py;h=c3e725e22df316ab8552b92e9e4de605bcc700df;hb=918520c7cc16aa549e2af0f57b630905063bad19;hp=174b96c4e40bab1c05252afb0d6db0f753de21c4;hpb=0aab7ba4cf1b56cdc40fe839b47cdcafb06d6641;p=OpenColorIO-Configs.git diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py index 174b96c..c3e725e 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py @@ -26,7 +26,6 @@ from aces_ocio.utilities import ( sanitize, compact) - __author__ = 'ACES Developers' __copyright__ = 'Copyright (C) 2014 - 2015 - ACES Developers' __license__ = '' @@ -92,7 +91,7 @@ def create_ACES(): aces2065_1.description = ( 'The Academy Color Encoding System reference color space') aces2065_1.equality_group = '' - aces2065_1.aliases = ["lin_ap0", "aces"] + aces2065_1.aliases = ['lin_ap0', 'aces'] aces2065_1.family = 'ACES' aces2065_1.is_data = False aces2065_1.allocation_type = ocio.Constants.ALLOCATION_LG2 @@ -125,17 +124,23 @@ def create_ACEScc(aces_ctl_directory, cs = ColorSpace(name) cs.description = 'The %s color space' % name - cs.aliases = ["acescc", "acescc_ap1"] + cs.aliases = ['acescc', 'acescc_ap1'] cs.equality_group = '' cs.family = 'ACES' cs.is_data = False cs.allocation_type = ocio.Constants.ALLOCATION_UNIFORM cs.allocation_vars = [min_value, max_value] - cs.aces_transform_id = "ACEScsc.ACEScc_to_ACES.a1.0.0" + cs.aces_transform_id = 'ACEScsc.ACEScc_to_ACES.a1.0.0' ctls = [os.path.join(aces_ctl_directory, 'ACEScc', - 'ACEScsc.ACEScc_to_ACES.a1.0.0.ctl')] + '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, + 'ACEScg', + 'ACEScsc.ACES_to_ACEScg.a1.0.0.ctl')] lut = '%s_to_linear.spi1d' % name lut = sanitize(lut) @@ -147,7 +152,7 @@ def create_ACEScc(aces_ctl_directory, 'float', input_scale, 1, - {'transferFunctionOnly': 1}, + {}, cleanup, aces_ctl_directory, min_value, @@ -192,12 +197,12 @@ def create_ACESproxy(aces_ctl_directory, cs = ColorSpace(name) cs.description = 'The %s color space' % name - cs.aliases = ["acesproxy", "acesproxy_ap1"] + cs.aliases = ['acesproxy', 'acesproxy_ap1'] cs.equality_group = '' cs.family = 'ACES' cs.is_data = False - cs.aces_transform_id = "ACEScsc.ACESproxy10i_to_ACES.a1.0.0" + cs.aces_transform_id = 'ACEScsc.ACESproxy10i_to_ACES.a1.0.0' ctls = [os.path.join(aces_ctl_directory, 'ACESproxy', @@ -216,8 +221,8 @@ def create_ACESproxy(aces_ctl_directory, os.path.join(lut_directory, lut), ctls, lut_resolution_1d, - 'uint16', - 64, + 'float', + 1, 1, {}, cleanup, @@ -267,14 +272,14 @@ def create_ACEScg(aces_ctl_directory, cs = ColorSpace(name) cs.description = 'The %s color space' % name - cs.aliases = ["acescg", "lin_ap1"] + cs.aliases = ['acescg', 'lin_ap1'] cs.equality_group = '' cs.family = 'ACES' cs.is_data = False cs.allocation_type = ocio.Constants.ALLOCATION_LG2 cs.allocation_vars = [-8, 5, 0.00390625] - cs.aces_transform_id = "ACEScsc.ACEScg_to_ACES.a1.0.0" + cs.aces_transform_id = 'ACEScsc.ACEScg_to_ACES.a1.0.0' cs.to_reference_transforms = [] @@ -319,13 +324,13 @@ def create_ADX(lut_directory, name = '%s%s' % (name, bit_depth) cs = ColorSpace(name) cs.description = '%s color space - used for film scans' % name - cs.aliases = ["adx%s" % str(bit_depth)] + cs.aliases = ['adx%s' % str(bit_depth)] cs.equality_group = '' cs.family = 'ADX' cs.is_data = False if bit_depth == 10: - cs.aces_transform_id = "ACEScsc.ADX10_to_ACES.a1.0.0" + cs.aces_transform_id = 'ACEScsc.ADX10_to_ACES.a1.0.0' cs.bit_depth = ocio.Constants.BIT_DEPTH_UINT10 ADX_to_CDD = [1023 / 500, 0, 0, 0, @@ -334,7 +339,7 @@ def create_ADX(lut_directory, 0, 0, 0, 1] offset = [-95 / 500, -95 / 500, -95 / 500, 0] elif bit_depth == 16: - cs.aces_transform_id = "ACEScsc.ADX16_to_ACES.a1.0.0" + cs.aces_transform_id = 'ACEScsc.ADX16_to_ACES.a1.0.0' cs.bit_depth = ocio.Constants.BIT_DEPTH_UINT16 ADX_to_CDD = [65535 / 8000, 0, 0, 0, @@ -364,10 +369,10 @@ def create_ADX(lut_directory, # Copied from *Alex Fry*'s *adx_cid_to_rle.py* def create_CID_to_RLE_LUT(): - def interpolate_1D(x, xp, fp): + def interpolate_1d(x, xp, fp): return numpy.interp(x, xp, fp) - LUT_1D_xp = [-0.190000000000000, + LUT_1D_XP = [-0.190000000000000, 0.010000000000000, 0.028000000000000, 0.054000000000000, @@ -379,7 +384,7 @@ def create_ADX(lut_directory, 0.500000000000000, 0.600000000000000] - LUT_1D_fp = [-6.000000000000000, + LUT_1D_FP = [-6.000000000000000, -2.721718645000000, -2.521718645000000, -2.321718645000000, @@ -396,7 +401,7 @@ def create_ADX(lut_directory, def cid_to_rle(x): if x <= 0.6: - return interpolate_1D(x, LUT_1D_xp, LUT_1D_fp) + return interpolate_1d(x, LUT_1D_XP, LUT_1D_FP) return (100 / 55) * x - REF_PT def fit(value, from_min, from_max, to_min, to_max): @@ -459,7 +464,7 @@ def create_generic_log(aces_ctl_directory, lut_resolution_1d, cleanup, name='log', - aliases=[], + aliases=None, min_value=0, max_value=1, input_scale=1, @@ -480,6 +485,9 @@ def create_generic_log(aces_ctl_directory, *Generic Log* colorspace. """ + if aliases is None: + aliases = [] + cs = ColorSpace(name) cs.description = 'The %s color space' % name cs.aliases = aliases @@ -490,7 +498,7 @@ def create_generic_log(aces_ctl_directory, ctls = [os.path.join( aces_ctl_directory, 'utilities', - 'ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl')] + 'ACESlib.Log2_to_Lin_param.a1.0.0.ctl')] lut = '%s_to_linear.spi1d' % name lut = sanitize(lut) @@ -525,15 +533,18 @@ def create_generic_log(aces_ctl_directory, # ------------------------------------------------------------------------- # *base Dolby PQ Transform* # ------------------------------------------------------------------------- -def create_dolbypq(aces_CTL_directory, +def create_Dolby_PQ(aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup, name='pq', - aliases=[], + aliases=None, min_value=0.0, max_value=1.0, input_scale=1.0): + if aliases is None: + aliases = [] + cs = ColorSpace(name) cs.description = 'The %s color space' % name cs.aliases = aliases @@ -542,9 +553,9 @@ def create_dolbypq(aces_CTL_directory, cs.is_data = False ctls = [os.path.join( - aces_CTL_directory, + aces_ctl_directory, 'utilities', - 'ACESlib.OCIO_shaper_dolbypq_to_lin.a1.0.0.ctl')] + 'ACESlib.DolbyPQ_to_Lin.a1.0.0.ctl')] lut = '%s_to_linear.spi1d' % name lut = sanitize(lut) @@ -558,7 +569,7 @@ def create_dolbypq(aces_CTL_directory, 1.0, {}, cleanup, - aces_CTL_directory, + aces_ctl_directory, min_value, max_value) @@ -576,18 +587,21 @@ def create_dolbypq(aces_CTL_directory, # ------------------------------------------------------------------------- # *Dolby PQ Transform that considers a fixed linear range* # ------------------------------------------------------------------------- -def create_dolbypq_scaled(aces_CTL_directory, +def create_Dolby_PQ_scaled(aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup, name='pq', - aliases=[], + aliases=None, min_value=0.0, max_value=1.0, input_scale=1.0, middle_grey=0.18, min_exposure=-6.0, max_exposure=6.5): + if aliases is None: + aliases = [] + cs = ColorSpace(name) cs.description = 'The %s color space' % name cs.aliases = aliases @@ -596,9 +610,9 @@ def create_dolbypq_scaled(aces_CTL_directory, cs.is_data = False ctls = [os.path.join( - aces_CTL_directory, + aces_ctl_directory, 'utilities', - 'ACESlib.OCIO_shaper_dolbypq_to_lin_param.a1.0.0.ctl')] + 'ACESlib.DolbyPQ_to_lin_param.a1.0.0.ctl')] lut = '%s_to_linear.spi1d' % name lut = sanitize(lut) @@ -614,7 +628,7 @@ def create_dolbypq_scaled(aces_CTL_directory, 'minExposure': min_exposure, 'maxExposure': max_exposure}, cleanup, - aces_CTL_directory, + aces_ctl_directory, min_value, max_value) @@ -666,13 +680,14 @@ def create_ACES_LMT(lmt_name, cs.is_data = False cs.allocation_type = ocio.Constants.ALLOCATION_LG2 cs.allocation_vars = [-8, 5, 0.00390625] + cs.aces_transform_id = lmt_values['transformID'] pprint.pprint(lmt_values) # Generating the *shaper* transform. (shaper_name, - shaper_to_ACES_CTL, - shaper_from_ACES_CTL, + shaper_to_aces_ctl, + shaper_from_aces_ctl, shaper_input_scale, shaper_params) = shaper_info @@ -680,7 +695,7 @@ def create_ACES_LMT(lmt_name, shaper_lut = '%s_to_linear.spi1d' % shaper_name shaper_lut = sanitize(shaper_lut) - shaper_OCIO_transform = { + shaper_ocio_transform = { 'type': 'lutFile', 'path': shaper_lut, 'interpolation': 'linear', @@ -690,7 +705,7 @@ def create_ACES_LMT(lmt_name, cs.from_reference_transforms = [] if 'transformCTL' in lmt_values: - ctls = [shaper_to_ACES_CTL % 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) @@ -708,7 +723,7 @@ def create_ACES_LMT(lmt_name, cleanup, aces_ctl_directory) - cs.from_reference_transforms.append(shaper_OCIO_transform) + cs.from_reference_transforms.append(shaper_ocio_transform) cs.from_reference_transforms.append({ 'type': 'lutFile', 'path': lut, @@ -721,7 +736,8 @@ def create_ACES_LMT(lmt_name, if 'transformCTLInverse' in lmt_values: ctls = [os.path.join(aces_ctl_directory, lmt_values['transformCTLInverse']), - shaper_from_ACES_CTL % aces_ctl_directory] + shaper_from_aces_ctl % aces_ctl_directory] + # TODO: Investigate unresolved `odt_name` reference. lut = 'Inverse.%s.%s.spi3d' % (odt_name, shaper_name) lut = sanitize(lut) @@ -736,9 +752,7 @@ def create_ACES_LMT(lmt_name, shaper_params, cleanup, aces_ctl_directory, - 0, - 1, - 1) + 0) cs.to_reference_transforms.append({ 'type': 'lutFile', @@ -746,7 +760,7 @@ def create_ACES_LMT(lmt_name, 'interpolation': 'tetrahedral', 'direction': 'forward'}) - shaper_inverse = shaper_OCIO_transform.copy() + shaper_inverse = shaper_ocio_transform.copy() shaper_inverse['direction'] = 'forward' cs.to_reference_transforms.append(shaper_inverse) @@ -811,18 +825,18 @@ def create_LMTs(aces_ctl_directory, lmt_shaper_name, os.path.join('%s', 'utilities', - 'ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl'), + 'ACESlib.Log2_to_Lin_param.a1.0.0.ctl'), os.path.join('%s', 'utilities', - 'ACESlib.OCIO_shaper_lin_to_log2_param.a1.0.0.ctl'), + 'ACESlib.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: + 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'])] + lmt_aliases = ['look_%s' % compact(lmt_values['transformUserName'])] cs = create_ACES_LMT( lmt_values['transformUserName'], lmt_values, @@ -881,8 +895,8 @@ def create_ACES_RRT_plus_ODT(odt_name, # Generating the *shaper* transform. (shaper_name, - shaper_to_ACES_CTL, - shaper_from_ACES_CTL, + shaper_to_aces_ctl, + shaper_from_aces_ctl, shaper_input_scale, shaper_params) = shaper_info @@ -895,7 +909,7 @@ def create_ACES_RRT_plus_ODT(odt_name, shaper_lut = '%s_to_linear.spi1d' % shaper_name shaper_lut = sanitize(shaper_lut) - shaper_OCIO_transform = { + shaper_ocio_transform = { 'type': 'lutFile', 'path': shaper_lut, 'interpolation': 'linear', @@ -905,20 +919,20 @@ def create_ACES_RRT_plus_ODT(odt_name, cs.from_reference_transforms = [] if 'transformLUT' in odt_values: - transform_LUT_file_name = os.path.basename( + transform_lut_file_name = os.path.basename( odt_values['transformLUT']) - lut = os.path.join(lut_directory, transform_LUT_file_name) + lut = os.path.join(lut_directory, transform_lut_file_name) shutil.copy(odt_values['transformLUT'], lut) - cs.from_reference_transforms.append(shaper_OCIO_transform) + cs.from_reference_transforms.append(shaper_ocio_transform) cs.from_reference_transforms.append({ 'type': 'lutFile', - 'path': transform_LUT_file_name, + 'path': transform_lut_file_name, 'interpolation': 'tetrahedral', 'direction': 'forward'}) elif 'transformCTL' in odt_values: ctls = [ - shaper_to_ACES_CTL % aces_ctl_directory, + shaper_to_aces_ctl % aces_ctl_directory, os.path.join(aces_ctl_directory, 'rrt', 'RRT.a1.0.0.ctl'), @@ -941,7 +955,7 @@ def create_ACES_RRT_plus_ODT(odt_name, cleanup, aces_ctl_directory) - cs.from_reference_transforms.append(shaper_OCIO_transform) + cs.from_reference_transforms.append(shaper_ocio_transform) cs.from_reference_transforms.append({ 'type': 'lutFile', 'path': lut, @@ -952,18 +966,18 @@ def create_ACES_RRT_plus_ODT(odt_name, cs.to_reference_transforms = [] if 'transformLUTInverse' in odt_values: - transform_LUT_inverse_file_name = os.path.basename( + transform_lut_inverse_file_name = os.path.basename( odt_values['transformLUTInverse']) - lut = os.path.join(lut_directory, transform_LUT_inverse_file_name) + lut = os.path.join(lut_directory, transform_lut_inverse_file_name) shutil.copy(odt_values['transformLUTInverse'], lut) cs.to_reference_transforms.append({ 'type': 'lutFile', - 'path': transform_LUT_inverse_file_name, + 'path': transform_lut_inverse_file_name, 'interpolation': 'tetrahedral', 'direction': 'forward'}) - shaper_inverse = shaper_OCIO_transform.copy() + shaper_inverse = shaper_ocio_transform.copy() shaper_inverse['direction'] = 'forward' cs.to_reference_transforms.append(shaper_inverse) elif 'transformCTLInverse' in odt_values: @@ -973,7 +987,7 @@ def create_ACES_RRT_plus_ODT(odt_name, 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) @@ -996,7 +1010,7 @@ def create_ACES_RRT_plus_ODT(odt_name, 'interpolation': 'tetrahedral', 'direction': 'forward'}) - shaper_inverse = shaper_OCIO_transform.copy() + shaper_inverse = shaper_ocio_transform.copy() shaper_inverse['direction'] = 'forward' cs.to_reference_transforms.append(shaper_inverse) @@ -1039,7 +1053,7 @@ def create_ODTs(aces_ctl_directory, # Defining the *Log 2* shaper. log2_shaper_name = shaper_name - log2_shaper_name_aliases = ["crv_%s" % compact(log2_shaper_name)] + log2_shaper_name_aliases = ['crv_%s' % compact(log2_shaper_name)] log2_params = { 'middleGrey': 0.18, 'minExposure': -6, @@ -1064,20 +1078,22 @@ def create_ODTs(aces_ctl_directory, log2_shaper_name, os.path.join('%s', 'utilities', - 'ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl'), + 'ACESlib.Log2_to_Lin_param.a1.0.0.ctl'), os.path.join('%s', 'utilities', - 'ACESlib.OCIO_shaper_lin_to_log2_param.a1.0.0.ctl'), + 'ACESlib.Lin_to_Log2_param.a1.0.0.ctl'), shaper_input_scale_generic_log2, log2_params] shaper_data[log2_shaper_name] = log2_shaper_data # Space with a more user-friendly name. Direct copy otherwise. - log2_shaper_copy_name = "Log2 Shaper" + log2_shaper_copy_name = 'Log2 Shaper' log2_shaper_copy_colorspace = ColorSpace(log2_shaper_copy_name) - log2_shaper_copy_colorspace.description = 'The %s color space' % log2_shaper_copy_name - log2_shaper_copy_colorspace.aliases = ["crv_%s" % compact(log2_shaper_copy_name)] + log2_shaper_copy_colorspace.description = ( + 'The %s color space' % log2_shaper_copy_name) + log2_shaper_copy_colorspace.aliases = [ + 'crv_%s' % compact(log2_shaper_copy_name)] log2_shaper_copy_colorspace.equality_group = log2_shaper_copy_name log2_shaper_copy_colorspace.family = log2_shaper_colorspace.family log2_shaper_copy_colorspace.is_data = log2_shaper_colorspace.is_data @@ -1088,11 +1104,12 @@ def create_ODTs(aces_ctl_directory, colorspaces.append(log2_shaper_copy_colorspace) # Defining the *Log2 shaper that includes the AP1* primaries. - log2_shaper_api1_name = "%s - AP1" % "Log2 Shaper" + log2_shaper_api1_name = '%s - AP1' % 'Log2 Shaper' log2_shaper_api1_colorspace = ColorSpace(log2_shaper_api1_name) - log2_shaper_api1_colorspace.description = 'The %s color space' % log2_shaper_api1_name + log2_shaper_api1_colorspace.description = ( + 'The %s color space' % log2_shaper_api1_name) log2_shaper_api1_colorspace.aliases = [ - "%s_ap1" % compact(log2_shaper_copy_name)] + '%s_ap1' % compact(log2_shaper_copy_name)] log2_shaper_api1_colorspace.equality_group = log2_shaper_api1_name log2_shaper_api1_colorspace.family = log2_shaper_colorspace.family log2_shaper_api1_colorspace.is_data = log2_shaper_colorspace.is_data @@ -1111,10 +1128,11 @@ def create_ODTs(aces_ctl_directory, # Defining the *Log2 shaper that includes the AP1* primaries. # Named with 'shaper_name' variable. Needed for some LUT baking steps. - shaper_api1_name = "%s - AP1" % shaper_name + shaper_api1_name = '%s - AP1' % shaper_name shaper_api1_colorspace = ColorSpace(shaper_api1_name) - shaper_api1_colorspace.description = 'The %s color space' % shaper_api1_name - shaper_api1_colorspace.aliases = ["%s_ap1" % compact(shaper_name)] + shaper_api1_colorspace.description = ( + 'The %s color space' % shaper_api1_name) + shaper_api1_colorspace.aliases = ['%s_ap1' % compact(shaper_name)] shaper_api1_colorspace.equality_group = shaper_api1_name shaper_api1_colorspace.family = log2_shaper_colorspace.family shaper_api1_colorspace.is_data = log2_shaper_colorspace.is_data @@ -1126,10 +1144,10 @@ def create_ODTs(aces_ctl_directory, # Define the base *Dolby PQ Shaper* # - dolbypq_shaper_name = "Dolby PQ 10000" - dolbypq_shaper_name_aliases = ["crv_%s" % "dolbypq_10000"] + dolbypq_shaper_name = 'Dolby PQ 10000' + dolbypq_shaper_name_aliases = ['crv_%s' % 'dolbypq_10000'] - dolbypq_shaper_colorspace = create_dolbypq( + dolbypq_shaper_colorspace = create_Dolby_PQ( aces_ctl_directory, lut_directory, lut_resolution_1d, @@ -1143,10 +1161,10 @@ def create_ODTs(aces_ctl_directory, dolbypq_shaper_name, os.path.join('%s', 'utilities', - 'ACESlib.OCIO_shaper_dolbypq_to_lin.a1.0.0.ctl'), + 'ACESlib.DolbyPQ_to_Lin.a1.0.0.ctl'), os.path.join('%s', 'utilities', - 'ACESlib.OCIO_shaper_lin_to_dolbypq.a1.0.0.ctl'), + 'ACESlib.Lin_to_DolbyPQ.a1.0.0.ctl'), 1.0, {}] @@ -1154,10 +1172,10 @@ def create_ODTs(aces_ctl_directory, # Define the *Dolby PQ Shaper that considers a fixed linear range* # - dolbypq_scaled_shaper_name = "Dolby PQ Scaled" - dolbypq_scaled_shaper_name_aliases = ["crv_%s" % "dolbypq_scaled"] + dolbypq_scaled_shaper_name = 'Dolby PQ Scaled' + dolbypq_scaled_shaper_name_aliases = ['crv_%s' % 'dolbypq_scaled'] - dolbypq_scaled_shaper_colorspace = create_dolbypq_scaled( + dolbypq_scaled_shaper_colorspace = create_Dolby_PQ_scaled( aces_ctl_directory, lut_directory, lut_resolution_1d, @@ -1171,10 +1189,10 @@ def create_ODTs(aces_ctl_directory, dolbypq_scaled_shaper_name, os.path.join('%s', 'utilities', - 'ACESlib.OCIO_shaper_dolbypq_to_lin_param.a1.0.0.ctl'), + 'ACESlib.DolbyPQ_to_Lin_param.a1.0.0.ctl'), os.path.join('%s', 'utilities', - 'ACESlib.OCIO_shaper_lin_to_dolbypq_param.a1.0.0.ctl'), + 'ACESlib.Lin_to_DolbyPQ_param.a1.0.0.ctl'), 1.0, log2_params] @@ -1192,17 +1210,23 @@ def create_ODTs(aces_ctl_directory, for odt in sorted_odts: (odt_name, odt_values) = odt - # Generating legal range transform for *ODTs* that can generate + # Generating only full range transform for *ODTs* that can generate # either *legal* or *full* output. + + # Uncomment these lines and the lower section and + # flip the 'legalRange' value to 1 to recover the old behavior, + # where both legal and full range LUTs were generated. if odt_values['transformHasFullLegalSwitch']: - odt_name_legal = '%s - Legal' % odt_values['transformUserName'] - else: - odt_name_legal = odt_values['transformUserName'] + # odt_name_legal = '%s - Legal' % odt_values['transformUserName'] + odt_legal['legalRange'] = 0 + # else: + # odt_name_legal = odt_values['transformUserName'] + + odt_name_legal = odt_values['transformUserName'] odt_legal = odt_values.copy() - odt_legal['legalRange'] = 1 - odt_aliases = ["out_%s" % compact(odt_name_legal)] + odt_aliases = ['out_%s' % compact(odt_name_legal)] cs = create_ACES_RRT_plus_ODT( odt_name_legal, @@ -1221,7 +1245,7 @@ def create_ODTs(aces_ctl_directory, 'Log': log_display_space, 'Output Transform': cs} - + """ # Generating full range transform for *ODTs* that can generate # either *legal* or *full* output. if odt_values['transformHasFullLegalSwitch']: @@ -1231,7 +1255,7 @@ def create_ODTs(aces_ctl_directory, odt_full = odt_values.copy() odt_full['legalRange'] = 0 - odt_full_aliases = ["out_%s" % compact(odt_name_full)] + odt_full_aliases = ['out_%s' % compact(odt_name_full)] cs_full = create_ACES_RRT_plus_ODT( odt_name_full, @@ -1249,8 +1273,9 @@ def create_ODTs(aces_ctl_directory, 'Raw': linear_display_space, 'Log': log_display_space, 'Output Transform': cs_full} + """ - return (colorspaces, displays) + return colorspaces, displays def get_transform_info(ctl_transform): @@ -1278,11 +1303,12 @@ def get_transform_info(ctl_transform): transform_user_name_prefix = ( lines[2][3:].split('<')[1].split('>')[1].split('-')[0].strip()) - # Figuring out if this transform has options for processing full and legal range + # Figuring out if this transform has options + # for processing full and legal range. transform_full_legal_switch = False for line in lines: - if line.strip() == "input varying int legalRange = 0": - # print( "%s has legal range flag" % transform_user_name) + if line.strip() == 'input varying int legalRange = 0': + # print( '%s has legal range flag' % transform_user_name) transform_full_legal_switch = True break @@ -1315,13 +1341,13 @@ def get_ODTs_info(aces_ctl_directory): for fname in file_list: all_odt.append((os.path.join(dir_name, fname))) - odt_CTLs = [x for x in all_odt if + odt_ctls = [x for x in all_odt if ('InvODT' not in x) and (os.path.split(x)[-1][0] != '.')] odts = {} - for odt_CTL in odt_CTLs: - odt_tokens = os.path.split(odt_CTL) + for odt_ctl in odt_ctls: + odt_tokens = os.path.split(odt_ctl) # Handling nested directories. odt_path_tokens = os.path.split(odt_tokens[-2]) @@ -1331,47 +1357,47 @@ def get_ODTs_info(aces_ctl_directory): odt_dir = os.path.join(odt_path_tokens[-1], odt_dir) # Building full name, - transform_CTL = odt_tokens[-1] - odt_name = string.join(transform_CTL.split('.')[1:-1], '.') + transform_ctl = odt_tokens[-1] + odt_name = string.join(transform_ctl.split('.')[1:-1], '.') # Finding id, user name and user name prefix. - (transform_ID, + (transform_id, 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 + transform_ctl_inverse = 'InvODT.%s.ctl' % odt_name if not os.path.exists( - os.path.join(odt_tokens[-2], transform_CTL_inverse)): - transform_CTL_inverse = None + os.path.join(odt_tokens[-2], transform_ctl_inverse)): + transform_ctl_inverse = None # Add to list of ODTs odts[odt_name] = {} - odts[odt_name]['transformCTL'] = os.path.join(odt_dir, transform_CTL) - if transform_CTL_inverse is not None: + odts[odt_name]['transformCTL'] = os.path.join(odt_dir, transform_ctl) + if transform_ctl_inverse is not None: odts[odt_name]['transformCTLInverse'] = os.path.join( - odt_dir, transform_CTL_inverse) + odt_dir, transform_ctl_inverse) - odts[odt_name]['transformID'] = transform_ID + odts[odt_name]['transformID'] = transform_id odts[odt_name]['transformUserNamePrefix'] = transform_user_name_prefix odts[odt_name]['transformUserName'] = transform_user_name odts[odt_name][ 'transformHasFullLegalSwitch'] = transform_full_legal_switch - forward_CTL = odts[odt_name]['transformCTL'] + forward_ctl = odts[odt_name]['transformCTL'] print('ODT : %s' % odt_name) - print('\tTransform ID : %s' % transform_ID) + print('\tTransform ID : %s' % transform_id) print('\tTransform User Name Prefix : %s' % transform_user_name_prefix) print('\tTransform User Name : %s' % transform_user_name) print( '\tHas Full / Legal Switch : %s' % transform_full_legal_switch) - print('\tForward ctl : %s' % forward_CTL) + print('\tForward ctl : %s' % forward_ctl) if 'transformCTLInverse' in odts[odt_name]: - inverse_CTL = odts[odt_name]['transformCTLInverse'] - print('\tInverse ctl : %s' % inverse_CTL) + inverse_ctl = odts[odt_name]['transformCTLInverse'] + print('\tInverse ctl : %s' % inverse_ctl) else: print('\tInverse ctl : %s' % 'None') @@ -1406,14 +1432,14 @@ def get_LMTs_info(aces_ctl_directory): for fname in file_list: all_lmt.append((os.path.join(dir_name, fname))) - lmt_CTLs = [x for x in all_lmt if + lmt_ctls = [x for x in all_lmt if ('InvLMT' not in x) and ('README' not in x) and ( os.path.split(x)[-1][0] != '.')] lmts = {} - for lmt_CTL in lmt_CTLs: - lmt_tokens = os.path.split(lmt_CTL) + for lmt_ctl in lmt_ctls: + lmt_tokens = os.path.split(lmt_ctl) # Handlimg nested directories. lmt_path_tokens = os.path.split(lmt_tokens[-2]) @@ -1427,38 +1453,38 @@ def get_LMTs_info(aces_ctl_directory): lmt_name = string.join(transform_CTL.split('.')[1:-1], '.') # Finding id, user name and user name prefix. - (transform_ID, + (transform_id, transform_user_name, transform_user_name_prefix, transform_full_legal_switch) = get_transform_info( os.path.join(aces_ctl_directory, lmt_dir, transform_CTL)) # Finding inverse. - transform_CTL_inverse = 'InvLMT.%s.ctl' % lmt_name + transform_ctl_inverse = 'InvLMT.%s.ctl' % lmt_name if not os.path.exists( - os.path.join(lmt_tokens[-2], transform_CTL_inverse)): - transform_CTL_inverse = None + os.path.join(lmt_tokens[-2], transform_ctl_inverse)): + transform_ctl_inverse = None lmts[lmt_name] = {} lmts[lmt_name]['transformCTL'] = os.path.join(lmt_dir, transform_CTL) - if transform_CTL_inverse is not None: + if transform_ctl_inverse is not None: lmts[lmt_name]['transformCTLInverse'] = os.path.join( - lmt_dir, transform_CTL_inverse) + lmt_dir, transform_ctl_inverse) - lmts[lmt_name]['transformID'] = transform_ID + lmts[lmt_name]['transformID'] = transform_id lmts[lmt_name]['transformUserNamePrefix'] = transform_user_name_prefix lmts[lmt_name]['transformUserName'] = transform_user_name - forward_CTL = lmts[lmt_name]['transformCTL'] + forward_ctl = lmts[lmt_name]['transformCTL'] print('LMT : %s' % lmt_name) - print('\tTransform ID : %s' % transform_ID) + print('\tTransform ID : %s' % transform_id) print('\tTransform User Name Prefix : %s' % transform_user_name_prefix) print('\tTransform User Name : %s' % transform_user_name) - print('\t Forward ctl : %s' % forward_CTL) + print('\t Forward ctl : %s' % forward_ctl) if 'transformCTLInverse' in lmts[lmt_name]: - inverse_CTL = lmts[lmt_name]['transformCTLInverse'] - print('\t Inverse ctl : %s' % inverse_CTL) + inverse_ctl = lmts[lmt_name]['transformCTLInverse'] + print('\t Inverse ctl : %s' % inverse_ctl) else: print('\t Inverse ctl : %s' % 'None') @@ -1533,7 +1559,7 @@ def create_colorspaces(aces_ctl_directory, colorspaces.extend(odts) # Wish there was an automatic way to get this from the CTL - defaultDisplay = "sRGB (D60 sim.)" + default_display = 'sRGB (D60 sim.)' roles = {'color_picking': ACEScg.name, 'color_timing': ACEScc.name, @@ -1545,4 +1571,4 @@ def create_colorspaces(aces_ctl_directory, 'scene_linear': ACEScg.name, 'texture_paint': ''} - return ACES, colorspaces, displays, ACEScc, roles, defaultDisplay + return ACES, colorspaces, displays, ACEScc, roles, default_display