Removed Rec.2020 12 bit curve and colorspace to simplify matters.
authorHaarm-Pieter Duiker <hpd1@duikerresearch.com>
Thu, 4 Jun 2015 03:02:29 +0000 (20:02 -0700)
committerHaarm-Pieter Duiker <hpd1@duikerresearch.com>
Thu, 4 Jun 2015 03:02:29 +0000 (20:02 -0700)
aces_1.0.0/config.ocio
aces_1.0.0/luts/rec2020_to_linear.spi1d
aces_1.0.0/python/aces_ocio/aces_config.py
aces_1.0.0/python/aces_ocio/colorspaces/general.py

index f16898d..c7180fa 100644 (file)
@@ -497,100 +497,100 @@ colorspaces:
     from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: DCDM (P3 gamut clip)}
 
   - !<ColorSpace>
-    name: P3-D60 PQ (1000 nits)
+    name: DCDM
     family: Output
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 PQ (1000 nits) Output Transform
+      ACES 1.0 Output - DCDM Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: InvRRT.a1.0.0.P3-D60_PQ__1000_nits_.Output_Shaper.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: InvRRT.a1.0.0.DCDM.Output_Shaper.spi3d, interpolation: tetrahedral}
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}
     from_reference: !<GroupTransform>
       children:
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
-        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.P3-D60_PQ__1000_nits_.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.DCDM.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: out_p3d60pq1000nits
+    name: out_dcdm
     family: Aliases
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 PQ (1000 nits) Output Transform
+      ACES 1.0 Output - DCDM Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    to_reference: !<ColorSpaceTransform> {src: P3-D60 PQ (1000 nits), dst: ACES2065-1}
-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: P3-D60 PQ (1000 nits)}
+    to_reference: !<ColorSpaceTransform> {src: DCDM, dst: ACES2065-1}
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: DCDM}
 
   - !<ColorSpace>
-    name: DCDM
+    name: P3-D60 PQ (4000 nits)
     family: Output
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - DCDM Output Transform
+      ACES 1.0 Output - P3-D60 PQ (4000 nits) Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: InvRRT.a1.0.0.DCDM.Output_Shaper.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: InvRRT.a1.0.0.P3-D60_PQ__4000_nits_.Output_Shaper.spi3d, interpolation: tetrahedral}
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}
     from_reference: !<GroupTransform>
       children:
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
-        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.DCDM.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.P3-D60_PQ__4000_nits_.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: out_dcdm
+    name: out_p3d60pq4000nits
     family: Aliases
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - DCDM Output Transform
+      ACES 1.0 Output - P3-D60 PQ (4000 nits) Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    to_reference: !<ColorSpaceTransform> {src: DCDM, dst: ACES2065-1}
-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: DCDM}
+    to_reference: !<ColorSpaceTransform> {src: P3-D60 PQ (4000 nits), dst: ACES2065-1}
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: P3-D60 PQ (4000 nits)}
 
   - !<ColorSpace>
-    name: Rec.2020 - Full
+    name: P3-D60 PQ (1000 nits)
     family: Output
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - Rec.2020 - Full Output Transform
+      ACES 1.0 Output - P3-D60 PQ (1000 nits) Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: InvRRT.a1.0.0.Rec.2020_-_Full.Output_Shaper.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: InvRRT.a1.0.0.P3-D60_PQ__1000_nits_.Output_Shaper.spi3d, interpolation: tetrahedral}
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}
     from_reference: !<GroupTransform>
       children:
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
-        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.Rec.2020_-_Full.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.P3-D60_PQ__1000_nits_.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: out_rec2020full
+    name: out_p3d60pq1000nits
     family: Aliases
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - Rec.2020 - Full Output Transform
+      ACES 1.0 Output - P3-D60 PQ (1000 nits) Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    to_reference: !<ColorSpaceTransform> {src: Rec.2020 - Full, dst: ACES2065-1}
-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Rec.2020 - Full}
+    to_reference: !<ColorSpaceTransform> {src: P3-D60 PQ (1000 nits), dst: ACES2065-1}
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: P3-D60 PQ (1000 nits)}
 
   - !<ColorSpace>
     name: P3-D60 PQ (2000 nits)
@@ -625,68 +625,68 @@ colorspaces:
     from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: P3-D60 PQ (2000 nits)}
 
   - !<ColorSpace>
-    name: P3-D60
+    name: Rec.2020 - Full
     family: Output
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 Output Transform
+      ACES 1.0 Output - Rec.2020 - Full Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: InvRRT.a1.0.0.P3-D60.Output_Shaper.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: InvRRT.a1.0.0.Rec.2020_-_Full.Output_Shaper.spi3d, interpolation: tetrahedral}
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}
     from_reference: !<GroupTransform>
       children:
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
-        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.P3-D60.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.Rec.2020_-_Full.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: out_p3d60
+    name: out_rec2020full
     family: Aliases
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 Output Transform
+      ACES 1.0 Output - Rec.2020 - Full Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    to_reference: !<ColorSpaceTransform> {src: P3-D60, dst: ACES2065-1}
-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: P3-D60}
+    to_reference: !<ColorSpaceTransform> {src: Rec.2020 - Full, dst: ACES2065-1}
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Rec.2020 - Full}
 
   - !<ColorSpace>
-    name: P3-D60 PQ (4000 nits)
+    name: P3-D60
     family: Output
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 PQ (4000 nits) Output Transform
+      ACES 1.0 Output - P3-D60 Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: InvRRT.a1.0.0.P3-D60_PQ__4000_nits_.Output_Shaper.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: InvRRT.a1.0.0.P3-D60.Output_Shaper.spi3d, interpolation: tetrahedral}
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear}
     from_reference: !<GroupTransform>
       children:
         - !<FileTransform> {src: Output_Shaper_to_linear.spi1d, interpolation: linear, direction: inverse}
-        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.P3-D60_PQ__4000_nits_.spi3d, interpolation: tetrahedral}
+        - !<FileTransform> {src: Output_Shaper.RRT.a1.0.0.P3-D60.spi3d, interpolation: tetrahedral}
 
   - !<ColorSpace>
-    name: out_p3d60pq4000nits
+    name: out_p3d60
     family: Aliases
     equalitygroup: ""
     bitdepth: 32f
     description: |
-      ACES 1.0 Output - P3-D60 PQ (4000 nits) Output Transform
+      ACES 1.0 Output - P3-D60 Output Transform
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    to_reference: !<ColorSpaceTransform> {src: P3-D60 PQ (4000 nits), dst: ACES2065-1}
-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: P3-D60 PQ (4000 nits)}
+    to_reference: !<ColorSpaceTransform> {src: P3-D60, dst: ACES2065-1}
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: P3-D60}
 
   - !<ColorSpace>
     name: P3-DCI
@@ -2819,88 +2819,36 @@ colorspaces:
     from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Linear - Rec.2020}
 
   - !<ColorSpace>
-    name: Curve - Rec.2020 - 10 bit
-    family: Utility
-    equalitygroup: Curve - Rec.2020 - 10 bit
-    bitdepth: 32f
-    description: |
-      The Curve - Rec.2020 - 10 bit color space
-    isdata: false
-    allocation: uniform
-    allocationvars: [0, 1]
-    to_reference: !<FileTransform> {src: rec2020_to_linear.spi1d, interpolation: linear}
-
-  - !<ColorSpace>
-    name: crv_rec202010bit
-    family: Aliases
-    equalitygroup: Curve - Rec.2020 - 10 bit
-    bitdepth: 32f
-    description: |
-      The Curve - Rec.2020 - 10 bit color space
-    isdata: false
-    allocation: uniform
-    allocationvars: [0, 1]
-    to_reference: !<ColorSpaceTransform> {src: Curve - Rec.2020 - 10 bit, dst: ACES2065-1}
-
-  - !<ColorSpace>
-    name: Rec.2020 10 bit - Rec.2020
-    family: Utility
-    equalitygroup: Rec.2020 10 bit - Rec.2020
-    bitdepth: 32f
-    description: |
-      The Rec.2020 10 bit - Rec.2020 color space
-    isdata: false
-    allocation: uniform
-    allocationvars: [0, 1]
-    from_reference: !<GroupTransform>
-      children:
-        - !<MatrixTransform> {matrix: [0.952552, 0, 9.36786e-05, 0, 0.343966, 0.728166, -0.0721325, 0, 0, 0, 1.00883, 0, 0, 0, 0, 1]}
-        - !<MatrixTransform> {matrix: [1.71665, -0.355671, -0.253366, 0, -0.666684, 1.61648, 0.0157685, 0, 0.0176399, -0.0427706, 0.942103, 0, 0, 0, 0, 1]}
-        - !<FileTransform> {src: rec2020_to_linear.spi1d, interpolation: linear, direction: inverse}
-
-  - !<ColorSpace>
-    name: rec202010bit
-    family: Aliases
-    equalitygroup: Rec.2020 10 bit - Rec.2020
-    bitdepth: 32f
-    description: |
-      The Rec.2020 10 bit - Rec.2020 color space
-    isdata: false
-    allocation: uniform
-    allocationvars: [0, 1]
-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Rec.2020 10 bit - Rec.2020}
-
-  - !<ColorSpace>
-    name: Curve - Rec.2020 - 12 bit
+    name: Curve - Rec.2020
     family: Utility
-    equalitygroup: Curve - Rec.2020 - 12 bit
+    equalitygroup: Curve - Rec.2020
     bitdepth: 32f
     description: |
-      The Curve - Rec.2020 - 12 bit color space
+      The Curve - Rec.2020 color space
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
     to_reference: !<FileTransform> {src: rec2020_to_linear.spi1d, interpolation: linear}
 
   - !<ColorSpace>
-    name: crv_rec202012bit
+    name: crv_rec2020
     family: Aliases
-    equalitygroup: Curve - Rec.2020 - 12 bit
+    equalitygroup: Curve - Rec.2020
     bitdepth: 32f
     description: |
-      The Curve - Rec.2020 - 12 bit color space
+      The Curve - Rec.2020 color space
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    to_reference: !<ColorSpaceTransform> {src: Curve - Rec.2020 - 12 bit, dst: ACES2065-1}
+    to_reference: !<ColorSpaceTransform> {src: Curve - Rec.2020, dst: ACES2065-1}
 
   - !<ColorSpace>
-    name: Rec.2020 12 bit - Rec.2020
+    name: Rec.2020
     family: Utility
-    equalitygroup: Rec.2020 12 bit - Rec.2020
+    equalitygroup: Rec.2020
     bitdepth: 32f
     description: |
-      The Rec.2020 12 bit - Rec.2020 color space
+      The Rec.2020 color space
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
@@ -2911,16 +2859,16 @@ colorspaces:
         - !<FileTransform> {src: rec2020_to_linear.spi1d, interpolation: linear, direction: inverse}
 
   - !<ColorSpace>
-    name: rec202012bit
+    name: rec2020
     family: Aliases
-    equalitygroup: Rec.2020 12 bit - Rec.2020
+    equalitygroup: Rec.2020
     bitdepth: 32f
     description: |
-      The Rec.2020 12 bit - Rec.2020 color space
+      The Rec.2020 color space
     isdata: false
     allocation: uniform
     allocationvars: [0, 1]
-    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Rec.2020 12 bit - Rec.2020}
+    from_reference: !<ColorSpaceTransform> {src: ACES2065-1, dst: Rec.2020}
 
   - !<ColorSpace>
     name: Linear - RIMM ROMM (ProPhoto)
index 523e482..7cfe9d9 100644 (file)
@@ -86,945 +86,945 @@ Components 1
          0.0173780824989
          0.0175953079015
          0.0178125333041
-         0.0180297605693
-         0.0182481463999
-         0.0184673722833
-         0.0186880417168
-         0.018910150975
-         0.0191337056458
-         0.0193587057292
-         0.0195851549506
-         0.0198130514473
-         0.0200423989445
-         0.0202732011676
-         0.0205054562539
-         0.0207391660661
-         0.0209743343294
-         0.0212109629065
-         0.0214490517974
-         0.0216886028647
-         0.0219296179712
-         0.0221720989794
-         0.0224160477519
-         0.0226614642888
-         0.0229083523154
-         0.0231567136943
-         0.0234065465629
-         0.0236578565091
-         0.0239106416702
-         0.0241649057716
-         0.0244206506759
-         0.0246778763831
-         0.0249365866184
-         0.0251967795193
-         0.0254584606737
-         0.0257216282189
-         0.0259862858802
-         0.0262524336576
-         0.0265200752765
-         0.0267892088741
-         0.0270598381758
-         0.0273319650441
-         0.0276055894792
-         0.0278807152063
-         0.0281573403627
-         0.0284354705364
-         0.0287151038647
-         0.0289962422103
-         0.0292788892984
-         0.0295630451292
-         0.0298487097025
-         0.0301358867437
-         0.0304245762527
-         0.0307147819549
-         0.0310065019876
-         0.0312997400761
-         0.0315944962204
-         0.0318907722831
-         0.0321885719895
-         0.0324878953397
-         0.0327887386084
-         0.0330911129713
-         0.033395010978
-         0.033700440079
-         0.034007396549
-         0.0343158878386
-         0.0346259102225
-         0.0349374674261
-         0.0352505594492
-         0.0355651900172
-         0.0358813554049
-         0.0361990630627
-         0.0365183129907
-         0.0368391051888
-         0.0371614396572
-         0.0374853163958
-         0.0378107428551
-         0.0381377190351
-         0.0384662412107
-         0.0387963168323
-         0.0391279421747
-         0.0394611209631
-         0.0397958531976
-         0.0401321426034
-         0.0404699891806
-         0.0408093929291
-         0.0411503575742
-         0.0414928793907
-         0.0418369695544
-         0.0421826168895
-         0.0425298325717
-         0.0428786166012
-         0.0432289652526
-         0.0435808822513
-         0.0439343713224
-         0.0442894287407
-         0.0446460582316
-         0.0450042635202
-         0.0453640446067
-         0.0457254014909
-         0.046088334173
-         0.0464528463781
-         0.0468189381063
-         0.0471866130829
-         0.0475558713078
-         0.0479267090559
-         0.0482991337776
-         0.048673145473
-         0.0490487441421
-         0.0494259297848
-         0.0498047061265
-         0.0501850768924
-         0.050567034632
-         0.0509505905211
-         0.0513357371092
-         0.0517224818468
-         0.052110824734
-         0.0525007620454
-         0.0528923012316
-         0.0532854422927
-         0.0536801815033
-         0.054076526314
-         0.0544744767249
-         0.0548740290105
-         0.0552751906216
-         0.0556779578328
-         0.0560823343694
-         0.0564883202314
-         0.0568959191442
-         0.0573051311076
-         0.0577159561217
-         0.0581283941865
-         0.0585424490273
-         0.0589581206441
-         0.0593754090369
-         0.0597943179309
-         0.0602148473263
-         0.0606369972229
-         0.0610607713461
-         0.0614861696959
-         0.0619131922722
-         0.0623418390751
-         0.0627721175551
-         0.0632040202618
-         0.0636375546455
-         0.0640727132559
-         0.064509510994
-         0.0649479404092
-         0.0653880015016
-         0.0658296942711
-         0.0662730336189
-         0.0667179971933
-         0.0671646073461
-         0.0676128566265
-         0.0680627450347
-         0.0685142725706
-         0.0689674466848
-         0.0694222599268
-         0.0698787197471
-         0.0703368261456
-         0.0707965791225
-         0.0712579861283
-         0.0717210322618
-         0.0721857324243
-         0.0726520866156
-         0.0731200873852
-         0.0735897496343
-         0.0740610584617
-         0.0745340287685
-         0.0750086531043
-         0.075484931469
-         0.0759628713131
-         0.0764424726367
-         0.0769237279892
-         0.0774066522717
-         0.0778912380338
-         0.0783774852753
-         0.0788654014468
-         0.0793549790978
-         0.0798462256789
-         0.0803391337395
-         0.0808337181807
-         0.0813299715519
-         0.0818278938532
-         0.0823274925351
-         0.0828287601471
-         0.0833317041397
-         0.083836324513
-         0.0843426138163
-         0.0848505869508
-         0.0853602364659
-         0.0858715698123
-         0.0863845720887
-         0.0868992656469
-         0.0874156355858
-         0.0879336893559
-         0.0884534269571
-         0.0889748558402
-         0.0894979685545
-         0.0900227651
-         0.0905492454767
-         0.0910774245858
-         0.0916072875261
-         0.0921388417482
-         0.0926720872521
-         0.0932070314884
-         0.0937436670065
-         0.0942819938064
-         0.0948220193386
-         0.0953637436032
-         0.0959071591496
-         0.096452280879
-         0.0969991013408
-         0.0975476205349
-         0.0980978384614
-         0.0986497625709
-         0.0992033854127
-         0.0997587218881
-         0.100315757096
-         0.100874498487
-         0.101434953511
-         0.101997107267
-         0.102560982108
-         0.103126555681
-         0.103693850338
-         0.104262851179
-         0.104833565652
-         0.10540599376
-         0.1059801355
-         0.106555998325
-         0.107133574784
-         0.107712864876
-         0.108293883502
-         0.108876615763
-         0.109461069107
-         0.110047243536
-         0.110635139048
-         0.111224755645
-         0.111816100776
-         0.112409166992
-         0.113003961742
-         0.113600485027
-         0.114198736846
-         0.114798717201
-         0.115400418639
-         0.116003863513
-         0.116609029472
-         0.117215931416
-         0.117824569345
-         0.118434935808
-         0.119047038257
-         0.119660884142
-         0.120276458561
-         0.120893776417
-         0.121512830257
-         0.122133620083
-         0.122756153345
-         0.123380430043
-         0.124006442726
-         0.124634206295
-         0.12526370585
-         0.125894963741
-         0.126527950168
-         0.127162694931
-         0.12779918313
-         0.128437414765
-         0.129077404737
-         0.129719138145
-         0.130362614989
-         0.131007865071
-         0.131654843688
-         0.132303595543
-         0.132954090834
-         0.133606344461
-         0.134260356426
-         0.134916126728
-         0.135573640466
-         0.136232927442
-         0.136893972754
-         0.137556776404
-         0.138221338391
-         0.138887658715
-         0.139555752277
-         0.140225604177
-         0.140897214413
-         0.141570597887
-         0.1422457546
-         0.142922669649
-         0.143601357937
-         0.144281804562
-         0.144964024425
-         0.145648017526
-         0.146333783865
-         0.147021323442
-         0.147710621357
-         0.148401707411
-         0.149094566703
-         0.149789199233
-         0.150485605001
-         0.151183798909
-         0.151883751154
-         0.152585491538
-         0.153289020061
-         0.153994321823
-         0.154701411724
-         0.155410274863
-         0.156120926142
-         0.156833350658
-         0.157547563314
-         0.15826356411
-         0.158981353045
-         0.159700930119
-         0.160422295332
-         0.161145448685
-         0.161870390177
-         0.162597119808
-         0.163325637579
-         0.164055943489
-         0.16478805244
-         0.16552194953
-         0.166257634759
-         0.166995123029
-         0.167734414339
-         0.168475493789
-         0.169218361378
-         0.169963046908
-         0.170709520578
-         0.171457782388
-         0.172207862139
-         0.172959730029
-         0.173713415861
-         0.174468889832
-         0.175226166844
-         0.175985261798
-         0.176746144891
-         0.177508845925
-         0.17827335
-         0.179039672017
-         0.179807782173
-         0.180577710271
-         0.18134945631
-         0.18212300539
-         0.182898372412
-         0.183675542474
-         0.184454530478
-         0.185235321522
-         0.186017945409
-         0.186802372336
-         0.187588617206
-         0.188376680017
-         0.189166545868
-         0.189958244562
-         0.190751761198
-         0.191547095776
-         0.192344263196
-         0.193143233657
-         0.193944036961
-         0.194746658206
-         0.195551097393
-         0.196357369423
-         0.197165474296
-         0.197975382209
-         0.198787137866
-         0.199600711465
-         0.200416117907
-         0.20123334229
-         0.202052399516
-         0.202873289585
-         0.203696012497
-         0.204520568252
-         0.205346956849
-         0.206175178289
-         0.207005232573
-         0.207837119699
-         0.208670839667
-         0.209506392479
-         0.210343793035
-         0.211183026433
-         0.212024092674
-         0.21286700666
-         0.213711753488
-         0.21455834806
-         0.215406775475
-         0.216257050633
-         0.217109173536
-         0.217963129282
-         0.218818932772
-         0.219676584005
-         0.220536082983
-         0.221397414804
-         0.222260609269
-         0.223125651479
-         0.223992526531
-         0.224861264229
-         0.22573184967
-         0.226604282856
-         0.227478563786
-         0.22835470736
-         0.229232698679
-         0.230112537742
-         0.23099423945
-         0.231877788901
-         0.232763200998
-         0.233650460839
-         0.234539583325
-         0.235430568457
-         0.236323401332
-         0.237218096852
-         0.238114655018
-         0.239013075829
-         0.239913344383
-         0.240815490484
-         0.241719484329
-         0.242625355721
-         0.243533089757
-         0.244442686439
-         0.245354145765
-         0.246267467737
-         0.247182667255
-         0.248099714518
-         0.249018654227
-         0.249939441681
-         0.250862121582
-         0.251786649227
-         0.252713054419
-         0.253641337156
-         0.25457149744
-         0.255503505468
-         0.256437420845
-         0.257373183966
-         0.258310824633
-         0.259250372648
-         0.260191768408
-         0.261135041714
-         0.262080192566
-         0.263027220964
-         0.263976126909
-         0.264926940203
-         0.26587960124
-         0.266834169626
-         0.267790585756
-         0.268748909235
-         0.26970911026
-         0.270671188831
-         0.271635174751
-         0.272601038218
-         0.27356877923
-         0.274538397789
-         0.275509923697
-         0.27648332715
-         0.27745860815
-         0.278435796499
-         0.279414862394
-         0.280395805836
-         0.281378656626
-         0.282363414764
-         0.283350050449
-         0.284338563681
-         0.285329014063
-         0.286321312189
-         0.287315517664
-         0.288311630487
-         0.28930965066
-         0.290309548378
-         0.291311353445
-         0.292315036058
-         0.29332062602
-         0.294328123331
-         0.29533752799
-         0.296348839998
-         0.297362029552
-         0.298377126455
-         0.299394130707
-         0.300413042307
-         0.301433861256
-         0.302456587553
-         0.303481191397
-         0.304507732391
-         0.305536180735
-         0.306566506624
-         0.307598769665
-         0.308632940054
-         0.309668987989
-         0.310706973076
-         0.311746865511
-         0.312788665295
-         0.313832402229
-         0.31487801671
-         0.315925568342
-         0.31697499752
-         0.31802636385
-         0.31907966733
-         0.320134848356
-         0.321191966534
-         0.322251021862
-         0.323311954737
-         0.324374824762
-         0.325439631939
-         0.326506316662
-         0.327574938536
-         0.328645497561
-         0.329717963934
-         0.330792367458
-         0.331868678331
-         0.332946926355
-         0.334027081728
-         0.335109174252
-         0.336193174124
-         0.337279111147
-         0.338366985321
-         0.339456766844
-         0.340548485518
-         0.341642141342
-         0.342737704515
-         0.34383520484
-         0.344934642315
-         0.346036016941
-         0.347139328718
-         0.348244547844
-         0.349351704121
-         0.350460797548
-         0.351571828127
-         0.352684795856
-         0.353799700737
-         0.354916512966
-         0.356035292149
-         0.357156008482
-         0.358278661966
-         0.359403222799
-         0.360529750586
-         0.361658215523
-         0.362788617611
-         0.36392095685
-         0.36505523324
-         0.366191476583
-         0.367329627275
-         0.368469744921
-         0.369611799717
-         0.370755791664
-         0.371901750565
-         0.373049616814
-         0.374199450016
-         0.375351250172
-         0.376504957676
-         0.377660632133
-         0.378818273544
-         0.379977822304
-         0.381139367819
-         0.382302820683
-         0.383468240499
-         0.38463562727
-         0.385804951191
-         0.386976242065
-         0.388149470091
-         0.389324635267
-         0.390501797199
-         0.39168086648
-         0.392861932516
-         0.394044935703
-         0.395229905844
-         0.396416813135
-         0.39760568738
-         0.398796528578
-         0.399989336729
-         0.401184082031
-         0.402380794287
-         0.403579473495
-         0.404780089855
-         0.405982702971
-         0.407187253237
-         0.408393800259
-         0.409602284431
-         0.410812735558
-         0.412025153637
-         0.41323953867
-         0.414455860853
-         0.415674179792
-         0.416894465685
-         0.418116718531
-         0.41934093833
-         0.420567125082
-         0.421795278788
-         0.423025399446
-         0.424257487059
-         0.425491571426
-         0.426727592945
-         0.427965611219
-         0.429205596447
-         0.430447548628
-         0.431691497564
-         0.432937383652
-         0.434185266495
-         0.435435146093
-         0.436686962843
-         0.437940776348
-         0.439196556807
-         0.440454334021
-         0.441714078188
-         0.442975789309
-         0.444239497185
-         0.445505172014
-         0.446772843599
-         0.448042482138
-         0.449314117432
-         0.450587719679
-         0.451863318682
-         0.453140884638
-         0.45442044735
-         0.455702006817
-         0.456985533237
-         0.458271056414
-         0.459558546543
-         0.460848033428
-         0.462139517069
-         0.463432997465
-         0.464728444815
-         0.46602588892
-         0.467325329781
-         0.468626737595
-         0.469930142164
-         0.471235543489
-         0.47254294157
-         0.473852336407
-         0.475163727999
-         0.476477116346
-         0.477792471647
-         0.479109853506
-         0.480429202318
-         0.481750547886
-         0.483073920012
-         0.48439925909
-         0.485726594925
-         0.487055957317
-         0.488387286663
-         0.489720642567
-         0.491055965424
-         0.492393314838
-         0.493732661009
-         0.495074003935
-         0.496417343616
-         0.497762709856
-         0.499110043049
-         0.500459432602
-         0.501810789108
-         0.503164112568
-         0.50451952219
-         0.505876898766
-         0.507236242294
-         0.508597612381
-         0.509961009026
-         0.511326432228
-         0.512693822384
-         0.514063239098
-         0.515434682369
-         0.516808152199
-         0.518183588982
-         0.519561052322
-         0.520940482616
-         0.522321999073
-         0.523705482483
-         0.525090992451
-         0.526478528976
-         0.527868032455
-         0.529259622097
-         0.530653178692
-         0.532048761845
-         0.533446371555
-         0.534845948219
-         0.536247611046
-         0.537651240826
-         0.539056897163
-         0.540464580059
-         0.541874289513
-         0.543286025524
-         0.544699788094
-         0.546115577221
-         0.547533333302
-         0.548953175545
-         0.550374984741
-         0.551798820496
-         0.553224742413
-         0.554652631283
-         0.556082546711
-         0.557514548302
-         0.558948516846
-         0.560384511948
-         0.561822533607
-         0.563262581825
-         0.564704716206
-         0.566148817539
-         0.567594945431
-         0.569043159485
-         0.570493340492
-         0.571945548058
-         0.573399841785
-         0.574856162071
-         0.57631444931
-         0.577774822712
-         0.579237222672
-         0.580701649189
-         0.582168102264
-         0.583636641502
-         0.585107147694
-         0.586579740047
-         0.588054299355
-         0.589530944824
-         0.591009616852
-         0.592490375042
-         0.593973100185
-         0.595457911491
-         0.596944749355
-         0.598433613777
-         0.599924504757
-         0.601417481899
-         0.6029124856
-         0.604409515858
-         0.605908572674
-         0.607409715652
-         0.608912825584
-         0.610418081284
-         0.611925303936
-         0.613434612751
-         0.614945948124
-         0.616459310055
-         0.617974758148
-         0.6194922328
-         0.621011734009
-         0.622533321381
-         0.62405693531
-         0.625582635403
-         0.627110362053
-         0.628640115261
-         0.630171954632
-         0.63170582056
-         0.633241713047
-         0.634779691696
-         0.636319696903
-         0.637861788273
-         0.6394059062
-         0.640952110291
-         0.642500340939
-         0.644050657749
-         0.645603001118
-         0.647157430649
-         0.648713886738
-         0.650272369385
-         0.651832938194
-         0.653395593166
-         0.654960274696
-         0.656527042389
-         0.658095836639
-         0.659666717052
-         0.661239624023
-         0.662814617157
-         0.664391636848
-         0.665970742702
-         0.667551934719
-         0.669135153294
-         0.670720458031
-         0.67230784893
-         0.673897266388
-         0.675488770008
-         0.677082300186
-         0.678677916527
-         0.68027561903
-         0.681875348091
-         0.683477163315
-         0.685081064701
-         0.68668705225
-         0.688295066357
-         0.689905166626
-         0.691517293453
-         0.693131566048
-         0.6947478652
-         0.69636619091
-         0.697986662388
-         0.699609160423
-         0.701233744621
-         0.702860414982
-         0.704489171505
-         0.706119954586
-         0.70775282383
-         0.709387779236
-         0.711024820805
-         0.712663948536
-         0.714305102825
-         0.715948402882
-         0.717593729496
-         0.719241142273
-         0.720890641212
-         0.722542226315
-         0.724195837975
-         0.725851595402
-         0.727509379387
-         0.729169249535
-         0.73083126545
-         0.732495307922
-         0.734161436558
-         0.735829651356
-         0.737499952316
-         0.739172339439
-         0.740846812725
-         0.742523312569
-         0.744201958179
-         0.745882689953
-         0.747565507889
-         0.749250411987
-         0.750937342644
-         0.752626419067
-         0.754317581654
-         0.756010830402
-         0.757706165314
-         0.759403586388
-         0.761103093624
-         0.762804687023
-         0.764508366585
-         0.766214132309
-         0.767921984196
-         0.76963198185
-         0.771344006062
-         0.773058176041
-         0.774774372578
-         0.776492714882
-         0.778213143349
-         0.779935657978
-         0.78166025877
-         0.783387005329
-         0.785115778446
-         0.78684669733
-         0.788579702377
-         0.790314793587
-         0.792051970959
-         0.793791234493
-         0.795532643795
-         0.797276139259
-         0.799021720886
-         0.800769388676
-         0.802519202232
-         0.804271101952
-         0.806025087833
-         0.807781159878
-         0.809539377689
-         0.811299681664
-         0.8130620718
-         0.8148265481
-         0.816593170166
-         0.818361878395
-         0.820132732391
-         0.821905612946
-         0.823680639267
-         0.825457811356
-         0.827237069607
-         0.829018414021
-         0.830801844597
-         0.83258742094
-         0.834375083447
-         0.83616489172
-         0.837956786156
-         0.839750766754
-         0.84154689312
-         0.843345105648
-         0.845145463943
-         0.846947908401
-         0.848752439022
-         0.85055911541
-         0.85236787796
-         0.854178786278
-         0.855991780758
-         0.857806921005
-         0.859624147415
-         0.861443519592
-         0.863264977932
-         0.865088582039
-         0.866914272308
-         0.868742108345
-         0.870572090149
-         0.872404098511
-         0.874238312244
-         0.876074612141
-         0.877912998199
-         0.879753530025
-         0.881596207619
-         0.883440971375
-         0.885287880898
-         0.887136876583
-         0.888988018036
-         0.890841305256
-         0.892696678638
-         0.894554197788
-         0.896413803101
-         0.898275613785
-         0.900139451027
-         0.902005493641
-         0.903873622417
-         0.905743896961
-         0.907616257668
-         0.909490764141
-         0.911367416382
-         0.913246154785
-         0.91512709856
-         0.917010068893
-         0.918895244598
-         0.920782506466
-         0.922671914101
-         0.924563467503
-         0.926457166672
-         0.928352952003
-         0.930250883102
-         0.932150959969
-         0.934053182602
-         0.935957491398
-         0.937864005566
-         0.939772605896
-         0.941683292389
-         0.943596184254
-         0.945511221886
-         0.94742834568
-         0.949347615242
-         0.951269030571
-         0.953192591667
-         0.955118238926
-         0.957046091557
-         0.95897603035
-         0.960908174515
-         0.962842404842
-         0.964778780937
-         0.966717302799
-         0.968657970428
-         0.970600783825
-         0.972545742989
-         0.974492788315
-         0.976442039013
-         0.978393375874
-         0.980346918106
-         0.982302546501
-         0.984260380268
-         0.986220300198
-         0.988182425499
-         0.990146636963
-         0.992112994194
-         0.994081556797
-         0.996052205563
-         0.9980250597
+         0.0179747063667
+         0.018192185089
+         0.0184111017734
+         0.0186314620078
+         0.0188532639295
+         0.0190765094012
+         0.0193012021482
+         0.0195273440331
+         0.0197549331933
+         0.0199839752167
+         0.0202144701034
+         0.0204464197159
+         0.0206798240542
+         0.0209146887064
+         0.0211510118097
+         0.0213887952268
+         0.021628042683
+         0.0218687541783
+         0.0221109334379
+         0.0223545785993
+         0.0225996933877
+         0.0228462796658
+         0.0230943374336
+         0.0233438704163
+         0.0235948786139
+         0.0238473638892
+         0.0241013281047
+         0.0243567749858
+         0.0246137008071
+         0.0248721111566
+         0.0251320078969
+         0.0253933891654
+         0.02565626055
+         0.0259206201881
+         0.026186471805
+         0.0264538172632
+         0.0267226565629
+         0.026992989704
+         0.0272648222744
+         0.0275381524116
+         0.0278129838407
+         0.0280893165618
+         0.0283671524376
+         0.0286464933306
+         0.0289273411036
+         0.0292096957564
+         0.0294935591519
+         0.0297789350152
+         0.0300658214837
+         0.0303542222828
+         0.0306441374123
+         0.030935568735
+         0.0312285181135
+         0.0315229892731
+         0.0318189784884
+         0.0321164876223
+         0.0324155241251
+         0.0327160842717
+         0.0330181717873
+         0.0333217866719
+         0.0336269289255
+         0.0339336059988
+         0.034241810441
+         0.0345515497029
+         0.0348628275096
+         0.0351756364107
+         0.0354899838567
+         0.0358058698475
+         0.0361232981086
+         0.0364422686398
+         0.0367627777159
+         0.0370848365128
+         0.0374084375799
+         0.0377335846424
+         0.0380602814257
+         0.0383885316551
+         0.0387183278799
+         0.0390496775508
+         0.0393825806677
+         0.039717040956
+         0.0400530546904
+         0.0403906293213
+         0.0407297573984
+         0.0410704500973
+         0.0414127036929
+         0.0417565219104
+         0.0421019010246
+         0.0424488447607
+         0.0427973568439
+         0.0431474372745
+         0.0434990860522
+         0.0438523069024
+         0.0442070998251
+         0.0445634648204
+         0.0449214018881
+         0.045280918479
+         0.0456420071423
+         0.046004679054
+         0.0463689267635
+         0.0467347539961
+         0.0471021682024
+         0.0474711619318
+         0.0478417389095
+         0.0482139028609
+         0.0485876537859
+         0.0489629916847
+         0.0493399202824
+         0.049718439579
+         0.0500985495746
+         0.0504802502692
+         0.0508635491133
+         0.0512484386563
+         0.0516349300742
+         0.0520230159163
+         0.052412699908
+         0.0528039857745
+         0.0531968735158
+         0.0535913594067
+         0.053987454623
+         0.0543851517141
+         0.0547844544053
+         0.0551853626966
+         0.0555878840387
+         0.0559920109808
+         0.0563977509737
+         0.056805100292
+         0.0572140626609
+         0.0576246418059
+         0.0580368340015
+         0.0584506429732
+         0.0588660724461
+         0.059283118695
+         0.0597017817199
+         0.0601220689714
+         0.0605439767241
+         0.0609675087035
+         0.0613926686347
+         0.0618194490671
+         0.0622478574514
+         0.0626778975129
+         0.063109561801
+         0.0635428577662
+         0.0639777854085
+         0.064414344728
+         0.0648525357246
+         0.0652923583984
+         0.0657338276505
+         0.0661769211292
+         0.0666216611862
+         0.0670680403709
+         0.0675160512328
+         0.067965708673
+         0.0684170126915
+         0.0688699483871
+         0.0693245381117
+         0.0697807744145
+         0.0702386498451
+         0.0706981793046
+         0.0711593478918
+         0.0716221779585
+         0.0720866546035
+         0.0725527778268
+         0.0730205625296
+         0.0734899938107
+         0.0739610865712
+         0.0744338259101
+         0.074908234179
+         0.0753842890263
+         0.0758620128036
+         0.0763413906097
+         0.076822437346
+         0.0773051381111
+         0.0777895078063
+         0.078275538981
+         0.0787632390857
+         0.0792526006699
+         0.0797436311841
+         0.080236338079
+         0.0807307064533
+         0.0812267437577
+         0.0817244574428
+         0.0822238475084
+         0.0827249065042
+         0.0832276344299
+         0.0837320461869
+         0.0842381343246
+         0.0847458988428
+         0.0852553397417
+         0.0857664644718
+         0.0862792655826
+         0.0867937579751
+         0.0873099192977
+         0.0878277719021
+         0.0883473157883
+         0.0888685360551
+         0.0893914476037
+         0.0899160429835
+         0.0904423296452
+         0.0909703075886
+         0.0914999693632
+         0.0920313298702
+         0.092564381659
+         0.0930991247296
+         0.0936355665326
+         0.0941736996174
+         0.0947135314345
+         0.0952550619841
+         0.095798291266
+         0.0963432192802
+         0.0968898460269
+         0.0974381789565
+         0.0979882106185
+         0.0985399410129
+         0.0990933850408
+         0.099648527801
+         0.100205376744
+         0.100763939321
+         0.101324208081
+         0.101886183023
+         0.102449864149
+         0.103015258908
+         0.103582367301
+         0.104151189327
+         0.104721724987
+         0.10529397428
+         0.105867944658
+         0.106443621218
+         0.107021026313
+         0.107600145042
+         0.108180977404
+         0.108763538301
+         0.109347820282
+         0.109933815897
+         0.110521540046
+         0.11111099273
+         0.111702166498
+         0.11229506135
+         0.112889684737
+         0.113486044109
+         0.114084124565
+         0.114683933556
+         0.115285478532
+         0.115888752043
+         0.116493754089
+         0.11710049212
+         0.117708966136
+         0.118319176137
+         0.118931114674
+         0.119544796646
+         0.120160214603
+         0.120777368546
+         0.121396265924
+         0.122016899288
+         0.122639276087
+         0.123263396323
+         0.123889252543
+         0.124516859651
+         0.125146210194
+         0.125777304173
+         0.126410141587
+         0.127044737339
+         0.127681076527
+         0.12831915915
+         0.128959000111
+         0.129600584507
+         0.13024392724
+         0.13088901341
+         0.131535857916
+         0.132184460759
+         0.132834807038
+         0.133486926556
+         0.134140789509
+         0.134796410799
+         0.135453790426
+         0.136112943292
+         0.136773839593
+         0.137436509132
+         0.138100937009
+         0.138767123222
+         0.139435067773
+         0.140104785562
+         0.140776276588
+         0.141449525952
+         0.142124533653
+         0.142801314592
+         0.14347986877
+         0.144160196185
+         0.144842281938
+         0.145526155829
+         0.146211788058
+         0.146899193525
+         0.147588372231
+         0.148279339075
+         0.148972064257
+         0.149666577578
+         0.150362864137
+         0.151060923934
+         0.151760771871
+         0.152462393045
+         0.153165787458
+         0.153870970011
+         0.154577940702
+         0.155286684632
+         0.155997216702
+         0.15670953691
+         0.157423630357
+         0.158139526844
+         0.158857196569
+         0.159576654434
+         0.160297915339
+         0.161020949483
+         0.161745786667
+         0.162472397089
+         0.163200810552
+         0.163931027055
+         0.164663016796
+         0.165396809578
+         0.1661324054
+         0.166869789362
+         0.167608961463
+         0.168349936604
+         0.169092714787
+         0.169837296009
+         0.170583665371
+         0.171331837773
+         0.172081813216
+         0.1728335917
+         0.173587173223
+         0.174342557788
+         0.175099745393
+         0.175858736038
+         0.176619529724
+         0.177382141352
+         0.17814655602
+         0.178912773728
+         0.179680809379
+         0.180450648069
+         0.181222304702
+         0.181995764375
+         0.182771041989
+         0.183548122644
+         0.184327021241
+         0.18510773778
+         0.18589027226
+         0.186674624681
+         0.187460780144
+         0.188248768449
+         0.189038574696
+         0.189830183983
+         0.190623626113
+         0.191418886185
+         0.192215964198
+         0.193014875054
+         0.193815588951
+         0.194618150592
+         0.195422515273
+         0.196228712797
+         0.197036743164
+         0.197846591473
+         0.198658272624
+         0.199471771717
+         0.200287118554
+         0.201104283333
+         0.201923280954
+         0.202744096518
+         0.203566759825
+         0.204391255975
+         0.205217570066
+         0.206045731902
+         0.206875726581
+         0.207707554102
+         0.208541214466
+         0.209376722574
+         0.210214063525
+         0.211053237319
+         0.211894258857
+         0.212737113237
+         0.213581815362
+         0.214428350329
+         0.215276733041
+         0.216126963496
+         0.216979026794
+         0.217832937837
+         0.218688696623
+         0.219546303153
+         0.220405742526
+         0.221267044544
+         0.222130194306
+         0.222995176911
+         0.223862022161
+         0.224730715156
+         0.225601255894
+         0.226473659277
+         0.227347895503
+         0.228224009275
+         0.229101955891
+         0.229981765151
+         0.230863422155
+         0.231746941805
+         0.2326323241
+         0.233519554138
+         0.234408646822
+         0.235299602151
+         0.236192405224
+         0.237087070942
+         0.237983599305
+         0.238881990314
+         0.239782243967
+         0.240684360266
+         0.24158833921
+         0.242494180799
+         0.243401885033
+         0.244311466813
+         0.245222911239
+         0.246136218309
+         0.247051388025
+         0.247968435287
+         0.248887345195
+         0.249808132648
+         0.250730782747
+         0.251655310392
+         0.252581685781
+         0.253509968519
+         0.254440099001
+         0.255372136831
+         0.256306022406
+         0.257241785526
+         0.258179426193
+         0.259118944407
+         0.260060340166
+         0.261003613472
+         0.261948764324
+         0.262895792723
+         0.263844698668
+         0.264795482159
+         0.265748172998
+         0.266702711582
+         0.267659157515
+         0.268617480993
+         0.269577682018
+         0.270539790392
+         0.27150374651
+         0.272469609976
+         0.273437350988
+         0.27440699935
+         0.275378525257
+         0.276351928711
+         0.277327239513
+         0.278304427862
+         0.27928352356
+         0.280264496803
+         0.281247347593
+         0.282232135534
+         0.283218771219
+         0.284207314253
+         0.285197764635
+         0.286190092564
+         0.287184327841
+         0.288180470467
+         0.289178490639
+         0.290178418159
+         0.291180253029
+         0.292183965445
+         0.293189585209
+         0.294197112322
+         0.295206546783
+         0.296217888594
+         0.29723110795
+         0.298246234655
+         0.299263268709
+         0.300282210112
+         0.301303058863
+         0.302325814962
+         0.303350478411
+         0.304377049208
+         0.305405527353
+         0.306435912848
+         0.30746820569
+         0.308502405882
+         0.309538513422
+         0.310576528311
+         0.31161648035
+         0.312658309937
+         0.313702076674
+         0.314747750759
+         0.315795332193
+         0.316844850779
+         0.317896276712
+         0.318949609995
+         0.320004850626
+         0.321062028408
+         0.322121113539
+         0.323182106018
+         0.324245035648
+         0.325309872627
+         0.326376646757
+         0.327445328236
+         0.328515946865
+         0.329588472843
+         0.330662935972
+         0.33173930645
+         0.332817614079
+         0.333897829056
+         0.334979981184
+         0.336064070463
+         0.337150067091
+         0.33823800087
+         0.339327841997
+         0.340419650078
+         0.341513365507
+         0.342609018087
+         0.343706578016
+         0.344806104898
+         0.345907539129
+         0.347010910511
+         0.348116219044
+         0.349223464727
+         0.350332647562
+         0.351443737745
+         0.352556794882
+         0.353671759367
+         0.354788690805
+         0.355907559395
+         0.357028335333
+         0.358151078224
+         0.359275728464
+         0.360402345657
+         0.361530900002
+         0.362661391497
+         0.363793820143
+         0.36492818594
+         0.36606451869
+         0.367202788591
+         0.368342965841
+         0.369485139847
+         0.370629221201
+         0.371775269508
+         0.372923254967
+         0.374073177576
+         0.375225067139
+         0.376378893852
+         0.377534657717
+         0.378692388535
+         0.379852086306
+         0.381013691425
+         0.382177293301
+         0.383342802525
+         0.384510308504
+         0.385679721832
+         0.386851131916
+         0.388024479151
+         0.389199763536
+         0.390377014875
+         0.391556233168
+         0.392737388611
+         0.393920511007
+         0.395105600357
+         0.396292626858
+         0.397481620312
+         0.398672580719
+         0.39986550808
+         0.401060372591
+         0.402257204056
+         0.403456032276
+         0.404656767845
+         0.40585950017
+         0.407064199448
+         0.408270835876
+         0.409479469061
+         0.410690039396
+         0.411902606487
+         0.413117110729
+         0.414333581924
+         0.415552049875
+         0.416772454977
+         0.417994856834
+         0.419219195843
+         0.420445531607
+         0.421673834324
+         0.422904103994
+         0.424136340618
+         0.425370544195
+         0.426606714725
+         0.427844882011
+         0.429085016251
+         0.430327117443
+         0.431571185589
+         0.43281725049
+         0.434065282345
+         0.435315281153
+         0.436567276716
+         0.437821239233
+         0.439077198505
+         0.440335094929
+         0.44159501791
+         0.442856878042
+         0.444120764732
+         0.445386588573
+         0.44665440917
+         0.447924226522
+         0.449196010828
+         0.450469791889
+         0.451745539904
+         0.453023284674
+         0.454303026199
+         0.455584734678
+         0.456868439913
+         0.458154112101
+         0.459441781044
+         0.460731446743
+         0.462023109198
+         0.463316738605
+         0.464612364769
+         0.465909987688
+         0.467209607363
+         0.468511193991
+         0.469814807177
+         0.471120387316
+         0.472427964211
+         0.473737537861
+         0.475049108267
+         0.476362645626
+         0.477678209543
+         0.478995770216
+         0.480315327644
+         0.481636852026
+         0.482960402966
+         0.484285950661
+         0.485613465309
+         0.486943006516
+         0.488274544477
+         0.489608079195
+         0.490943640471
+         0.492281168699
+         0.493620723486
+         0.494962245226
+         0.496305793524
+         0.497651338577
+         0.498998910189
+         0.500348448753
+         0.501700043678
+         0.503053605556
+         0.504409193993
+         0.505766749382
+         0.507126331329
+         0.508487939835
+         0.509851515293
+         0.511217176914
+         0.512584805489
+         0.513954401016
+         0.515326023102
+         0.51669973135
+         0.518075346947
+         0.519453048706
+         0.520832717419
+         0.522214472294
+         0.523598134518
+         0.524983882904
+         0.526371657848
+         0.527761399746
+         0.529153168201
+         0.530546963215
+         0.531942784786
+         0.533340573311
+         0.534740447998
+         0.536142289639
+         0.537546217442
+         0.538952112198
+         0.540360033512
+         0.541769981384
+         0.54318189621
+         0.544595897198
+         0.546011924744
+         0.547429919243
+         0.548849999905
+         0.55027204752
+         0.551696181297
+         0.553122282028
+         0.554550468922
+         0.555980622768
+         0.557412803173
+         0.55884706974
+         0.560283303261
+         0.561721563339
+         0.56316190958
+         0.564604222775
+         0.566048622131
+         0.567494988441
+         0.568943440914
+         0.570393919945
+         0.571846425533
+         0.57330095768
+         0.574757456779
+         0.576216101646
+         0.577676713467
+         0.579139351845
+         0.580604076385
+         0.582070767879
+         0.583539545536
+         0.585010349751
+         0.586483180523
+         0.587958037853
+         0.589434981346
+         0.590913891792
+         0.592394888401
+         0.593877911568
+         0.595363020897
+         0.596850097179
+         0.598339259624
+         0.599830448627
+         0.601323664188
+         0.602818965912
+         0.604316234589
+         0.605815589428
+         0.60731703043
+         0.608820438385
+         0.610325932503
+         0.611833512783
+         0.613343060017
+         0.614854693413
+         0.616368353367
+         0.617884099483
+         0.619401872158
+         0.620921671391
+         0.622443556786
+         0.623967468739
+         0.625493466854
+         0.627021491528
+         0.628551542759
+         0.630083620548
+         0.631617844105
+         0.633154034615
+         0.634692311287
+         0.636232674122
+         0.63777500391
+         0.639319479465
+         0.640865981579
+         0.64241451025
+         0.643965125084
+         0.645517766476
+         0.64707249403
+         0.648629248142
+         0.650188088417
+         0.65174895525
+         0.653311908245
+         0.654876947403
+         0.656444013119
+         0.658013105392
+         0.659584343433
+         0.661157548428
+         0.662732899189
+         0.664310276508
+         0.665889680386
+         0.667471170425
+         0.669054746628
+         0.670640349388
+         0.672228038311
+         0.673817813396
+         0.67540961504
+         0.677003502846
+         0.678599476814
+         0.680197477341
+         0.68179756403
+         0.683399736881
+         0.685003995895
+         0.686610281467
+         0.688218653202
+         0.689829051495
+         0.691441595554
+         0.693056166172
+         0.694672763348
+         0.69629150629
+         0.697912275791
+         0.699535191059
+         0.701160132885
+         0.702787101269
+         0.70441621542
+         0.706047356129
+         0.707680583
+         0.709315896034
+         0.710953295231
+         0.71259278059
+         0.714234292507
+         0.715877890587
+         0.717523634434
+         0.719171404839
+         0.720821261406
+         0.722473204136
+         0.724127173424
+         0.725783288479
+         0.727441489697
+         0.729101717472
+         0.730764091015
+         0.732428491116
+         0.734094977379
+         0.735763549805
+         0.737434267998
+         0.739107012749
+         0.740781843662
+         0.742458760738
+         0.744137763977
+         0.745818912983
+         0.747502088547
+         0.749187350273
+         0.750874698162
+         0.752564132214
+         0.754255712032
+         0.755949318409
+         0.757645010948
+         0.759342849255
+         0.761042714119
+         0.762744724751
+         0.76444876194
+         0.766154944897
+         0.767863214016
+         0.769573569298
+         0.771286010742
+         0.773000538349
+         0.774717211723
+         0.776435911655
+         0.778156757355
+         0.779879689217
+         0.781604707241
+         0.783331811428
+         0.785061001778
+         0.786792337894
+         0.788525700569
+         0.790261209011
+         0.791998803616
+         0.793738543987
+         0.795480310917
+         0.797224223614
+         0.798970222473
+         0.8007183671
+         0.802468538284
+         0.804220855236
+         0.80597525835
+         0.807731747627
+         0.809490382671
+         0.811251103878
+         0.813013911247
+         0.814778864384
+         0.816545903683
+         0.818315029144
+         0.820086300373
+         0.821859657764
+         0.823635101318
+         0.825412631035
+         0.827192306519
+         0.828974127769
+         0.830758035183
+         0.832544028759
+         0.834332108498
+         0.836122334003
+         0.837914645672
+         0.839709103107
+         0.841505646706
+         0.843304336071
+         0.845105111599
+         0.846908032894
+         0.848712980747
+         0.850520133972
+         0.85232937336
+         0.85414069891
+         0.855954170227
+         0.857769727707
+         0.859587430954
+         0.861407279968
+         0.86322915554
+         0.865053236485
+         0.866879403591
+         0.86870765686
+         0.870538055897
+         0.8723706007
+         0.874205231667
+         0.8760420084
+         0.877880871296
+         0.879721879959
+         0.881564974785
+         0.883410215378
+         0.885257601738
+         0.887107074261
+         0.888958692551
+         0.890812456608
+         0.892668306828
+         0.894526302814
+         0.896386384964
+         0.898248612881
+         0.900112986565
+         0.901979506016
+         0.903848111629
+         0.90571886301
+         0.907591700554
+         0.909466683865
+         0.911343812943
+         0.913223087788
+         0.915104448795
+         0.91698795557
+         0.918873608112
+         0.920761406422
+         0.922651290894
+         0.924543321133
+         0.926437497139
+         0.928333818913
+         0.930232226849
+         0.932132780552
+         0.934035539627
+         0.93594032526
+         0.937847316265
+         0.939756393433
+         0.941667675972
+         0.943581044674
+         0.945496559143
+         0.947414219379
+         0.949333965778
+         0.951255917549
+         0.953179955482
+         0.955106198788
+         0.957034528255
+         0.95896500349
+         0.960897624493
+         0.962832391262
+         0.964769244194
+         0.966708302498
+         0.968649506569
+         0.970592796803
+         0.972538292408
+         0.974485874176
+         0.976435661316
+         0.978387534618
+         0.980341553688
+         0.98229777813
+         0.984256088734
+         0.986216545105
+         0.988179206848
+         0.990143954754
+         0.992110848427
+         0.994079947472
+         0.996051132679
+         0.998024523258
          1.0
 }
index c762485..3ec0a72 100755 (executable)
@@ -350,6 +350,8 @@ def create_config(config_data, gui=False):
 
     print("")
 
+    #print( "color spaces : %s" % [x.name for x in sorted(config_data['colorSpaces'])])
+
     # Creating the remaining colorspaces.
     for colorspace in sorted(config_data['colorSpaces']):
         print('Creating new color space : %s' % colorspace.name)
index 6729726..d3a9fc2 100644 (file)
@@ -483,44 +483,23 @@ def create_colorspaces(lut_directory,
 
     # *Linear* to *Rec. 2020 10 bit* Transfer Function*
     cs = create_transfer_colorspace(
-        'Curve - Rec.2020 - 10 bit',
+        'Curve - Rec.2020',
         'rec2020',
         transfer_function_Rec2020_10bit_to_linear,
         lut_directory,
         lut_resolution_1d,
-        aliases=["crv_rec202010bit"])
+        aliases=["crv_rec2020"])
     colorspaces.append(cs)
 
     # *ACES* to *Rec. 2020 10 bit* Primaries + Transfer Function*
     cs = create_matrix_plus_transfer_colorspace(
-        'Rec.2020 10 bit - Rec.2020',
+        'Rec.2020',
         'rec2020',
         transfer_function_Rec2020_10bit_to_linear,
         lut_directory,
         lut_resolution_1d,
         from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_Rec2020],
-        aliases=["rec202010bit"])
-    colorspaces.append(cs)
-
-    # *Linear* to *Rec. 2020 10 bit* Transfer Function*
-    cs = create_transfer_colorspace(
-        'Curve - Rec.2020 - 12 bit',
-        'rec2020',
-        transfer_function_Rec2020_12bit_to_linear,
-        lut_directory,
-        lut_resolution_1d,
-        aliases=["crv_rec202012bit"])
-    colorspaces.append(cs)
-
-    # *ACES* to *Rec. 2020 10 bit* Primaries + Transfer Function*
-    cs = create_matrix_plus_transfer_colorspace(
-        'Rec.2020 12 bit - Rec.2020',
-        'rec2020',
-        transfer_function_Rec2020_12bit_to_linear,
-        lut_directory,
-        lut_resolution_1d,
-        from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_Rec2020],
-        aliases=["rec202012bit"])
+        aliases=["rec2020"])
     colorspaces.append(cs)
 
     #