Update ".gitignore" file.

[OpenColorIO-Configs.git] / aces_1.0.0 / python / create_aces_config.py

diff --git a/aces_1.0.0/python/create_aces_config.py b/aces_1.0.0/python/create_aces_config.py
index 7e01865..3c1350b 100755 (executable)
--- a/aces_1.0.0/python/create_aces_config.py
+++ b/aces_1.0.0/python/create_aces_config.py
@@ -189,9 +189,6 @@ def createConfig(configData, nuke=False):
     #
     # Create the rest of the color spaces
     #
-    #sortedColorspaces = sorted(configData['colorSpaces'], key=lambda x: x.name)
-    #print( sortedColorspaces )
-    #for colorspace in sortedColorspaces:
     for colorspace in sorted(configData['colorSpaces']):
         print( "Creating new color space : %s" % colorspace.name)
 
@@ -338,6 +335,10 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
             '%s/ACEScg/ACEScsc.ACES_to_ACEScg.a1.0.0.ctl' % acesCTLReleaseDir
         ]
         lut = "%s_to_ACES.spi1d" % name
+
+        # Remove spaces and parentheses
+        lut = lut.replace(' ', '_').replace(')', '_').replace('(', '_')
+
         genlut.generate1dLUTFromCTL( lutDir + "/" + lut, 
             ctls, 
             lutResolution1d, 
@@ -389,6 +390,10 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
             '%s/ACEScg/ACEScsc.ACES_to_ACEScg.a1.0.0.ctl' % acesCTLReleaseDir
         ]
         lut = "%s_to_aces.spi1d" % name
+
+        # Remove spaces and parentheses
+        lut = lut.replace(' ', '_').replace(')', '_').replace('(', '_')
+
         genlut.generate1dLUTFromCTL( lutDir + "/" + lut, 
             ctls, 
             lutResolution1d, 
@@ -623,11 +628,13 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
         cs.isData=False
 
         ctls = [
-            #'%s/logShaper/logShaper16i_to_aces_param.ctl' % acesCTLReleaseDir
             '%s/utilities/ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl' % acesCTLReleaseDir
         ]
         lut = "%s_to_aces.spi1d" % name
 
+        # Remove spaces and parentheses
+        lut = lut.replace(' ', '_').replace(')', '_').replace('(', '_')
+
         genlut.generate1dLUTFromCTL( lutDir + "/" + lut, 
             ctls, 
             lutResolution1d, 
@@ -683,6 +690,10 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
             ctls = [
                 shaperToACESCTL % acesCTLReleaseDir
             ]
+            
+            # Remove spaces and parentheses
+            shaperLut = shaperLut.replace(' ', '_').replace(')', '_').replace('(', '_')
+
             genlut.generate1dLUTFromCTL( lutDir + "/" + shaperLut, 
                 ctls, 
                 lutResolution1d, 
@@ -712,6 +723,9 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
             ]
             lut = "%s.%s.spi3d" % (shaperName, lmtName)
 
+            # Remove spaces and parentheses
+            lut = lut.replace(' ', '_').replace(')', '_').replace('(', '_')
+
             genlut.generate3dLUTFromCTL( lutDir + "/" + lut, 
                 ctls, 
                 lutResolution3d, 
@@ -742,6 +756,9 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
             ]
             lut = "Inverse.%s.%s.spi3d" % (odtName, shaperName)
 
+            # Remove spaces and parentheses
+            lut = lut.replace(' ', '_').replace(')', '_').replace('(', '_')
+
             genlut.generate3dLUTFromCTL( lutDir + "/" + lut, 
                 ctls, 
                 lutResolution3d, 
@@ -793,8 +810,6 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
         lmtShaperName, 
         '%s/utilities/ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl',
         '%s/utilities/ACESlib.OCIO_shaper_lin_to_log2_param.a1.0.0.ctl',
-        #'%s/logShaper/logShaper16i_to_aces_param.ctl',
-        #'%s/logShaper/aces_to_logShaper16i_param.ctl',
         shaperInputScale_genericLog2,
         lmtParams
     ]
@@ -846,6 +861,10 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
             ctls = [
                 shaperToACESCTL % acesCTLReleaseDir
             ]
+
+            # Remove spaces and parentheses
+            shaperLut = shaperLut.replace(' ', '_').replace(')', '_').replace('(', '_')
+
             genlut.generate1dLUTFromCTL( lutDir + "/" + shaperLut, 
                 ctls, 
                 lutResolution1d, 
@@ -891,6 +910,9 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
             ]
             lut = "%s.RRT.a1.0.0.%s.spi3d" % (shaperName, odtName)
 
+            # Remove spaces and parentheses
+            lut = lut.replace(' ', '_').replace(')', '_').replace('(', '_')
+
             genlut.generate3dLUTFromCTL( lutDir + "/" + lut, 
                 #shaperLUT,
                 ctls, 
@@ -939,6 +961,9 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
             ]
             lut = "InvRRT.a1.0.0.%s.%s.spi3d" % (odtName, shaperName)
 
+            # Remove spaces and parentheses
+            lut = lut.replace(' ', '_').replace(')', '_').replace('(', '_')
+
             genlut.generate3dLUTFromCTL( lutDir + "/" + lut, 
                 #None,
                 ctls, 
@@ -988,8 +1013,6 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
         log2ShaperName, 
         '%s/utilities/ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl',
         '%s/utilities/ACESlib.OCIO_shaper_lin_to_log2_param.a1.0.0.ctl',
-        #'%s/logShaper/logShaper16i_to_aces_param.ctl',
-        #'%s/logShaper/aces_to_logShaper16i_param.ctl',
         shaperInputScale_genericLog2,
         log2Params
     ]
@@ -1016,24 +1039,12 @@ def generateLUTs(odtInfo, lmtInfo, shaperName, acesCTLReleaseDir, lutDir, lutRes
     #
     # Choose your shaper
     #
-    # XXX
-    # Shaper name. Should really be automated or made a user choice
-    #
-    # Options: aceslogShaper, aceslogScaledShaper, log2Shaper
-    #shaperName = 'log2Shaper'
-
-    #if shaperName in shaperData:
-    #    rrtShaperName = shaperName
-    #    rrtShaper = shaperData[shaperName]
-    #else:
-
     rrtShaperName = log2ShaperName
     rrtShaper = log2ShaperData
 
     #
     # RRT + ODT Combinations
     #
-    #for odtName, odtValues in odtInfo.iteritems():
     sortedOdts = sorted(odtInfo.iteritems(), key=lambda x: x[1])
     print( sortedOdts )
     for odt in sortedOdts:
@@ -1480,10 +1491,13 @@ def main():
 
     print( "command line : \n%s\n" % " ".join(sys.argv) )
 
-    if configDir == None:
+    if not acesCTLDir:
         print( "process: No ACES CTL directory specified" )
         return
- 
+
+    if not configDir:
+        print( "process: No configuration directory specified" )
+        return
     #
     # Generate the configuration
     #