johannes hanika wrote: [about copy of D800 settings] > i'm totally uncomfortable pushing this without having looked at a > graph (at which point we might just as well push the correct data, if > we profiled it already).
full ACK, ...calibration done. took a little longer because:
* pictures not dark enough in first attempt
* ignored most of the blog ('apply style...', export?). done this:
take raw pics, put them in a dir and run gen-profile -d .
* the exiv part in gen-profile returned '0' for iso settings
LOx and HIx (<100 and >6400), script fixed.
--> Found ISO 0 image: ./DSC_...
'git diff' attached,
dt-noiseprofile-20130221.tar.gz (2,1MB) on request as personal mail?
kind regards
Wolfgang
diff --git a/src/common/exif.cc b/src/common/exif.cc
index 4f9a06a..a468d28 100644
--- a/src/common/exif.cc
+++ b/src/common/exif.cc
@@ -1078,9 +1078,13 @@ int dt_exif_read_blob(
Exiv2::ExifParser::encode(blob, Exiv2::bigEndian, exifData);
const int length = blob.size();
memcpy(buf, "Exif\000\000", 6);
- if(length > 0 && length < 65534)
+ if(length > 0 && length < 65534){//todo 65534?
memcpy(buf+6, &(blob[0]), length);
- return length;
+ return length+6;
+ }
+ else{
+ return 6;
+ }
}
catch (Exiv2::AnyError& e)
{
diff --git a/src/common/noiseprofiles.h b/src/common/noiseprofiles.h
index 2bdb06b..28e5fc3 100644
--- a/src/common/noiseprofiles.h
+++ b/src/common/noiseprofiles.h
@@ -510,6 +510,35 @@ const dt_noiseprofile_t dt_noiseprofiles[] = {
{"Nikon D800 iso 12800", "NIKON", "D800", 12800, {0.00018493145619636,
0.00018493145619636, 0.00018493145619636}, {7.71909224546891e-07,
7.71909224546891e-07, 7.71909224546891e-07}},
{"Nikon D800 iso 25600", "NIKON", "D800", 25600, {0.000359528021714155,
0.000359528021714155, 0.000359528021714155}, {6.42176785593581e-06,
6.42176785593581e-06, 6.42176785593581e-06}},
+// Nikon D800E, contributed by WG
+{"NIKON D800E iso 50", "NIKON CORPORATION", "NIKON D800E",
50, {2.47950042812616e-06, 1.89007913739829e-06,
6.22303763880983e-07}, {-2.54764522868205e-08, -4.65866010174205e-08,
6.02970774261104e-07}},
+{"NIKON D800E iso 63", "NIKON CORPORATION", "NIKON D800E",
63, {2.52617605471794e-06, 1.9155957625239e-06,
4.52005980868485e-07}, {-3.14632529718683e-08, -5.27982510676594e-08,
6.29386935246036e-07}},
+{"NIKON D800E iso 79", "NIKON CORPORATION", "NIKON D800E",
79, {2.48019787217052e-06, 1.74724483086114e-06,
3.04542189083626e-07}, {-2.46215332902138e-08, -1.92040692739085e-08,
6.32586684516755e-07}},
+{"NIKON D800E iso 100", "NIKON CORPORATION", "NIKON D800E",
100, {2.33950662988413e-06, 1.80481136484837e-06,
3.61564449581278e-07}, {-1.11781130599113e-08, -3.93379525783742e-08,
6.19613205485056e-07}},
+{"NIKON D800E iso 125", "NIKON CORPORATION", "NIKON D800E",
125, {2.92050181503123e-06, 2.16648878154414e-06,
9.09882842560613e-07}, {-1.37481195172961e-08, -4.31324669745174e-08,
6.84498699955463e-07}},
+{"NIKON D800E iso 160", "NIKON CORPORATION", "NIKON D800E",
160, {3.49916608427732e-06, 2.59199142512512e-06,
6.85592333913582e-06}, {-1.49947984295679e-09, -2.91579683903105e-08,
-9.20870467050362e-08}},
+{"NIKON D800E iso 200", "NIKON CORPORATION", "NIKON D800E",
200, {4.64241122822783e-06, 3.24838185405598e-06,
3.68478191849984e-07}, {-3.07994649461231e-08, -5.71373308339205e-08,
1.18520378316292e-06}},
+{"NIKON D800E iso 250", "NIKON CORPORATION", "NIKON D800E",
250, {5.56597025227697e-06, 3.95459126956011e-06,
4.98145054987976e-07}, {-1.03609603479457e-09, -4.32374912265535e-08,
1.46010865015988e-06}},
+{"NIKON D800E iso 320", "NIKON CORPORATION", "NIKON D800E",
320, {6.8091394880186e-06, 4.86023511621434e-06,
5.44350137121875e-07}, {1.19546695555644e-09, -3.81127020874309e-08,
1.81611638624893e-06}},
+{"NIKON D800E iso 400", "NIKON CORPORATION", "NIKON D800E",
400, {8.60302405059914e-06, 6.18340742933378e-06,
1.88235874741871e-07}, {-7.86680552970148e-10, -5.56623410283349e-08,
2.34728860747305e-06}},
+{"NIKON D800E iso 500", "NIKON CORPORATION", "NIKON D800E",
500, {1.04832015265563e-05, 7.66280906891528e-06,
7.83395820929019e-07}, {1.31014781356844e-08, -8.83055860723616e-08,
2.83170128317793e-06}},
+{"NIKON D800E iso 640", "NIKON CORPORATION", "NIKON D800E",
640, {1.35586012679998e-05, 9.60732247821001e-06,
4.11689034178953e-07}, {-8.68901435402503e-09, -8.90176717819707e-08,
3.64149578118993e-06}},
+{"NIKON D800E iso 800", "NIKON CORPORATION", "NIKON D800E",
800, {1.67457496748671e-05, 1.19192176897617e-05,
6.476293572464e-06}, {5.59281632519398e-09, -1.29487739805406e-07,
3.60159850754591e-06}},
+{"NIKON D800E iso 1000", "NIKON CORPORATION", "NIKON D800E",
1000, {2.10260702117938e-05, 1.48621856710804e-05,
3.77836676324913e-05}, {5.71825525523424e-08, -6.25159281831868e-08,
-2.40823855143781e-07}},
+{"NIKON D800E iso 1250", "NIKON CORPORATION", "NIKON D800E",
1250, {2.60757021362497e-05, 1.82470179088582e-05,
1.24624153523446e-06}, {9.36630412442482e-08, -4.60744622987197e-08,
7.05714264268106e-06}},
+{"NIKON D800E iso 1600", "NIKON CORPORATION", "NIKON D800E",
1600, {3.41323546872789e-05, 2.33428377680625e-05,
4.29917820871289e-06}, {2.36404014179177e-08, -1.51001611664244e-08,
8.60040711007302e-06}},
+{"NIKON D800E iso 2000", "NIKON CORPORATION", "NIKON D800E",
2000, {4.19229991249149e-05, 2.95851825924165e-05,
5.53029956275229e-06}, {1.13894360680683e-07, 3.19409754814293e-08,
1.09013667119605e-05}},
+{"NIKON D800E iso 2500", "NIKON CORPORATION", "NIKON D800E",
2500, {5.43060301441471e-05, 3.76980387278306e-05,
1.22459448596722e-05}, {5.09355266546247e-08, -9.80382380204792e-08,
1.28734681095848e-05}},
+{"NIKON D800E iso 3200", "NIKON CORPORATION", "NIKON D800E",
3200, {6.77957487614127e-05, 4.67789559899518e-05,
9.95429302487372e-05}, {8.21669384446783e-08, 6.17698986247756e-08,
2.8380887490685e-06}},
+{"NIKON D800E iso 4000", "NIKON CORPORATION", "NIKON D800E",
4000, {8.85772591321022e-05, 5.87482496651853e-05,
4.79079756656232e-05}, {6.27533106152045e-09, 4.69100490772446e-07,
1.60367980306127e-05}},
+{"NIKON D800E iso 5000", "NIKON CORPORATION", "NIKON D800E",
5000, {0.000107254225983481, 7.57978599603096e-05,
1.24008269998274e-05}, {2.5882113212772e-07, 8.91570054116542e-09,
2.78201135016986e-05}},
+{"NIKON D800E iso 6400", "NIKON CORPORATION", "NIKON D800E",
6400, {0.000138909402379952, 9.39800732084756e-05,
8.0171324874729e-05}, {1.89262809921205e-07, 4.68341268476712e-07,
2.48616677680723e-05}},
+{"NIKON D800E iso 8063", "NIKON CORPORATION", "NIKON D800E",
8063, {0.000165678934174764, 0.000117178318465476,
0.000205585370490118}, {-1.33327895685009e-07, 6.66495883517521e-07,
1.5299558079462e-05}},
+{"NIKON D800E iso 10159", "NIKON CORPORATION", "NIKON D800E",
10159, {0.000203692601185298, 0.000151585658459017,
4.41076480753117e-05}, {5.05618471814225e-07, -1.59171325515882e-07,
5.16814530805088e-05}},
+{"NIKON D800E iso 12800", "NIKON CORPORATION", "NIKON D800E",
12800, {0.000250548092879238, 0.00019114882117511,
2.26058499706455e-05}, {1.88793608574928e-06, 4.84091766485229e-07,
7.03093683285303e-05}},
+{"NIKON D800E iso 25600", "NIKON CORPORATION", "NIKON D800E",
25600, {0.000505949016676869, 0.000363178791825,
0.000299638065952473}, {6.92718931739042e-06, 7.28461519946033e-06,
0.000104299127644332}},
+
+
// nikon d3100, contributed by sismo
{"Nikon D3100 iso 100", "NIKON CORPORATION", "NIKON D3100", 100,
{8.24450984493645e-06, 4.57339084914489e-06, 6.72909677335241e-06},
{6.34439375134399e-08, -1.68257151487887e-07, -1.42662968173028e-07}},
{"Nikon D3100 iso 200", "NIKON CORPORATION", "NIKON D3100", 200,
{1.69522646284645e-05, 7.73797088383233e-06, 9.96806279498521e-06},
{-2.10460064704677e-07, -2.50467421709781e-07, 1.62253095955509e-07}},
diff --git a/tools/noise/subr.sh b/tools/noise/subr.sh
index a0f1010..a4011d5 100644
--- a/tools/noise/subr.sh
+++ b/tools/noise/subr.sh
@@ -303,7 +303,7 @@ get_image_iso() {
# possibly talk with exiv2 developers to get an option that only
# displays the correct iso
- if [ -z "$iso" ]; then
+ if [ -z "$iso" -o "$iso" = "0" ]; then
case "$(get_image_camera_maker "$1")" in
[Nn][Ii][Kk][Oo][Nn]*)
# Read "Exif.Nikon3.*" before "Exif.NikonIi.*":
@@ -313,10 +313,10 @@ get_image_iso() {
# 2. That looks like versionned nodes:
# "Nikon2" vs. "Nikon3".
iso=$(get_exif_key "$file" Exif.Nikon3.ISOSpeed)
- if [ -z "$iso" ]; then
+ if [ -z "$iso" -o "$iso" = "0" ]; then
iso=$(get_exif_key "$file"
Exif.Nikon3.ISOSettings)
fi
- if [ -z "$iso" ]; then
+ if [ -z "$iso" -o "$iso" = "0" ]; then
iso=$(get_exif_key "$file" Exif.NikonIi.ISO)
fi
;;
signature.asc
Description: PGP signature
------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________ darktable-devel mailing list darktable-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/darktable-devel
