X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=blobdiff_plain;f=aces_1.0.1%2Fpython%2Faces_ocio%2Fcolorspaces%2Fpanasonic_gh4.py;fp=aces_1.0.1%2Fpython%2Faces_ocio%2Fcolorspaces%2Fpanasonic_gh4.py;h=11611faf32f6cb9b97b9fd8cae9e3ea86e983f94;hp=1d0c95b76c5edd4bc057620fdd657cf4033410c6;hb=123d7599747b039c3fe2ea254b85cb922dc1c1e4;hpb=53086cf74147603796da1ab49798f75ecce655d9

diff --git a/aces_1.0.1/python/aces_ocio/colorspaces/panasonic_gh4.py b/aces_1.0.1/python/aces_ocio/colorspaces/panasonic_gh4.py
index 1d0c95b..11611fa 100644
--- a/aces_1.0.1/python/aces_ocio/colorspaces/panasonic_gh4.py
+++ b/aces_1.0.1/python/aces_ocio/colorspaces/panasonic_gh4.py
@@ -5,7 +5,7 @@
 Implements support for *Panasonic GH4* colorspaces conversions and transfer
 functions based on empirical data.
 """
-# from panasonic_gh4_data import *
+from panasonic_gh4_data import *
 
 import numpy as np
 from scipy import interpolate
@@ -354,15 +354,18 @@ def create_gh4_style(gamut,
             return cs
 
         if variant == ('Calibrated'):
-            # wb = [0.]*16
-            # wb[0] = calibration_wb[style][0]
-            # wb[5] = calibration_wb[style][1]
-            # wb[10] = calibration_wb[style][2]
-            # wb[15] = 1.0
-            # cs.to_reference_transforms.append({
-            #     'type': 'matrix',
-            #     'matrix': wb,
-            #     'direction': 'forward'})
+            wb = [0.]*16
+            wb[0] = 1/calibration_wb[style][0]
+            wb[5] = 1/calibration_wb[style][1]
+            wb[10] = 1/calibration_wb[style][2]
+            wb[15] = 1.0
+            cs.to_reference_transforms.append({
+                'type': 'matrix',
+                'matrix': wb,
+                'direction': 'forward'})
+
+            # calibrat_matrices = clibration_matrices_argyll
+            
             cs.to_reference_transforms.append({
                 'type': 'matrix',
                 'matrix': (calibration_matrices[style][0] + [0.0] +
@@ -376,14 +379,14 @@ def create_gh4_style(gamut,
         # colour.chromatic_adaptation_matrix_VonKries(
         #   colour.xy_to_XYZ(colour.ILLUMINANTS[
         #     'CIE 1931 2 Degree Standard Observer']['D50']),
-        #   colour.xy_to_XYZ(colour.V_GAMUT_COLOURSPACE.whitepoint),
+        #   colour.xy_to_XYZ(colour.ACES_2065_1_COLOURSPACE.whitepoint),
         #   'CAT02')
         
         cs.to_reference_transforms.append({
             'type': 'matrix',
-            'matrix': [ 0.95991641, -0.02931741,  0.06566143, 0.0,
-                        -0.02119542,  0.99887268,  0.02613247, 0.0,
-                        0.00137075,  0.00443593,  1.31260073, 0.0,
+            'matrix': [ 9.71197151e-01,  -2.17328334e-02,  4.59761326e-02, 0.0,
+                        -1.56890302e-02,  1.00002082e+00,  1.83070138e-02, 0.0,
+                        9.70076767e-04,   3.08175255e-03,  1.21767128e+00, 0.0,
                         0, 0, 0, 1.0],
             'direction': 'forward'})
 
@@ -512,35 +515,3 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
 
             
     return colorspaces
-
-calibration_matrices = {
-    
-'Cinelike-D': [[1.165504, 0.251869, -0.118313],
-                [-0.369525, 1.80097, -0.096786],
-                [-0.05245, 0.097669, 1.326889]],
- 'Cinelike-V': [[1.060891, 0.353566, -0.102382],
-                [-0.460172, 1.927755, -0.122295],
-                [-0.129601, 0.137134, 1.373328]],
- 'Custom': [[0.946141, 0.485274, -0.087787],
-            [-0.555203, 2.05073, -0.100206],
-            [-0.128126, 0.12821, 1.426733]],
- 'Natural': [[0.874551, 0.439286, -0.085863],
-             [-0.516138, 1.916301, -0.11907],
-             [-0.071172, 0.056567, 1.347203]],
- 'Portrait': [[0.660386, 0.650877, -0.060211],
-              [-0.600758, 1.998228, -0.085769],
-              [-0.110666, 0.124363, 1.339439]],
- 'Scenery': [[0.812315, 0.534553, -0.098869],
-             [-0.542253, 1.934419, -0.071867],
-             [-0.123626, 0.142352, 1.292352]],
- 'Standard': [[0.886056, 0.415669, -0.073317],
-              [-0.482919, 1.84707, -0.088924],
-              [-0.117718, 0.126855, 1.321097]],
- 'V-Log': [[1.127527, 0.284008, -0.033005],
-           [-0.192653, 1.619262, -0.030388],
-           [-0.080181, 0.057527, 1.39992]],
- 'Vivid': [[0.754924, 0.526196, -0.061668],
-           [-0.503233, 1.851748, -0.065254],
-           [-0.197153, 0.267533, 1.212053]]
-
-}