diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-07 13:29:54 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-07 13:29:54 +0200 |
commit | a879b4e708b3e46c9697ba6581687eeb5b02a320 (patch) | |
tree | f85acc5cb1a7c0b03a050c879c20cab3deb9f40e /xicc/moncurve.c | |
parent | 556dffcdad42b938bc196819aa463247de709765 (diff) | |
parent | c07d0c2d2f6f7b0eb6e92cc6204bf05037957e82 (diff) |
state from 2014-09-07 13:30 MESZ
Diffstat (limited to 'xicc/moncurve.c')
-rw-r--r-- | xicc/moncurve.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/xicc/moncurve.c b/xicc/moncurve.c index b904420..1769ce4 100644 --- a/xicc/moncurve.c +++ b/xicc/moncurve.c @@ -39,11 +39,10 @@ #undef TEST_PDE /* Ckeck partial derivative calcs */ -/* Normalization factors for an average data point error squared, scale 100 */ -#define HW01 0.002 /* 0 & 1 harmonic weights */ -#define HBREAK 4 /* Harmonic that has HWBR */ -#define HWBR 0.8 /* Base weight of harmonics HBREAK up */ -#define HWINC 0.5 /* Increase in weight for each harmonic above HWBR */ +#define HW01 0.01 /* 0 & 1 harmonic weights */ +#define HBREAK 3 /* Harmonic that has HWBR */ +#define HWBR 0.5 /* Base weight of harmonics HBREAK up */ +#define HWINC 0.7 /* Increase in weight for each harmonic above HWBR */ static void mcv_del(mcv *p); static void mcv_fit(mcv *p, int verb, int order, mcvco *d, int ndp, double smooth); @@ -550,7 +549,7 @@ double smooth) { w = HW01; } else if (cx <= HBREAK) { double bl = (cx - 1.0)/(HBREAK - 1.0); - w = (1.0 - bl) * HW01 + bl * HWBR; + w = (1.0 - bl) * HW01 + bl * HWBR * smooth; } else { w = HWBR + (cx-HBREAK) * HWINC * smooth; } @@ -653,7 +652,7 @@ double smooth) { w = HW01; } else if (cx <= HBREAK) { /* First or second curves */ double bl = (cx - 1.0)/(HBREAK - 1.0); - w = (1.0 - bl) * HW01 + bl * HWBR; + w = (1.0 - bl) * HW01 + bl * HWBR * smooth; } else { w = HWBR + (cx-HBREAK) * HWINC * smooth; } |