Made shaper colorspace names more consistent with other colorspace names.

diff --git a/aces_1.0.0/README.md b/aces_1.0.0/README.md
index 361bd65..a8a264e 100644 (file)
--- a/aces_1.0.0/README.md
+++ b/aces_1.0.0/README.md
@@ -125,12 +125,11 @@ For ease of use across a broader number of applications, the family name of each
 - Description: A collection of colorspaces that are used to facilitate the creation of LUTs and other basic functionality.
 
 - Technical information:
-       - The Log2 shaper, Output shaper and 'Dolby PQ Scaled' spaces cover the linear range going from 6 stops below 18% grey (0.0028125) to 6.5 stops above 18% grey (16.291740)
+       - The 'Log2 xx nits Shaper' and 'Dolby PQ xx nits Shaper' spaces cover the linear range going centered around 18% grey. The 48 nits spaces cover -6.5 stops (0.0028125) to +6.5 stops(16.291740). The 1000 nits spaces cover -12 stops to +10 stops. The 2000 nits spaces cover -12 stops to +11 stops. The 4000 nits spaces cover -12 stops to +12 stops.
        - The LMT shaper spaces cover the linear range going from 10 stops below 18% grey (0.00017578125) to 6.5 stops above 18% grey (16.291740)
        - The colorspaces that start with "Linear - " will convert to or from a specific gamut but not apply a transfer function.
        - The colorspaces that start with "Curve - " will apply a transfer function but not convert between gamuts.
 
-
 ### Roles
 
 - Description: The role colorspaces are aliases to the colorspaces used for the OCIO 'roles' functionality.

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 fc23937..a299c16 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py
@@ -1177,7 +1177,7 @@ def create_shapers(aces_ctl_directory,
        lut_directory,
        lut_resolution_1d,
        cleanup,
-       'Log2 48nits Shaper',
+       'Log2 48 nits Shaper',
        0.18,
        -6.5,
        6.5)
@@ -1191,7 +1191,7 @@ def create_shapers(aces_ctl_directory,
        lut_directory,
        lut_resolution_1d,
        cleanup,
-       'Log2 1000nits Shaper',
+       'Log2 1000 nits Shaper',
        0.18,
        -12.0,
        10.0)
@@ -1205,7 +1205,7 @@ def create_shapers(aces_ctl_directory,
        lut_directory,
        lut_resolution_1d,
        cleanup,
-       'Log2 2000nits Shaper',
+       'Log2 2000 nits Shaper',
        0.18,
        -12.0,
        11.0)
@@ -1219,7 +1219,7 @@ def create_shapers(aces_ctl_directory,
        lut_directory,
        lut_resolution_1d,
        cleanup,
-       'Log2 4000nits Shaper',
+       'Log2 4000 nits Shaper',
        0.18,
        -12.0,
        12.0)
@@ -1261,7 +1261,7 @@ def create_shapers(aces_ctl_directory,
        lut_directory,
        lut_resolution_1d,
        cleanup,
-       'Dolby PQ 48nits Shaper',
+       'Dolby PQ 48 nits Shaper',
        0.18,
        -6.5,
        6.5)
@@ -1275,7 +1275,7 @@ def create_shapers(aces_ctl_directory,
        lut_directory,
        lut_resolution_1d,
        cleanup,
-       'Dolby PQ 1000nits Shaper',
+       'Dolby PQ 1000 nits Shaper',
        0.18,
        -12.0,
        10.0)
@@ -1289,7 +1289,7 @@ def create_shapers(aces_ctl_directory,
        lut_directory,
        lut_resolution_1d,
        cleanup,
-       'Dolby PQ 2000nits Shaper',
+       'Dolby PQ 2000 nits Shaper',
        0.18,
        -12.0,
        11.0)
@@ -1303,7 +1303,7 @@ def create_shapers(aces_ctl_directory,
        lut_directory,
        lut_resolution_1d,
        cleanup,
-       'Dolby PQ 4000nits Shaper',
+       'Dolby PQ 4000 nits Shaper',
        0.18,
        -12.0,
        12.0)
@@ -1354,9 +1354,9 @@ def create_ODTs(aces_ctl_directory,
     # Assumes shaper has variants covering the range expected by the
     # 48 nit, 1000 nit, 2000 nit and 4000 nit Ouput Transforms 
     rrt_shaper_48nits = shaper_data[shaper_name]
-    rrt_shaper_1000nits = shaper_data[shaper_name.replace("48nits", "1000nits")]
-    rrt_shaper_2000nits = shaper_data[shaper_name.replace("48nits", "2000nits")]
-    rrt_shaper_4000nits = shaper_data[shaper_name.replace("48nits", "4000nits")]
+    rrt_shaper_1000nits = shaper_data[shaper_name.replace("48 nits", "1000 nits")]
+    rrt_shaper_2000nits = shaper_data[shaper_name.replace("48 nits", "2000 nits")]
+    rrt_shaper_4000nits = shaper_data[shaper_name.replace("48 nits", "4000 nits")]
 
     # *RRT + ODT* combinations.
     sorted_odts = sorted(odt_info.iteritems(), key=lambda x: x[1])

diff --git a/aces_1.0.0/python/aces_ocio/generate_config.py b/aces_1.0.0/python/aces_ocio/generate_config.py
index 7d4ea60..13022c0 100755 (executable)
--- a/aces_1.0.0/python/aces_ocio/generate_config.py
+++ b/aces_1.0.0/python/aces_ocio/generate_config.py
@@ -1134,11 +1134,11 @@ def generate_baked_LUTs(odt_info,
         odt_name = odt_values['transformUserName']
 
         if odt_name in ['P3-D60 PQ (1000 nits)']:
-            odt_shaper = shaper_name.replace("48nits", "1000nits")
+            odt_shaper = shaper_name.replace("48 nits", "1000 nits")
         elif odt_name in ['P3-D60 PQ (2000 nits)']:
-            odt_shaper = shaper_name.replace("48nits", "2000nits")
+            odt_shaper = shaper_name.replace("48 nits", "2000 nits")
         elif odt_name in ['P3-D60 PQ (4000 nits)']:
-            odt_shaper = shaper_name.replace("48nits", "4000nits")
+            odt_shaper = shaper_name.replace("48 nits", "4000 nits")
         else:
             odt_shaper = shaper_name
 
@@ -1342,9 +1342,9 @@ def generate_config(aces_ctl_directory,
     lmt_info = aces.get_LMTs_info(aces_ctl_directory)
 
     if shaper_base_name == 'DolbyPQ':
-        shaper_name = 'Dolby PQ 48nits Shaper'
+        shaper_name = 'Dolby PQ 48 nits Shaper'
     else:
-        shaper_name = 'Log2 48nits Shaper'
+        shaper_name = 'Log2 48 nits Shaper'
 
     config_data = create_config_data(odt_info,
                                      lmt_info,