Fix "PEP8" naming convention violations.
authorThomas Mansencal <thomas.mansencal@gmail.com>
Wed, 29 Jul 2015 11:46:28 +0000 (23:46 +1200)
committerThomas Mansencal <thomas.mansencal@gmail.com>
Wed, 29 Jul 2015 11:46:28 +0000 (23:46 +1200)
aces_1.0.0/python/aces_ocio/aces_config.py
aces_1.0.0/python/aces_ocio/colorspaces/aces.py
aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py
aces_1.0.0/python/aces_ocio/colorspaces/sony.py
aces_1.0.0/python/aces_ocio/generate_lut.py

index a955dd8..77df1a2 100755 (executable)
@@ -581,10 +581,10 @@ def create_config(config_data,
     config.setDescription('An ACES config generated from python')
 
     # Setting configuration search path.
-    searchPath = ['luts']
+    search_path = ['luts']
     if custom_lut_dir:
-        searchPath.append('custom')
-    config.setSearchPath(':'.join(searchPath))
+        search_path.append('custom')
+    config.setSearchPath(':'.join(search_path))
 
     # Defining the reference colorspace.
     reference_data = config_data['referenceColorSpace']
@@ -895,10 +895,10 @@ def create_config(config_data,
                         display_cleaned = '%s with %s' % (
                         display_cleaned, look_names)
 
-                        viewsWithLooksAtEnd = False
+                        views_with_looks_at_end = False
                         # Storing combo of display, view and colorspace name
                         # in a list so we can add them to the end of the list.
-                        if viewsWithLooksAtEnd:
+                        if views_with_looks_at_end:
                             displays_views_colorspaces.append(
                                 [single_display_name, display_cleaned,
                                  colorspace.name])
@@ -922,7 +922,7 @@ def create_config(config_data,
                             views.append(display_cleaned)
 
         # Add to config any display, view combinations that were saved
-        # for later. This list will be empty unless viewsWithLooksAtEnd is
+        # for later. This list will be empty unless views_with_looks_at_end is
         # set to True above.
         for display_view_colorspace in displays_views_colorspaces:
             single_display_name, display_cleaned, colorspace_name = (
@@ -1060,9 +1060,9 @@ def generate_LUTs(odt_info,
     # -------------------------------------------------------------------------
 
     # *ARRI Log-C* to *ACES*.
-    arri_colorSpaces = arri.create_colorspaces(lut_directory,
+    arri_colorspaces = arri.create_colorspaces(lut_directory,
                                                lut_resolution_1d)
-    for cs in arri_colorSpaces:
+    for cs in arri_colorspaces:
         config_data['colorSpaces'].append(cs)
 
     # *Canon-Log* to *ACES*.
@@ -1078,9 +1078,9 @@ def generate_LUTs(odt_info,
         config_data['colorSpaces'].append(cs)
 
     # *Panasonic V-Log* to *ACES*.
-    panasonic_colorSpaces = panasonic.create_colorspaces(lut_directory,
+    panasonic_colorspaces = panasonic.create_colorspaces(lut_directory,
                                                          lut_resolution_1d)
-    for cs in panasonic_colorSpaces:
+    for cs in panasonic_colorspaces:
         config_data['colorSpaces'].append(cs)
 
     # *RED* colorspaces to *ACES*.
@@ -1090,18 +1090,18 @@ def generate_LUTs(odt_info,
         config_data['colorSpaces'].append(cs)
 
     # *S-Log* to *ACES*.
-    sony_colorSpaces = sony.create_colorspaces(lut_directory,
+    sony_colorspaces = sony.create_colorspaces(lut_directory,
                                                lut_resolution_1d)
-    for cs in sony_colorSpaces:
+    for cs in sony_colorspaces:
         config_data['colorSpaces'].append(cs)
 
     # -------------------------------------------------------------------------
     # General Color Spaces
     # -------------------------------------------------------------------------
-    general_colorSpaces = general.create_colorspaces(lut_directory,
+    general_colorspaces = general.create_colorspaces(lut_directory,
                                                      lut_resolution_1d,
                                                      lut_resolution_3d)
-    for cs in general_colorSpaces:
+    for cs in general_colorspaces:
         config_data['colorSpaces'].append(cs)
 
     # The *Raw* color space
@@ -1290,7 +1290,7 @@ def generate_baked_LUTs(odt_info,
 
 
 def create_config_dir(config_directory,
-                      bake_secondary_LUTs=False,
+                      bake_secondary_luts=False,
                       custom_lut_dir=None):
     """
     Object description.
@@ -1309,7 +1309,7 @@ def create_config_dir(config_directory,
     lut_directory = os.path.join(config_directory, 'luts')
     dirs = [config_directory, lut_directory]
 
-    if bake_secondary_LUTs:
+    if bake_secondary_luts:
         dirs.extend([os.path.join(config_directory, 'baked'),
                      os.path.join(config_directory, 'baked', 'flame'),
                      os.path.join(config_directory, 'baked', 'photoshop'),
@@ -1330,7 +1330,7 @@ def create_ACES_config(aces_ctl_directory,
                        config_directory,
                        lut_resolution_1d=4096,
                        lut_resolution_3d=64,
-                       bake_secondary_LUTs=True,
+                       bake_secondary_luts=True,
                        multiple_displays=False,
                        look_info=None,
                        copy_custom_luts=True,
@@ -1359,7 +1359,7 @@ def create_ACES_config(aces_ctl_directory,
         custom_lut_dir = os.path.join(config_directory, 'custom')
 
     lut_directory = create_config_dir(config_directory,
-                                      bake_secondary_LUTs,
+                                      bake_secondary_luts,
                                       custom_lut_dir)
 
     odt_info = aces.get_ODTs_info(aces_ctl_directory)
@@ -1387,7 +1387,7 @@ def create_ACES_config(aces_ctl_directory,
     write_config(config,
                  os.path.join(config_directory, 'config.ocio'))
 
-    if bake_secondary_LUTs:
+    if bake_secondary_luts:
         generate_baked_LUTs(odt_info,
                             shaper_name,
                             os.path.join(config_directory, 'baked'),
index 170a872..5996b43 100644 (file)
@@ -369,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,
@@ -384,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,
@@ -401,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):
@@ -533,7 +533,7 @@ 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,
@@ -553,7 +553,7 @@ def create_dolbypq(aces_CTL_directory,
     cs.is_data = False
 
     ctls = [os.path.join(
-        aces_CTL_directory,
+        aces_ctl_directory,
         'utilities',
         'ACESlib.DolbyPQ_to_Lin.a1.0.0.ctl')]
     lut = '%s_to_linear.spi1d' % name
@@ -569,7 +569,7 @@ def create_dolbypq(aces_CTL_directory,
         1.0,
         {},
         cleanup,
-        aces_CTL_directory,
+        aces_ctl_directory,
         min_value,
         max_value)
 
@@ -587,7 +587,7 @@ 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,
@@ -610,7 +610,7 @@ def create_dolbypq_scaled(aces_CTL_directory,
     cs.is_data = False
 
     ctls = [os.path.join(
-        aces_CTL_directory,
+        aces_ctl_directory,
         'utilities',
         'ACESlib.DolbyPQ_to_lin_param.a1.0.0.ctl')]
     lut = '%s_to_linear.spi1d' % name
@@ -628,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)
 
@@ -686,8 +686,8 @@ def create_ACES_LMT(lmt_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
 
@@ -695,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',
@@ -705,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)
@@ -723,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,
@@ -736,7 +736,7 @@ 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]
         lut = 'Inverse.%s.%s.spi3d' % (odt_name, shaper_name)
 
         lut = sanitize(lut)
@@ -759,7 +759,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)
 
@@ -831,9 +831,9 @@ def create_LMTs(aces_ctl_directory,
         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'])]
         cs = create_ACES_LMT(
@@ -894,8 +894,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
 
@@ -908,7 +908,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',
@@ -918,20 +918,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'),
@@ -954,7 +954,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,
@@ -965,18 +965,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:
@@ -986,7 +986,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)
@@ -1009,7 +1009,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)
 
@@ -1146,7 +1146,7 @@ def create_ODTs(aces_ctl_directory,
     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,
@@ -1174,7 +1174,7 @@ def create_ODTs(aces_ctl_directory,
     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,
@@ -1340,13 +1340,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])
@@ -1356,47 +1356,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')
 
@@ -1431,14 +1431,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])
@@ -1452,38 +1452,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')
 
@@ -1558,7 +1558,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,
@@ -1570,4 +1570,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
index 13f2d4d..9dd16f7 100644 (file)
@@ -66,12 +66,12 @@ def create_v_log(gamut,
         cs.allocation_vars = [-8, 5, 0.00390625]
 
     def v_log_to_linear(x):
-        cutInv = 0.181
+        cut_inv = 0.181
         b = 0.00873
         c = 0.241514
         d = 0.598206
 
-        if (x <= cutInv):
+        if (x <= cut_inv):
             return (x - 0.125) / 5.6
         else:
             return pow(10, (x - d) / c) - b
index 9c7026a..876066d 100644 (file)
@@ -22,11 +22,11 @@ __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,
@@ -233,7 +233,7 @@ 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',
@@ -243,7 +243,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     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',
@@ -252,7 +252,7 @@ def create_colorspaces(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',
@@ -261,7 +261,7 @@ def create_colorspaces(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',
@@ -271,7 +271,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     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',
@@ -280,7 +280,7 @@ def create_colorspaces(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',
@@ -290,7 +290,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     colorspaces.append(s_log3_s_gamut3)
 
     # Linearization Only
-    s_log1 = create_s_log(
+    s_log1 = create_S_Log(
         '',
         'S-Log1',
         'S-Log',
@@ -299,7 +299,7 @@ def create_colorspaces(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',
@@ -308,7 +308,7 @@ def create_colorspaces(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',
@@ -318,7 +318,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     colorspaces.append(s_log3)
 
     # Primaries Only
-    s_gamut = create_s_log(
+    s_gamut = create_S_Log(
         'S-Gamut',
         '',
         'S-Log',
@@ -327,7 +327,7 @@ def create_colorspaces(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',
@@ -336,7 +336,7 @@ def create_colorspaces(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',
@@ -345,7 +345,7 @@ def create_colorspaces(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',
@@ -354,7 +354,7 @@ def create_colorspaces(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',
index 2a718a7..5b67c0a 100755 (executable)
@@ -291,15 +291,15 @@ def write_1d(filename,
          Return value description.
     """
 
-    ocioFormatsToExtensions = {'cinespace': 'csp',
-                               'flame': '3dl',
-                               'icc': 'icc',
-                               'houdini': 'lut',
-                               'lustre': '3dl',
-                               'ctl': 'ctl'}
-
-    if format in ocioFormatsToExtensions:
-        if ocioFormatsToExtensions[format] == 'csp':
+    ocio_formats_to_extensions = {'cinespace': 'csp',
+                                  'flame': '3dl',
+                                  'icc': 'icc',
+                                  'houdini': 'lut',
+                                  'lustre': '3dl',
+                                  'ctl': 'ctl'}
+
+    if format in ocio_formats_to_extensions:
+        if ocio_formats_to_extensions[format] == 'csp':
             write_CSP_1d(filename,
                          from_min,
                          from_max,
@@ -307,7 +307,7 @@ def write_1d(filename,
                          data_entries,
                          data_channels,
                          lut_components)
-        elif ocioFormatsToExtensions[format] == 'ctl':
+        elif ocio_formats_to_extensions[format] == 'ctl':
             write_CTL_1d(filename,
                          from_min,
                          from_max,
@@ -412,13 +412,13 @@ def generate_3d_LUT_from_image(ramp_3d_path,
     if output_path is None:
         output_path = '%s.%s' % (ramp_3d_path, 'spi3d')
 
-    ocioFormatsToExtensions = {'cinespace': 'csp',
-                               'flame': '3dl',
-                               'icc': 'icc',
-                               'houdini': 'lut',
-                               'lustre': '3dl'}
+    ocio_formats_to_extensions = {'cinespace': 'csp',
+                                  'flame': '3dl',
+                                  'icc': 'icc',
+                                  'houdini': 'lut',
+                                  'lustre': '3dl'}
 
-    if format == 'spi3d' or not (format in ocioFormatsToExtensions):
+    if format == 'spi3d' or not (format in ocio_formats_to_extensions):
         # Extract a spi3d LUT
         args = ['--extract',
                 '--cubesize',
@@ -547,7 +547,7 @@ def convert_bit_depth(input_image, output_image, depth):
 def generate_1d_LUT_from_CTL(lut_path,
                              ctl_paths,
                              lut_resolution=1024,
-                             identity_LUT_bit_depth='half',
+                             identity_lut_bit_depth='half',
                              input_scale=1,
                              output_scale=1,
                              global_params=None,
@@ -576,30 +576,30 @@ def generate_1d_LUT_from_CTL(lut_path,
 
     lut_path_base = os.path.splitext(lut_path)[0]
 
-    identity_LUT_image_float = '%s.%s.%s' % (lut_path_base, 'float', 'tiff')
-    generate_1d_LUT_image(identity_LUT_image_float,
+    identity_lut_image_float = '%s.%s.%s' % (lut_path_base, 'float', 'tiff')
+    generate_1d_LUT_image(identity_lut_image_float,
                           lut_resolution,
                           min_value,
                           max_value)
 
-    if identity_LUT_bit_depth not in ['half', 'float']:
-        identity_LUT_image = '%s.%s.%s' % (lut_path_base, 'uint16', 'tiff')
-        convert_bit_depth(identity_LUT_image_float,
-                          identity_LUT_image,
-                          identity_LUT_bit_depth)
+    if identity_lut_bit_depth not in ['half', 'float']:
+        identity_lut_image = '%s.%s.%s' % (lut_path_base, 'uint16', 'tiff')
+        convert_bit_depth(identity_lut_image_float,
+                          identity_lut_image,
+                          identity_lut_bit_depth)
     else:
-        identity_LUT_image = identity_LUT_image_float
+        identity_lut_image = identity_lut_image_float
 
-    transformed_LUT_image = '%s.%s.%s' % (lut_path_base, 'transformed', 'exr')
-    apply_CTL_to_image(identity_LUT_image,
-                       transformed_LUT_image,
+    transformed_lut_image = '%s.%s.%s' % (lut_path_base, 'transformed', 'exr')
+    apply_CTL_to_image(identity_lut_image,
+                       transformed_lut_image,
                        ctl_paths,
                        input_scale,
                        output_scale,
                        global_params,
                        aces_ctl_directory)
 
-    generate_1d_LUT_from_image(transformed_LUT_image,
+    generate_1d_LUT_from_image(transformed_lut_image,
                                lut_path,
                                min_value,
                                max_value,
@@ -607,14 +607,14 @@ def generate_1d_LUT_from_CTL(lut_path,
                                format)
 
     if cleanup:
-        os.remove(identity_LUT_image)
-        if identity_LUT_image != identity_LUT_image_float:
-            os.remove(identity_LUT_image_float)
-        os.remove(transformed_LUT_image)
+        os.remove(identity_lut_image)
+        if identity_lut_image != identity_lut_image_float:
+            os.remove(identity_lut_image_float)
+        os.remove(transformed_lut_image)
 
 
-def correct_LUT_image(transformed_LUT_image,
-                      corrected_LUT_image,
+def correct_LUT_image(transformed_lut_image,
+                      corrected_lut_image,
                       lut_resolution):
     """
     Object description.
@@ -630,7 +630,7 @@ def correct_LUT_image(transformed_LUT_image,
          Return value description.
     """
 
-    transformed = oiio.ImageInput.open(transformed_LUT_image)
+    transformed = oiio.ImageInput.open(transformed_lut_image)
 
     transformed_spec = transformed.spec()
     width = transformed_spec.width
@@ -644,14 +644,14 @@ def correct_LUT_image(transformed_LUT_image,
                   height,
                   lut_resolution * lut_resolution,
                   lut_resolution))
-        print('Generating %s' % corrected_LUT_image)
+        print('Generating %s' % corrected_lut_image)
 
         # Forcibly read data as float, the Python API doesn't handle half-float
         # well yet.
         type = oiio.FLOAT
         source_data = transformed.read_image(type)
 
-        correct = oiio.ImageOutput.create(corrected_LUT_image)
+        correct = oiio.ImageOutput.create(corrected_lut_image)
 
         correct_spec = oiio.ImageSpec()
         correct_spec.set_format(oiio.FLOAT)
@@ -659,7 +659,7 @@ def correct_LUT_image(transformed_LUT_image,
         correct_spec.height = width
         correct_spec.nchannels = channels
 
-        correct.open(corrected_LUT_image, correct_spec, oiio.Create)
+        correct.open(corrected_lut_image, correct_spec, oiio.Create)
 
         dest_data = array.array('f',
                                 ('\0' * correct_spec.width *
@@ -679,17 +679,17 @@ def correct_LUT_image(transformed_LUT_image,
         correct.close()
     else:
         # shutil.copy(transformedLUTImage, correctedLUTImage)
-        corrected_LUT_image = transformed_LUT_image
+        corrected_lut_image = transformed_lut_image
 
     transformed.close()
 
-    return corrected_LUT_image
+    return corrected_lut_image
 
 
 def generate_3d_LUT_from_CTL(lut_path,
                              ctl_paths,
                              lut_resolution=64,
-                             identity_LUT_bit_depth='half',
+                             identity_lut_bit_depth='half',
                              input_scale=1,
                              output_scale=1,
                              global_params=None,
@@ -715,45 +715,45 @@ def generate_3d_LUT_from_CTL(lut_path,
 
     lut_path_base = os.path.splitext(lut_path)[0]
 
-    identity_LUT_image_float = '%s.%s.%s' % (lut_path_base, 'float', 'tiff')
-    generate_3d_LUT_image(identity_LUT_image_float, lut_resolution)
+    identity_lut_image_float = '%s.%s.%s' % (lut_path_base, 'float', 'tiff')
+    generate_3d_LUT_image(identity_lut_image_float, lut_resolution)
 
-    if identity_LUT_bit_depth not in ['half', 'float']:
-        identity_LUT_image = '%s.%s.%s' % (lut_path_base,
-                                           identity_LUT_bit_depth,
+    if identity_lut_bit_depth not in ['half', 'float']:
+        identity_lut_image = '%s.%s.%s' % (lut_path_base,
+                                           identity_lut_bit_depth,
                                            'tiff')
-        convert_bit_depth(identity_LUT_image_float,
-                          identity_LUT_image,
-                          identity_LUT_bit_depth)
+        convert_bit_depth(identity_lut_image_float,
+                          identity_lut_image,
+                          identity_lut_bit_depth)
     else:
-        identity_LUT_image = identity_LUT_image_float
+        identity_lut_image = identity_lut_image_float
 
-    transformed_LUT_image = '%s.%s.%s' % (lut_path_base, 'transformed', 'exr')
-    apply_CTL_to_image(identity_LUT_image,
-                       transformed_LUT_image,
+    transformed_lut_image = '%s.%s.%s' % (lut_path_base, 'transformed', 'exr')
+    apply_CTL_to_image(identity_lut_image,
+                       transformed_lut_image,
                        ctl_paths,
                        input_scale,
                        output_scale,
                        global_params,
                        aces_ctl_directory)
 
-    corrected_LUT_image = '%s.%s.%s' % (lut_path_base, 'correct', 'exr')
-    corrected_LUT_image = correct_LUT_image(transformed_LUT_image,
-                                            corrected_LUT_image,
+    corrected_lut_image = '%s.%s.%s' % (lut_path_base, 'correct', 'exr')
+    corrected_lut_image = correct_LUT_image(transformed_lut_image,
+                                            corrected_lut_image,
                                             lut_resolution)
 
-    generate_3d_LUT_from_image(corrected_LUT_image,
+    generate_3d_LUT_from_image(corrected_lut_image,
                                lut_path,
                                lut_resolution,
                                format)
 
     if cleanup:
-        os.remove(identity_LUT_image)
-        if identity_LUT_image != identity_LUT_image_float:
-            os.remove(identity_LUT_image_float)
-        os.remove(transformed_LUT_image)
-        if corrected_LUT_image != transformed_LUT_image:
-            os.remove(corrected_LUT_image)
+        os.remove(identity_lut_image)
+        if identity_lut_image != identity_lut_image_float:
+            os.remove(identity_lut_image_float)
+        os.remove(transformed_lut_image)
+        if corrected_lut_image != transformed_lut_image:
+            os.remove(corrected_lut_image)
         if format != 'spi3d':
             lut_path_spi3d = '%s.%s' % (lut_path, 'spi3d')
             os.remove(lut_path_spi3d)