From d0ec3f2dbc644b8466e19a5032f75a49658f13b4 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Thu, 7 Jun 2018 20:48:53 +0200
Subject: [PATCH 1/4] move to camconst.json the info about whether global green
 equilibration is needed for the camera

---
 rtengine/camconst.cc       | 33 ++++++++++++++++++++++++++++++++
 rtengine/camconst.h        |  5 +++++
 rtengine/camconst.json     | 39 ++++++++++++++++++++++++++++++++++++++
 rtengine/rawimagesource.cc | 13 +++++++++++--
 4 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/rtengine/camconst.cc b/rtengine/camconst.cc
index 3d4342ed9..f83de99bd 100644
--- a/rtengine/camconst.cc
+++ b/rtengine/camconst.cc
@@ -25,6 +25,7 @@ CameraConst::CameraConst() : pdafOffset(0)
     memset(raw_crop, 0, sizeof(raw_crop));
     memset(raw_mask, 0, sizeof(raw_mask));
     white_max = 0;
+    globalGreenEquilibration = -1;
 }
 
 
@@ -339,6 +340,17 @@ CameraConst::parseEntry(void *cJSON_, const char *make_model)
         cc->pdafOffset = ji->valueint;
     }
 
+    ji = cJSON_GetObjectItem(js, "global_green_equilibration");
+
+    if (ji) {
+        if (ji->type != cJSON_Number) {
+            fprintf(stderr, "\"global_green_equilibration\" must be a number\n");
+            goto parse_error;
+        }
+
+        cc->globalGreenEquilibration = ji->valueint;
+    }
+    
     return cc;
 
 parse_error:
@@ -606,6 +618,24 @@ CameraConst::get_WhiteLevel(const int idx, const int iso_speed, const float fnum
     return lvl.levels[idx];
 }
 
+bool
+CameraConst::has_globalGreenEquilibration()
+{
+    return globalGreenEquilibration >= 0;
+}
+
+bool
+CameraConst::get_globalGreenEquilibration()
+{
+    return globalGreenEquilibration > 0;
+}
+
+void
+CameraConst::update_globalGreenEquilibration(bool other)
+{
+    globalGreenEquilibration = (other ? 1 : 0);
+}
+
 bool
 CameraConstantsStore::parse_camera_constants_file(Glib::ustring filename_)
 {
@@ -739,6 +769,9 @@ CameraConstantsStore::parse_camera_constants_file(Glib::ustring filename_)
                 existingcc->update_Crop(cc);
                 existingcc->update_pdafPattern(cc->get_pdafPattern());
                 existingcc->update_pdafOffset(cc->get_pdafOffset());
+                if (cc->has_globalGreenEquilibration()) {
+                    existingcc->update_globalGreenEquilibration(cc->get_globalGreenEquilibration());
+                }
 
                 if (settings->verbose) {
                     printf("Merging camera constants for \"%s\"\n", make_model.c_str());
diff --git a/rtengine/camconst.h b/rtengine/camconst.h
index 60e17201b..eb43da483 100644
--- a/rtengine/camconst.h
+++ b/rtengine/camconst.h
@@ -26,6 +26,8 @@ private:
     std::map<float, float> mApertureScaling;
     std::vector<int> pdafPattern;
     int pdafOffset;
+    int globalGreenEquilibration;
+    
     CameraConst();
     static bool parseLevels(CameraConst *cc, int bw, void *ji);
     static bool parseApertureScaling(CameraConst *cc, void *ji);
@@ -45,10 +47,13 @@ public:
     void get_rawMask(int idx, int& top, int& left, int& bottom, int& right);
     int get_BlackLevel(int idx, int iso_speed);
     int get_WhiteLevel(int idx, int iso_speed, float fnumber);
+    bool has_globalGreenEquilibration();
+    bool get_globalGreenEquilibration();
     void update_Levels(const CameraConst *other);
     void update_Crop(CameraConst *other);
     void update_pdafPattern(const std::vector<int> &other);
     void update_pdafOffset(int other);
+    void update_globalGreenEquilibration(bool other);
 };
 
 class CameraConstantsStore
diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index 597c5e4d4..7763edd75 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -1563,6 +1563,7 @@ Camera constants:
 
     { // Quality B, 16Mp and 64Mp raw frames
         "make_model": "OLYMPUS E-M5MarkII",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 9422,-3258,-711,-2655,10898,2015,-512,1354,5512 ], // DNG_v8.8 D65
         "raw_crop": [ 0, 0, -6, -6 ], // largest valid, full 64Mp 9280x6938, official crop 0 0 9216 6912
         "ranges": {
@@ -1604,12 +1605,14 @@ Camera constants:
 
     { // Quality B, missing per ISO samples
         "make_model": "OLYMPUS E-M1",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7687,-1984,-606,-4327,11928,2721,-1381,2339,6452 ], // dng d65
         "ranges": { "white": 4080 } // nominal 4095-4094, spread with some settings as long exposure
     },
 
     { // Quality B, crop correction
         "make_model": [ "OLYMPUS E-M10", "OLYMPUS E-M10MarkII", "OLYMPUS E-M10 Mark III" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 ],
         "raw_crop": [ 0, 0, 4624, 3472 ], // largest valid - full frame is 4640x3472
         //"raw_crop": [ 4, 4, 4616, 3464 ], // olympus jpeg crop 8, 8, 4608, 3456
@@ -1618,12 +1621,14 @@ Camera constants:
 
     { // Quality A, white level correction
         "make_model": "OLYMPUS E-PM2",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 ],
         "ranges": { "white": 4040 } // nominal 4056
     },
 
     { // Quality B, with long exposure noise reduction White Level gets WL-BL = around 256_12-bit levels less
         "make_model": [ "OLYMPUS E-PL7", "OLYMPUS E-PL8" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 9197,-3190,-659,-2606,10830,2039,-458,1250,5458 ], // DNG_v9.8 D65
         "ranges": { "white": 4080 } // nominal 4093
     },
@@ -1642,6 +1647,7 @@ Camera constants:
 
     { // Quality C, proper ISO 100-125-160 samples missing, pixelshift files have no black offset etc. #4574
         "make_model": [ "Panasonic DC-G9" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7685, -2375, -634, -3687, 11700, 2249, -748, 1546, 5111 ], // Adobe DNG Converter 10.3 ColorMatrix2
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT reads the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1655,6 +1661,7 @@ Camera constants:
 
     { // Quality B, CameraPhone, some samples are missing but has the same sensor as FZ1000 ..
         "make_model": [ "Panasonic DMC-CM1", "Panasonic DMC-CM10" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 8770,-3194,-820,-2871,11281,1803,-513,1552,4434 ], // dcp_v8.7 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1668,6 +1675,7 @@ Camera constants:
 
     { // Quality B
         "make_model": [ "Panasonic DC-FZ80", "Panasonic DC-FZ81", "Panasonic DC-FZ82", "Panasonic DC-FZ83" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 8550,-2908,-842,-3195,11529,1881,-338,1603,4631 ], // DNGv9.10.1 D65
         "raw_crop": [ 0, 6, -8, -2 ], // fullraw4/3 5040x3688 official 8,8,4904,3680 = 4896X3672. Dcraw 0,0,4912,3688 RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
@@ -1675,18 +1683,21 @@ Camera constants:
 
     { // Quality A, replicated from rawimage.cc
         "make_model": "Panasonic DMC-FZ150",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 10435,-3208,-72,-2293,10506,2067,-486,1725,4682 ], // RT, copy from custom dcp d55
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
     },
 
     { // Quality B,
         "make_model": [ "Panasonic DMC-FZ300", "Panasonic DMC-FZ330" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 8378,-2798,-769,-3068,11410,1877,-538,1792,4623 ], // DNG-V9.1.1
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
     },
 
     { // Quality A, samples by helices at RT forums
         "make_model": [ "Panasonic DMC-FZ1000", "Leica V-LUX (Typ 114)" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7830,-2696,-763,-3325,11667,1866,-641,1712,4824 ], // dcp_v8.6 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1700,6 +1711,7 @@ Camera constants:
 
     { // Quality B,
         "make_model": [ "Panasonic DMC-FZ2500", "Panasonic DMC-FZ2000", "Panasonic DMC-FZH1" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7386,-2443,-743,-3437,11864,1757,-608,1660,4766  ], // dcp_v9.8 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1713,6 +1725,7 @@ Camera constants:
 
     { // Quality A, samples by helices at RT forums and Chris Power at github
         "make_model": [ "Panasonic DMC-ZS100", "Panasonic DMC-ZS110", "Panasonic DMC-TZ100", "Panasonic DMC-TZ101", "Panasonic DMC-TZ110", "Panasonic DMC-TX1" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 ], // dcp_v8.6 d65
         "raw_crop": [ 4, 4, -4, -4 ], // full raw frame 5488x3664 Exif crop 5472X3648 with 8pixel borders. Set the borders at 4 pixels which added with RT's 4 pixels border gives exactly the official frame.
         "ranges": {
@@ -1727,12 +1740,14 @@ Camera constants:
 
     { // Quality A
         "make_model": [ "Panasonic DMC-LF1", "Leica C (Typ 112)" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 9379,-3267,-816,-3227,11560,1881,-926,1928,5340 ],
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
     },
 
     { // Quality A
         "make_model": [ "Panasonic DMC-TZ60", "Panasonic DMC-TZ61", "Panasonic DMC-ZS40", "Panasonic DMC-ZS41" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 8607,-2822,-808,-3755,11930,2049,-820,2060,5224 ], // matrix from Adobe dcp v8.4
         "raw_crop": [ 8, 8, -8, -8 ], // crop according to Exif 4896 X 3672 plus 4 pixels borders. RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 14, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
@@ -1740,6 +1755,7 @@ Camera constants:
 
     { // Quality B
         "make_model": [ "Panasonic DMC-TZ70", "Panasonic DMC-TZ71", "Panasonic DMC-ZS50", "Panasonic DMC-ZS51" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 8802,-3135,-789,-3151,11468,1904,-550,1745,4810 ], // DNG_V8.8 D65
         "raw_crop": [ 0, 0, -4, -4 ], // full raw 4/3 4144x3016 8,8,3008,4008 = 4000X3000. RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 14, "white": 4050 } // 12+1+1 is BL offset
@@ -1747,6 +1763,7 @@ Camera constants:
 
     { // Quality A, samples by Hombre
         "make_model": [ "Panasonic DC-ZS70", "Panasonic DC-TZ90", "Panasonic DC-TZ91", "Panasonic DC-TZ92", "Panasonic DC-TZ93" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 9052,-3117,-883,-3045,11346,1927,-205,1520,4730 ], // DNG_V9.10.1 D65
         "raw_crop": [ 0, 6, -8, -2 ], // fullraw4/3 5264x3904 official 8,8,3896,5192 = 5184X3888. Dcraw 0,0,5200,3904 RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 16, "white": 4050 } // 12+3+1 is BL offset
@@ -1756,6 +1773,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": [ "Panasonic DMC-G10", "Panasonic DMC-G2" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 8310,-1811,-960,-4941,12990,2151,-1378,2468,6860 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is black offset, dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1768,6 +1786,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-G1",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7477,-1615,-651,-5016,12769,2506,-1380,2475,7240 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1780,6 +1799,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-G3",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 6051,-1406,-671,-4015,11505,2868,-1654,2667,6219 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1788,6 +1808,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-G5",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7122,-2092,-419,-4643,11769,3283,-1363,2413,5944 ], // RT
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1796,6 +1817,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GF1",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7863,-2080,-668,-4623,12331,2578,-1020,2066,7266 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1808,6 +1830,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GF2",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7694,-1791,-745,-4917,12818,2332,-1221,2322,7197 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1816,6 +1839,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GF3",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 8074,-1846,-861,-5026,12999,2239,-1320,2375,7422 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1824,6 +1848,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GH1",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 6360,-1557,-375,-4201,11504,3086,-1378,2518,5843 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1836,6 +1861,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GH2",
+        "global_green_equilibration" : 1,
         //"dcraw_matrix": [ 6855,-1765,-456,-4223,11600,2996,-1450,2602,5761 ], // Colin Walker - disabled due to problems with underwater
         "dcraw_matrix": [ 7780,-2410,-806,-3913,11724,2484,-1018,2390,5298 ], // dcraw d65
         "ranges": {
@@ -1849,6 +1875,7 @@ Camera constants:
 
     { // Quality B, variable WL
         "make_model": "Panasonic DMC-GH3",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 6559,-1752,-491,-3672,11407,2586,-962,1875,5130 ], // dcp d65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1861,6 +1888,7 @@ Camera constants:
 
     { // Quality B, some ISO WLevels are safely guessed
         "make_model": "Panasonic DMC-GH4",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7122,-2108,-512,-3155,11201,2231,-541,1423,5045 ], // dng_v8.5 d65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1874,6 +1902,7 @@ Camera constants:
 
     { // Quality C
         "make_model": "Panasonic DC-GH5",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7641,-2336,-605,-3218,11299,2187,-485,1338,5121 ], // DNG_v9.9 D65
         "ranges": {
             "black": 15, // 16 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1887,6 +1916,7 @@ Camera constants:
 
     { // Quality A
         "make_model": "Panasonic DMC-GM1",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 6770,-1895,-744,-5232,13145,2303,-1664,2691,5703 ],
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1900,6 +1930,7 @@ Camera constants:
 
     { // Quality B, uncertainty about ISO100 WL
         "make_model": "Panasonic DMC-GM5",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 8238,-3244,-679,-3921,11814,2384,-836,2022,5852 ], // dng_v8.7 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1912,6 +1943,7 @@ Camera constants:
 
     { // Quality A
         "make_model": [ "Panasonic DMC-GX7", "Panasonic DMC-GF7", "Panasonic DMC-GF8" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ],
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1925,6 +1957,7 @@ Camera constants:
 
     { // Quality A
         "make_model": [ "Panasonic DMC-G7", "Panasonic DMC-G70" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ], // DNG_v9.1 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1938,6 +1971,7 @@ Camera constants:
 
     { // Quality B
         "make_model": [ "Panasonic DMC-GX80", "Panasonic DMC-GX85", "Panasonic DMC-GX7MK2" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7771,-3020,-629,-4029,11950,2345,-821,1977,6119 ], // DNG_v9.6 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1951,6 +1985,7 @@ Camera constants:
 
     { // Quality X, no white-frames nor black-frames yet, see #4550
         "make_model": [ "Panasonic DC-GX9" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7564,-2263,-606,-3148,11239,2177,-540,1435,4853 ], // ColorMatrix2 from Adobe DNG Converter 10.3
         "ranges": {
             "black": 16,
@@ -1960,6 +1995,7 @@ Camera constants:
 
     { // Quality B, Same as Panasonic G7
         "make_model": [ "Panasonic DMC-G8", "Panasonic DMC-G80", "Panasonic DMC-G81", "Panasonic DMC-G85" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ], // DNG_v9.7 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1973,6 +2009,7 @@ Camera constants:
 
     { // Quality B
         "make_model": "Panasonic DMC-GX8",
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7564,-2263,-606,-3148,11239,2177,-540,1435,4853 ], // DNG_v9.1.1 D65
         "ranges": {
             "black": 15, // 16 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1986,6 +2023,7 @@ Camera constants:
 
     { // Quality B, samples by Ingo, missing some long exposure at high ISO samples with LENR ON
         "make_model": [ "Panasonic DMC-LX100", "Leica D-LUX (Typ 109)" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 8844,-3538,-768,-3709,11762,2200,-698,1792,5220 ], // DNG_V8.7 d65
         //"dcraw_matrix": [ 6538,-1614,-549,-5475,13096,2646,-1780,2799,5612 ], // calculated from DxO D50
         "ranges": {
@@ -2006,6 +2044,7 @@ Camera constants:
 
     { // Quality B, Intermediate ISOs missing
         "make_model": [ "Panasonic DMC-LX9", "Panasonic DMC-LX10", "Panasonic DMC-LX15" ],
+        "global_green_equilibration" : 1,
         "dcraw_matrix": [ 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 ], // DNg_v9.8 d65
         "raw_crop": [ 4, 4, -4, -4 ], // full raw frame 5488x3664 Exif crop 5472X3648 with 8pixel borders. Set the borders at 4 pixels which added with RT's 4 pixels border gives exactly the official frame.
         "ranges": {
diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 6f119a2ad..0c35154bf 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -35,6 +35,7 @@
 #include "improcfun.h"
 #include "rtlensfun.h"
 #include "pdaflinesfilter.h"
+#include "camconst.h"
 #ifdef _OPENMP
 #include <omp.h>
 #endif
@@ -1945,8 +1946,16 @@ void RawImageSource::preprocess  (const RAWParams &raw, const LensProfParams &le
         }
     }
 
-    // check if it is an olympus E camera or green equilibration is enabled. If yes, compute G channel pre-compensation factors
-    if ( ri->getSensorType() == ST_BAYER && (raw.bayersensor.greenthresh || (((idata->getMake().size() >= 7 && idata->getMake().substr(0, 7) == "OLYMPUS" && idata->getModel()[0] == 'E') || (idata->getMake().size() >= 9 && idata->getMake().substr(0, 9) == "Panasonic")) && raw.bayersensor.method != RAWParams::BayerSensor::getMethodString( RAWParams::BayerSensor::Method::VNG4))) ) {
+    // check if green equilibration is needed. If yes, compute G channel pre-compensation factors
+    const auto globalGreenEq =
+        [&]() -> bool
+        {
+            CameraConstantsStore *ccs = CameraConstantsStore::getInstance();
+            CameraConst *cc = ccs->get(ri->get_maker().c_str(), ri->get_model().c_str());
+            return cc && cc->get_globalGreenEquilibration();
+        };
+    
+    if ( ri->getSensorType() == ST_BAYER && (raw.bayersensor.greenthresh || (globalGreenEq() && raw.bayersensor.method != RAWParams::BayerSensor::getMethodString( RAWParams::BayerSensor::Method::VNG4))) ) {
         // global correction
         if(numFrames == 4) {
             for(int i = 0; i < 4; ++i) {

From 0e22f0b610bef09abf8815535c6052d9a4095af5 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Thu, 7 Jun 2018 20:50:32 +0200
Subject: [PATCH 2/4] camconst.json: rename pdafPattern -> pdaf_pattern and
 pdafOffset -> pdaf_offset

this is for consistency with the other entries
---
 rtengine/camconst.cc   | 10 +++++-----
 rtengine/camconst.json | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/rtengine/camconst.cc b/rtengine/camconst.cc
index f83de99bd..3e6139fc6 100644
--- a/rtengine/camconst.cc
+++ b/rtengine/camconst.cc
@@ -311,17 +311,17 @@ CameraConst::parseEntry(void *cJSON_, const char *make_model)
         }
     }
 
-    ji = cJSON_GetObjectItem(js, "pdafPattern");
+    ji = cJSON_GetObjectItem(js, "pdaf_pattern");
 
     if (ji) {
         if (ji->type != cJSON_Array) {
-            fprintf(stderr, "\"pdafPattern\" must be an array\n");
+            fprintf(stderr, "\"pdaf_pattern\" must be an array\n");
             goto parse_error;
         }
 
         for (ji = ji->child; ji != nullptr; ji = ji->next) {
             if (ji->type != cJSON_Number) {
-                fprintf(stderr, "\"pdafPattern\" array must contain numbers\n");
+                fprintf(stderr, "\"pdaf_pattern\" array must contain numbers\n");
                 goto parse_error;
             }
 
@@ -329,11 +329,11 @@ CameraConst::parseEntry(void *cJSON_, const char *make_model)
         }
     }
 
-    ji = cJSON_GetObjectItem(js, "pdafOffset");
+    ji = cJSON_GetObjectItem(js, "pdaf_offset");
 
     if (ji) {
         if (ji->type != cJSON_Number) {
-            fprintf(stderr, "\"pdafOffset\" must contain a number\n");
+            fprintf(stderr, "\"pdaf_offset\" must contain a number\n");
             goto parse_error;
         }
 
diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index 7763edd75..4772868a1 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -83,10 +83,10 @@ Examples:
         // instead, to take care of possible light leaks from the light sensing area to the optically black (masked)
         // area or sensor imperfections at the outer borders.
 
-        // list of indices of the rows with on-sensor PDAF pixels, for cameras that have such features. The indices here form a pattern that is repeated for the whole height of the sensor. The values are relative to the "pdafOffset" value (see below)
-        "pdafPattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
+        // list of indices of the rows with on-sensor PDAF pixels, for cameras that have such features. The indices here form a pattern that is repeated for the whole height of the sensor. The values are relative to the "pdaf_offset" value (see below)
+        "pdaf_pattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
         // index of the first row of the PDAF pattern in the sensor (0 is the topmost row). Allowed to be negative for convenience (this means that the first repetition of the pattern doesn't start from the first row)
-        "pdafOffset" : 3
+        "pdaf_offset" : 3
     },
 
     {
@@ -2308,8 +2308,8 @@ Camera constants:
         "ranges": { "black": 512, "white": 16300 },
         // detected by hand, using the picture from https://www.dpreview.com/forums/thread/3923513
         // P 11 P 23 P 17 P 17 P 17 P 23 P 11 P 17 P 17 P 17 P 23 P 11 P 23 P 11 P 17 P 23 P 11 P 17 P 17 P 23 P 17 P 11 P 17 P 17 P 17 P 23 P 17 P 11 P 17 P 17 P 23 P 11 P 17 P 11 P 23
-        "pdafPattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
-        "pdafOffset" : 3
+        "pdaf_pattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
+        "pdaf_offset" : 3
     },
 
     { // Quality A
@@ -2318,8 +2318,8 @@ Camera constants:
         "raw_crop": [ 0, 0, 6024, 4024 ],
         "ranges": { "black": 512, "white": 16300 },
         // contributed by Horshak from https://www.dpreview.com/forums/post/60873077
-        "pdafPattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
-        "pdafOffset" : 3        
+        "pdaf_pattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
+        "pdaf_offset" : 3        
     },
 
     { // Quality C, only pdaf data
@@ -2330,8 +2330,8 @@ Camera constants:
         //
         // rotated to match the start of the frame
         //   P 11 P 11 P 11 P 17 P 11 P 5 P 11 P 11 P 17 P 5 P 11 P 17 P 5 P 17 P 5 P 11 P 11 P 11 P 17 P 5 P 11 P 11 P 11 P 5 P 17 P 5 P 17 P 11 P 5 P 17 P 11 P 11 P 17 P 11 P 5
-        "pdafPattern" : [ 0,12,24,36,54,66,72,84,96,114,120,132,150,156,174,180,192,204,216,234,240,252,264,276,282,300,306,324,336,342,360,372,384,402,414,420],
-        "pdafOffset" : 9
+        "pdaf_pattern" : [ 0,12,24,36,54,66,72,84,96,114,120,132,150,156,174,180,192,204,216,234,240,252,264,276,282,300,306,324,336,342,360,372,384,402,414,420],
+        "pdaf_offset" : 9
     },
 
     { // Quality A, correction for frame width
@@ -2353,8 +2353,8 @@ Camera constants:
         "raw_crop": [ 0, 0, -36, 0 ], // full raw frame 8000x5320 - 36 rightmost columns are garbage
         "ranges": { "black": 512, "white": 16300 },
         // PDAF info provided by Horshack with the rawshack tool (http://testcams.com/rawshack/)
-        "pdafPattern" : [ 0,24,36,60,84,120,132,156,192,204,240,252,276,300,324,360,372,396,420 ],
-        "pdafOffset" : 31
+        "pdaf_pattern" : [ 0,24,36,60,84,120,132,156,192,204,240,252,276,300,324,360,372,396,420 ],
+        "pdaf_offset" : 31
     },
 
     { // Quality C, color matrix copied from ILCE-9, LongExposures 2-3sec only
@@ -2384,8 +2384,8 @@ Camera constants:
         "dcraw_matrix": [ 6640,-1847,-503,-5238,13010,2474,-993,1673,6527 ], // DNG_v10.1 D65
         "raw_crop": [ 0, 0, -36, 0 ], // full raw frame 8000x5320 - 36 rightmost columns are garbage
         "ranges": { "black": 512, "white": 16300 },
-        "pdafPattern" : [0, 24, 36, 60, 84, 120, 132, 156, 192, 204, 240, 252, 276, 300, 324, 360, 372, 396, 420, 444, 480, 492, 504, 540, 564, 576, 612, 636, 660, 696, 720, 732, 756, 780, 804, 840],
-        "pdafOffset" : 31
+        "pdaf_pattern" : [0, 24, 36, 60, 84, 120, 132, 156, 192, 204, 240, 252, 276, 300, 324, 360, 372, 396, 420, 444, 480, 492, 504, 540, 564, 576, 612, 636, 660, 696, 720, 732, 756, 780, 804, 840],
+        "pdaf_offset" : 31
     },
 
     { // Quality B, color matrix copied from a7rm2
@@ -2396,8 +2396,8 @@ Camera constants:
         // the A9 is the same as the A7III, rotated of 1 position
         // source: https://www.dpreview.com/forums/post/60857788
         // P 11 P 11 P 11 P 17 P 11 P 5 P 11 P 11 P 17 P 5 P 11 P 17 P 5 P 17 P 5 P 11 P 11 P 11 P 17 P 5 P 11 P 11 P 11 P 5 P 17 P 5 P 17 P 11 P 5 P 17 P 11 P 11 P 17 P 11 P 5
-        "pdafPattern" : [ 0,12,24,36,54,66,72,84,96,114,120,132,150,156,174,180,192,204,216,234,240,252,264,276,282,300,306,324,336,342,360,372,384,402,414,420 ],
-        "pdafOffset" : -7
+        "pdaf_pattern" : [ 0,12,24,36,54,66,72,84,96,114,120,132,150,156,174,180,192,204,216,234,240,252,264,276,282,300,306,324,336,342,360,372,384,402,414,420 ],
+        "pdaf_offset" : -7
     },
 
     { // Quality B, correction for frame width

From 4361e1206217f2d5cbff16e2b207bbf04df8eda7 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Fri, 8 Jun 2018 13:55:15 +0200
Subject: [PATCH 3/4] camconst: use true/false instead of 0/1 for
 "global_green_equilibration"

---
 rtengine/camconst.cc       |  6 +--
 rtengine/camconst.json     | 78 +++++++++++++++++++-------------------
 rtengine/rawimagesource.cc |  3 ++
 3 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/rtengine/camconst.cc b/rtengine/camconst.cc
index 3e6139fc6..43de5d688 100644
--- a/rtengine/camconst.cc
+++ b/rtengine/camconst.cc
@@ -343,12 +343,12 @@ CameraConst::parseEntry(void *cJSON_, const char *make_model)
     ji = cJSON_GetObjectItem(js, "global_green_equilibration");
 
     if (ji) {
-        if (ji->type != cJSON_Number) {
-            fprintf(stderr, "\"global_green_equilibration\" must be a number\n");
+        if (ji->type != cJSON_False && ji->type != cJSON_True) {
+            fprintf(stderr, "\"global_green_equilibration\" must be a boolean\n");
             goto parse_error;
         }
 
-        cc->globalGreenEquilibration = ji->valueint;
+        cc->globalGreenEquilibration = (ji->type == cJSON_True);
     }
     
     return cc;
diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index 4772868a1..bfa22567c 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -1563,7 +1563,7 @@ Camera constants:
 
     { // Quality B, 16Mp and 64Mp raw frames
         "make_model": "OLYMPUS E-M5MarkII",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 9422,-3258,-711,-2655,10898,2015,-512,1354,5512 ], // DNG_v8.8 D65
         "raw_crop": [ 0, 0, -6, -6 ], // largest valid, full 64Mp 9280x6938, official crop 0 0 9216 6912
         "ranges": {
@@ -1605,14 +1605,14 @@ Camera constants:
 
     { // Quality B, missing per ISO samples
         "make_model": "OLYMPUS E-M1",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7687,-1984,-606,-4327,11928,2721,-1381,2339,6452 ], // dng d65
         "ranges": { "white": 4080 } // nominal 4095-4094, spread with some settings as long exposure
     },
 
     { // Quality B, crop correction
         "make_model": [ "OLYMPUS E-M10", "OLYMPUS E-M10MarkII", "OLYMPUS E-M10 Mark III" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 ],
         "raw_crop": [ 0, 0, 4624, 3472 ], // largest valid - full frame is 4640x3472
         //"raw_crop": [ 4, 4, 4616, 3464 ], // olympus jpeg crop 8, 8, 4608, 3456
@@ -1621,14 +1621,14 @@ Camera constants:
 
     { // Quality A, white level correction
         "make_model": "OLYMPUS E-PM2",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 ],
         "ranges": { "white": 4040 } // nominal 4056
     },
 
     { // Quality B, with long exposure noise reduction White Level gets WL-BL = around 256_12-bit levels less
         "make_model": [ "OLYMPUS E-PL7", "OLYMPUS E-PL8" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 9197,-3190,-659,-2606,10830,2039,-458,1250,5458 ], // DNG_v9.8 D65
         "ranges": { "white": 4080 } // nominal 4093
     },
@@ -1647,7 +1647,7 @@ Camera constants:
 
     { // Quality C, proper ISO 100-125-160 samples missing, pixelshift files have no black offset etc. #4574
         "make_model": [ "Panasonic DC-G9" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7685, -2375, -634, -3687, 11700, 2249, -748, 1546, 5111 ], // Adobe DNG Converter 10.3 ColorMatrix2
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT reads the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1661,7 +1661,7 @@ Camera constants:
 
     { // Quality B, CameraPhone, some samples are missing but has the same sensor as FZ1000 ..
         "make_model": [ "Panasonic DMC-CM1", "Panasonic DMC-CM10" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8770,-3194,-820,-2871,11281,1803,-513,1552,4434 ], // dcp_v8.7 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1675,7 +1675,7 @@ Camera constants:
 
     { // Quality B
         "make_model": [ "Panasonic DC-FZ80", "Panasonic DC-FZ81", "Panasonic DC-FZ82", "Panasonic DC-FZ83" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8550,-2908,-842,-3195,11529,1881,-338,1603,4631 ], // DNGv9.10.1 D65
         "raw_crop": [ 0, 6, -8, -2 ], // fullraw4/3 5040x3688 official 8,8,4904,3680 = 4896X3672. Dcraw 0,0,4912,3688 RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
@@ -1683,21 +1683,21 @@ Camera constants:
 
     { // Quality A, replicated from rawimage.cc
         "make_model": "Panasonic DMC-FZ150",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 10435,-3208,-72,-2293,10506,2067,-486,1725,4682 ], // RT, copy from custom dcp d55
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
     },
 
     { // Quality B,
         "make_model": [ "Panasonic DMC-FZ300", "Panasonic DMC-FZ330" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8378,-2798,-769,-3068,11410,1877,-538,1792,4623 ], // DNG-V9.1.1
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
     },
 
     { // Quality A, samples by helices at RT forums
         "make_model": [ "Panasonic DMC-FZ1000", "Leica V-LUX (Typ 114)" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7830,-2696,-763,-3325,11667,1866,-641,1712,4824 ], // dcp_v8.6 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1711,7 +1711,7 @@ Camera constants:
 
     { // Quality B,
         "make_model": [ "Panasonic DMC-FZ2500", "Panasonic DMC-FZ2000", "Panasonic DMC-FZH1" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7386,-2443,-743,-3437,11864,1757,-608,1660,4766  ], // dcp_v9.8 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1725,7 +1725,7 @@ Camera constants:
 
     { // Quality A, samples by helices at RT forums and Chris Power at github
         "make_model": [ "Panasonic DMC-ZS100", "Panasonic DMC-ZS110", "Panasonic DMC-TZ100", "Panasonic DMC-TZ101", "Panasonic DMC-TZ110", "Panasonic DMC-TX1" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 ], // dcp_v8.6 d65
         "raw_crop": [ 4, 4, -4, -4 ], // full raw frame 5488x3664 Exif crop 5472X3648 with 8pixel borders. Set the borders at 4 pixels which added with RT's 4 pixels border gives exactly the official frame.
         "ranges": {
@@ -1740,14 +1740,14 @@ Camera constants:
 
     { // Quality A
         "make_model": [ "Panasonic DMC-LF1", "Leica C (Typ 112)" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 9379,-3267,-816,-3227,11560,1881,-926,1928,5340 ],
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
     },
 
     { // Quality A
         "make_model": [ "Panasonic DMC-TZ60", "Panasonic DMC-TZ61", "Panasonic DMC-ZS40", "Panasonic DMC-ZS41" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8607,-2822,-808,-3755,11930,2049,-820,2060,5224 ], // matrix from Adobe dcp v8.4
         "raw_crop": [ 8, 8, -8, -8 ], // crop according to Exif 4896 X 3672 plus 4 pixels borders. RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 14, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
@@ -1755,7 +1755,7 @@ Camera constants:
 
     { // Quality B
         "make_model": [ "Panasonic DMC-TZ70", "Panasonic DMC-TZ71", "Panasonic DMC-ZS50", "Panasonic DMC-ZS51" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8802,-3135,-789,-3151,11468,1904,-550,1745,4810 ], // DNG_V8.8 D65
         "raw_crop": [ 0, 0, -4, -4 ], // full raw 4/3 4144x3016 8,8,3008,4008 = 4000X3000. RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 14, "white": 4050 } // 12+1+1 is BL offset
@@ -1763,7 +1763,7 @@ Camera constants:
 
     { // Quality A, samples by Hombre
         "make_model": [ "Panasonic DC-ZS70", "Panasonic DC-TZ90", "Panasonic DC-TZ91", "Panasonic DC-TZ92", "Panasonic DC-TZ93" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 9052,-3117,-883,-3045,11346,1927,-205,1520,4730 ], // DNG_V9.10.1 D65
         "raw_crop": [ 0, 6, -8, -2 ], // fullraw4/3 5264x3904 official 8,8,3896,5192 = 5184X3888. Dcraw 0,0,5200,3904 RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 16, "white": 4050 } // 12+3+1 is BL offset
@@ -1773,7 +1773,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": [ "Panasonic DMC-G10", "Panasonic DMC-G2" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8310,-1811,-960,-4941,12990,2151,-1378,2468,6860 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is black offset, dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1786,7 +1786,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-G1",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7477,-1615,-651,-5016,12769,2506,-1380,2475,7240 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1799,7 +1799,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-G3",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 6051,-1406,-671,-4015,11505,2868,-1654,2667,6219 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1808,7 +1808,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-G5",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7122,-2092,-419,-4643,11769,3283,-1363,2413,5944 ], // RT
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1817,7 +1817,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GF1",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7863,-2080,-668,-4623,12331,2578,-1020,2066,7266 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1830,7 +1830,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GF2",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7694,-1791,-745,-4917,12818,2332,-1221,2322,7197 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1839,7 +1839,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GF3",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8074,-1846,-861,-5026,12999,2239,-1320,2375,7422 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1848,7 +1848,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GH1",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 6360,-1557,-375,-4201,11504,3086,-1378,2518,5843 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1861,7 +1861,7 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GH2",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         //"dcraw_matrix": [ 6855,-1765,-456,-4223,11600,2996,-1450,2602,5761 ], // Colin Walker - disabled due to problems with underwater
         "dcraw_matrix": [ 7780,-2410,-806,-3913,11724,2484,-1018,2390,5298 ], // dcraw d65
         "ranges": {
@@ -1875,7 +1875,7 @@ Camera constants:
 
     { // Quality B, variable WL
         "make_model": "Panasonic DMC-GH3",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 6559,-1752,-491,-3672,11407,2586,-962,1875,5130 ], // dcp d65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1888,7 +1888,7 @@ Camera constants:
 
     { // Quality B, some ISO WLevels are safely guessed
         "make_model": "Panasonic DMC-GH4",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7122,-2108,-512,-3155,11201,2231,-541,1423,5045 ], // dng_v8.5 d65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1902,7 +1902,7 @@ Camera constants:
 
     { // Quality C
         "make_model": "Panasonic DC-GH5",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7641,-2336,-605,-3218,11299,2187,-485,1338,5121 ], // DNG_v9.9 D65
         "ranges": {
             "black": 15, // 16 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1916,7 +1916,7 @@ Camera constants:
 
     { // Quality A
         "make_model": "Panasonic DMC-GM1",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 6770,-1895,-744,-5232,13145,2303,-1664,2691,5703 ],
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1930,7 +1930,7 @@ Camera constants:
 
     { // Quality B, uncertainty about ISO100 WL
         "make_model": "Panasonic DMC-GM5",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8238,-3244,-679,-3921,11814,2384,-836,2022,5852 ], // dng_v8.7 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1943,7 +1943,7 @@ Camera constants:
 
     { // Quality A
         "make_model": [ "Panasonic DMC-GX7", "Panasonic DMC-GF7", "Panasonic DMC-GF8" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ],
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1957,7 +1957,7 @@ Camera constants:
 
     { // Quality A
         "make_model": [ "Panasonic DMC-G7", "Panasonic DMC-G70" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ], // DNG_v9.1 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1971,7 +1971,7 @@ Camera constants:
 
     { // Quality B
         "make_model": [ "Panasonic DMC-GX80", "Panasonic DMC-GX85", "Panasonic DMC-GX7MK2" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7771,-3020,-629,-4029,11950,2345,-821,1977,6119 ], // DNG_v9.6 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1985,7 +1985,7 @@ Camera constants:
 
     { // Quality X, no white-frames nor black-frames yet, see #4550
         "make_model": [ "Panasonic DC-GX9" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7564,-2263,-606,-3148,11239,2177,-540,1435,4853 ], // ColorMatrix2 from Adobe DNG Converter 10.3
         "ranges": {
             "black": 16,
@@ -1995,7 +1995,7 @@ Camera constants:
 
     { // Quality B, Same as Panasonic G7
         "make_model": [ "Panasonic DMC-G8", "Panasonic DMC-G80", "Panasonic DMC-G81", "Panasonic DMC-G85" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ], // DNG_v9.7 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -2009,7 +2009,7 @@ Camera constants:
 
     { // Quality B
         "make_model": "Panasonic DMC-GX8",
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7564,-2263,-606,-3148,11239,2177,-540,1435,4853 ], // DNG_v9.1.1 D65
         "ranges": {
             "black": 15, // 16 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -2023,7 +2023,7 @@ Camera constants:
 
     { // Quality B, samples by Ingo, missing some long exposure at high ISO samples with LENR ON
         "make_model": [ "Panasonic DMC-LX100", "Leica D-LUX (Typ 109)" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8844,-3538,-768,-3709,11762,2200,-698,1792,5220 ], // DNG_V8.7 d65
         //"dcraw_matrix": [ 6538,-1614,-549,-5475,13096,2646,-1780,2799,5612 ], // calculated from DxO D50
         "ranges": {
@@ -2044,7 +2044,7 @@ Camera constants:
 
     { // Quality B, Intermediate ISOs missing
         "make_model": [ "Panasonic DMC-LX9", "Panasonic DMC-LX10", "Panasonic DMC-LX15" ],
-        "global_green_equilibration" : 1,
+        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 ], // DNg_v9.8 d65
         "raw_crop": [ 4, 4, -4, -4 ], // full raw frame 5488x3664 Exif crop 5472X3648 with 8pixel borders. Set the borders at 4 pixels which added with RT's 4 pixels border gives exactly the official frame.
         "ranges": {
diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 0c35154bf..5438b8b1e 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -1956,6 +1956,9 @@ void RawImageSource::preprocess  (const RAWParams &raw, const LensProfParams &le
         };
     
     if ( ri->getSensorType() == ST_BAYER && (raw.bayersensor.greenthresh || (globalGreenEq() && raw.bayersensor.method != RAWParams::BayerSensor::getMethodString( RAWParams::BayerSensor::Method::VNG4))) ) {
+        if (settings->verbose) {
+            printf("Performing global green equilibration...\n");
+        }
         // global correction
         if(numFrames == 4) {
             for(int i = 0; i < 4; ++i) {

From 55f232f4dda80caaf22181ea11b928998ade3378 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Tue, 12 Jun 2018 08:44:34 +0200
Subject: [PATCH 4/4] updated camconst.json with global green eq info according
 to iliasg's advice

---
 rtengine/camconst.json | 41 +++++------------------------------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index bfa22567c..449484e8a 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -1563,7 +1563,6 @@ Camera constants:
 
     { // Quality B, 16Mp and 64Mp raw frames
         "make_model": "OLYMPUS E-M5MarkII",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 9422,-3258,-711,-2655,10898,2015,-512,1354,5512 ], // DNG_v8.8 D65
         "raw_crop": [ 0, 0, -6, -6 ], // largest valid, full 64Mp 9280x6938, official crop 0 0 9216 6912
         "ranges": {
@@ -1612,7 +1611,6 @@ Camera constants:
 
     { // Quality B, crop correction
         "make_model": [ "OLYMPUS E-M10", "OLYMPUS E-M10MarkII", "OLYMPUS E-M10 Mark III" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 ],
         "raw_crop": [ 0, 0, 4624, 3472 ], // largest valid - full frame is 4640x3472
         //"raw_crop": [ 4, 4, 4616, 3464 ], // olympus jpeg crop 8, 8, 4608, 3456
@@ -1645,9 +1643,13 @@ Camera constants:
         "ranges": { "white": 4050 } // safe for worst case detected, nominal is 4093
     },
 
+    { // Quality C, only green equilibration
+        "make_model" : ["OLYMPUS E-3", "OLYMPUS E-520"],
+        "global_green_equilibration" : true
+    },
+
     { // Quality C, proper ISO 100-125-160 samples missing, pixelshift files have no black offset etc. #4574
         "make_model": [ "Panasonic DC-G9" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7685, -2375, -634, -3687, 11700, 2249, -748, 1546, 5111 ], // Adobe DNG Converter 10.3 ColorMatrix2
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT reads the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1661,7 +1663,6 @@ Camera constants:
 
     { // Quality B, CameraPhone, some samples are missing but has the same sensor as FZ1000 ..
         "make_model": [ "Panasonic DMC-CM1", "Panasonic DMC-CM10" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8770,-3194,-820,-2871,11281,1803,-513,1552,4434 ], // dcp_v8.7 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1675,7 +1676,6 @@ Camera constants:
 
     { // Quality B
         "make_model": [ "Panasonic DC-FZ80", "Panasonic DC-FZ81", "Panasonic DC-FZ82", "Panasonic DC-FZ83" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8550,-2908,-842,-3195,11529,1881,-338,1603,4631 ], // DNGv9.10.1 D65
         "raw_crop": [ 0, 6, -8, -2 ], // fullraw4/3 5040x3688 official 8,8,4904,3680 = 4896X3672. Dcraw 0,0,4912,3688 RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
@@ -1683,21 +1683,18 @@ Camera constants:
 
     { // Quality A, replicated from rawimage.cc
         "make_model": "Panasonic DMC-FZ150",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 10435,-3208,-72,-2293,10506,2067,-486,1725,4682 ], // RT, copy from custom dcp d55
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
     },
 
     { // Quality B,
         "make_model": [ "Panasonic DMC-FZ300", "Panasonic DMC-FZ330" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8378,-2798,-769,-3068,11410,1877,-538,1792,4623 ], // DNG-V9.1.1
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
     },
 
     { // Quality A, samples by helices at RT forums
         "make_model": [ "Panasonic DMC-FZ1000", "Leica V-LUX (Typ 114)" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7830,-2696,-763,-3325,11667,1866,-641,1712,4824 ], // dcp_v8.6 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1711,7 +1708,6 @@ Camera constants:
 
     { // Quality B,
         "make_model": [ "Panasonic DMC-FZ2500", "Panasonic DMC-FZ2000", "Panasonic DMC-FZH1" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7386,-2443,-743,-3437,11864,1757,-608,1660,4766  ], // dcp_v9.8 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1725,7 +1721,6 @@ Camera constants:
 
     { // Quality A, samples by helices at RT forums and Chris Power at github
         "make_model": [ "Panasonic DMC-ZS100", "Panasonic DMC-ZS110", "Panasonic DMC-TZ100", "Panasonic DMC-TZ101", "Panasonic DMC-TZ110", "Panasonic DMC-TX1" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 ], // dcp_v8.6 d65
         "raw_crop": [ 4, 4, -4, -4 ], // full raw frame 5488x3664 Exif crop 5472X3648 with 8pixel borders. Set the borders at 4 pixels which added with RT's 4 pixels border gives exactly the official frame.
         "ranges": {
@@ -1740,14 +1735,12 @@ Camera constants:
 
     { // Quality A
         "make_model": [ "Panasonic DMC-LF1", "Leica C (Typ 112)" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 9379,-3267,-816,-3227,11560,1881,-926,1928,5340 ],
         "ranges": { "black": 15, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
     },
 
     { // Quality A
         "make_model": [ "Panasonic DMC-TZ60", "Panasonic DMC-TZ61", "Panasonic DMC-ZS40", "Panasonic DMC-ZS41" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8607,-2822,-808,-3755,11930,2049,-820,2060,5224 ], // matrix from Adobe dcp v8.4
         "raw_crop": [ 8, 8, -8, -8 ], // crop according to Exif 4896 X 3672 plus 4 pixels borders. RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 14, "white": 4050 } // 15 is BL offset. dcraw/RT read the base offset from Exif and calculates total BL = BLbase+BLoffset
@@ -1755,7 +1748,6 @@ Camera constants:
 
     { // Quality B
         "make_model": [ "Panasonic DMC-TZ70", "Panasonic DMC-TZ71", "Panasonic DMC-ZS50", "Panasonic DMC-ZS51" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8802,-3135,-789,-3151,11468,1904,-550,1745,4810 ], // DNG_V8.8 D65
         "raw_crop": [ 0, 0, -4, -4 ], // full raw 4/3 4144x3016 8,8,3008,4008 = 4000X3000. RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 14, "white": 4050 } // 12+1+1 is BL offset
@@ -1763,7 +1755,6 @@ Camera constants:
 
     { // Quality A, samples by Hombre
         "make_model": [ "Panasonic DC-ZS70", "Panasonic DC-TZ90", "Panasonic DC-TZ91", "Panasonic DC-TZ92", "Panasonic DC-TZ93" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 9052,-3117,-883,-3045,11346,1927,-205,1520,4730 ], // DNG_V9.10.1 D65
         "raw_crop": [ 0, 6, -8, -2 ], // fullraw4/3 5264x3904 official 8,8,3896,5192 = 5184X3888. Dcraw 0,0,5200,3904 RT's frame gets smaller than dcraw but works better with auto distortion
         "ranges": { "black": 16, "white": 4050 } // 12+3+1 is BL offset
@@ -1773,7 +1764,6 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": [ "Panasonic DMC-G10", "Panasonic DMC-G2" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8310,-1811,-960,-4941,12990,2151,-1378,2468,6860 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is black offset, dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1786,7 +1776,6 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-G1",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7477,-1615,-651,-5016,12769,2506,-1380,2475,7240 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1799,7 +1788,6 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-G3",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 6051,-1406,-671,-4015,11505,2868,-1654,2667,6219 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1808,7 +1796,6 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-G5",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7122,-2092,-419,-4643,11769,3283,-1363,2413,5944 ], // RT
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1817,7 +1804,6 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GF1",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7863,-2080,-668,-4623,12331,2578,-1020,2066,7266 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1830,7 +1816,6 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GF2",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7694,-1791,-745,-4917,12818,2332,-1221,2322,7197 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1839,7 +1824,6 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GF3",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8074,-1846,-861,-5026,12999,2239,-1320,2375,7422 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1848,7 +1832,6 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GH1",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 6360,-1557,-375,-4201,11504,3086,-1378,2518,5843 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1861,7 +1844,6 @@ Camera constants:
 
     { // Quality A, Replicated from rawimage.cc
         "make_model": "Panasonic DMC-GH2",
-        "global_green_equilibration" : true,
         //"dcraw_matrix": [ 6855,-1765,-456,-4223,11600,2996,-1450,2602,5761 ], // Colin Walker - disabled due to problems with underwater
         "dcraw_matrix": [ 7780,-2410,-806,-3913,11724,2484,-1018,2390,5298 ], // dcraw d65
         "ranges": {
@@ -1875,7 +1857,6 @@ Camera constants:
 
     { // Quality B, variable WL
         "make_model": "Panasonic DMC-GH3",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 6559,-1752,-491,-3672,11407,2586,-962,1875,5130 ], // dcp d65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1888,7 +1869,6 @@ Camera constants:
 
     { // Quality B, some ISO WLevels are safely guessed
         "make_model": "Panasonic DMC-GH4",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7122,-2108,-512,-3155,11201,2231,-541,1423,5045 ], // dng_v8.5 d65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1902,7 +1882,6 @@ Camera constants:
 
     { // Quality C
         "make_model": "Panasonic DC-GH5",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7641,-2336,-605,-3218,11299,2187,-485,1338,5121 ], // DNG_v9.9 D65
         "ranges": {
             "black": 15, // 16 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -1916,7 +1895,6 @@ Camera constants:
 
     { // Quality A
         "make_model": "Panasonic DMC-GM1",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 6770,-1895,-744,-5232,13145,2303,-1664,2691,5703 ],
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1930,7 +1908,6 @@ Camera constants:
 
     { // Quality B, uncertainty about ISO100 WL
         "make_model": "Panasonic DMC-GM5",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8238,-3244,-679,-3921,11814,2384,-836,2022,5852 ], // dng_v8.7 d65
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1943,7 +1920,6 @@ Camera constants:
 
     { // Quality A
         "make_model": [ "Panasonic DMC-GX7", "Panasonic DMC-GF7", "Panasonic DMC-GF8" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ],
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1957,7 +1933,6 @@ Camera constants:
 
     { // Quality A
         "make_model": [ "Panasonic DMC-G7", "Panasonic DMC-G70" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ], // DNG_v9.1 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1971,7 +1946,6 @@ Camera constants:
 
     { // Quality B
         "make_model": [ "Panasonic DMC-GX80", "Panasonic DMC-GX85", "Panasonic DMC-GX7MK2" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7771,-3020,-629,-4029,11950,2345,-821,1977,6119 ], // DNG_v9.6 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -1985,7 +1959,6 @@ Camera constants:
 
     { // Quality X, no white-frames nor black-frames yet, see #4550
         "make_model": [ "Panasonic DC-GX9" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7564,-2263,-606,-3148,11239,2177,-540,1435,4853 ], // ColorMatrix2 from Adobe DNG Converter 10.3
         "ranges": {
             "black": 16,
@@ -1995,7 +1968,6 @@ Camera constants:
 
     { // Quality B, Same as Panasonic G7
         "make_model": [ "Panasonic DMC-G8", "Panasonic DMC-G80", "Panasonic DMC-G81", "Panasonic DMC-G85" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ], // DNG_v9.7 D65
         "ranges": {
             "black": 16, // 16 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
@@ -2009,7 +1981,6 @@ Camera constants:
 
     { // Quality B
         "make_model": "Panasonic DMC-GX8",
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7564,-2263,-606,-3148,11239,2177,-540,1435,4853 ], // DNG_v9.1.1 D65
         "ranges": {
             "black": 15, // 16 is BL offset. dcraw/RT read the base BL from Exif and calculates total BL = BLbase+BLoffset
@@ -2023,7 +1994,6 @@ Camera constants:
 
     { // Quality B, samples by Ingo, missing some long exposure at high ISO samples with LENR ON
         "make_model": [ "Panasonic DMC-LX100", "Leica D-LUX (Typ 109)" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 8844,-3538,-768,-3709,11762,2200,-698,1792,5220 ], // DNG_V8.7 d65
         //"dcraw_matrix": [ 6538,-1614,-549,-5475,13096,2646,-1780,2799,5612 ], // calculated from DxO D50
         "ranges": {
@@ -2044,7 +2014,6 @@ Camera constants:
 
     { // Quality B, Intermediate ISOs missing
         "make_model": [ "Panasonic DMC-LX9", "Panasonic DMC-LX10", "Panasonic DMC-LX15" ],
-        "global_green_equilibration" : true,
         "dcraw_matrix": [ 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 ], // DNg_v9.8 d65
         "raw_crop": [ 4, 4, -4, -4 ], // full raw frame 5488x3664 Exif crop 5472X3648 with 8pixel borders. Set the borders at 4 pixels which added with RT's 4 pixels border gives exactly the official frame.
         "ranges": {