X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=blobdiff_plain;f=aces_1.0.0%2Fpython%2Faces_ocio%2FcreateREDColorSpaces.py;h=097a5c0bc7c8308e4e0979d4a4218e5ebf90c2a1;hp=934fec5754f236a325d5ecdc0118b0c49ea3b876;hb=8a160c48f21fd063b5a59e702a9d5ffdaaefe3b3;hpb=4522d8db6373342fe8eddc5eb97e13322a9e80a3

diff --git a/aces_1.0.0/python/aces_ocio/createREDColorSpaces.py b/aces_1.0.0/python/aces_ocio/createREDColorSpaces.py
index 934fec5..097a5c0 100644
--- a/aces_1.0.0/python/aces_ocio/createREDColorSpaces.py
+++ b/aces_1.0.0/python/aces_ocio/createREDColorSpaces.py
@@ -20,7 +20,7 @@ def createREDlogFilm(gamut, transferFunction, name, lutDir, lutResolution1d):
     cs.description = name
     cs.equalityGroup = ''
     cs.family = 'RED'
-    cs.isData=False
+    cs.isData = False
 
     def cineonToLinear(codeValue):
         nGamma = 0.6
@@ -28,110 +28,129 @@ def createREDlogFilm(gamut, transferFunction, name, lutDir, lutResolution1d):
         whitePoint = 685.0
         codeValueToDensity = 0.002
 
-        blackLinear = pow(10.0, (blackPoint - whitePoint) * (codeValueToDensity / nGamma))
-        codeLinear = pow(10.0, (codeValue - whitePoint) * (codeValueToDensity / nGamma))
+        blackLinear = pow(10.0, (blackPoint - whitePoint) * (
+            codeValueToDensity / nGamma))
+        codeLinear = pow(10.0, (codeValue - whitePoint) * (
+            codeValueToDensity / nGamma))
 
-        return (codeLinear - blackLinear)/(1.0 - blackLinear)
+        return (codeLinear - blackLinear) / (1.0 - blackLinear)
 
     cs.toReferenceTransforms = []
 
     if transferFunction == 'REDlogFilm':
         data = array.array('f', "\0" * lutResolution1d * 4)
         for c in range(lutResolution1d):
-            data[c] = cineonToLinear(1023.0*c/(lutResolution1d-1))
+            data[c] = cineonToLinear(1023.0 * c / (lutResolution1d - 1))
 
         lut = "CineonLog_to_linear.spi1d"
-        genlut.writeSPI1D(lutDir + "/" + lut, 0.0, 1.0, data, lutResolution1d, 1)
-
-        cs.toReferenceTransforms.append( {
-            'type':'lutFile', 
-            'path':lut, 
-            'interpolation':'linear', 
-            'direction':'forward'
-        } )
+        genlut.writeSPI1D(lutDir + "/" + lut,
+                          0.0,
+                          1.0,
+                          data,
+                          lutResolution1d,
+                          1)
+
+        cs.toReferenceTransforms.append({
+            'type': 'lutFile',
+            'path': lut,
+            'interpolation': 'linear',
+            'direction': 'forward'
+        })
 
     if gamut == 'DRAGONcolor':
-        cs.toReferenceTransforms.append( {
-            'type':'matrix',
-            'matrix':mat44FromMat33([0.532279,  0.376648,  0.091073, 
-                                     0.046344,  0.974513, -0.020860, 
-                                    -0.053976, -0.000320, 1.054267]),
-            'direction':'forward'
+        cs.toReferenceTransforms.append({
+            'type': 'matrix',
+            'matrix': mat44FromMat33([0.532279, 0.376648, 0.091073,
+                                      0.046344, 0.974513, -0.020860,
+                                      -0.053976, -0.000320, 1.054267]),
+            'direction': 'forward'
         })
     elif gamut == 'DRAGONcolor2':
-        cs.toReferenceTransforms.append( {
-            'type':'matrix',
-            'matrix':mat44FromMat33([0.468452,  0.331484,  0.200064, 
-                                     0.040787,  0.857658,  0.101553, 
-                                    -0.047504, -0.000282, 1.047756]),
-            'direction':'forward'
+        cs.toReferenceTransforms.append({
+            'type': 'matrix',
+            'matrix': mat44FromMat33([0.468452, 0.331484, 0.200064,
+                                      0.040787, 0.857658, 0.101553,
+                                      -0.047504, -0.000282, 1.047756]),
+            'direction': 'forward'
         })
     elif gamut == 'REDcolor2':
-        cs.toReferenceTransforms.append( {
-            'type':'matrix',
-            'matrix':mat44FromMat33([0.480997, 0.402289, 0.116714, 
-                                    -0.004938, 1.000154, 0.004781, 
-                                    -0.105257, 0.025320, 1.079907]),
-            'direction':'forward'
+        cs.toReferenceTransforms.append({
+            'type': 'matrix',
+            'matrix': mat44FromMat33([0.480997, 0.402289, 0.116714,
+                                      -0.004938, 1.000154, 0.004781,
+                                      -0.105257, 0.025320, 1.079907]),
+            'direction': 'forward'
         })
     elif gamut == 'REDcolor3':
-        cs.toReferenceTransforms.append( {
-            'type':'matrix',
-            'matrix':mat44FromMat33([0.512136, 0.360370, 0.127494, 
-                                     0.070377, 0.903884, 0.025737, 
-                                    -0.020824, 0.017671, 1.003123]),
-            'direction':'forward'
+        cs.toReferenceTransforms.append({
+            'type': 'matrix',
+            'matrix': mat44FromMat33([0.512136, 0.360370, 0.127494,
+                                      0.070377, 0.903884, 0.025737,
+                                      -0.020824, 0.017671, 1.003123]),
+            'direction': 'forward'
         })
     elif gamut == 'REDcolor4':
-        cs.toReferenceTransforms.append( {
-            'type':'matrix',
-            'matrix':mat44FromMat33([0.474202, 0.333677, 0.192121, 
-                                     0.065164, 0.836932, 0.097901, 
-                                    -0.019281, 0.016362, 1.002889]),
-            'direction':'forward'
+        cs.toReferenceTransforms.append({
+            'type': 'matrix',
+            'matrix': mat44FromMat33([0.474202, 0.333677, 0.192121,
+                                      0.065164, 0.836932, 0.097901,
+                                      -0.019281, 0.016362, 1.002889]),
+            'direction': 'forward'
         })
 
     cs.fromReferenceTransforms = []
     return cs
 
+
 # Generate all color spaces conversion
 def createColorSpaces(lutDir, lutResolution1d):
     colorspaces = []
 
     # Full conversion
-    REDlogFilmDRAGON = createREDlogFilm("DRAGONcolor", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
+    REDlogFilmDRAGON = createREDlogFilm(
+        "DRAGONcolor", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
     colorspaces.append(REDlogFilmDRAGON)
 
-    REDlogFilmDRAGON2 = createREDlogFilm("DRAGONcolor2", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
+    REDlogFilmDRAGON2 = createREDlogFilm(
+        "DRAGONcolor2", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
     colorspaces.append(REDlogFilmDRAGON2)
 
-    REDlogFilmREDcolor2 = createREDlogFilm("REDcolor2", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
+    REDlogFilmREDcolor2 = createREDlogFilm(
+        "REDcolor2", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
     colorspaces.append(REDlogFilmREDcolor2)
 
-    REDlogFilmREDcolor3 = createREDlogFilm("REDcolor3", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
+    REDlogFilmREDcolor3 = createREDlogFilm(
+        "REDcolor3", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
     colorspaces.append(REDlogFilmREDcolor3)
 
-    REDlogFilmREDcolor4 = createREDlogFilm("REDcolor4", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
+    REDlogFilmREDcolor4 = createREDlogFilm(
+        "REDcolor4", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
     colorspaces.append(REDlogFilmREDcolor4)
 
     # Linearization only
-    REDlogFilmDRAGON = createREDlogFilm("", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
+    REDlogFilmDRAGON = createREDlogFilm(
+        "", "REDlogFilm", "REDlogFilm", lutDir, lutResolution1d)
     colorspaces.append(REDlogFilmDRAGON)
 
     # Primaries only
-    REDlogFilmDRAGON = createREDlogFilm("DRAGONcolor", "", "REDlogFilm", lutDir, lutResolution1d)
+    REDlogFilmDRAGON = createREDlogFilm(
+        "DRAGONcolor", "", "REDlogFilm", lutDir, lutResolution1d)
     colorspaces.append(REDlogFilmDRAGON)
 
-    REDlogFilmDRAGON2 = createREDlogFilm("DRAGONcolor2", "", "REDlogFilm", lutDir, lutResolution1d)
+    REDlogFilmDRAGON2 = createREDlogFilm(
+        "DRAGONcolor2", "", "REDlogFilm", lutDir, lutResolution1d)
     colorspaces.append(REDlogFilmDRAGON2)
 
-    REDlogFilmREDcolor2 = createREDlogFilm("REDcolor2", "", "REDlogFilm", lutDir, lutResolution1d)
+    REDlogFilmREDcolor2 = createREDlogFilm(
+        "REDcolor2", "", "REDlogFilm", lutDir, lutResolution1d)
     colorspaces.append(REDlogFilmREDcolor2)
 
-    REDlogFilmREDcolor3 = createREDlogFilm("REDcolor3", "", "REDlogFilm", lutDir, lutResolution1d)
+    REDlogFilmREDcolor3 = createREDlogFilm(
+        "REDcolor3", "", "REDlogFilm", lutDir, lutResolution1d)
     colorspaces.append(REDlogFilmREDcolor3)
 
-    REDlogFilmREDcolor4 = createREDlogFilm("REDcolor4", "", "REDlogFilm", lutDir, lutResolution1d)
+    REDlogFilmREDcolor4 = createREDlogFilm(
+        "REDcolor4", "", "REDlogFilm", lutDir, lutResolution1d)
     colorspaces.append(REDlogFilmREDcolor4)
 
     return colorspaces