diff --git a/rtengine/camconst.json b/rtengine/camconst.json index 026a49ad2..b3294e379 100755 --- a/rtengine/camconst.json +++ b/rtengine/camconst.json @@ -705,23 +705,23 @@ Quality X: unknown, ie we knowing to little about the camera properties to know // "dcraw_matrix": [ 7009,-1699,-414,-5209,12641,2886,-1201,1904,7229 ], // Calculated from DxO d50 // "ranges": { "black": 600 } // }, - - { // quality B, lacks WL measures at intermediate ISOs (160-250-320 ..) and measures at long exposures with LongExposureNoiseReduction - // aperture scaling known to exist, but little to gain as the levels are so close to white_max - "make_model": "Nikon D610", - "dcraw_matrix": [ 8178,-2245,-609,-4857,12394,2776,-1207,2086,7298 ], // dcp d65 - "raw_crop": [ 0, 0, 6034, 4028 ], // Dcraw has no raw crop for D610 - "ranges": { - "white": [ - { "iso": [ 50, 100 ], "levels": [ 15800, 15700, 15800 ] }, // typical G1/G2 15778, R/B 15879 lowered to 15700, 158800 for possible WL distribution under LENR - { "iso": [ 200, 400, 800 ], "levels": [ 16300, 15700, 16300 ] }, // 15878, 16383 - { "iso": 1600, "levels": [ 16300, 16100, 16300 ] }, // 16145-165, 16383 - { "iso": [ 3200, 6400, 12800, 25600 ], "levels": [ 16300, 16300, 16300 ] } // 16383 - ], - "white_max": 16383 - } - }, - + + { // quality B, lacks WL measures at intermediate ISOs (160-250-320 ..) and measures at long exposures with LongExposureNoiseReduction + // aperture scaling known to exist, but little to gain as the levels are so close to white_max + "make_model": "Nikon D610", + "dcraw_matrix": [ 8178,-2245,-609,-4857,12394,2776,-1207,2086,7298 ], // dcp d65 + "raw_crop": [ 0, 0, 6034, 4028 ], // Dcraw has no raw crop for D610 + "ranges": { + "white": [ + { "iso": [ 50, 100 ], "levels": [ 15800, 15700, 15800 ] }, // typical G1/G2 15778, R/B 15879 lowered to 15700, 158800 for possible WL distribution under LENR + { "iso": [ 200, 400, 800 ], "levels": [ 16300, 15700, 16300 ] }, // 15878, 16383 + { "iso": 1600, "levels": [ 16300, 16100, 16300 ] }, // 16145-165, 16383 + { "iso": [ 3200, 6400, 12800, 25600 ], "levels": [ 16300, 16300, 16300 ] } // 16383 + ], + "white_max": 16383 + } + }, + { // Quality A, new model, there is a conflict with E-M1 in Dcraw.cc, raw crop correction "make_model": "OLYMPUS E-M10", @@ -871,12 +871,12 @@ Quality X: unknown, ie we knowing to little about the camera properties to know and white level is typically at or close to 65535. However sensors vary a bit and can be noisy around clip so we cut away 0.05 stop from top down to 63300 to be a bit conservative. */ { // quality A - "make_model": [ "Phase One P40+", "Phase One IQ140", "Phase One P65+", "Phase One IQ160", "Phase One IQ260" ], + "make_model": [ "Phase One P40+", "Phase One IQ140", "Leaf Credo 40", "Phase One P65+", "Phase One IQ160", "Leaf Credo 60", "Phase One IQ260" ], "dcraw_matrix": [ 8035,435,-962,-6001,13872,2320,-1159,3065,5434 ], "ranges": { "black": 0, "white": 63300 } }, { // quality A - "make_model": [ "Phase One IQ180", "Phase One IQ280" ], + "make_model": [ "Phase One IQ180", "Leaf Credo 80", "Phase One IQ280" ], "dcraw_matrix": [ 6294,686,-712,-5435,13417,2211,-1006,2435,5042 ], "ranges": { "black": 0, "white": 63300 } },