From: hpd <hpd1@duikerresearch.com>
Date: Wed, 16 Sep 2015 02:36:20 +0000 (-0400)
Subject: Merge pull request #13 from selfshadow/patches-2
X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=commitdiff_plain;h=a5214b5440991c2166d7216fe94df6fb8d0d5abb;hp=a797d4adfdf83258f6fbe60870d3d3470bcc8099

Merge pull request #13 from selfshadow/patches-2

Changes related to new LUT defaults
---

diff --git a/aces_1.0.1/python/aces_ocio/generate_config.py b/aces_1.0.1/python/aces_ocio/generate_config.py
index 5ceae55..cce8ae9 100755
--- a/aces_1.0.1/python/aces_ocio/generate_config.py
+++ b/aces_1.0.1/python/aces_ocio/generate_config.py
@@ -1480,34 +1480,34 @@ def main():
 
     usage = '%prog [options]\n'
     usage += '\n'
-    usage += 'An OCIO config generation script for ACES 1.0\n'
+    usage += 'An OCIO config generation script for ACES 1.0.1\n'
     usage += '\n'
-    usage += 'Command line examples'
+    usage += 'Command-line examples'
     usage += '\n'
-    usage += ('Create a GUI-friendly ACES 1.0 config with no secondary, '
-              'baked LUTs : \n')
+    usage += ('Create a GUI-friendly ACES 1.0.1 config with no secondary, '
+              'baked LUTs: \n')
     usage += ('\tcreate_aces_config -a /path/to/aces-dev/transforms/ctl '
-              '--lutResolution1d 1024 --lutResolution3d 33 -c aces_1.0.0 '
+              '--lutResolution1d 4096 --lutResolution3d 65 -c aces_1.0.1 '
               '--dontBakeSecondaryLUTs')
     usage += '\n'
-    usage += 'Create a more OCIO-compliant ACES 1.0 config : \n'
+    usage += 'Create a more OCIO-compliant ACES 1.0.1 config: \n'
     usage += ('\tcreate_aces_config -a /path/to/aces-dev/transforms/ctl '
-              '--lutResolution1d 1024 --lutResolution3d 33 -c aces_1.0.0 '
+              '--lutResolution1d 4096 --lutResolution3d 65 -c aces_1.0.1 '
               '--createMultipleDisplays')
     usage += '\n'
     usage += '\n'
     usage += 'Adding custom looks'
     usage += '\n'
-    usage += ('Create a GUI-friendly ACES 1.0 config with an ACES-style CDL '
+    usage += ('Create a GUI-friendly ACES 1.0.1 config with an ACES-style CDL '
               '(will be applied in the ACEScc colorspace): \n')
     usage += ('\tcreate_aces_config -a /path/to/aces-dev/transforms/ctl '
-              '--lutResolution1d 1024 --lutResolution3d 33 -c aces_1.0.0 '
+              '--lutResolution1d 4096 --lutResolution3d 65 -c aces_1.0.1 '
               '\n\t\t--addACESLookCDL ACESCDLName '
               '/path/to/SampleCDL.ccc cc03345')
     usage += '\n'
-    usage += 'Create a GUI-friendly ACES 1.0 config with an general CDL: \n'
+    usage += 'Create a GUI-friendly ACES 1.0.1 config with a general CDL: \n'
     usage += ('\tcreate_aces_config -a /path/to/aces-dev/transforms/ctl '
-              '--lutResolution1d 1024 --lutResolution3d 33 -c aces_1.0.0 '
+              '--lutResolution1d 4096 --lutResolution3d 65 -c aces_1.0.1 '
               '\n\t\t--addCustomLookCDL CustomCDLName "ACES - ACEScc" '
               '/path/to/SampleCDL.ccc cc03345')
     usage += '\n'
@@ -1515,16 +1515,16 @@ def main():
               'ACEScc colorspace, but the user could choose other spaces '
               'by changing the argument after the name of the look. \n')
     usage += '\n'
-    usage += ('Create a GUI-friendly ACES 1.0 config with an ACES-style LUT '
+    usage += ('Create a GUI-friendly ACES 1.0.1 config with an ACES-style LUT '
               '(will be applied in the ACEScc colorspace): \n')
     usage += ('\tcreate_aces_config -a /path/to/aces-dev/transforms/ctl '
-              '--lutResolution1d 1024 --lutResolution3d 33 -c aces_1.0.0 '
+              '--lutResolution1d 4096 --lutResolution3d 65 -c aces_1.0.1 '
               '\n\t\t--addACESLookLUT ACESLUTName '
               '/path/to/SampleCDL.ccc cc03345')
     usage += '\n'
-    usage += 'Create a GUI-friendly ACES 1.0 config with an general LUT: \n'
+    usage += 'Create a GUI-friendly ACES 1.0.1 config with a general LUT: \n'
     usage += ('\tcreate_aces_config -a /path/to/aces-dev/transforms/ctl '
-              '--lutResolution1d 1024 --lutResolution3d 33 -c aces_1.0.0 '
+              '--lutResolution1d 4096 --lutResolution3d 65 -c aces_1.0.1 '
               '\n\t\t--addCustomLookLUT CustomLUTName "ACES - ACEScc" '
               '/path/to/SampleCDL.ccc cc03345')
     usage += '\n'
@@ -1532,10 +1532,10 @@ def main():
               'ACEScc colorspace, but the user could choose other spaces '
               'by changing the argument after the name of the look. \n')
     usage += '\n'
-    usage += ('Create a GUI-friendly ACES 1.0 config using the Dolby PQ '
+    usage += ('Create a GUI-friendly ACES 1.0.1 config using the Dolby PQ '
               'transfer function as the shaper: \n')
     usage += ('\tcreate_aces_config -a /path/to/aces-dev/transforms/ctl '
-              '--lutResolution1d 1024 --lutResolution3d 33 -c aces_1.0.0 '
+              '--lutResolution1d 4096 --lutResolution3d 65 -c aces_1.0.1 '
               '--shaper DolbyPQ')
     usage += '\n'
  
diff --git a/aces_1.0.1/python/aces_ocio/generate_lut.py b/aces_1.0.1/python/aces_ocio/generate_lut.py
index 94bd735..5bcd9da 100755
--- a/aces_1.0.1/python/aces_ocio/generate_lut.py
+++ b/aces_1.0.1/python/aces_ocio/generate_lut.py
@@ -958,8 +958,8 @@ def main():
     p.add_option('--lut', '-l', type='string', default='')
     p.add_option('--format', '-f', type='string', default='')
     p.add_option('--ctl', '-c', type='string', action='append')
-    p.add_option('--lutResolution1d', '', type='int', default=1024)
-    p.add_option('--lutResolution3d', '', type='int', default=33)
+    p.add_option('--lutResolution1d', '', type='int', default=4096)
+    p.add_option('--lutResolution3d', '', type='int', default=65)
     p.add_option('--ctlReleasePath', '-r', type='string', default='')
     p.add_option('--bitDepth', '-b', type='string', default='float')
     p.add_option('--keepTempImages', '', action='store_true')