X-Git-Url: http://users.mur.at/ms/git/gitweb/?a=blobdiff_plain;f=aces_1.0.0%2Fpython%2Faces_ocio%2Fcolorspaces%2Fsony.py;h=a19d2e5313b2794db567b0c14d75e7241b01a489;hb=3d531dce5348148c92789eebf0d198c42c2a0820;hp=876066dc19a942540a6db584f3de0481d02d3012;hpb=b05a1064b4e4b9a6b1cfc5ccd8c249d19e007330;p=OpenColorIO-Configs.git diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/sony.py b/aces_1.0.0/python/aces_ocio/colorspaces/sony.py index 876066d..a19d2e5 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/sony.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/sony.py @@ -22,13 +22,12 @@ __maintainer__ = 'ACES Developers' __email__ = 'aces@oscars.org' __status__ = 'Production' -__all__ = ['create_S_Log', +__all__ = ['create_s_log', 'create_colorspaces'] -def create_S_Log(gamut, +def create_s_log(gamut, transfer_function, - name, lut_directory, lut_resolution_1d, aliases): @@ -66,7 +65,7 @@ def create_S_Log(gamut, transfer_function.replace('-', ''), gamut.replace('-', '').replace(' ', '_')) - # 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] @@ -233,131 +232,117 @@ def create_colorspaces(lut_directory, lut_resolution_1d): colorspaces = [] # *S-Log1* - s_log1_s_gamut = create_S_Log( + s_log1_s_gamut = create_s_log( 'S-Gamut', 'S-Log1', - 'S-Log', lut_directory, lut_resolution_1d, ['slog1_sgamut']) colorspaces.append(s_log1_s_gamut) # *S-Log2* - s_log2_s_gamut = create_S_Log( + s_log2_s_gamut = create_s_log( 'S-Gamut', 'S-Log2', - 'S-Log2', lut_directory, lut_resolution_1d, ['slog2_sgamut']) colorspaces.append(s_log2_s_gamut) - s_log2_s_gamut_daylight = create_S_Log( + s_log2_s_gamut_daylight = create_s_log( 'S-Gamut Daylight', 'S-Log2', - 'S-Log2', lut_directory, lut_resolution_1d, ['slog2_sgamutday']) colorspaces.append(s_log2_s_gamut_daylight) - s_log2_s_gamut_tungsten = create_S_Log( + s_log2_s_gamut_tungsten = create_s_log( 'S-Gamut Tungsten', 'S-Log2', - 'S-Log2', lut_directory, lut_resolution_1d, ['slog2_sgamuttung']) colorspaces.append(s_log2_s_gamut_tungsten) # *S-Log3* - s_log3_s_gamut3Cine = create_S_Log( + s_log3_s_gamut3Cine = create_s_log( 'S-Gamut3.Cine', 'S-Log3', - 'S-Log3', lut_directory, lut_resolution_1d, ['slog3_sgamutcine']) colorspaces.append(s_log3_s_gamut3Cine) - s_log3_s_gamut3 = create_S_Log( + s_log3_s_gamut3 = create_s_log( 'S-Gamut3', 'S-Log3', - 'S-Log3', lut_directory, lut_resolution_1d, ['slog3_sgamut3']) colorspaces.append(s_log3_s_gamut3) # Linearization Only - s_log1 = create_S_Log( + s_log1 = create_s_log( '', 'S-Log1', - 'S-Log', lut_directory, lut_resolution_1d, ['crv_slog1']) colorspaces.append(s_log1) - s_log2 = create_S_Log( + s_log2 = create_s_log( '', 'S-Log2', - 'S-Log2', lut_directory, lut_resolution_1d, ['crv_slog2']) colorspaces.append(s_log2) - s_log3 = create_S_Log( + s_log3 = create_s_log( '', 'S-Log3', - 'S-Log3', lut_directory, lut_resolution_1d, ['crv_slog3']) colorspaces.append(s_log3) # Primaries Only - s_gamut = create_S_Log( + s_gamut = create_s_log( 'S-Gamut', '', - 'S-Log', lut_directory, lut_resolution_1d, ['lin_sgamut']) colorspaces.append(s_gamut) - s_gamut_daylight = create_S_Log( + s_gamut_daylight = create_s_log( 'S-Gamut Daylight', '', - 'S-Log2', lut_directory, lut_resolution_1d, ['lin_sgamutday']) colorspaces.append(s_gamut_daylight) - s_gamut_tungsten = create_S_Log( + s_gamut_tungsten = create_s_log( 'S-Gamut Tungsten', '', - 'S-Log2', lut_directory, lut_resolution_1d, ['lin_sgamuttung']) colorspaces.append(s_gamut_tungsten) - s_gamut3Cine = create_S_Log( + s_gamut3Cine = create_s_log( 'S-Gamut3.Cine', '', - 'S-Log3', lut_directory, lut_resolution_1d, ['lin_sgamut3cine']) colorspaces.append(s_gamut3Cine) - s_gamut3 = create_S_Log( + s_gamut3 = create_s_log( 'S-Gamut3', '', - 'S-Log3', lut_directory, lut_resolution_1d, ['lin_sgamut3'])